From 63c38e4ee54812e94d68ab4ac7789642802ac9da Mon Sep 17 00:00:00 2001
From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Jul 28 2016 19:06:45 +0000
Subject: Drop -sysvinit subpackage


---

diff --git a/apmd.spec b/apmd.spec
index f5d46b2..02d5fcf 100644
--- a/apmd.spec
+++ b/apmd.spec
@@ -1,7 +1,7 @@
 Summary: Advanced Power Management (APM) BIOS utilities for laptops
 Name: apmd
 Version: 3.2.2
-Release: 24%{?dist}
+Release: 25%{?dist}
 Source: ftp://ftp.debian.org/debian/pool/main/a/apmd/%{name}_%{version}.orig.tar.gz
 Source1: apmd.init
 Source2: apmscript
@@ -16,17 +16,12 @@ Patch4: apmd-3.2-x.patch
 URL: ftp://ftp.debian.org/debian/pool/main/a/apmd
 Epoch: 1
 License: GPLv2+
-Group: System Environment/Daemons
-Requires: chkconfig
 BuildRequires: libtool
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRequires: systemd
 ExclusiveArch: %{ix86}
 
-Requires(post): /sbin/chkconfig
-Requires(preun): /sbin/chkconfig
-Requires(post): systemd-units
-Requires(preun): systemd-units
-Requires(postun): systemd-units
+%{?systemd_requires}
+Obsoletes: %{name}-sysvinit < 3.2.2-25
 
 %description
 APMD is a set of programs for controlling the Advanced Power
@@ -38,16 +33,6 @@ down the PCMCIA sockets before a suspend.
 Install the apmd package if you need to control the APM system
 on your laptop.
 
-%package sysvinit
-Group: System Environment/Daemons
-Summary: SysV initscript for apmd daemon
-Requires: %{name} = %{epoch}:%{version}-%{release}
-Requires(preun): /sbin/service
-Requires(postun): /sbin/service
-
-%description sysvinit
-The apmd-sysvinit contains SysV initscritps support.
-
 %prep
 %setup -q -n apmd-%{version}.orig
 %patch -p1 -b .build
@@ -58,13 +43,10 @@ iconv -f iso-8859-1 -t utf-8 < apmsleep.fr.1 > apmsleep.fr.1_
 mv apmsleep.fr.1_ apmsleep.fr.1
 
 %build
-make CFLAGS="$RPM_OPT_FLAGS"
+%make_build
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/{modules-load.d,sysconfig/apm-scripts,rc.d/init.d}
-mkdir -p $RPM_BUILD_ROOT/lib/systemd/system
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/{modules-load.d,sysconfig/apm-scripts}
 
 %makeinstall APMD_PROXY_DIR=$RPM_BUILD_ROOT/etc
 
@@ -76,45 +58,28 @@ done
 install -m 644 apmd.8 $RPM_BUILD_ROOT/%{_mandir}/man8/
 install -m 644 apmsleep.fr.1 $RPM_BUILD_ROOT/%{_mandir}/fr/man1/
 
-install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/apmd
-install -m 755 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/apm-scripts/
-install -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/apmd
-install -m 755 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/apm-scripts/
-install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/modules-load.d/apmd.conf
-install -m 755 %{SOURCE6} $RPM_BUILD_ROOT/lib/systemd/system
 rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/apmd_proxy
 rm -rf $RPM_BUILD_ROOT%{_bindir}/on_ac_power
 rm -rf $RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_includedir}
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+install -m 755 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/apm-scripts/
+install -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/apmd
+install -m 755 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/apm-scripts/
+install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/modules-load.d/apmd.conf
+install -D -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{_unitdir}/apmd.service
 
 %post
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+%systemd_post apmd.service
 
 %preun
-if [ $1 = 0 ]; then
-    /bin/systemctl disable apmd.service > /dev/null 2>&1 || :
-    /bin/systemctl stop apmd.service > /dev/null 2>&1 || :
-fi
+%systemd_preun apmd.service
 
 %postun
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-
-if [ "$1" -ge "1" ]; then
-    /bin/systemctl try-restart apmd.service >/dev/null 2>&1 || :
-fi
-
-%triggerun --  %{name} < 1:3.2.2-13
-    /sbin/chkconfig --del apmd >/dev/null 2>&1 || :
-    /bin/systemctl try-restart apmd.service >/dev/null 2>&1 || :
-
-%triggerpostun -n %{name}-sysvinit -- %{name} <= 1:3.2.2-13
-    /sbin/chkconfig --add apmd >/dev/null 2>&1 || :
+%systemd_postun apmd.service
 
 %files
-%defattr(-,root,root)
-%doc ChangeLog COPYING apmlib.COPYING README AUTHORS LSM
+%doc ChangeLog README AUTHORS LSM
+%license COPYING apmlib.COPYING
 %{_mandir}/man?/*
 %lang(fr) %{_mandir}/fr/man?/*
 %{_bindir}/*
@@ -123,12 +88,14 @@ fi
 %config(noreplace) %{_sysconfdir}/sysconfig/apmd
 %config(noreplace) %{_sysconfdir}/sysconfig/apm-scripts/*
 %config(noreplace) %{_sysconfdir}/modules-load.d/apmd.conf
-/lib/systemd/system/apmd.service
-
-%files sysvinit
-%attr(0755,root,root) %{_sysconfdir}/rc.d/init.d/apmd
+%{_unitdir}/apmd.service
 
 %changelog
+* Thu Jul 28 2016 Zbigniew Jędrzejewski-Szmek <zbyszek@bupkis> - 1:3.2.2-25
+- Drop -sysinit subpackage (sysvinit scripts are forbidden in Fedora)
+- Use normal systemd macros
+- Drop lots of old cruft
+
 * Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.2.2-24
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild