Rebase to 2.4.8

.gitignore

@@ -1 +1,2 @@
 /iprutils-*-src.tgz
+/iprutils-2.4.8.tar.gz

0001-Service-start-is-controled-by-udev-rule.patch

@@ -1,44 +1,47 @@
-From fed37f858254734b26c09f3b52b51cb63d102229 Mon Sep 17 00:00:00 2001
+From b880ec7893b072467df1dc202d3a09f5bddbb9b6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jakub=20=C4=8Cajka?= <jcajka@redhat.com>
+From: Jakub Cajka <jcajka@redhat.com>
-Date: Mon, 1 Sep 2014 14:03:56 +0200
+Date: Wed, 8 Jul 2015 12:48:43 -0300
 Subject: [PATCH] Service start is controled by udev rule
 
+Signed-off-by: Gabriel Krisman Bertazi <krisman@linux.vnet.ibm.com>
+	[Rebased to upstream.]
+	[Modified to use Autotools.]
 ---
- systemd/iprdump.service        | 2 +-
+ systemd/iprdump.service.in     | 2 +-
- systemd/iprinit.service        | 2 +-
+ systemd/iprinit.service.in     | 2 +-
- systemd/iprupdate.service      | 2 +-
+ systemd/iprupdate.service.in   | 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
+diff --git a/systemd/iprdump.service.in b/systemd/iprdump.service.in
-index f1a72ff..4f085eb 100644
+index 7f60e7c..fc92a40 100644
---- a/systemd/iprdump.service
+--- a/systemd/iprdump.service.in
-+++ b/systemd/iprdump.service
++++ b/systemd/iprdump.service.in
 @@ -7,4 +7,4 @@ Type=forking
- ExecStart=/sbin/iprdump --daemon
+ ExecStart=@sbindir@/iprdump --daemon
  
  [Install]
 -WantedBy=multi-user.target
 +WantedBy=iprutils.target
-diff --git a/systemd/iprinit.service b/systemd/iprinit.service
+diff --git a/systemd/iprinit.service.in b/systemd/iprinit.service.in
-index 2ae0ce0..1d699d6 100644
+index dfbd33e..fb20cce 100644
---- a/systemd/iprinit.service
+--- a/systemd/iprinit.service.in
-+++ b/systemd/iprinit.service
++++ b/systemd/iprinit.service.in
 @@ -6,4 +6,4 @@ Type=forking
- ExecStart=/sbin/iprinit --daemon
+ ExecStart=@sbindir@/iprinit --daemon
  
  [Install]
 -WantedBy=multi-user.target
 +WantedBy=iprutils.target
-diff --git a/systemd/iprupdate.service b/systemd/iprupdate.service
+diff --git a/systemd/iprupdate.service.in b/systemd/iprupdate.service.in
-index f34ed86..732dcf4 100644
+index 9f44245..001b1e8 100644
---- a/systemd/iprupdate.service
+--- a/systemd/iprupdate.service.in
-+++ b/systemd/iprupdate.service
++++ b/systemd/iprupdate.service.in
 @@ -6,4 +6,4 @@ Type=forking
- ExecStart=/sbin/iprupdate --daemon
+ ExecStart=@sbindir@/iprupdate --daemon
  
  [Install]
 -WantedBy=multi-user.target
@@ -58,11 +61,11 @@ index 0000000..1b1260e
 +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
+index 0000000..1bb5a4a
 --- /dev/null
 +++ b/udev/rules.d/90-iprutils.rules
 @@ -0,0 +1 @@
-+DRIVERS=="ipr", TAG+="systemd", ENV{SYSTEMD_WANTS}+="iprutils.target" 
++DRIVERS=="ipr", TAG+="systemd", ENV{SYSTEMD_WANTS}+="iprutils.target"
 -- 
-1.9.3
+2.1.0
 

iprutils.spec

@@ -1,12 +1,12 @@
 Summary: Utilities for the IBM Power Linux RAID adapters
 Name:    iprutils
-Version: 2.4.5
+Version: 2.4.8
-Release: 2%{?dist}
+Release: 1%{?dist}
 License: CPL
 Group:   System Environment/Base
 URL:     http://sourceforge.net/projects/iprdd/
 
-Source0: http://downloads.sourceforge.net/project/iprdd/iprutils%20for%202.6%20kernels/%{version}/%{name}-%{version}-src.tgz
+Source0: http://downloads.sourceforge.net/project/iprdd/iprutils%20for%202.6%20kernels/%{version}/%{name}-%{version}.tar.gz
 
 # missing man page
 Source1: iprdbg.8.gz
@@ -20,6 +20,7 @@ BuildRequires: ncurses-devel
 BuildRequires: libcap-devel
 BuildRequires: kernel-devel
 BuildRequires: systemd
+BuildRequires: python-devel
 
 Obsoletes: ipr-utils
 
@@ -28,21 +29,25 @@ Provides a suite of utilities to manage and configure SCSI devices
 supported by the ipr SCSI storage device driver.
 
 %prep
-%setup -q -n %{name}
+%setup -q
 %patch0 -p1 -b .udev
 
 %build
 export CFLAGS="%{optflags} -fPIE -Wl,-z,relro,-z,now"
 export LDFLAGS="-pie"
-%{__make}
+%configure
+%{__make} %{?_smp_mflags}
 
 %install
-%{__make} INSTALL_MOD_PATH=%{buildroot} install
+%{__make} DESTDIR=%{buildroot} install
 
+# move systemd files to _unitdir
 mkdir -p %{buildroot}/%{_unitdir}
-%{__install} -m 0644 systemd/iprinit.service %{buildroot}/%{_unitdir}/iprinit.service
+%{__mv} %{buildroot}/%{_datadir}/iprutils/iprinit.service %{buildroot}/%{_unitdir}/
-%{__install} -m 0644 systemd/iprdump.service %{buildroot}/%{_unitdir}/iprdump.service
+%{__mv} %{buildroot}/%{_datadir}/iprutils/iprdump.service %{buildroot}/%{_unitdir}/
-%{__install} -m 0644 systemd/iprupdate.service %{buildroot}/%{_unitdir}/iprupdate.service
+%{__mv} %{buildroot}/%{_datadir}/iprutils/iprupdate.service %{buildroot}/%{_unitdir}/
+
+# iprutils.target
 %{__install} -m 0644 systemd/iprutils.target %{buildroot}/%{_unitdir}/iprutils.target
 
 mkdir -p %{buildroot}/%{_udevrulesdir}
@@ -51,13 +56,16 @@ mkdir -p %{buildroot}/%{_udevrulesdir}
 # missing man page
 %{__install} -m 0644 %SOURCE1 %{buildroot}%{_mandir}/man8/
 
-# move all binaries from /sbin to /usr/sbin
+#install bash completion
-mkdir %{buildroot}/usr/sbin
+%{__mv} %{buildroot}/%{_sysconfdir}/bash_completion.d/{iprconfig-bash-completion.sh,iprconfig}
-for file in iprconfig iprdbg iprdump iprinit iprupdate; do
+
-  mv %{buildroot}/sbin/$file %{buildroot}/usr/sbin/$file
+# Remove temporary files and scripts that will not be packaged.
-  # fix permissions
+%{__rm} %{buildroot}/%{_sysconfdir}/ha.d/resource.d/{iprha,iprha.in}
-  chmod 0755 %{buildroot}/usr/sbin/$file
+%{__rm} %{buildroot}/%{_datadir}/iprutils/{iprdump,iprinit,iprupdate}
-done
+%{__rm} %{buildroot}/%{_datadir}/iprutils/{iprdump,iprinit,iprupdate}.in
+%{__rm} %{buildroot}/%{_datadir}/iprutils/{iprdump,iprinit,iprupdate}.service.in
+%{__rm} %{buildroot}/%{_datadir}/iprutils/iprutils.spec
+%{__rm} %{buildroot}/%{python_sitelib}/sos/plugins/iprutils.{py,pyo,pyc}
 
 %post
 %systemd_post iprinit.service
@@ -74,6 +82,7 @@ done
 %files
 %doc README LICENSE
 %{_sbindir}/*
+%{_sysconfdir}/bash_completion.d/
 #fix permissions
 %attr(0644,root,root) %{_mandir}/man*/*
 %{_unitdir}/iprinit.service
@@ -83,6 +92,14 @@ done
 %{_udevrulesdir}/90-iprutils.rules
  
 %changelog
+* Fri Jul 10 2015 Gabriel Krisman Bertazi <krisman@linux.vnet.ibm.com> - 2.4.8-1
+- Rebase to 2.4.8
+- Move to Autotools
+- Remove unused files
+- Rebase patch 0001 to use autotools
+- Install bash completion
+- Spec file clean up
+
 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 

sources

@@ -1 +1 @@
-62411afab58c47fd52a532c3b02fd1d0  iprutils-2.4.5-src.tgz
+0c7877b914848e47710e14acc89c01c2  iprutils-2.4.8.tar.gz