Author: hobbes1069
Update of /cvs/free/rpms/akmods/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv22863
Modified Files:
akmods.spec akmodsposttrans
Log Message:
* Fri Jun 01 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.5.1-2
- Add service file to run again on shutdown.
- Add conditional for Fedora 18 to specify correct systemd graphical service.
Index: akmods.spec
===================================================================
RCS file: /cvs/free/rpms/akmods/F-18/akmods.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- akmods.spec 12 Apr 2012 22:25:58 -0000 1.15
+++ akmods.spec 31 Dec 2012 14:26:51 -0000 1.16
@@ -1,6 +1,6 @@
Name: akmods
-Version: 0.4.0
-Release: 4%{?dist}
+Version: 0.5.1
+Release: 2%{?dist}
Summary: Automatic kmods build and install tool
Group: System Environment/Kernel
@@ -10,8 +10,10 @@
Source1: akmods.1
Source2: akmodsbuild
Source3: akmodsbuild.1
-Source4: akmods.service
+Source4: akmods.service.in
Source5: akmodsposttrans
+Source6: akmods-shutdown
+Source7: akmods-shutdown.service
BuildArch: noarch
@@ -49,11 +51,11 @@
%prep
-echo nothing to prep
+echo Nothing to prep.
%build
-echo nothing to build
+echo Nothing to build.
%install
@@ -63,8 +65,17 @@
install -D -pm 0644 %{SOURCE1} %{buildroot}%{_mandir}/man1/akmods.1
install -D -pm 0755 %{SOURCE2} %{buildroot}%{_bindir}/akmodsbuild
install -D -pm 0644 %{SOURCE3} %{buildroot}%{_mandir}/man1/akmodsbuild.1
-install -D -pm 0644 %{SOURCE4} %{buildroot}%{_unitdir}/akmods.service
-install -D -pm 0755 %{SOURCE5} %{buildroot}%{_sysconfdir}/kernel/postinst.d/akmods
+install -D -pm 0755 %{SOURCE6} %{buildroot}%{_bindir}/akmods-shutdown
+install -D -pm 0755 %{SOURCE5}
%{buildroot}%{_sysconfdir}/kernel/postinst.d/akmodsposttrans
+install -D -pm 0644 %{SOURCE7} %{buildroot}%{_unitdir}/akmods-shutdown.service
+
+%if 0%{?fedora} >= 18
+sed "s|@SERVICE(a)|display-manager.service|" %{SOURCE4} >\
+ %{buildroot}%{_unitdir}/akmods.service
+%else
+sed "s|@SERVICE(a)|prefdm.service|" %{SOURCE4} >\
+ %{buildroot}%{_unitdir}/akmods.service
+%endif
%pre
@@ -79,6 +90,7 @@
if [ $1 -eq 1 ] ; then
# Initial installation
/bin/systemctl enable akmods.service >/dev/null 2>&1 || :
+ /bin/systemctl enable akmods-shutdown.service >/dev/null 2>&1 || :
fi
%preun
@@ -86,20 +98,28 @@
# Package removal, not upgrade
/bin/systemctl --no-reload disable akmods.service > /dev/null 2>&1 || :
/bin/systemctl stop akmods.service > /dev/null 2>&1 || :
+ /bin/systemctl --no-reload disable akmods-shutdown.service > /dev/null 2>&1
|| :
+ /bin/systemctl stop akmods-shutdown.service > /dev/null 2>&1 || :
fi
%files
%{_bindir}/akmodsbuild
+%{_bindir}/akmods-shutdown
%{_sbindir}/akmods
-%{_sysconfdir}/kernel/postinst.d/akmods
+%{_sysconfdir}/kernel/postinst.d/akmodsposttrans
%{_unitdir}/akmods.service
+%{_unitdir}/akmods-shutdown.service
%{_usrsrc}/akmods
%attr(-,akmods,akmods) %{_localstatedir}/cache/akmods
%{_mandir}/man1/*
%changelog
+* Fri Jun 01 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.5.1-2
+- Add service file to run again on shutdown.
+- Add conditional for Fedora 18 to specify correct systemd graphical service.
+
* Thu Apr 12 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.4.0-4
- Rebuilt
Index: akmodsposttrans
===================================================================
RCS file: /cvs/free/rpms/akmods/F-18/akmodsposttrans,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- akmodsposttrans 1 Feb 2009 13:21:31 -0000 1.2
+++ akmodsposttrans 31 Dec 2012 14:26:51 -0000 1.3
@@ -1,6 +1,6 @@
#!/bin/bash -
#
-# akmodposttras - Calls akmods for newly installed kernels
+# akmodposttrans - Calls akmods for newly installed kernels
#
# Copyright (c) 2009 Thorsten Leemhuis <fedora(a)leemhuis.info>
#