Author: hobbes1069 Update of /cvs/free/rpms/akmods/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv30795 Modified Files: akmods akmods-shutdown.service akmods.spec akmodsbuild Log Message: * Wed Apr 4 2015 Richard Shaw <hobbes1069(a)gmail.com&gt; - 0.5.2-1 - Fix temporary directory creation when TMPDIR environment variable is set, fixes BZ#2596. - Update systemd scripts to use macros. - Fix akmods run on shutdown systemd unit file, fixes BZ#3503. Index: akmods =================================================================== RCS file: /cvs/free/rpms/akmods/devel/akmods,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- akmods 16 Nov 2014 14:29:05 -0000 1.12 +++ akmods 7 Apr 2015 13:32:05 -0000 1.13 @@ -109,7 +109,7 @@ create_tmpdir() { - if ! tmpdir="$(mktemp -d -t ${myprog}.XXXXXXXX)/" ; then + if ! tmpdir="$(mktemp -d -p /tmp ${myprog}.XXXXXXXX)/" ; then akmods_echo 2 1 "ERROR: failed to create tmpdir." akmods_echo 2 1 --failure; return 1 fi Index: akmods-shutdown.service =================================================================== RCS file: /cvs/free/rpms/akmods/devel/akmods-shutdown.service,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- akmods-shutdown.service 22 Dec 2012 16:02:20 -0000 1.1 +++ akmods-shutdown.service 7 Apr 2015 13:32:05 -0000 1.2 @@ -6,7 +6,8 @@ [Service] Type=oneshot RemainAfterExit=yes -ExecStart=-/usr/sbin/akmods --from-init +ExecStart=/bin/true +ExecStop=-/usr/sbin/akmods --from-init [Install] WantedBy=multi-user.target Index: akmods.spec =================================================================== RCS file: /cvs/free/rpms/akmods/devel/akmods.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- akmods.spec 16 Nov 2014 14:29:05 -0000 1.19 +++ akmods.spec 7 Apr 2015 13:32:05 -0000 1.20 @@ -1,11 +1,11 @@ Name: akmods -Version: 0.5.1 -Release: 4%{?dist} +Version: 0.5.2 +Release: 1%{?dist} Summary: Automatic kmods build and install tool -Group: System Environment/Kernel License: MIT URL: http://rpmfusion.org/Packaging/KernelModules/Akmods + Source0: akmods Source1: akmods.1 Source2: akmodsbuild @@ -38,10 +38,10 @@ Requires(pre): shadow-utils # systemd unit requirements. -BuildRequires: systemd-units -Requires(post): systemd-units -Requires(preun): systemd-units -Requires(postun): systemd-units +BuildRequires: systemd +Requires(post): systemd +Requires(preun): systemd +Requires(postun): systemd %description @@ -94,13 +94,11 @@ fi %preun -if [ $1 -eq 0 ] ; then - # 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 +%systemd_preun akmods.service +%systemd_preun akmods-shutdown.service + +%postun +%systemd_postun %files @@ -116,6 +114,12 @@ %changelog +* Wed Apr 4 2015 Richard Shaw <hobbes1069(a)gmail.com&gt; - 0.5.2-1 +- Fix temporary directory creation when TMPDIR environment variable is set, + fixes BZ#2596. +- Update systemd scripts to use macros. +- Fix akmods run on shutdown systemd unit file, fixes BZ#3503. + * Sun Nov 16 2014 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 0.5.1-4 - Fix akmods on armhfp - rfbz#3117 - Use yum instead of rpm to install packages - rfbz#3350 Index: akmodsbuild =================================================================== RCS file: /cvs/free/rpms/akmods/devel/akmodsbuild,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- akmodsbuild 16 Nov 2014 14:10:31 -0000 1.4 +++ akmodsbuild 7 Apr 2015 13:32:05 -0000 1.5 @@ -88,7 +88,7 @@ ## preparations # tmpdir - if ! tmpdir="$(mktemp -d -t ${myprog}.XXXXXXXX)" ; then + if ! tmpdir="$(mktemp -d -p /tmp ${myprog}.XXXXXXXX)" ; then echo "ERROR: Could create tempdir." exit 1 fi