diff --git a/powerd.changes b/powerd.changes index a83d180..3c292c3 100644 --- a/powerd.changes +++ b/powerd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Nov 25 15:04:45 UTC 2020 - Ludwig Nussel + +- prepare usrmerge (boo#1029961) + ------------------------------------------------------------------- Tue Jun 18 10:25:28 UTC 2019 - Dr. Werner Fink diff --git a/powerd.spec b/powerd.spec index c68234c..8ed82e9 100644 --- a/powerd.spec +++ b/powerd.spec @@ -1,7 +1,7 @@ # # spec file for package powerd # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,6 +16,12 @@ # +%if 0%{?usrmerged} +%define sbindir %_sbindir +%else +%define sbindir /sbin +%endif + Name: powerd Version: 2.0.2 Release: 0 @@ -50,9 +56,9 @@ than a specified number of minutes. RPM_OPT_FLAGS="${RPM_OPT_FLAGS} $(getconf LFS_CFLAGS) -pipe" CC=%__cc export RPM_OPT_FLAGS CC - %configure --prefix= --bindir='$(DESTDIR)/sbin' \ + %configure --prefix= --bindir='$(DESTDIR)%{sbindir}' \ --mandir='$(DESTDIR)%{_mandir}' \ - --sbindir='$(DESTDIR)/sbin' + --sbindir='$(DESTDIR)%{sbindir}' make %{?_smp_mflags} CFLAGS="-I. $RPM_OPT_FLAGS -DWITH_SYSVINIT" %install @@ -71,7 +77,7 @@ than a specified number of minutes. echo '# systemctl start powerd.service' >> %{buildroot}/etc/powerd.conf mkdir -p %{buildroot}/%{_unitdir} install -m 0644 %{S:2} %{buildroot}/%{_unitdir}/powerd.service - ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rcpowerd + ln -sf service %{buildroot}%{_sbindir}/rcpowerd %pre %service_add_post powerd.service @@ -89,8 +95,8 @@ than a specified number of minutes. %defattr (-,root,root,755) %license COPYING %doc README SUPPORTED FAQ powerd.conf.monitor powerd.conf.peer -/sbin/powerd -/sbin/detectups +%{sbindir}/powerd +%{sbindir}/detectups %{_sbindir}/rcpowerd %config /etc/powerd.conf %attr(0644,root,root) %{_unitdir}/powerd.service diff --git a/sysvinit-2.90-no-kill.patch b/sysvinit-2.90-no-kill.patch index 17d56f1..24da2f7 100644 --- a/sysvinit-2.90-no-kill.patch +++ b/sysvinit-2.90-no-kill.patch @@ -43,7 +43,7 @@ * Read the proc filesystem. * CWD must be /proc to avoid problems if / is affected by the killing (ie depend on fuse). */ -@@ -683,6 +715,26 @@ int readproc(int do_stat) +@@ -676,6 +708,26 @@ int readproc(int do_stat) p->nfs = 0; switch (do_stat) { diff --git a/sysvinit-2.98.tar.xz b/sysvinit-2.98.tar.xz deleted file mode 100644 index e205097..0000000 --- a/sysvinit-2.98.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7b2c3ffaf19eaf1ca80268762f85f9e4eb8e3c973213d49f9802605b72caa7dc -size 127028 diff --git a/sysvinit-2.99.tar.xz b/sysvinit-2.99.tar.xz new file mode 100644 index 0000000..5c1658d --- /dev/null +++ b/sysvinit-2.99.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b05c3677bb698afe64c997968b00c49b2a9bd320ce963523230ee7ea41197757 +size 126908 diff --git a/sysvinit.changes b/sysvinit.changes index f8ba04b..734c7b6 100644 --- a/sysvinit.changes +++ b/sysvinit.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Mon Feb 22 16:00:28 UTC 2021 - Dr. Werner Fink + +- Update to sysvinit 2.99: + * Mostly typo and just better documentation and easier to read + code comments + +------------------------------------------------------------------- +Wed Nov 25 15:04:42 UTC 2020 - Ludwig Nussel + +- prepare usrmerge (boo#1029961) + ------------------------------------------------------------------- Tue Nov 17 11:26:22 UTC 2020 - Dr. Werner Fink diff --git a/sysvinit.spec b/sysvinit.spec index c705637..30d8785 100644 --- a/sysvinit.spec +++ b/sysvinit.spec @@ -1,7 +1,7 @@ # # spec file for package sysvinit # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,9 +16,17 @@ # +%if 0%{?usrmerged} +%define sbindir %_sbindir +%define bindir %_bindir +%else +%define sbindir /sbin +%define bindir /bin +%endif + Name: sysvinit %define KPVER 2.23 -%define SIVER 2.98 +%define SIVER 2.99 %define START 0.65 Version: %{SIVER} Release: 0 @@ -105,23 +113,30 @@ popd rm -vf %{buildroot}/usr/include/initreq.h # pidof is part of procps-ng; let's remove the symlinks to killproc5 here rm -f %{buildroot}{/sbin,/bin,%{_mandir}/man8}/pidof{,.8} +%if 0%{?usrmerged} +# it's all hardcoded in Makefiles so move here +mkdir -p %{buildroot}%{_bindir} +mkdir -p %{buildroot}%{_sbindir} +mv %{buildroot}/bin/* %{buildroot}%{_bindir} +mv %{buildroot}/sbin/* %{buildroot}%{_sbindir} +%endif %files tools %defattr (-,root,root,755) %license COPYING COPYRIGHT %doc doc/Propaganda doc/Changelog doc/killproc -/bin/usleep -/bin/fsync -/sbin/fstab-decode -/sbin/checkproc -/sbin/pidofproc -/sbin/killproc -/sbin/killall5 -/sbin/startproc -/sbin/rvmtab -/sbin/vhangup -/sbin/mkill -/sbin/start_daemon +%{bindir}/usleep +%{bindir}/fsync +%{sbindir}/fstab-decode +%{sbindir}/checkproc +%{sbindir}/pidofproc +%{sbindir}/killproc +%{sbindir}/killall5 +%{sbindir}/startproc +%{sbindir}/rvmtab +%{sbindir}/vhangup +%{sbindir}/mkill +%{sbindir}/start_daemon %{_bindir}/startpar %doc %{_mandir}/man1/usleep.1.gz %doc %{_mandir}/man1/fsync.1.gz