Accepting request 312583 from home:lee_duncan:branches:network

- Add rcsymlinks (bnc#932814) (from mpluskal@suse.com)
  Cleaned up spec file rpmlint commplaints

OBS-URL: https://build.opensuse.org/request/show/312583
OBS-URL: https://build.opensuse.org/package/show/network/open-iscsi?expand=0&rev=58

open-iscsi-Factory-latest.diff.bz2

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b5d1dd38dfe8462157889dcd67baaf71ec46f407d74e8c62b7b6459668bf97fd
+oid sha256:1d4c5b843e1786b32830cb12bd6034fdb5915236dfc8ee1c2b4773eae436d3f5
-size 197747
+size 197332

open-iscsi.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jun 18 17:29:56 UTC 2015 - lduncan@suse.com
+
+- Add rcsymlinks (bnc#932814) (from mpluskal@suse.com)
+  Cleaned up spec file rpmlint commplaints
+
 -------------------------------------------------------------------
 Thu Mar 19 16:30:26 UTC 2015 - lduncan@suse.com
 

open-iscsi.spec

@@ -38,8 +38,6 @@ Url:            http://www.open-iscsi.org
 Version:        2.0.873
 Release:        0
 %{?systemd_requires}
-Requires:       libmount1
-Requires:       logrotate
 %define iscsi_release 873
 Summary:        Linux* Open-iSCSI Software Initiator
 License:        GPL-2.0+
@@ -86,6 +84,7 @@ Summary:        Linux Broadcom NetXtremem II iscsi server
 Group:          Productivity/Networking/Other
 Version:        0.7.8.2
 Release:        0
+Requires:       logrotate
 
 %description -n iscsiuio
 This tool is to be used in conjunction with the Broadcom NetXtreme II Linux
@@ -123,6 +122,12 @@ make DESTDIR=${RPM_BUILD_ROOT} install_mkinitrd_suse
 # install service files
 %if 0%{?suse_version} >= 1230
 make DESTDIR=${RPM_BUILD_ROOT} install_service_suse
+# create rc symlinks
+[ -d ${RPM_BUILD_ROOT}/usr/sbin ] || mkdir -p ${RPM_BUILD_ROOT}/usr/sbin
+ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rciscsi
+ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rciscsid
+ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rciscsiuio
+ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcisnsd
 %else
 make DESTDIR=${RPM_BUILD_ROOT} install_initd_suse
 # rename open-iscsi service to iscsid for openSUSE
@@ -244,11 +249,12 @@ fi
 %{_unitdir}/iscsid.socket
 %{_unitdir}/iscsi.service
 %{_libexecdir}/systemd/system-generators/ibft-rule-generator
+%{_sbindir}/rciscsi
 %else
 %config /etc/init.d/iscsid
 %config /etc/init.d/boot.iscsid-early
-/usr/sbin/rciscsid
 %endif
+%{_sbindir}/rciscsid
 /sbin/iscsid
 /sbin/iscsiadm
 /sbin/iscsi-iname
@@ -279,6 +285,7 @@ fi
 %if 0%{?suse_version} >= 1230
 %{_unitdir}/isnsd.service
 %{_unitdir}/isnsd.socket
+%{_sbindir}/rcisnsd
 %endif
 /usr/sbin/isnsd
 /usr/sbin/isnsdd
@@ -297,6 +304,7 @@ fi
 %if 0%{?suse_version} >= 1230
 %{_unitdir}/iscsiuio.service
 %{_unitdir}/iscsiuio.socket
+%{_sbindir}/rciscsiuio
 %endif
 
 %changelog