- correct the library install order
- keep timestamps - add documentation in a subpackage
This commit is contained in:
parent
a9ba7f1f94
commit
24f804df8f
|
@ -0,0 +1,22 @@
|
|||
--- libdap-3.7.6/Makefile.in.lib_order 2007-04-30 15:34:02.000000000 +0200
|
||||
+++ libdap-3.7.6/Makefile.in 2007-04-30 15:35:07.000000000 +0200
|
||||
@@ -310,7 +310,7 @@
|
||||
TEST_COV_FLAGS = -ftest-coverage -fprofile-arcs
|
||||
SUBDIRS = gl . tests
|
||||
DIST_SUBDIRS = unit-tests gl tests
|
||||
-lib_LTLIBRARIES = libdapclient.la libdapserver.la libdap.la
|
||||
+lib_LTLIBRARIES = libdap.la libdapclient.la libdapserver.la
|
||||
bin_SCRIPTS = dap-config
|
||||
libdap_la_SOURCES = $(DAP_SRC) $(GNU_SRC)
|
||||
libdapclient_la_SOURCES = $(CLIENT_SRC)
|
||||
--- libdap-3.7.6/Makefile.am.lib_order 2007-04-30 15:33:47.000000000 +0200
|
||||
+++ libdap-3.7.6/Makefile.am 2007-04-30 15:34:34.000000000 +0200
|
||||
@@ -22,7 +22,7 @@
|
||||
SUBDIRS = gl . tests
|
||||
DIST_SUBDIRS = unit-tests gl tests
|
||||
|
||||
-lib_LTLIBRARIES = libdapclient.la libdapserver.la libdap.la
|
||||
+lib_LTLIBRARIES = libdap.la libdapclient.la libdapserver.la
|
||||
|
||||
bin_SCRIPTS = dap-config
|
||||
|
34
libdap.spec
34
libdap.spec
|
@ -1,7 +1,8 @@
|
|||
Name: libdap
|
||||
Summary: The C++ DAP2 library from OPeNDAP
|
||||
Version: 3.7.6
|
||||
Release: 2%{?dist}
|
||||
Release: 3%{?dist}
|
||||
Patch0: libdap-3.7.6-lib_order.patch
|
||||
|
||||
Source0: ftp://ftp.unidata.ucar.edu/pub/opendap/source/libdap-%{version}.tar.gz
|
||||
URL: http://www.opendap.org/
|
||||
|
@ -15,6 +16,7 @@ License: LGPL
|
|||
#BuildRequires: libcurl3-devel >= 7.10.6 libxml2-devel >= 2.5.7
|
||||
# fedora
|
||||
BuildRequires: curl-devel >= 7.10.6 libxml2-devel >= 2.5.7
|
||||
BuildRequires: doxygen graphviz
|
||||
|
||||
# This package could be relocatable. In that case uncomment the following
|
||||
# line
|
||||
|
@ -40,8 +42,18 @@ Requires: automake
|
|||
This package contains all the files needed to develop applications that
|
||||
will use libdap.
|
||||
|
||||
%package doc
|
||||
Summary: Documentation of the libdap library
|
||||
Group: Documentation
|
||||
|
||||
%description doc
|
||||
Documentation of the libdap library.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1 -b .lib_order
|
||||
touch -r Makefile.am.lib_order Makefile.am
|
||||
touch -r Makefile.in.lib_order Makefile.in
|
||||
|
||||
%build
|
||||
%configure --disable-dependency-tracking
|
||||
|
@ -49,8 +61,15 @@ make %{?_smp_mflags}
|
|||
|
||||
%install
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
make install DESTDIR=$RPM_BUILD_ROOT
|
||||
rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
|
||||
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p"
|
||||
rm $RPM_BUILD_ROOT/%{_libdir}/*.la
|
||||
|
||||
make docs
|
||||
|
||||
rm -rf __fedora_docs
|
||||
cp -pr docs __fedora_docs
|
||||
# those .map and .md5 are of dubious use, remove them
|
||||
rm -f __fedora_docs/html/*.map __fedora_docs/html/*.md5
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
@ -81,7 +100,16 @@ rm -rf $RPM_BUILD_ROOT
|
|||
%{_includedir}/libdap/
|
||||
%{_datadir}/aclocal/*
|
||||
|
||||
%files doc
|
||||
%defattr(-,root,root,-)
|
||||
%doc __fedora_docs/html/
|
||||
|
||||
%changelog
|
||||
* Mon Apr 30 2007 Patrice Dumas <pertusus@free.fr> 3.7.6-3
|
||||
- correct the library install order
|
||||
- keep timestamps
|
||||
- add documentation in a subpackage
|
||||
|
||||
* Mon Apr 30 2007 Patrice Dumas <pertusus@free.fr> 3.7.6-2
|
||||
- update to 3.7.6
|
||||
|
||||
|
|
Loading…
Reference in New Issue