From 390b83216891de0f21ab6875731dd0154d4e3622 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 15 Jul 2010 16:58:55 +0000 Subject: [PATCH] - Add patch to bump soname as this dropped the AIS* functions - Add BR cppunit-devel and %check section --- libdap-3.10.2-soname.patch | 11 +++++++++++ libdap.spec | 16 ++++++++++++++-- 2 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 libdap-3.10.2-soname.patch diff --git a/libdap-3.10.2-soname.patch b/libdap-3.10.2-soname.patch new file mode 100644 index 0000000..cd111c2 --- /dev/null +++ b/libdap-3.10.2-soname.patch @@ -0,0 +1,11 @@ +--- libdap-3.10.2/configure.soname 2010-06-03 04:05:24.000000000 -0600 ++++ libdap-3.10.2/configure 2010-07-15 10:24:00.147942692 -0600 +@@ -2847,7 +2847,7 @@ + + + DAPLIB_CURRENT=12 +-DAPLIB_AGE=2 ++DAPLIB_AGE=1 + DAPLIB_REVISION=0 + + diff --git a/libdap.spec b/libdap.spec index ac5bb7d..c91fc07 100644 --- a/libdap.spec +++ b/libdap.spec @@ -1,21 +1,25 @@ Name: libdap Summary: The C++ DAP2 library from OPeNDAP Version: 3.10.2 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ Group: Development/Libraries URL: http://www.opendap.org/ Source0: http://www.opendap.org/pub/source/libdap-%{version}.tar.gz +#Don't put -luuid in pkg-config libs Patch0: libdap-3.10.2-libuuid.patch +#Bump the soname (by dropping DAPLIB_AGE) since we dropped some AIS* fuctions +Patch1: libdap-3.10.2-soname.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: cppunit-devel BuildRequires: curl-devel -BuildRequires: libxml2-devel BuildRequires: doxygen BuildRequires: graphviz BuildRequires: libuuid-devel +BuildRequires: libxml2-devel BuildRequires: pkgconfig # This package could be relocatable. In that case uncomment the following @@ -57,6 +61,7 @@ Documentation of the libdap library. %prep %setup -q %patch0 -p1 -b .libuuid +%patch1 -p1 -b .soname iconv -f latin1 -t utf8 < COPYRIGHT_W3C > COPYRIGHT_W3C.utf8 touch -r COPYRIGHT_W3C COPYRIGHT_W3C.utf8 mv COPYRIGHT_W3C.utf8 COPYRIGHT_W3C @@ -84,6 +89,9 @@ rm -f __dist_docs/html/*.map __dist_docs/html/*.md5 touch -r ChangeLog __dist_docs/html/* +%check +make check + %clean rm -rf $RPM_BUILD_ROOT @@ -119,6 +127,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Jul 15 2010 Orion Poplawski - 3.10.2-3 +- Add patch to bump soname as this dropped the AIS* functions +- Add BR cppunit-devel and %%check section + * Wed Jul 14 2010 Orion Poplawski - 3.10.2-2 - Add patch to remove -luuid from pkg-config libs