Author: qboosh Date: Mon May 30 18:49:50 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- avoid using kernel source; just force NETLINK_ISCSI value from 2.6.13+
- db-devel seems not used (there is internal some kind of db)
- bcond to link dynamically with openslp
---- Files affected:
packages/open-iscsi:
open-iscsi.spec (1.25 -> 1.26)
---- Diffs:
================================================================
Index: packages/open-iscsi/open-iscsi.spec
diff -u packages/open-iscsi/open-iscsi.spec:1.25
packages/open-iscsi/open-iscsi.spec:1.26
--- packages/open-iscsi/open-iscsi.spec:1.25 Fri Dec 3 10:16:55 2010
+++ packages/open-iscsi/open-iscsi.spec Mon May 30 20:49:45 2011
@@ -1,6 +1,10 @@
# $Revision$, $Date$
# TODO
# - /sbin/iscsistart is linked static, should it be linked uclibc/klibc-static
for initrd?
+# - for use in /sbin only openslp should be static (or libslp moved to /lib)
+#
+# Conditional build:
+%bcond_with dynamic # link utilities dynamically
#
%define subver 872
%define rel 3
@@ -9,7 +13,7 @@
Name: open-iscsi
Version: 2.0
Release: 0.%{subver}.%{rel}
-License: GPL
+License: GPL v2
Group: Networking/Daemons
Source0:
http://kernel.org/pub/linux/kernel/people/mnc/open-iscsi/releases/%{name}-%{version}-%{subver}.tar.gz
# Source0-md5: b4df94f08c241352bb964043b3e44779
@@ -18,11 +22,15 @@
Source3: %{name}-devices.init
Patch0: %{name}-build.patch
URL: http://www.open-iscsi.org/
-BuildRequires: db-devel
+BuildRequires: openssl-devel
+BuildRequires: rpmbuild(macros) >= 1.379
+%if %{with dynamic}
+BuildRequires: openslp-devel
+BuildRequires: sed >= 4.0
+%else
BuildRequires: glibc-static
BuildRequires: openslp-static
-BuildRequires: openssl-static
-BuildRequires: rpmbuild(macros) >= 1.379
+%endif
Requires(post,preun): /sbin/chkconfig
Requires: rc-scripts
Suggests: multipath-tools
@@ -52,6 +60,10 @@
%setup -q -n %{name}-%{version}-%{subver}
%patch0 -p1
+%if %{with dynamic}
+sed -i -e 's/-static //' usr/Makefile
+%endif
+
%build
cd utils/open-isns
%configure \
@@ -63,7 +75,9 @@
%{__make} -C $i \
CC="%{__cc}" \
OPTFLAGS="%{rpmcflags} %{rpmcppflags}" \
- KSRC="%{_kernelsrcdir}"
+ IPC_FLAGS="-DNETLINK_ISCSI=8 -D_GNU_SOURCE" \
+ KSUBLEVEL=0 \
+ KSRC=/usr
done
%install
@@ -127,7 +141,11 @@
%attr(755,root,root) %{_sbindir}/iscsid
%attr(755,root,root) %{_sbindir}/iscsistart
%attr(755,root,root) %{_sbindir}/iscsi_discovery
-%{_mandir}/man8/*
+%{_mandir}/man8/iscsi-iname.8*
+%{_mandir}/man8/iscsi_discovery.8*
+%{_mandir}/man8/iscsiadm.8*
+%{_mandir}/man8/iscsid.8*
+%{_mandir}/man8/iscsistart.8*
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -135,6 +153,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.26 2011/05/30 18:49:45 qboosh
+- avoid using kernel source; just force NETLINK_ISCSI value from 2.6.13+
+- db-devel seems not used (there is internal some kind of db)
+- bcond to link dynamically with openslp
+
Revision 1.25 2010/12/03 09:16:55 arekm
... and package iscsi-devices
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/open-iscsi/open-iscsi.spec?r1=1.25&r2=1.26&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
