- Add patch to bump soname as this dropped the AIS* functions
- Add BR cppunit-devel and %check section
This commit is contained in:
parent
324eaf91ec
commit
390b832168
11
libdap-3.10.2-soname.patch
Normal file
11
libdap-3.10.2-soname.patch
Normal file
@ -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
|
||||||
|
|
||||||
|
|
16
libdap.spec
16
libdap.spec
@ -1,21 +1,25 @@
|
|||||||
Name: libdap
|
Name: libdap
|
||||||
Summary: The C++ DAP2 library from OPeNDAP
|
Summary: The C++ DAP2 library from OPeNDAP
|
||||||
Version: 3.10.2
|
Version: 3.10.2
|
||||||
Release: 2%{?dist}
|
Release: 3%{?dist}
|
||||||
|
|
||||||
License: LGPLv2+
|
License: LGPLv2+
|
||||||
Group: Development/Libraries
|
Group: Development/Libraries
|
||||||
URL: http://www.opendap.org/
|
URL: http://www.opendap.org/
|
||||||
Source0: http://www.opendap.org/pub/source/libdap-%{version}.tar.gz
|
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
|
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)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
|
|
||||||
|
BuildRequires: cppunit-devel
|
||||||
BuildRequires: curl-devel
|
BuildRequires: curl-devel
|
||||||
BuildRequires: libxml2-devel
|
|
||||||
BuildRequires: doxygen
|
BuildRequires: doxygen
|
||||||
BuildRequires: graphviz
|
BuildRequires: graphviz
|
||||||
BuildRequires: libuuid-devel
|
BuildRequires: libuuid-devel
|
||||||
|
BuildRequires: libxml2-devel
|
||||||
BuildRequires: pkgconfig
|
BuildRequires: pkgconfig
|
||||||
|
|
||||||
# This package could be relocatable. In that case uncomment the following
|
# This package could be relocatable. In that case uncomment the following
|
||||||
@ -57,6 +61,7 @@ Documentation of the libdap library.
|
|||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch0 -p1 -b .libuuid
|
%patch0 -p1 -b .libuuid
|
||||||
|
%patch1 -p1 -b .soname
|
||||||
iconv -f latin1 -t utf8 < COPYRIGHT_W3C > COPYRIGHT_W3C.utf8
|
iconv -f latin1 -t utf8 < COPYRIGHT_W3C > COPYRIGHT_W3C.utf8
|
||||||
touch -r COPYRIGHT_W3C COPYRIGHT_W3C.utf8
|
touch -r COPYRIGHT_W3C COPYRIGHT_W3C.utf8
|
||||||
mv COPYRIGHT_W3C.utf8 COPYRIGHT_W3C
|
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/*
|
touch -r ChangeLog __dist_docs/html/*
|
||||||
|
|
||||||
|
|
||||||
|
%check
|
||||||
|
make check
|
||||||
|
|
||||||
%clean
|
%clean
|
||||||
rm -rf $RPM_BUILD_ROOT
|
rm -rf $RPM_BUILD_ROOT
|
||||||
|
|
||||||
@ -119,6 +127,10 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Jul 15 2010 Orion Poplawski <orion@cora.nwra.com> - 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 <orion@cora.nwra.com> - 3.10.2-2
|
* Wed Jul 14 2010 Orion Poplawski <orion@cora.nwra.com> - 3.10.2-2
|
||||||
- Add patch to remove -luuid from pkg-config libs
|
- Add patch to remove -luuid from pkg-config libs
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user