admin/libiscsi
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Rename libiscsi to libiscsiclient to avoid clash with obscure linux library

Browse Source 
Change to version 2
This commit is contained in:
Ronnie Sahlberg
2012-03-03 17:01:37 +11:00
parent 2b521b4d24
commit c4386dfb87
4 changed files with 40 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
packaging/RPM/libiscsi.spec.in → packaging/RPM/libiscsiclient.spec.in
View File

@@ -1,12 +1,12 @@
Name: libiscsi
Name: libiscsiclient
Summary: iSCSI client library
Version: 1.1.0
Version: 2.0.0
Release: 1GITHASH%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
URL: https://github.com/sahlberg/libiscsi
Source: libiscsi-%{version}.tar.gz
Source: libiscsiclient-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-root
BuildRequires: autoconf
@@ -15,7 +15,7 @@ BuildRequires: libtool
BuildRequires: popt-devel
%description
libiscsi is a library for attaching to iSCSI resources across
libiscsiclient is a library for attaching to iSCSI resources across
a network.
@@ -26,7 +26,7 @@ a network.
%prep
%setup -q
# setup the init script and sysconfig file
%setup -T -D -n libiscsi-%{version} -q
%setup -T -D -n libiscsiclient-%{version} -q
%build
@@ -43,8 +43,8 @@ make %{?_smp_mflags}
# Clean up in case there is trash left from a previous build
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install %{?_smp_mflags}
rm $RPM_BUILD_ROOT/%{_libdir}/libiscsi.a
rm $RPM_BUILD_ROOT/%{_libdir}/libiscsi.la
rm $RPM_BUILD_ROOT/%{_libdir}/libiscsiclient.a
rm $RPM_BUILD_ROOT/%{_libdir}/libiscsiclient.la
# Remove "*.old" files
find $RPM_BUILD_ROOT -name "*.old" -exec rm -f {} \;
@@ -59,14 +59,14 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
%doc COPYING.LESSER README TODO
%{_libdir}/libiscsi.so.*
%{_libdir}/libiscsiclient.so.*
%package utils
Summary: iSCSI Client Utilities
Group: Applications/System
%description utils
The libiscsi-utils package provides a set of assorted utilities to connect
The libiscsiclient-utils package provides a set of assorted utilities to connect
to iSCSI servers without having to set up the Linux iSCSI initiator.
%files utils
@@ -78,19 +78,21 @@ to iSCSI servers without having to set up the Linux iSCSI initiator.
%package devel
Summary: iSCSI client development libraries
Group: Development/Libraries
Requires: libiscsi = %{version}-%{release}
Requires: libiscsiclient = %{version}-%{release}
%description devel
The libiscsi-devel package includes the header files for libiscsi.
The libiscsiclient-devel package includes the header files for libiscsiclient.
%files devel
%defattr(-,root,root)
%doc COPYING.LESSER README TODO
%{_includedir}/iscsi/iscsi.h
%{_includedir}/iscsi/scsi-lowlevel.h
%{_libdir}/libiscsi.so
%{_libdir}/libiscsiclient.so
%changelog
* Sat Mar 3 2012 : 2.0.0
- Rename to libiscsiclient to avoid collission with obscure linux library
* Sun Dec 25 2011 : 1.1.0
- Fix TaskManagement AbortTask/AbortTaskSet to send to correct LUN

8
packaging/RPM/makerpms.sh
View File

@@ -40,8 +40,8 @@ TOPDIR=${DIRNAME}/../..
SPECDIR=`rpm --eval %_specdir`
SRCDIR=`rpm --eval %_sourcedir`
SPECFILE="libiscsi.spec"
SPECFILE_IN="libiscsi.spec.in"
SPECFILE="libiscsiclient.spec"
SPECFILE_IN="libiscsiclient.spec.in"
RPMBUILD="rpmbuild"
GITHASH=".$(git log --pretty=format:%h -1)"
@@ -64,7 +64,7 @@ else
fi
pushd ${TOPDIR}
echo -n "Creating libiscsi-${VERSION}.tar.gz ... "
echo -n "Creating libiscsiclient-${VERSION}.tar.gz ... "
sh autogen.sh
make dist GZIP_ENV="\"$GZIP_ENV\""
RC=$?
@@ -80,7 +80,7 @@ fi
##
## copy additional source files
##
cp -p ${TOPDIR}/libiscsi-${VERSION}.tar.gz ${SRCDIR}
cp -p ${TOPDIR}/libiscsiclient-${VERSION}.tar.gz ${SRCDIR}
cp -p ${DIRNAME}/${SPECFILE} ${SPECDIR}
##