import reviewed package (bug 914752)

This commit is contained in:
Paolo Bonzini 2013-03-11 16:33:38 +01:00
parent ee0dce8a48
commit 93f0a2c0d4
4 changed files with 146 additions and 0 deletions

1
.gitignore vendored
View File

@ -0,0 +1 @@
/libiscsi-1.7.0.tar.gz

View File

@ -0,0 +1,42 @@
diff --git a/Makefile.am b/Makefile.am
index b750cdb..869b4d0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,6 +11,9 @@ EXTRA_DIST = autogen.sh COPYING LICENCE-GPL-2.txt LICENCE-LGPL-2.1.txt \
# Simplify conditions below by declaring variables as empty
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libiscsi.pc
+
bin_PROGRAMS =
noinst_PROGRAMS =
EXTRA_PROGRAMS =
diff --git a/configure.ac b/configure.ac
index bb95018..d3e393d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -81,5 +81,5 @@ else
fi
AM_CONDITIONAL(PROGRAMS, [test "$ac_cv_have_popt" = yes])
-AC_CONFIG_FILES(Makefile)
+AC_CONFIG_FILES(Makefile libiscsi.pc)
AC_OUTPUT
diff --git a/libiscsi.pc.in b/libiscsi.pc.in
index e69de29..730a258 100644
--- a/libiscsi.pc.in
+++ b/libiscsi.pc.in
@@ -0,0 +1,12 @@
+prefix=@prefix@
+exec_prefix=${prefix}
+libdir=@libdir@
+includedir=@includedir@
+
+Name: libiscsi
+Description: iSCSI initiator library
+Version: @VERSION@
+
+Libs: -L${libdir} -liscsi
+Libs.private:
+Cflags: -I${includedir}

102
libiscsi.spec Normal file
View File

@ -0,0 +1,102 @@
Name: libiscsi
Summary: iSCSI client library
Version: 1.7.0
Release: 3%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
URL: https://github.com/sahlberg/%{name}
Source: https://github.com/downloads/sahlberg/%{name}/%{name}-%{version}.tar.gz
Patch0: 0001-distribute-pkgconfig-file.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libtool
BuildRequires: popt-devel
%description
libiscsi is a library for attaching to iSCSI resources across
a network.
#######################################################################
# Conflict with iscsi-initiator-utils.
%global libiscsi_includedir %{_includedir}/iscsi
%global libiscsi_libdir %{_libdir}/iscsi
%prep
%setup -q
%patch0 -p1
%build
## always run autogen.sh
./autogen.sh
%configure --libdir=%{libiscsi_libdir}
make %{?_smp_mflags}
%install
make DESTDIR=$RPM_BUILD_ROOT install pkgconfigdir=%{_libdir}/pkgconfig %{?_smp_mflags}
mkdir -p $RPM_BUILD_ROOT/etc/ld.so.conf.d
echo %{libiscsi_libdir} > $RPM_BUILD_ROOT/etc/ld.so.conf.d/%{name}-%{_arch}.conf
rm $RPM_BUILD_ROOT/%{libiscsi_libdir}/libiscsi.a
rm $RPM_BUILD_ROOT/%{libiscsi_libdir}/libiscsi.la
rm $RPM_BUILD_ROOT/%{_bindir}/ld_iscsi.so
# Remove "*.old" files
find $RPM_BUILD_ROOT -name "*.old" -exec rm -f {} \;
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%defattr(-,root,root)
%doc COPYING LICENCE-LGPL-2.1.txt README TODO
%{libiscsi_libdir}/libiscsi.so.*
%config /etc/ld.so.conf.d/*
%package utils
Summary: iSCSI Client Utilities
Group: Applications/System
License: GPLv2+
Requires: %{name}%{?_isa} = %{version}-%{release}
%description utils
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
%doc COPYING LICENCE-GPL-2.txt LICENCE-LGPL-2.1.txt README TODO
%{_bindir}/iscsi-ls
%{_bindir}/iscsi-inq
%{_bindir}/iscsi-readcapacity16
%package devel
Summary: iSCSI client development libraries
Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
%description devel
The libiscsi-devel package includes the header files for libiscsi.
%files devel
%defattr(-,root,root)
%doc COPYING LICENCE-LGPL-2.1.txt README TODO
%{libiscsi_includedir}/iscsi.h
%{libiscsi_includedir}/scsi-lowlevel.h
%{libiscsi_libdir}/libiscsi.so
%{_libdir}/pkgconfig/libiscsi.pc
%changelog
* Thu Mar 7 2013 Paolo Bonzini <pbonzini@redhat.com> - 1.7.0-3
- Correct license for libiscsi-utils, prefer %%global to %%define
- Add Requires
- Remove %clean section
* Fri Feb 22 2013 Paolo Bonzini <pbonzini@redhat.com> - 1.7.0-2
- Use %config for ld.so.conf.d file.
* Fri Feb 22 2013 Paolo Bonzini <pbonzini@redhat.com> - 1.7.0-1
- Initial version (bug 914752)

View File

@ -0,0 +1 @@
4ba621f47d016d48ab93d5301ae5a363 libiscsi-1.7.0.tar.gz