[iprutils] Rebase to 2.4.4

Wed Oct 1 11:09:29 UTC 2014

commit 3f5259234e697c572006380dc899a75bf7ef29c7
Author: Jakub Čajka <jcajka at redhat.com>
Date:   Wed Oct 1 13:07:37 2014 +0200

    Rebase to 2.4.4

 0001-Service-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(-)
---

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?= <jcajka at redhat.com>
+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.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 <jcajka at redhat.com> - 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 <rel-eng at lists.fedoraproject.org> - 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
