rpm/open-iscsi
SHA256
1
0
Fork 0
forked from pool/open-iscsi
Code Pull Requests Activity

Accepting request 264227 from network

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/264227
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/open-iscsi?expand=0&rev=49
This commit is contained in:
Dominique Leuenberger 2014-12-08 15:56:24 +00:00 committed by Git OBS Bridge
commit db3a41e157
3 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
open-iscsi-Factory-latest.diff.bz2
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:91881c7ea58e34d71f379da845357f86110b8412405156307ca66e22a0db38c2
size 184073
oid sha256:36bb67b7d05170b033fe7300d0ec376990b3ccf14702950fa4be06c2b8cbcc14
size 184160

6
open-iscsi.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Dec 5 22:54:32 UTC 2014 - lduncan@suse.com
- Fixed spec file to support dracut on newers versions (bsc#893578)
- Also cleaned up spec file a bit for rpmlint
-------------------------------------------------------------------
Tue Nov 25 13:44:28 PST 2014 - lduncan@suse.com

24
open-iscsi.spec
View File

@ -28,12 +28,15 @@ BuildRequires: openssl-devel
%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 @@ 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
@ -156,7 +161,11 @@ install -vD %{S:1} %{buildroot}/etc/sysconfig/SuSEfirewall2.d/services/isns
[ "${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 @@ fi
%{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 @@ fi
%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 @@ fi
%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 @@ fi
/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