Drop unneeded patches
This commit is contained in:
parent
187ec50aeb
commit
81b489b9fc
|
@ -1,10 +0,0 @@
|
||||||
--- libdap-3.10.2/libdapserver.pc.in.libuuid 2010-05-17 12:28:40.000000000 -0600
|
|
||||||
+++ libdap-3.10.2/libdapserver.pc.in 2010-07-14 10:50:46.471946436 -0600
|
|
||||||
@@ -9,6 +9,6 @@
|
|
||||||
Description: Server side of the OPeNDAP C++ implementation of the Data Access Protocol
|
|
||||||
Version: @VERSION@
|
|
||||||
Requires: libdap
|
|
||||||
-Libs: -L${libdir} -ldapserver @UUID_LIBS@
|
|
||||||
+Libs: -L${libdir} -ldapserver
|
|
||||||
Cflags: -I${includedir}/libdap
|
|
||||||
|
|
|
@ -1,11 +0,0 @@
|
||||||
--- 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
|
|
||||||
|
|
||||||
|
|
|
@ -7,10 +7,6 @@ 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
|
|
||||||
#Bump the soname (by dropping DAPLIB_AGE) since we dropped some AIS* fuctions
|
|
||||||
Patch1: libdap-3.10.2-soname.patch
|
|
||||||
#Don't run HTTP tests - builders don't have network connections
|
#Don't run HTTP tests - builders don't have network connections
|
||||||
Patch2: libdap-3.10.2-offline.patch
|
Patch2: libdap-3.10.2-offline.patch
|
||||||
|
|
||||||
|
@ -62,8 +58,6 @@ Documentation of the libdap library.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch0 -p1 -b .libuuid
|
|
||||||
%patch1 -p1 -b .soname
|
|
||||||
%patch2 -p1 -b .offline
|
%patch2 -p1 -b .offline
|
||||||
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
|
||||||
|
@ -132,6 +126,8 @@ rm -rf $RPM_BUILD_ROOT
|
||||||
%changelog
|
%changelog
|
||||||
* Fri Dec 10 2010 Orion Poplawski <orion@cora.nwra.com> - 3.11.0-1
|
* Fri Dec 10 2010 Orion Poplawski <orion@cora.nwra.com> - 3.11.0-1
|
||||||
- Update to 3.11.0
|
- Update to 3.11.0
|
||||||
|
- Drop libuuid patch fixed upstream
|
||||||
|
- Drop soname patch
|
||||||
|
|
||||||
* Thu Jul 15 2010 Orion Poplawski <orion@cora.nwra.com> - 3.10.2-3
|
* 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 patch to bump soname as this dropped the AIS* functions
|
||||||
|
|
Loading…
Reference in New Issue