commit open-iscsi for openSUSE:Factory
Hello community, here is the log from the commit of package open-iscsi for openSUSE:Factory checked in at 2018-01-31 19:48:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/open-iscsi (Old) and /work/SRC/openSUSE:Factory/.open-iscsi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "open-iscsi" Wed Jan 31 19:48:22 2018 rev:68 rq:568778 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/open-iscsi/open-iscsi.changes 2017-12-19 10:48:47.853416784 +0100 +++ /work/SRC/openSUSE:Factory/.open-iscsi.new/open-iscsi.changes 2018-01-31 19:48:23.903223260 +0100 @@ -1,0 +2,32 @@ +Tue Jan 23 22:43:51 UTC 2018 - lduncan@suse.com + +- Removed the "rpm/" source directory from both the + open-iscsi-2.0.876-suse.tar.bz2 and open-iscsi-SUSE-latest.diff.bz2 + files, since they are not needed for building and are not part + of the upstream sources. They are still available under the + git repository at github.com/hreinecke/open-iscsi.git. This means + that changes to the spec file or the changes file will no longer + require a change to the "*SUSE-latest*" file. + +------------------------------------------------------------------- +Mon Jan 22 20:58:30 UTC 2018 - lduncan@suse.com + +- Update to latest upstream vesion 2.0.876, with very few + SUSE-specific modifications, namely around things upstream + does not care about, like SUSE-specific systemd files. Also, + version number modified to add "-suse", as usual. See + the Changelog file for more details on changes in this + upstream version. + + This replaces open-iscsi-2.0.875-suse.tar.bz2 with + open-iscsi-2.0.876-suse.tar.bz2, and resets + open-iscsi-SUSE-latest.diff.bz2 to contain only changes + since the 2.0.876-suse tag. + + These changes added a new libopeniscsiusr.so library, as + well as include files under a new open-iscsi-dev package, + if you want to link against this library. + + The SPEC file was also cleaned up using spec-cleaner. + +------------------------------------------------------------------- Old: ---- open-iscsi-2.0.875-suse.tar.bz2 New: ---- open-iscsi-2.0.876-suse.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ open-iscsi.spec ++++++ --- /var/tmp/diff_new_pack.6PlYsv/_old 2018-01-31 19:48:24.563192574 +0100 +++ /var/tmp/diff_new_pack.6PlYsv/_new 2018-01-31 19:48:24.567192388 +0100 @@ -1,7 +1,7 @@ # # spec file for package open-iscsi # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 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 @@ -16,11 +16,21 @@ # +%define iscsi_release 876-suse Name: open-iscsi +Version: 2.0.876 +Release: 0 +Summary: Linux* Open-iSCSI Software Initiator +License: GPL-2.0+ +Group: Productivity/Networking/Other +Url: http://www.open-iscsi.com +Source: %{name}-2.0.%{iscsi_release}.tar.bz2 +Patch1: %{name}-SUSE-latest.diff.bz2 BuildRequires: autoconf BuildRequires: automake BuildRequires: bison BuildRequires: db-devel < 5 +BuildRequires: fdupes BuildRequires: flex BuildRequires: libmount-devel BuildRequires: libtool @@ -29,18 +39,8 @@ BuildRequires: openssl-devel BuildRequires: suse-module-tools BuildRequires: systemd -Url: http://www.open-iscsi.com -Version: 2.0.875 -Release: 0 -%{?systemd_requires} -%define iscsi_release 875-suse -Summary: Linux* Open-iSCSI Software Initiator -License: GPL-2.0+ -Group: Productivity/Networking/Other Requires(post): coreutils -Source: %{name}-2.0.%{iscsi_release}.tar.bz2 -Patch1: %{name}-SUSE-latest.diff.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-build +%{?systemd_requires} %description Open-iSCSI is a high-performance, transport independent, multi-platform @@ -62,10 +62,10 @@ and a management utility iscsiadm. %package -n iscsiuio -Summary: Linux Broadcom NetXtremem II iscsi server -Group: Productivity/Networking/Other Version: 0.7.8.2 Release: 0 +Summary: Linux Broadcom NetXtremem II iscsi server +Group: Productivity/Networking/Other Requires: logrotate %description -n iscsiuio @@ -82,44 +82,59 @@ The communication to the driver is done via Userspace I/O (Kernel module name 'uio'). +%package devel +Version: 2.0.876 +Release: 0 +Summary: Linux open-iscsi user-level library and include files +Group: Development/Libraries/C and C++ +Requires: %{name} + +%description devel +This development package contains the open-iscsi user-level library +include files and documentation. These are used to compile against +the libopeniscsiusr library. + %prep -%setup -n %{name}-2.0.%{iscsi_release} +%setup -q -n %{name}-2.0.%{iscsi_release} %patch1 -p1 %build -%{__make} OPTFLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing -DOFFLOAD_BOOT_SUPPORTED -DLOCK_DIR=\\\"/etc/iscsi\\\"" LDFLAGS="" user +make %{?_smp_mflags} OPTFLAGS="%{optflags} -fno-strict-aliasing -DOFFLOAD_BOOT_SUPPORTED -DLOCK_DIR=\\\"%{_sysconfdir}/iscsi\\\"" LDFLAGS="" user cd iscsiuio touch NEWS touch AUTHORS autoreconf --install %configure --sbindir=/sbin -make CFLAGS="${RPM_OPT_FLAGS}" +make %{?_smp_mflags} CFLAGS="%{optflags}" %install -make DESTDIR=${RPM_BUILD_ROOT} install_user +make DESTDIR=%{buildroot} install_user # install service files -make DESTDIR=${RPM_BUILD_ROOT} install_service_suse +make DESTDIR=%{buildroot} install_service_suse # create rc symlinks -[ -d ${RPM_BUILD_ROOT}/usr/sbin ] || mkdir -p ${RPM_BUILD_ROOT}/usr/sbin +[ -d %{buildroot}%{_sbindir} ] || mkdir -p %{buildroot}%{_sbindir} ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rciscsi ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rciscsid ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rciscsiuio -(cd ${RPM_BUILD_ROOT}/etc; ln -sf iscsi/iscsid.conf iscsid.conf) -touch ${RPM_BUILD_ROOT}/etc/iscsi/initiatorname.iscsi +(cd %{buildroot}/etc; ln -sf iscsi/iscsid.conf iscsid.conf) +touch %{buildroot}%{_sysconfdir}/iscsi/initiatorname.iscsi install -m 0755 usr/iscsistart %{buildroot}/sbin -make DESTDIR=${RPM_BUILD_ROOT} -C iscsiuio install +make DESTDIR=%{buildroot} -C iscsiuio install +%fdupes %{buildroot} %post %{?regenerate_initrd_post} -if [ ! -f /etc/iscsi/initiatorname.iscsi ] ; then +if [ ! -f %{_sysconfdir}/iscsi/initiatorname.iscsi ] ; then /sbin/iscsi-gen-initiatorname fi +%{run_ldconfig} %{service_add_post iscsid.socket iscsid.service iscsi.service} %posttrans %{?regenerate_initrd_posttrans} %postun +%{run_ldconfig} %{service_del_postun iscsid.socket iscsid.service iscsi.service} %pre @@ -141,13 +156,12 @@ %{service_del_preun iscsiuio.socket iscsiuio.service} %files -%defattr(-,root,root) -%dir /etc/iscsi -%attr(0600,root,root) %config(noreplace) /etc/iscsi/iscsid.conf -%ghost /etc/iscsi/initiatorname.iscsi -%dir /etc/iscsi/ifaces -%config /etc/iscsi/ifaces/iface.example -/etc/iscsid.conf +%dir %{_sysconfdir}/iscsi +%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/iscsi/iscsid.conf +%ghost %{_sysconfdir}/iscsi/initiatorname.iscsi +%dir %{_sysconfdir}/iscsi/ifaces +%config %{_sysconfdir}/iscsi/ifaces/iface.example +%{_sysconfdir}/iscsid.conf %{_unitdir}/iscsid.service %{_unitdir}/iscsid.socket %{_unitdir}/iscsi.service @@ -163,24 +177,26 @@ /sbin/iscsi_discovery /sbin/iscsi_fw_login %doc COPYING README -%doc %{_mandir}/man8/iscsiadm.8.gz -%doc %{_mandir}/man8/iscsid.8.gz -%doc %{_mandir}/man8/iscsi_discovery.8.gz -%doc %{_mandir}/man8/iscsistart.8.gz -%doc %{_mandir}/man8/iscsi-iname.8.gz -%doc %{_mandir}/man8/iscsi_fw_login.8.gz -%dir %{_sysconfdir}/udev -%dir %{_sysconfdir}/udev/rules.d -%config %{_sysconfdir}/udev/rules.d/50-iscsi-firmware-login.rules +%{_mandir}/man8/iscsiadm.8%{ext_man} +%{_mandir}/man8/iscsid.8%{ext_man} +%{_mandir}/man8/iscsi_discovery.8%{ext_man} +%{_mandir}/man8/iscsistart.8%{ext_man} +%{_mandir}/man8/iscsi-iname.8%{ext_man} +%{_mandir}/man8/iscsi_fw_login.8%{ext_man} +%{_udevrulesdir}/50-iscsi-firmware-login.rules +%{_libdir}/libopeniscsiusr.so* %files -n iscsiuio -%defattr(-,root,root) /sbin/iscsiuio /sbin/brcm_iscsiuio -%doc %{_mandir}/man8/iscsiuio.8.gz -%config /etc/logrotate.d/iscsiuiolog +%{_mandir}/man8/iscsiuio.8%{ext_man} +%config %{_sysconfdir}/logrotate.d/iscsiuiolog %{_unitdir}/iscsiuio.service %{_unitdir}/iscsiuio.socket %{_sbindir}/rciscsiuio +%files devel +%{_includedir}/libopeniscsiusr*.h +%{_mandir}/man3/*.3%{ext_man} + %changelog ++++++ open-iscsi-2.0.875-suse.tar.bz2 -> open-iscsi-2.0.876-suse.tar.bz2 ++++++ ++++ 32491 lines of diff (skipped) ++++++ open-iscsi-SUSE-latest.diff.bz2 ++++++ ++++ 677 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/open-iscsi/open-iscsi-SUSE-latest.diff.bz2 ++++ and /work/SRC/openSUSE:Factory/.open-iscsi.new/open-iscsi-SUSE-latest.diff.bz2
participants (1)
-
root@hilbert.suse.de