From ca7dfcd48061178d6b263dbd48c4888bc5301abe Mon Sep 17 00:00:00 2001 From: Petr Šabata Date: Nov 24 2011 13:52:55 +0000 Subject: 1.0.13 bump --- diff --git a/.gitignore b/.gitignore index b796c06..065f646 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ libhbalinux-1.0.10.tar.gz /libhbalinux-1.0.12.tar.gz +/libhbalinux-1.0.13.tar.gz diff --git a/libhbalinux-1.0.13-conf.patch b/libhbalinux-1.0.13-conf.patch new file mode 100644 index 0000000..7f999f6 --- /dev/null +++ b/libhbalinux-1.0.13-conf.patch @@ -0,0 +1,28 @@ +diff --git a/Makefile.am b/Makefile.am +index 1349e7b..7c5ac14 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -12,23 +12,3 @@ pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = libhbalinux.pc + + dist_noinst_DATA = README COPYING INSTALL libhbalinux.pc.in libhbalinux.spec +- +-install-data-hook: libhbalinux.la +- . $${PWD}/$<; \ +- ORG=org.open-fcoe.libhbalinux; \ +- LIB=${libdir}/$${dlname}; \ +- STR="$$ORG $$LIB"; \ +- CONF=${sysconfdir}/hba.conf; \ +- if test -f $$CONF; then \ +- grep -E -q ^[[:space:]]*$$ORG[[:space:]]+$$LIB $$CONF; \ +- if test $$? -ne 0; then \ +- echo $$STR >> $$CONF; \ +- else \ +- echo "** $$CONF already configured"; \ +- echo "** system configuration not updated"; \ +- fi; \ +- else \ +- echo "** WARNING: $$CONF does not exist"; \ +- echo "** system configuration not updated"; \ +- fi +- diff --git a/libhbalinux-1.0.9-conf.patch b/libhbalinux-1.0.9-conf.patch deleted file mode 100644 index c45fe61..0000000 --- a/libhbalinux-1.0.9-conf.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- libhbalinux-1.0.9/Makefile.am.orig 2010-01-13 11:28:40.000000000 +0100 -+++ libhbalinux-1.0.9/Makefile.am 2010-01-13 11:28:57.000000000 +0100 -@@ -10,22 +10,3 @@ libhbalinux_la_LIBADD = $(PCIACCESS_LIBS - - dist_noinst_DATA = README COPYING INSTALL libhbalinux.spec - --install-data-hook: libhbalinux.la -- . $${PWD}/$<; \ -- ORG=org.open-fcoe.libhbalinux; \ -- LIB=${libdir}/$${dlname}; \ -- STR="$$ORG $$LIB"; \ -- CONF=${sysconfdir}/hba.conf; \ -- if test -f $$CONF; then \ -- grep -E -q ^[[:space:]]*$$ORG[[:space:]]+$$LIB $$CONF; \ -- if test $$? -ne 0; then \ -- echo $$STR >> $$CONF; \ -- else \ -- echo "** $$CONF already configured"; \ -- echo "** system configuration not updated"; \ -- fi; \ -- else \ -- echo "** WARNING: $$CONF does not exist"; \ -- echo "** system configuration not updated"; \ -- fi -- diff --git a/libhbalinux.spec b/libhbalinux.spec index a1b800d..6b4f908 100644 --- a/libhbalinux.spec +++ b/libhbalinux.spec @@ -1,22 +1,26 @@ Name: libhbalinux -Version: 1.0.12 +Version: 1.0.13 Release: 1%{?dist} Summary: FC-HBAAPI implementation using scsi_transport_fc interfaces Group: System Environment/Libraries License: LGPLv2 URL: http://www.open-fcoe.org -# This source was cloned from upstream git -# To get the tar package, just run: -# git clone git://open-fcoe.org/openfc/libhbalinux.git && cd libhbalinux -# git archive --prefix=libhbalinux-%{version}/ v%{version} > ../libhbalinux-%{version}.tar -# cd .. && gzip libhbalinux-%{version}.tar Source0: %{name}-%{version}.tar.gz -Patch0: libhbalinux-1.0.9-conf.patch +Patch0: libhbalinux-1.0.13-conf.patch BuildRequires: libhbaapi-devel libpciaccess-devel libtool automake Requires: libhbaapi %description -SNIA HBAAPI vendor library built on top of the scsi_transport_fc interfaces +SNIA HBAAPI vendor library built on top of the scsi_transport_fc interfaces. + +%package devel +Summary: A file needed for libhbalinux application development +Group: Development/Libraries +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: pkgconfig + +%description devel +The libhbalinux-devel package contains the library pkgconfig file. %prep %setup -q @@ -56,9 +60,16 @@ fi %files %doc README COPYING -%{_libdir}/*.so.* +%{_libdir}/%{name}.so.* + +%files devel +%{_libdir}/pkgconfig/%{name}.pc %changelog +* Thu Nov 24 2011 Petr Šabata - 1.0.13-1 +- 1.0.13 bump +- Creating the devel subpackage with a pkgconfig file + * Thu Jul 07 2011 Petr Sabata - 1.0.12-1 - 1.0.12 bump - Remove now obsolete Buildroot and defattr diff --git a/sources b/sources index 1118371..7287178 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d18f11fc0f630ce68693fe825afa7e6c libhbalinux-1.0.12.tar.gz +904da15eaaf9fa93c0fe69e93de537ef libhbalinux-1.0.13.tar.gz