Hello community, here is the log from the commit of package open-iscsi for openSUSE:Factory checked in at 2016-01-11 19:10:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-07-05 17:56:14.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.open-iscsi.new/open-iscsi.changes 2016-01-11 19:10:07.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Jan 07 01:39:10 UTC 16 - [email protected] + +- Removing creation of the open-isns RPM, since it + is now created in its own package + +------------------------------------------------------------------- Old: ---- open-iscsi-firewall.service ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ open-iscsi.spec ++++++ --- /var/tmp/diff_new_pack.Tyb2ZA/_old 2016-01-11 19:10:08.000000000 +0100 +++ /var/tmp/diff_new_pack.Tyb2ZA/_new 2016-01-11 19:10:08.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package open-iscsi # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -43,7 +43,6 @@ License: GPL-2.0+ Group: Productivity/Networking/Other Source: %{name}-2.0-%{iscsi_release}.tar.bz2 -Source1: %{name}-firewall.service Patch1: %{name}-Factory-latest.diff.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -66,19 +65,6 @@ The user space Open-iSCSI consists of a daemon process called iscsid, and a management utility iscsiadm. -%package -n open-isns -Summary: Linux iSNS server -Group: Productivity/Networking/Other -Version: 0.90 -Release: 0 -Obsoletes: isns <= 2.1.02 -Provides: isns = 2.1.03 - -%description -n open-isns -This is a partial implementation of iSNS, according to RFC4171. -The implementation is still somewhat incomplete, but I am releasing -it for your reading pleasure. - %package -n iscsiuio Summary: Linux Broadcom NetXtremem II iscsi server Group: Productivity/Networking/Other @@ -127,7 +113,6 @@ 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 @@ -142,13 +127,7 @@ (cd ${RPM_BUILD_ROOT}/etc; ln -sf iscsi/iscsid.conf iscsid.conf) touch ${RPM_BUILD_ROOT}/etc/iscsi/initiatorname.iscsi install -m 0755 usr/iscsistart %{buildroot}/sbin -make DESTDIR=${RPM_BUILD_ROOT} -C utils/open-isns install -%if 0%{?suse_version} >= 1230 -make DESTDIR=${RPM_BUILD_ROOT} -C utils/open-isns install_service -%endif make DESTDIR=${RPM_BUILD_ROOT} -C iscsiuio install -# install firewall file for isns server -install -vD %{S:1} %{buildroot}/etc/sysconfig/SuSEfirewall2.d/services/isns %post %if 0%{?suse_version} < 1320 @@ -192,28 +171,6 @@ %{stop_on_removal iscsid} %endif -%post -n open-isns -%if 0%{?suse_version} >= 1230 -%{service_add_post isnsd.socket isnsd.service} -%endif - -%postun -n open-isns -%if 0%{?suse_version} >= 1230 -%{service_del_postun isnsd.socket isnsd.service} -%endif - -%pre -n open-isns -%if 0%{?suse_version} >= 1230 -%{service_add_pre isnsd.socket isnsd.service} -%endif - -%preun -n open-isns -%if 0%{?suse_version} >= 1230 -%{service_del_preun isnsd.socket isnsd.service} -%else -%{stop_on_removal isnsd isnsdd} -%endif - %post -n iscsiuio %if 0%{?suse_version} >= 1230 %{service_add_post iscsiuio.socket iscsiuio.service} @@ -276,25 +233,6 @@ %doc %{_mandir}/man8/iscsistart.8.gz %doc %{_mandir}/man8/iscsi-iname.8.gz -%files -n open-isns -%defattr(-,root,root) -%dir /etc/isns -%attr(0600,root,root) %config(noreplace) /etc/isns/isnsd.conf -%attr(0600,root,root) %config(noreplace) /etc/isns/isnsdd.conf -%attr(0644,root,root) %config /etc/sysconfig/SuSEfirewall2.d/services/isns -%if 0%{?suse_version} >= 1230 -%{_unitdir}/isnsd.service -%{_unitdir}/isnsd.socket -%{_sbindir}/rcisnsd -%endif -/usr/sbin/isnsd -/usr/sbin/isnsdd -/usr/sbin/isnsadm -%doc %{_mandir}/man8/isnsadm.8.gz -%doc %{_mandir}/man8/isnsd.8.gz -%doc %{_mandir}/man8/isnsdd.8.gz -%doc %{_mandir}/man5/isns_config.5.gz - %files -n iscsiuio %defattr(-,root,root) /sbin/iscsiuio ++++++ open-iscsi-Factory-latest.diff.bz2 ++++++ --- /var/tmp/diff_new_pack.Tyb2ZA/_old 2016-01-11 19:10:08.000000000 +0100 +++ /var/tmp/diff_new_pack.Tyb2ZA/_new 2016-01-11 19:10:09.000000000 +0100 @@ -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..42bace691f3b 100644 +index 2e21afc6bc7b..e70c5c681001 100644 --- a/rpm/open-iscsi.changes +++ b/rpm/open-iscsi.changes -@@ -1,4 +1,420 @@ +@@ -1,4 +1,426 @@ ------------------------------------------------------------------- ++Thu Jan 07 01:39:10 UTC 16 - [email protected] ++ ++- Removing creation of the open-isns RPM, since it ++ is now created in its own package ++ ++------------------------------------------------------------------- +Thu Jun 18 17:29:56 UTC 2015 - [email protected] + +- Add rcsymlinks (bnc#932814) (from [email protected]) @@ -19544,7 +19550,7 @@ Fri Dec 9 15:09:01 CET 2011 - [email protected] - iscsiadm: Return correct error when login fails (bnc#715071) -@@ -40,6 +456,11 @@ Fri Nov 4 09:15:52 CET 2011 - [email protected] +@@ -40,6 +462,11 @@ Fri Nov 4 09:15:52 CET 2011 - [email protected] - Stop iscsiuio when run inside initrd (bnc#728095) ------------------------------------------------------------------- @@ -19556,7 +19562,7 @@ Mon Oct 24 09:13:19 CEST 2011 - [email protected] - Update iscsiuio to 0.7.0.14f (bnc#687392) -@@ -101,6 +522,11 @@ Tue Jun 21 15:09:46 CEST 2011 - [email protected] +@@ -101,6 +528,11 @@ Tue Jun 21 15:09:46 CEST 2011 - [email protected] - Include scripts for automated build ------------------------------------------------------------------- @@ -19568,7 +19574,7 @@ Wed Feb 2 11:32:12 CET 2011 - [email protected] - Fix the following issues: -@@ -224,6 +650,11 @@ Wed Nov 18 10:33:27 CET 2009 - [email protected] +@@ -224,6 +656,11 @@ Wed Nov 18 10:33:27 CET 2009 - [email protected] - Read initiatorname correctly from sysfs (bnc#541882) ------------------------------------------------------------------- @@ -19580,7 +19586,7 @@ Wed Aug 19 12:58:13 CEST 2009 - [email protected] - Synchronize startup settings (bnc#514273) -@@ -231,11 +662,24 @@ Wed Aug 19 12:58:13 CEST 2009 - [email protected] +@@ -231,11 +668,24 @@ Wed Aug 19 12:58:13 CEST 2009 - [email protected] - Do not use temp file in iscsi_discovery (bnc#528711) ------------------------------------------------------------------- @@ -19606,7 +19612,7 @@ - Fix relogin retry handling (bnc#466846) diff --git a/rpm/open-iscsi.spec b/rpm/open-iscsi.spec -index 27ab050554f1..ab2082208493 100644 +index 27ab050554f1..2c571d7f0f68 100644 --- a/rpm/open-iscsi.spec +++ b/rpm/open-iscsi.spec @@ -1,7 +1,7 @@ @@ -19614,11 +19620,11 @@ # spec file for package open-iscsi # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. -+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. ++# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed -@@ -15,27 +15,36 @@ +@@ -15,27 +15,35 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -19666,28 +19672,16 @@ -Patch1: %{name}-git-update.diff.bz2 -Patch2: %{name}-git-merge.diff.bz2 -Patch3: %{name}-sles11-sp2.diff.bz2 -+Source1: %{name}-firewall.service +Patch1: %{name}-Factory-latest.diff.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -@@ -57,20 +66,47 @@ processing, iSNS, SLP, Radius, etc. +@@ -57,20 +65,34 @@ processing, iSNS, SLP, Radius, etc. The user space Open-iSCSI consists of a daemon process called iscsid, and a management utility iscsiadm. -+%package -n open-isns -+Summary: Linux iSNS server -+Group: Productivity/Networking/Other -+Version: 0.90 -+Release: 0 -+Obsoletes: isns <= 2.1.02 -+Provides: isns = 2.1.03 - -+%description -n open-isns -+This is a partial implementation of iSNS, according to RFC4171. -+The implementation is still somewhat incomplete, but I am releasing -+it for your reading pleasure. - +- +- -Authors: --------- - [email protected] @@ -19725,7 +19719,7 @@ cd iscsiuio touch NEWS touch AUTHORS -@@ -80,48 +116,195 @@ make CFLAGS="${RPM_OPT_FLAGS}" +@@ -80,48 +102,147 @@ make CFLAGS="${RPM_OPT_FLAGS}" %install make DESTDIR=${RPM_BUILD_ROOT} install_user @@ -19740,7 +19734,6 @@ +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) @@ -19761,13 +19754,7 @@ -[ "${RPM_BUILD_ROOT}" != "/" -a -d ${RPM_BUILD_ROOT} ] && rm -rf ${RPM_BUILD_ROOT} +touch ${RPM_BUILD_ROOT}/etc/iscsi/initiatorname.iscsi +install -m 0755 usr/iscsistart %{buildroot}/sbin -+make DESTDIR=${RPM_BUILD_ROOT} -C utils/open-isns install -+%if 0%{?suse_version} >= 1230 -+make DESTDIR=${RPM_BUILD_ROOT} -C utils/open-isns install_service -+%endif +make DESTDIR=${RPM_BUILD_ROOT} -C iscsiuio install -+# install firewall file for isns server -+install -vD %{S:1} %{buildroot}/etc/sysconfig/SuSEfirewall2.d/services/isns %post +%if 0%{?suse_version} < 1320 @@ -19813,28 +19800,6 @@ +%{stop_on_removal iscsid} +%endif + -+%post -n open-isns -+%if 0%{?suse_version} >= 1230 -+%{service_add_post isnsd.socket isnsd.service} -+%endif -+ -+%postun -n open-isns -+%if 0%{?suse_version} >= 1230 -+%{service_del_postun isnsd.socket isnsd.service} -+%endif -+ -+%pre -n open-isns -+%if 0%{?suse_version} >= 1230 -+%{service_add_pre isnsd.socket isnsd.service} -+%endif -+ -+%preun -n open-isns -+%if 0%{?suse_version} >= 1230 -+%{service_del_preun isnsd.socket isnsd.service} -+%else -+%{stop_on_removal isnsd isnsdd} -+%endif -+ +%post -n iscsiuio +%if 0%{?suse_version} >= 1230 +%{service_add_post iscsiuio.socket iscsiuio.service} @@ -19904,25 +19869,6 @@ +%doc %{_mandir}/man8/iscsistart.8.gz +%doc %{_mandir}/man8/iscsi-iname.8.gz + -+%files -n open-isns -+%defattr(-,root,root) -+%dir /etc/isns -+%attr(0600,root,root) %config(noreplace) /etc/isns/isnsd.conf -+%attr(0600,root,root) %config(noreplace) /etc/isns/isnsdd.conf -+%attr(0644,root,root) %config /etc/sysconfig/SuSEfirewall2.d/services/isns -+%if 0%{?suse_version} >= 1230 -+%{_unitdir}/isnsd.service -+%{_unitdir}/isnsd.socket -+%{_sbindir}/rcisnsd -+%endif -+/usr/sbin/isnsd -+/usr/sbin/isnsdd -+/usr/sbin/isnsadm -+%doc %{_mandir}/man8/isnsadm.8.gz -+%doc %{_mandir}/man8/isnsd.8.gz -+%doc %{_mandir}/man8/isnsdd.8.gz -+%doc %{_mandir}/man5/isns_config.5.gz -+ +%files -n iscsiuio +%defattr(-,root,root) +/sbin/iscsiuio
