From 3f5259234e697c572006380dc899a75bf7ef29c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20=C4=8Cajka?= Date: Wed, 1 Oct 2014 13:07:37 +0200 Subject: [PATCH] Rebase to 2.4.4 --- ...vice-start-is-controled-by-udev-rule.patch | 68 +++ iprutils-cflags.patch | 11 - iprutils-initscripts.patch | 463 ------------------ iprutils-lsb-init-ectomy.patch | 189 ------- iprutils.spec | 71 +-- sources | 2 +- 6 files changed, 111 insertions(+), 693 deletions(-) create mode 100644 0001-Service-start-is-controled-by-udev-rule.patch delete mode 100644 iprutils-cflags.patch delete mode 100644 iprutils-initscripts.patch delete mode 100644 iprutils-lsb-init-ectomy.patch diff --git a/0001-Service-start-is-controled-by-udev-rule.patch b/0001-Service-start-is-controled-by-udev-rule.patch new file mode 100644 index 0000000..2cf9077 --- /dev/null +++ b/0001-Service-start-is-controled-by-udev-rule.patch @@ -0,0 +1,68 @@ +From fed37f858254734b26c09f3b52b51cb63d102229 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jakub=20=C4=8Cajka?= +Date: Mon, 1 Sep 2014 14:03:56 +0200 +Subject: [PATCH] Service start is controled by udev rule + +--- + systemd/iprdump.service | 2 +- + systemd/iprinit.service | 2 +- + systemd/iprupdate.service | 2 +- + systemd/iprutils.target | 7 +++++++ + udev/rules.d/90-iprutils.rules | 1 + + 5 files changed, 11 insertions(+), 3 deletions(-) + create mode 100644 systemd/iprutils.target + create mode 100644 udev/rules.d/90-iprutils.rules + +diff --git a/systemd/iprdump.service b/systemd/iprdump.service +index f1a72ff..4f085eb 100644 +--- a/systemd/iprdump.service ++++ b/systemd/iprdump.service +@@ -7,4 +7,4 @@ Type=forking + ExecStart=/sbin/iprdump --daemon + + [Install] +-WantedBy=multi-user.target ++WantedBy=iprutils.target +diff --git a/systemd/iprinit.service b/systemd/iprinit.service +index 2ae0ce0..1d699d6 100644 +--- a/systemd/iprinit.service ++++ b/systemd/iprinit.service +@@ -6,4 +6,4 @@ Type=forking + ExecStart=/sbin/iprinit --daemon + + [Install] +-WantedBy=multi-user.target ++WantedBy=iprutils.target +diff --git a/systemd/iprupdate.service b/systemd/iprupdate.service +index f34ed86..732dcf4 100644 +--- a/systemd/iprupdate.service ++++ b/systemd/iprupdate.service +@@ -6,4 +6,4 @@ Type=forking + ExecStart=/sbin/iprupdate --daemon + + [Install] +-WantedBy=multi-user.target ++WantedBy=iprutils.target +diff --git a/systemd/iprutils.target b/systemd/iprutils.target +new file mode 100644 +index 0000000..1b1260e +--- /dev/null ++++ b/systemd/iprutils.target +@@ -0,0 +1,7 @@ ++[Unit] ++Description=IBM Power Raid utilities ++Requires=iprupdate.service iprinit.service iprdump.service basic.target ++Before=default.target ++ ++[Install] ++WantedBy=default.target +diff --git a/udev/rules.d/90-iprutils.rules b/udev/rules.d/90-iprutils.rules +new file mode 100644 +index 0000000..ea39fa3 +--- /dev/null ++++ b/udev/rules.d/90-iprutils.rules +@@ -0,0 +1 @@ ++DRIVERS=="ipr", TAG+="systemd", ENV{SYSTEMD_WANTS}+="iprutils.target" +-- +1.9.3 + diff --git a/iprutils-cflags.patch b/iprutils-cflags.patch deleted file mode 100644 index b615bde..0000000 --- a/iprutils-cflags.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- iprutils/Makefile.cflags 2005-12-23 10:11:42.000000000 +0000 -+++ iprutils/Makefile 2005-12-23 10:11:49.000000000 +0000 -@@ -9,7 +9,7 @@ - - include version.mk - --CFLAGS = -g -Wall $(IPR_DEFINES) -+CFLAGS += -g -Wall $(IPR_DEFINES) - UTILS_VER = $(IPR_MAJOR_RELEASE).$(IPR_MINOR_RELEASE).$(IPR_FIX_LEVEL) - TAR = cd .. && tar -zcpf iprutils-$(UTILS_VER)-src.tgz --exclude CVS --exclude applied-patches --exclude series --exclude txt --exclude pc --exclude patches --exclude debug --exclude *~* iprutils - diff --git a/iprutils-initscripts.patch b/iprutils-initscripts.patch deleted file mode 100644 index 0641491..0000000 --- a/iprutils-initscripts.patch +++ /dev/null @@ -1,463 +0,0 @@ -diff -up iprutils/init.d/iprdump.initscripts iprutils/init.d/iprdump ---- iprutils/init.d/iprdump.initscripts 2008-11-20 02:20:20.000000000 +0100 -+++ iprutils/init.d/iprdump 2009-10-05 13:46:41.000000000 +0200 -@@ -20,84 +20,98 @@ - # Short-Description: Start the ipr dump daemon - # Description: Start the ipr dump daemon - ### END INIT INFO -+# -+# chkconfig: 2345 20 80 -+# description: Runs the IBM Power RAID adapter dump daemon -+# processname: iprdump -+# pidfile: /var/run/iprdump.pid -+# -+ -+# Source function library -+. /etc/init.d/functions -+ -+RETVAL=0 -+ -+prog=iprdump -+exec=/sbin/iprdump -+lockfile=/var/lock/subsys/iprdump -+pidfile=/var/run/iprdump.pid - --IPRDUMP=/sbin/iprdump --test -x $IPRDUMP || exit 5 --. /lib/lsb/init-functions - - start() { -- echo -n "Starting ipr dump daemon" -+ [ -x $exec ] || exit 5 -+ echo -n "Starting $prog: " - if [ ! -d /sys/class/scsi_generic ] ; then - modprobe sg - fi -- start_daemon $IPRDUMP --daemon -- -+ -+ daemon $exec --daemon - RETVAL=$? -- if [ $RETVAL -eq 0 ]; then -- log_success_msg " " -- else -- log_failure_msg " " -- fi -+ echo -+ [ $RETVAL = 0 ] && touch $lockfile && /sbin/pidof $exec > $pidfile - return $RETVAL - } - - stop() { -- echo -n "Shutting down ipr dump daemon" -- killproc $IPRDUMP -- -+ echo -n "Stopping $prog: " -+ killproc $exec -TERM - RETVAL=$? -- if [ $RETVAL -eq 0 ]; then -- log_success_msg " " -- else -- log_failure_msg " " -- fi -+ echo -+ [ $RETVAL = 0 ] && rm -f $lockfile $pidfile - return $RETVAL - } - - restart() { -- $0 stop -- $0 start -- return $RETVAL -+ stop -+ start - } - - reload() { -- echo -n "Reload ipr dump daemon" -- $0 stop && $0 start -- return $RETVAL -+ restart - } - --status() { -- echo -n "Checking for iprdump daemon: " -+force_reload() { -+ restart -+} - -- pidofproc $IPRDUMP >& /dev/null -+rh_status() { -+ # run checks to determine if the service is running or use generic status -+ status $prog -+} - -- RETVAL=$? -- if [ $RETVAL -eq 0 ]; then -- log_success_msg "running" -- else -- log_failure_msg "unused" -- fi -- return $RETVAL -+rh_status_q() { -+ rh_status >/dev/null 2>&1 - } - - case "$1" in - start) -- start -- ;; -+ rh_status_q && exit 0 -+ $1 -+ ;; - stop) -- stop -- ;; -+ rh_status_q || exit 0 -+ $1 -+ ;; - restart) -- restart -- ;; -+ $1 -+ ;; - reload) -- reload -- ;; -+ rh_status_q || exit 7 -+ $1 -+ ;; -+ force-reload) -+ force_reload -+ ;; - status) -- status -- ;; -+ rh_status -+ ;; -+ condrestart|try-restart) -+ rh_status_q || exit 0 -+ restart -+ ;; - *) -- echo "Usage: $0 {start|stop|status|restart|reload}" -- exit 1 -- ;; -+ echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}" -+ exit 2 - esac -+exit $? -+ -diff -up iprutils/init.d/iprinit.initscripts iprutils/init.d/iprinit ---- iprutils/init.d/iprinit.initscripts 2007-08-21 20:56:03.000000000 +0200 -+++ iprutils/init.d/iprinit 2009-10-05 14:59:18.000000000 +0200 -@@ -20,84 +20,97 @@ - # Short-Description: Start the ipr init daemon - # Description: Start the ipr initialization daemon - ### END INIT INFO -- --IPRINIT=/sbin/iprinit --test -x $IPRINIT || exit 5 --. /lib/lsb/init-functions -+# -+# chkconfig: 2345 20 80 -+# description: Runs the IBM Power RAID adapter initialization daemon -+# processname: iprinit -+# pidfile: /var/run/iprinit.pid -+# -+ -+# Source function library -+. /etc/init.d/functions -+ -+RETVAL=0 -+ -+prog=iprinit -+exec=/sbin/iprinit -+lockfile=/var/lock/subsys/$prog -+pidfile=/var/run/iprinit.pid - - start() { -- echo -n "Starting ipr initialization daemon" -+ [ -x $exec ] || exit 5 -+ echo -n "Starting $prog: " - if [ ! -d /sys/class/scsi_generic ] ; then - modprobe sg - fi -- start_daemon $IPRINIT --daemon -+ daemon $exec --daemon - - RETVAL=$? -- if [ $RETVAL -eq 0 ]; then -- log_success_msg " " -- else -- log_failure_msg " " -- fi -+ echo -+ [ $RETVAL = 0 ] && touch $lockfile && /sbin/pidof $exec > $pidfile - return $RETVAL - } - - stop() { -- echo -n "Shutting down ipr initialization daemon" -- killproc $IPRINIT -- -+ echo -n "Stopping iprinit: " -+ killproc $exec -TERM - RETVAL=$? -- if [ $RETVAL -eq 0 ]; then -- log_success_msg " " -- else -- log_failure_msg " " -- fi -+ [ $RETVAL = 0 ] && rm -f $lockfile $pidfile - return $RETVAL - } - - restart() { -- $0 stop -- $0 start -- return $RETVAL -+ stop -+ start - } - - reload() { -- echo -n "Reload ipr initialization daemon" -- $0 stop && $0 start -- return $RETVAL -+ restart - } - --status() { -- echo -n "Checking for ipr initialization daemon: " -+force_reload() { -+ restart -+} - -- pidofproc $IPRINIT >& /dev/null -+rh_status() { -+ # run checks to determine if the service is running or use generic status -+ status $prog -+} - -- RETVAL=$? -- if [ $RETVAL -eq 0 ]; then -- log_success_msg "running" -- else -- log_failure_msg "unused" -- fi -- return $RETVAL -+rh_status_q() { -+ rh_status >/dev/null 2>&1 - } - -+ - case "$1" in - start) -- start -- ;; -+ rh_status_q && exit 0 -+ $1 -+ ;; - stop) -- stop -- ;; -+ rh_status_q || exit 0 -+ $1 -+ ;; - restart) -- restart -- ;; -+ $1 -+ ;; - reload) -- reload -- ;; -+ rh_status_q || exit 7 -+ $1 -+ ;; -+ force-reload) -+ force_reload -+ ;; - status) -- status -- ;; -+ rh_status -+ ;; -+ condrestart|try-restart) -+ rh_status_q || exit 0 -+ restart -+ ;; - *) -- echo "Usage: $0 {start|stop|status|restart|reload}" -- exit 1 -- ;; -+ echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}" -+ exit 2 - esac -+exit $? -+ -diff -up iprutils/init.d/iprupdate.initscripts iprutils/init.d/iprupdate ---- iprutils/init.d/iprupdate.initscripts 2008-11-20 02:20:20.000000000 +0100 -+++ iprutils/init.d/iprupdate 2009-10-05 15:04:50.000000000 +0200 -@@ -20,86 +20,98 @@ - # Short-Description: Start the iprupdate utility - # Description: Start the iprupdate utility - ### END INIT INFO -- --IPRUPDATE=/sbin/iprupdate --test -x $IPRUPDATE || exit 5 --. /lib/lsb/init-functions -+# -+# chkconfig: 2345 20 80 -+# description: Runs the IBM Power RAID adapter update daemon -+# processname: iprupdate -+# pidfile: /var/run/iprupdate.pid -+# -+ -+# Source function library -+. /etc/init.d/functions -+ -+RETVAL=0 -+ -+prog=iprupdate -+exec=/sbin/iprupdate -+lockfile=/var/lock/subsys/iprupdate -+pidfile=/var/run/iprupdate.pid - - start() { -- echo "Checking ipr microcode levels" -- if [ ! -d /sys/class/scsi_generic ] ; then -- modprobe sg -- fi -- start_daemon $IPRUPDATE --daemon -- -- RETVAL=$? -- if [ $RETVAL -eq 0 ]; then -- echo -n "Completed ipr microcode updates" -- log_success_msg " " -- else -- echo -n "Completed ipr microcode updates" -- log_failure_msg " " -- fi -- return $RETVAL -+ [ -x $exec ] || exit 5 -+ echo -n "Starting iprupdate: " -+ -+ if [ ! -d /sys/class/scsi_generic ]; then -+ modprobe sg -+ fi -+ -+ daemon $exec --daemon -+ RETVAL=$? -+ echo -+ [ $RETVAL = 0 ] && touch $lockfile && /sbin/pidof $exec > $pidfile -+ return $RETVAL - } - - stop() { -- echo -n "Shutting down ipr update daemon" -- killproc $IPRUPDATE -- -+ echo -n "Stopping iprupdate: " -+ killproc $exec -TERM - RETVAL=$? -- if [ $RETVAL -eq 0 ]; then -- log_success_msg " " -- else -- log_failure_msg " " -- fi -+ [ $RETVAL = 0 ] && rm -f $lockfile $pidfile - return $RETVAL - } - - restart() { -- $0 stop -- $0 start -- return $RETVAL -+ stop -+ start - } - - reload() { -- $0 stop -- $0 start -- return $RETVAL -+ restart - } - --status() { -- echo -n "Checking for ipr update daemon: " -+force_reload() { -+ restart -+} - -- pidofproc $IPRUPDATE >& /dev/null -+rh_status() { -+ # run checks to determine if the service is running or use generic status -+ status $prog -+} - -- RETVAL=$? -- if [ $RETVAL -eq 0 ]; then -- log_success_msg "running" -- else -- log_failure_msg "unused" -- fi -- return $RETVAL -+rh_status_q() { -+ rh_status >/dev/null 2>&1 - } - -+ - case "$1" in -- start) -- start -- ;; -- stop) -- stop -- ;; -- restart) -- restart -- ;; -- reload) -- reload -- ;; -- status) -- status -- ;; -- *) -- echo "Usage: $0 {start|stop|status|restart|reload}" -- exit 1 -- ;; -+ start) -+ rh_status_q && exit 0 -+ $1 -+ ;; -+ stop) -+ rh_status_q || exit 0 -+ $1 -+ ;; -+ restart) -+ $1 -+ ;; -+ reload) -+ rh_status_q || exit 7 -+ $1 -+ ;; -+ force-reload) -+ force_reload -+ ;; -+ status) -+ rh_status -+ ;; -+ condrestart|try-restart) -+ rh_status_q || exit 0 -+ restart -+ ;; -+ *) -+ echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}" -+ exit 2 - esac -+exit $? -+ diff --git a/iprutils-lsb-init-ectomy.patch b/iprutils-lsb-init-ectomy.patch deleted file mode 100644 index 328b5c5..0000000 --- a/iprutils-lsb-init-ectomy.patch +++ /dev/null @@ -1,189 +0,0 @@ -diff -up iprutils/init.d/iprdump.lsb iprutils/init.d/iprdump ---- iprutils/init.d/iprdump.lsb 2007-10-01 14:07:33.000000000 -0400 -+++ iprutils/init.d/iprdump 2007-10-01 14:12:04.000000000 -0400 -@@ -23,20 +23,20 @@ - - IPRDUMP=/sbin/iprdump - test -x $IPRDUMP || exit 5 --. /lib/lsb/init-functions -+. /etc/init.d/functions - - start() { - echo -n "Starting ipr dump daemon" - if [ ! -d /sys/class/scsi_generic ] ; then - modprobe sg - fi -- start_daemon $IPRDUMP -+ daemon $IPRDUMP - - RETVAL=$? - if [ $RETVAL -eq 0 ]; then -- log_success_msg " " -+ success " " - else -- log_failure_msg " " -+ failure " " - fi - return $RETVAL - } -@@ -47,9 +47,9 @@ stop() { - - RETVAL=$? - if [ $RETVAL -eq 0 ]; then -- log_success_msg " " -+ success " " - else -- log_failure_msg " " -+ failure " " - fi - return $RETVAL - } -@@ -73,9 +73,9 @@ status() { - - RETVAL=$? - if [ $RETVAL -eq 0 ]; then -- log_success_msg "running" -+ success "running" - else -- log_failure_msg "unused" -+ failure "unused" - fi - return $RETVAL - } -diff -up iprutils/init.d/iprha.lsb iprutils/init.d/iprha ---- iprutils/init.d/iprha.lsb 2007-10-01 14:07:37.000000000 -0400 -+++ iprutils/init.d/iprha 2007-10-01 14:12:17.000000000 -0400 -@@ -25,7 +25,7 @@ - - IPRCONFIG=/sbin/iprconfig - test -x $IPRCONFIG || exit 5 --. /lib/lsb/init-functions -+. /etc/init.d/functions - - start() { - echo -n "Enabling ipr primary adapter mode" -@@ -33,9 +33,9 @@ start() { - - RETVAL=$? - if [ $RETVAL -eq 0 ]; then -- log_success_msg " " -+ success " " - else -- log_failure_msg " " -+ failure " " - fi - return $RETVAL - } -@@ -46,9 +46,9 @@ stop() { - - RETVAL=$? - if [ $RETVAL -eq 0 ]; then -- log_success_msg " " -+ success " " - else -- log_failure_msg " " -+ failure " " - fi - return $RETVAL - } -diff -up iprutils/init.d/iprupdate.lsb iprutils/init.d/iprupdate ---- iprutils/init.d/iprupdate.lsb 2007-10-01 14:07:47.000000000 -0400 -+++ iprutils/init.d/iprupdate 2007-10-01 14:11:29.000000000 -0400 -@@ -23,7 +23,7 @@ - - IPRUPDATE=/sbin/iprupdate - test -x $IPRUPDATE || exit 5 --. /lib/lsb/init-functions -+. /etc/init.d/functions - - start() { - echo "Checking ipr microcode levels" -@@ -35,10 +35,10 @@ start() { - RETVAL=$? - if [ $RETVAL -eq 0 ]; then - echo -n "Completed ipr microcode updates" -- log_success_msg " " -+ success " " - else - echo -n "Completed ipr microcode updates" -- log_failure_msg " " -+ failure " " - fi - return $RETVAL - } -@@ -49,9 +49,9 @@ stop() { - - RETVAL=$? - if [ $RETVAL -eq 0 ]; then -- log_success_msg " " -+ success " " - else -- log_failure_msg " " -+ failure " " - fi - return $RETVAL - } -@@ -75,9 +75,9 @@ status() { - - RETVAL=$? - if [ $RETVAL -eq 0 ]; then -- log_success_msg "running" -+ success "running" - else -- log_failure_msg "unused" -+ failure "unused" - fi - return $RETVAL - } -diff -up iprutils/init.d/iprinit.lsb iprutils/init.d/iprinit ---- iprutils/init.d/iprinit.lsb 2007-10-01 14:07:43.000000000 -0400 -+++ iprutils/init.d/iprinit 2007-10-01 14:13:05.000000000 -0400 -@@ -23,20 +23,20 @@ - - IPRINIT=/sbin/iprinit - test -x $IPRINIT || exit 5 --. /lib/lsb/init-functions -+. /etc/init.d/functions - - start() { - echo -n "Starting ipr initialization daemon" - if [ ! -d /sys/class/scsi_generic ] ; then - modprobe sg - fi -- start_daemon $IPRINIT --daemon -+ daemon $IPRINIT --daemon - - RETVAL=$? - if [ $RETVAL -eq 0 ]; then -- log_success_msg " " -+ success " " - else -- log_failure_msg " " -+ failure " " - fi - return $RETVAL - } -@@ -47,9 +47,9 @@ stop() { - - RETVAL=$? - if [ $RETVAL -eq 0 ]; then -- log_success_msg " " -+ success " " - else -- log_failure_msg " " -+ failure " " - fi - return $RETVAL - } -@@ -73,9 +73,9 @@ status() { - - RETVAL=$? - if [ $RETVAL -eq 0 ]; then -- log_success_msg "running" -+ success "running" - else -- log_failure_msg "unused" -+ failure "unused" - fi - return $RETVAL - } diff --git a/iprutils.spec b/iprutils.spec index 753945d..b35aca8 100644 --- a/iprutils.spec +++ b/iprutils.spec @@ -1,7 +1,7 @@ Summary: Utilities for the IBM Power Linux RAID adapters Name: iprutils -Version: 2.3.13 -Release: 5%{?dist} +Version: 2.4.4 +Release: 1%{?dist} License: CPL Group: System Environment/Base URL: http://sourceforge.net/projects/iprdd/ @@ -11,17 +11,15 @@ Source0: http://downloads.sourceforge.net/project/iprdd/iprutils%20for%202.6%20k # missing man page Source1: iprdbg.8.gz -Patch0: %{name}-cflags.patch -Patch1: %{name}-initscripts.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +# sent to upstream +Patch0: 0001-Service-start-is-controled-by-udev-rule.patch Requires: /sbin/pidof -BuildRequires: libsysfs-devel -BuildRequires: pciutils-devel BuildRequires: ncurses-devel BuildRequires: libcap-devel BuildRequires: kernel-devel +BuildRequires: systemd Obsoletes: ipr-utils @@ -31,51 +29,66 @@ supported by the ipr SCSI storage device driver. %prep %setup -q -n %{name} -%patch0 -p1 -b .cflags -%patch1 -p1 -b .initscripts +%patch0 -p1 -b .udev %build -CFLAGS="%{optflags}" %{__make} +export CFLAGS="%{optflags} -fPIE -Wl,-z,relro,-z,now" +export LDFLAGS="-pie" +%{__make} %install -%{__rm} -rf %{buildroot} %{__make} INSTALL_MOD_PATH=%{buildroot} install -%{__install} -d %{buildroot}%{_sysconfdir}/rc.d/init.d -%{__install} -m 0755 init.d/iprinit %{buildroot}%{_sysconfdir}/rc.d/init.d/iprinit -%{__install} -m 0755 init.d/iprdump %{buildroot}%{_sysconfdir}/rc.d/init.d/iprdump -%{__install} -m 0755 init.d/iprupdate %{buildroot}%{_sysconfdir}/rc.d/init.d/iprupdate +mkdir -p %{buildroot}/%{_unitdir} +%{__install} -m 0644 systemd/iprinit.service %{buildroot}/%{_unitdir}/iprinit.service +%{__install} -m 0644 systemd/iprdump.service %{buildroot}/%{_unitdir}/iprdump.service +%{__install} -m 0644 systemd/iprupdate.service %{buildroot}/%{_unitdir}/iprupdate.service +%{__install} -m 0644 systemd/iprutils.target %{buildroot}/%{_unitdir}/iprutils.target + +mkdir -p %{buildroot}/%{_udevrulesdir} +%{__install} -m 0644 udev/rules.d/90-iprutils.rules %{buildroot}/%{_udevrulesdir}/90-iprutils.rules # missing man page -%{__install} -m 0755 %SOURCE1 %{buildroot}%{_mandir}/man8/ +%{__install} -m 0644 %SOURCE1 %{buildroot}%{_mandir}/man8/ # move all binaries from /sbin to /usr/sbin mkdir %{buildroot}/usr/sbin for file in iprconfig iprdbg iprdump iprinit iprupdate; do mv %{buildroot}/sbin/$file %{buildroot}/usr/sbin/$file + # fix permissions + chmod 0755 %{buildroot}/usr/sbin/$file done %post -/sbin/chkconfig --add iprdump -/sbin/chkconfig --add iprupdate -/sbin/chkconfig --add iprinit +%systemd_post iprinit.service +%systemd_post iprdump.service +%systemd_post iprupdate.service +%systemd_post iprutils.target %preun -/sbin/chkconfig --del iprdump -/sbin/chkconfig --del iprupdate -/sbin/chkconfig --del iprinit - -%clean -%{__rm} -rf %{buildroot} +%systemd_preun iprinit.service +%systemd_preun iprdump.service +%systemd_preun iprupdate.service +%systemd_preun iprutils.target %files -%defattr(-,root,root,-) %doc README LICENSE %{_sbindir}/* -%{_mandir}/man*/* -%{_sysconfdir}/rc.d/init.d/* - +#fix permissions +%attr(0644,root,root) %{_mandir}/man*/* +%{_unitdir}/iprinit.service +%{_unitdir}/iprdump.service +%{_unitdir}/iprupdate.service +%{_unitdir}/iprutils.target +%{_udevrulesdir}/90-iprutils.rules + %changelog +* Wed Oct 1 2014 Jakub Čajka - 2.4.4-1 +- Rebase to 2.4.4 +- Moved to systemd +- Spec file clean up +- Fixed build flags + * Sat Aug 16 2014 Fedora Release Engineering - 2.3.13-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild diff --git a/sources b/sources index a3b0b9e..9272c42 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -02bce5bf7c33535dfcf7af70db8900b2 iprutils-2.3.13-src.tgz +c7c7bef8c0512ff3f570b7e93c52c994 iprutils-2.4.4-src.tgz