M hikari/hikari.spec => hikari/hikari.spec +17 -10
@@ 1,6 1,6 @@
Name: hikari
Version: 2.2.2
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Stacking Wayland compositor with tiling capabilities
License: BSD
@@ 31,6 31,7 @@ views, groups, sheets and the workspace.
%autosetup
%build
+%set_build_flags
bmake WITH_POSIX_C_SOURCE=YES \
WITH_XWAYLAND=YES \
WITH_SCREENCOPY=YES \
@@ 38,25 39,31 @@ bmake WITH_POSIX_C_SOURCE=YES \
WITH_LAYERSHELL=YES
%install
-bmake DESTDIR=%{buildroot} PREFIX=%{_prefix} ETC_PREFIX="" install
-
-# Set standard exec permissions for binaries.
-chmod 755 %{buildroot}%{_bindir}/%{name}
-chmod 755 %{buildroot}%{_bindir}/%{name}-unlocker
+bmake DESTDIR=%{buildroot} \
+ PREFIX=%{_prefix} \
+ ETC_PREFIX="" \
+ WITHOUT_SUID=YES \
+ install
%files
%license LICENSE
%doc README.md
%config %{_sysconfdir}/pam.d/%{name}-unlocker
-%config %{_sysconfdir}/%{name}/%{name}.conf
-%{_bindir}/%{name}
-%{_bindir}/%{name}-unlocker
+%config %{_sysconfdir}/%{name}/
+%config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
+%attr(0755, root, root) %{_bindir}/%{name}
+%attr(0755, root, root) %{_bindir}/%{name}-unlocker
%{_mandir}/man1/hikari.1*
+%{_datadir}/backgrounds/%{name}/
%{_datadir}/backgrounds/%{name}/hikari_wallpaper.png
%{_datadir}/wayland-sessions/%{name}.desktop
%changelog
-* Sat Mar 06 2020 Timothée Floure <fnux@fedoraproject.org> - 2.2.2-2
+* Sat Mar 20 2021 Timothée Floure <fnux@fedoraproject.org> - 2.2.2-3
+- Remove useless setuid
+- Properly set fedora build flags
+
+* Sat Mar 06 2021 Timothée Floure <fnux@fedoraproject.org> - 2.2.2-2
- Fix various permission and rpmlint issues.
* Thu Dec 24 2020 Timothée Floure <fnux@fedoraproject.org> - 2.2.2-1
M mk-files/mk-files.spec => mk-files/mk-files.spec +6 -2
@@ 1,7 1,7 @@
Summary: Support files for bmake, the NetBSD make(1) tool
Name: mk-files
-Version: 20200505
-Release: 3%{?dist}
+Version: 20210321
+Release: 1%{?dist}
License: BSD
URL: ftp://ftp.NetBSD.org/pub/NetBSD/misc/sjg/
Source0: ftp://ftp.NetBSD.org/pub/NetBSD/misc/sjg/mk-%{version}.tar.gz
@@ 29,10 29,14 @@ env FORCE_BSD_MK={RPM_BUILD_ROOT}/nonexistent \
%files
%doc ChangeLog README
+%license LICENSE
%dir %{_datadir}/mk
%{_datadir}/mk/*
%changelog
+* Sat Mar 20 2021 Timothée Floure <fnux@fedoraproject.org> - 20200321-1
+- New upstream release shipping LICENSE
+
* Thu Mar 18 2021 Timothée Floure <fnux@fedoraproject.org> - 20200505-3
- Remove useless buildroot removal in install section
- Use -p flag with install to preserve timestamps