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

Revert "Rename libiscsi to libiscsiclient to avoid clash with obscure linux library"

Browse Source 
We dont need to change name anymore so witch back to original libiscsi name

This reverts commit c4386dfb87.
This commit is contained in:
Ronnie Sahlberg
2012-03-07 14:30:37 +11:00
parent 367f490edf
commit add1ce67e4
4 changed files with 38 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,12 +1,12 @@
Name: libiscsiclient
Name: libiscsi
Summary: iSCSI client library
Version: 2.0.0
Version: 1.1.0
Release: 1GITHASH%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
URL: https://github.com/sahlberg/libiscsi
Source: libiscsiclient-%{version}.tar.gz
Source: libiscsi-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-root
BuildRequires: autoconf
@@ -15,7 +15,7 @@ BuildRequires: libtool
BuildRequires: popt-devel
%description
libiscsiclient is a library for attaching to iSCSI resources across
libiscsi 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 libiscsiclient-%{version} -q
%setup -T -D -n libiscsi-%{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}/libiscsiclient.a
rm $RPM_BUILD_ROOT/%{_libdir}/libiscsiclient.la
rm $RPM_BUILD_ROOT/%{_libdir}/libiscsi.a
rm $RPM_BUILD_ROOT/%{_libdir}/libiscsi.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}/libiscsiclient.so.*
%{_libdir}/libiscsi.so.*
%package utils
Summary: iSCSI Client Utilities
Group: Applications/System
%description utils
The libiscsiclient-utils package provides a set of assorted utilities to connect
The libiscsi-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,21 +78,19 @@ to iSCSI servers without having to set up the Linux iSCSI initiator.
%package devel
Summary: iSCSI client development libraries
Group: Development/Libraries
Requires: libiscsiclient = %{version}-%{release}
Requires: libiscsi = %{version}-%{release}
%description devel
The libiscsiclient-devel package includes the header files for libiscsiclient.
The libiscsi-devel package includes the header files for libiscsi.
%files devel
%defattr(-,root,root)
%doc COPYING.LESSER README TODO
%{_includedir}/iscsi/iscsi.h
%{_includedir}/iscsi/scsi-lowlevel.h
%{_libdir}/libiscsiclient.so
%{_libdir}/libiscsi.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="libiscsiclient.spec"
SPECFILE_IN="libiscsiclient.spec.in"
SPECFILE="libiscsi.spec"
SPECFILE_IN="libiscsi.spec.in"
RPMBUILD="rpmbuild"
GITHASH=".$(git log --pretty=format:%h -1)"
@@ -64,7 +64,7 @@ else
fi
pushd ${TOPDIR}
echo -n "Creating libiscsiclient-${VERSION}.tar.gz ... "
echo -n "Creating libiscsi-${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}/libiscsiclient-${VERSION}.tar.gz ${SRCDIR}
cp -p ${TOPDIR}/libiscsi-${VERSION}.tar.gz ${SRCDIR}
cp -p ${DIRNAME}/${SPECFILE} ${SPECDIR}
##