Hello community, here is the log from the commit of package open-iscsi for openSUSE:Factory checked in at 2015-07-05 17:56:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/open-iscsi (Old) and /work/SRC/openSUSE:Factory/.open-iscsi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "open-iscsi" Changes: -------- --- /work/SRC/openSUSE:Factory/open-iscsi/open-iscsi.changes 2015-03-27 09:37:31.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.open-iscsi.new/open-iscsi.changes 2015-07-05 17:56:14.000000000 +0200 @@ -1,0 +2,6 @@ +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 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ open-iscsi.spec ++++++ --- /var/tmp/diff_new_pack.rkvG8Q/_old 2015-07-05 17:56:14.000000000 +0200 +++ /var/tmp/diff_new_pack.rkvG8Q/_new 2015-07-05 17:56:14.000000000 +0200 @@ -38,8 +38,6 @@ 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 @@ 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 @@ # 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 @@ %{_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 @@ %if 0%{?suse_version} >= 1230 %{_unitdir}/isnsd.service %{_unitdir}/isnsd.socket +%{_sbindir}/rcisnsd %endif /usr/sbin/isnsd /usr/sbin/isnsdd @@ -297,6 +304,7 @@ %if 0%{?suse_version} >= 1230 %{_unitdir}/iscsiuio.service %{_unitdir}/iscsiuio.socket +%{_sbindir}/rciscsiuio %endif %changelog ++++++ open-iscsi-Factory-latest.diff.bz2 ++++++ --- /var/tmp/diff_new_pack.rkvG8Q/_old 2015-07-05 17:56:14.000000000 +0200 +++ /var/tmp/diff_new_pack.rkvG8Q/_new 2015-07-05 17:56:14.000000000 +0200 @@ -19120,11 +19120,17 @@ +# space separated list of allowed UDP broadcast ports +BROADCAST="isns" diff --git a/rpm/open-iscsi.changes b/rpm/open-iscsi.changes -index 2e21afc6bc7b..71c03c092ddc 100644 +index 2e21afc6bc7b..42bace691f3b 100644 --- a/rpm/open-iscsi.changes +++ b/rpm/open-iscsi.changes -@@ -1,4 +1,414 @@ +@@ -1,4 +1,420 @@ ------------------------------------------------------------------- ++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 + +- Updated to latest upstream, adding 42 patches. See @@ -19538,7 +19544,7 @@ Fri Dec 9 15:09:01 CET 2011 - hare@suse.de - iscsiadm: Return correct error when login fails (bnc#715071) -@@ -40,6 +450,11 @@ Fri Nov 4 09:15:52 CET 2011 - hare@suse.de +@@ -40,6 +456,11 @@ Fri Nov 4 09:15:52 CET 2011 - hare@suse.de - Stop iscsiuio when run inside initrd (bnc#728095) ------------------------------------------------------------------- @@ -19550,7 +19556,7 @@ Mon Oct 24 09:13:19 CEST 2011 - hare@suse.de - Update iscsiuio to 0.7.0.14f (bnc#687392) -@@ -101,6 +516,11 @@ Tue Jun 21 15:09:46 CEST 2011 - hare@suse.de +@@ -101,6 +522,11 @@ Tue Jun 21 15:09:46 CEST 2011 - hare@suse.de - Include scripts for automated build ------------------------------------------------------------------- @@ -19562,7 +19568,7 @@ Wed Feb 2 11:32:12 CET 2011 - mweckbecker@suse.de - Fix the following issues: -@@ -224,6 +644,11 @@ Wed Nov 18 10:33:27 CET 2009 - hare@suse.de +@@ -224,6 +650,11 @@ Wed Nov 18 10:33:27 CET 2009 - hare@suse.de - Read initiatorname correctly from sysfs (bnc#541882) ------------------------------------------------------------------- @@ -19574,7 +19580,7 @@ Wed Aug 19 12:58:13 CEST 2009 - hare@suse.de - Synchronize startup settings (bnc#514273) -@@ -231,11 +656,24 @@ Wed Aug 19 12:58:13 CEST 2009 - hare@suse.de +@@ -231,11 +662,24 @@ Wed Aug 19 12:58:13 CEST 2009 - hare@suse.de - Do not use temp file in iscsi_discovery (bnc#528711) ------------------------------------------------------------------- @@ -19600,7 +19606,7 @@ - Fix relogin retry handling (bnc#466846) diff --git a/rpm/open-iscsi.spec b/rpm/open-iscsi.spec -index 27ab050554f1..84743819db1f 100644 +index 27ab050554f1..ab2082208493 100644 --- a/rpm/open-iscsi.spec +++ b/rpm/open-iscsi.spec @@ -1,7 +1,7 @@ @@ -19612,7 +19618,7 @@ # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed -@@ -15,27 +15,38 @@ +@@ -15,27 +15,36 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -19652,8 +19658,6 @@ +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+ @@ -19667,7 +19671,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -@@ -57,20 +68,46 @@ processing, iSNS, SLP, Radius, etc. +@@ -57,20 +66,47 @@ processing, iSNS, SLP, Radius, etc. The user space Open-iSCSI consists of a daemon process called iscsid, and a management utility iscsiadm. @@ -19692,6 +19696,7 @@ +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 @@ -19720,7 +19725,7 @@ cd iscsiuio touch NEWS touch AUTHORS -@@ -80,48 +117,186 @@ make CFLAGS="${RPM_OPT_FLAGS}" +@@ -80,48 +116,195 @@ make CFLAGS="${RPM_OPT_FLAGS}" %install make DESTDIR=${RPM_BUILD_ROOT} install_user @@ -19730,6 +19735,12 @@ +# 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 -(cd iscsiuio; make DESTDIR=${RPM_BUILD_ROOT} install) @@ -19865,11 +19876,12 @@ +%{_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 @@ -19901,6 +19913,7 @@ +%if 0%{?suse_version} >= 1230 +%{_unitdir}/isnsd.service +%{_unitdir}/isnsd.socket ++%{_sbindir}/rcisnsd +%endif +/usr/sbin/isnsd +/usr/sbin/isnsdd @@ -19919,6 +19932,7 @@ +%if 0%{?suse_version} >= 1230 +%{_unitdir}/iscsiuio.service +%{_unitdir}/iscsiuio.socket ++%{_sbindir}/rciscsiuio +%endif %changelog