Hello community, here is the log from the commit of package open-iscsi for openSUSE:Factory checked in at 2014-12-08 16:56:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-11-29 08:39:50.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.open-iscsi.new/open-iscsi.changes 2014-12-08 16:56:03.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Dec 5 22:54:32 UTC 2014 - [email protected] + +- Fixed spec file to support dracut on newers versions (bsc#893578) +- Also cleaned up spec file a bit for rpmlint + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ open-iscsi.spec ++++++ --- /var/tmp/diff_new_pack.I1D8PR/_old 2014-12-08 16:56:04.000000000 +0100 +++ /var/tmp/diff_new_pack.I1D8PR/_new 2014-12-08 16:56:04.000000000 +0100 @@ -28,12 +28,15 @@ %if 0%{?suse_version} >= 1230 BuildRequires: systemd %endif +%if 0%{?suse_version} >= 1320 +BuildRequires: suse-module-tools +%endif Url: http://www.open-iscsi.org PreReq: %fillup_prereq %insserv_prereq Version: 2.0.873 Release: 0 %{?systemd_requires} -Recommends: logrotate +Requires: logrotate %define iscsi_release 873 Summary: Linux* Open-iSCSI Software Initiator License: GPL-2.0+ @@ -126,7 +129,9 @@ %install make DESTDIR=${RPM_BUILD_ROOT} install_user +%if 0%{?suse_version} < 1320 make DESTDIR=${RPM_BUILD_ROOT} install_mkinitrd_suse +%endif # install service files %if 0%{?suse_version} >= 1230 make DESTDIR=${RPM_BUILD_ROOT} install_service_suse @@ -156,7 +161,11 @@ [ "${RPM_BUILD_ROOT}" != "/" -a -d ${RPM_BUILD_ROOT} ] && rm -rf ${RPM_BUILD_ROOT} %post +%if 0%{?suse_version} < 1320 [ -x /sbin/mkinitrd_setup ] && mkinitrd_setup +%else +%{?regenerate_initrd_post} +%endif if [ ! -f /etc/iscsi/initiatorname.iscsi ] ; then /sbin/iscsi-gen-initiatorname fi @@ -166,8 +175,15 @@ %{fillup_and_insserv -Y boot.iscsid-early} %endif +%posttrans +%if 0%{?suse_version} >= 1320 +%{?regenerate_initrd_posttrans} +%endif + %postun +%if 0%{?suse_version} < 1320 [ -x /sbin/mkinitrd_setup ] && mkinitrd_setup +%endif %if 0%{?suse_version} >= 1230 %{service_del_postun iscsid.socket iscsid.service iscsi.service} %else @@ -192,7 +208,7 @@ %postun -n open-isns %if 0%{?suse_version} >= 1230 -%{service_add_post isnsd.socket isnsd.service} +%{service_del_postun isnsd.socket isnsd.service} %endif %pre -n open-isns @@ -213,7 +229,7 @@ %postun -n iscsiuio %if 0%{?suse_version} >= 1230 -%{service_add_post iscsiuio.socket iscsiuio.service} +%{service_del_postun iscsiuio.socket iscsiuio.service} %endif %pre -n iscsiuio @@ -252,11 +268,13 @@ /sbin/iscsi-gen-initiatorname /sbin/iscsi_offload /sbin/iscsi_discovery +%if 0%{?suse_version} < 1320 %dir /lib/mkinitrd %dir /lib/mkinitrd/scripts /lib/mkinitrd/scripts/setup-iscsi.sh /lib/mkinitrd/scripts/boot-iscsi.sh /lib/mkinitrd/scripts/boot-killiscsi.sh +%endif %doc COPYING README %doc %{_mandir}/man8/iscsiadm.8.gz %doc %{_mandir}/man8/iscsid.8.gz ++++++ open-iscsi-Factory-latest.diff.bz2 ++++++ --- /var/tmp/diff_new_pack.I1D8PR/_old 2014-12-08 16:56:04.000000000 +0100 +++ /var/tmp/diff_new_pack.I1D8PR/_new 2014-12-08 16:56:04.000000000 +0100 @@ -19194,7 +19194,7 @@ - Fix relogin retry handling (bnc#466846) diff --git a/rpm/open-iscsi.spec b/rpm/open-iscsi.spec -index 27ab050554f1..1328f4a473d2 100644 +index 27ab050554f1..8fe23e7ecb2a 100644 --- a/rpm/open-iscsi.spec +++ b/rpm/open-iscsi.spec @@ -1,7 +1,7 @@ @@ -19206,7 +19206,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,32 @@ +@@ -15,27 +15,35 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -19226,6 +19226,9 @@ +%if 0%{?suse_version} >= 1230 +BuildRequires: systemd +%endif ++%if 0%{?suse_version} >= 1320 ++BuildRequires: suse-module-tools ++%endif Url: http://www.open-iscsi.org -License: GPL v2 or later -Group: Productivity/Networking/Other @@ -19235,11 +19238,12 @@ -Release: 0.<RELEASE26> -Provides: linux-iscsi -Obsoletes: linux-iscsi +-Recommends: logrotate +-%define iscsi_release 872 +Version: 2.0.873 +Release: 0 +%{?systemd_requires} - Recommends: logrotate --%define iscsi_release 872 ++Requires: logrotate +%define iscsi_release 873 Summary: Linux* Open-iSCSI Software Initiator +License: GPL-2.0+ @@ -19253,7 +19257,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -@@ -63,14 +68,55 @@ Authors: +@@ -63,14 +71,55 @@ Authors: -------- [email protected] @@ -19312,11 +19316,13 @@ cd iscsiuio touch NEWS touch AUTHORS -@@ -80,48 +126,171 @@ make CFLAGS="${RPM_OPT_FLAGS}" +@@ -80,48 +129,186 @@ make CFLAGS="${RPM_OPT_FLAGS}" %install make DESTDIR=${RPM_BUILD_ROOT} install_user ++%if 0%{?suse_version} < 1320 +make DESTDIR=${RPM_BUILD_ROOT} install_mkinitrd_suse ++%endif +# install service files +%if 0%{?suse_version} >= 1230 +make DESTDIR=${RPM_BUILD_ROOT} install_service_suse @@ -19349,8 +19355,12 @@ [ "${RPM_BUILD_ROOT}" != "/" -a -d ${RPM_BUILD_ROOT} ] && rm -rf ${RPM_BUILD_ROOT} %post ++%if 0%{?suse_version} < 1320 [ -x /sbin/mkinitrd_setup ] && mkinitrd_setup -%{fillup_and_insserv -Y boot.open-iscsi} ++%else ++%{?regenerate_initrd_post} ++%endif if [ ! -f /etc/iscsi/initiatorname.iscsi ] ; then /sbin/iscsi-gen-initiatorname fi @@ -19359,9 +19369,16 @@ +%else +%{fillup_and_insserv -Y boot.iscsid-early} +%endif ++ ++%posttrans ++%if 0%{?suse_version} >= 1320 ++%{?regenerate_initrd_posttrans} ++%endif %postun ++%if 0%{?suse_version} < 1320 [ -x /sbin/mkinitrd_setup ] && mkinitrd_setup ++%endif +%if 0%{?suse_version} >= 1230 +%{service_del_postun iscsid.socket iscsid.service iscsi.service} +%else @@ -19387,7 +19404,7 @@ + +%postun -n open-isns +%if 0%{?suse_version} >= 1230 -+%{service_add_post isnsd.socket isnsd.service} ++%{service_del_postun isnsd.socket isnsd.service} +%endif + +%pre -n open-isns @@ -19408,7 +19425,7 @@ + +%postun -n iscsiuio +%if 0%{?suse_version} >= 1230 -+%{service_add_post iscsiuio.socket iscsiuio.service} ++%{service_del_postun iscsiuio.socket iscsiuio.service} +%endif + +%pre -n iscsiuio @@ -19453,11 +19470,13 @@ +/sbin/iscsi-gen-initiatorname +/sbin/iscsi_offload +/sbin/iscsi_discovery ++%if 0%{?suse_version} < 1320 %dir /lib/mkinitrd %dir /lib/mkinitrd/scripts /lib/mkinitrd/scripts/setup-iscsi.sh /lib/mkinitrd/scripts/boot-iscsi.sh /lib/mkinitrd/scripts/boot-killiscsi.sh ++%endif %doc COPYING README -%doc %{_mandir}/man8/* +%doc %{_mandir}/man8/iscsiadm.8.gz -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
