diff --git a/libdap.spec b/libdap.spec index c62e8fb..0acdadd 100644 --- a/libdap.spec +++ b/libdap.spec @@ -1,15 +1,17 @@ Name: libdap Summary: The C++ DAP2 library from OPeNDAP Version: 3.7.8 -Release: 2%{?dist}.1 +Release: 3%{?dist} -Source0: http://www.opendap.org/pub/source/libdap-%{version}.tar.gz -URL: http://www.opendap.org/ - -Group: Development/Libraries -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # the deflate program is covered by the W3C license License: LGPLv2+ and W3C +Group: Development/Libraries +URL: http://www.opendap.org/ +Source0: http://www.opendap.org/pub/source/libdap-%{version}.tar.gz + +Patch0: libdap-3.7.8-nolibdir.patch + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # Mandrake # BuildRequires: libcurl3-devel >= 7.10.6 libxml2-devel >= 2.5.7 @@ -58,6 +60,12 @@ Documentation of the libdap library. %prep %setup -q +%patch0 -p1 -b .nolibdir +touch -r COPYRIGHT_W3C __timestamp_COPYRIGHT_W3C +iconv -f latin1 -t utf8 < COPYRIGHT_W3C > COPYRIGHT_W3C.utf8 +mv COPYRIGHT_W3C.utf8 COPYRIGHT_W3C +touch -r __timestamp_COPYRIGHT_W3C COPYRIGHT_W3C +rm __timestamp_COPYRIGHT_W3C %build @@ -72,13 +80,13 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p" rm $RPM_BUILD_ROOT/%{_libdir}/*.la -rm -rf __fedora_docs -cp -pr docs __fedora_docs +rm -rf __dist_docs +cp -pr docs __dist_docs # those .map and .md5 are of dubious use, remove them -rm -f __fedora_docs/html/*.map __fedora_docs/html/*.md5 +rm -f __dist_docs/html/*.map __dist_docs/html/*.md5 # use the ChangeLog timestamp to have the same timestamps for the doc files # for all arches -touch -r ChangeLog __fedora_docs/html/* +touch -r ChangeLog __dist_docs/html/* %clean @@ -112,10 +120,13 @@ rm -rf $RPM_BUILD_ROOT %files doc %defattr(-,root,root,-) -%doc __fedora_docs/html/ +%doc __dist_docs/html/ %changelog +* Sun Oct 21 2007 Patrice Dumas 3.7.8-3 +- remove reference to libdir in dap-config + * Wed Aug 29 2007 Fedora Release Engineering - 3.7.8-2 - Rebuild for selinux ppc32 issue.