Author: qboosh Date: Sat Oct 9 11:43:07 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- updated to 2.1.1
- updated shared patch
---- Files affected:
packages/h4h5tools:
h4h5tools-shared.patch (1.2 -> 1.3) , h4h5tools.spec (1.10 -> 1.11)
---- Diffs:
================================================================
Index: packages/h4h5tools/h4h5tools-shared.patch
diff -u packages/h4h5tools/h4h5tools-shared.patch:1.2
packages/h4h5tools/h4h5tools-shared.patch:1.3
--- packages/h4h5tools/h4h5tools-shared.patch:1.2 Thu Jun 12 19:29:37 2008
+++ packages/h4h5tools/h4h5tools-shared.patch Sat Oct 9 13:43:01 2010
@@ -1,6 +1,6 @@
--- h4h5tools_20/lib/src/Makefile.am.orig 2008-05-23 18:34:47.000000000
+0200
+++ h4h5tools_20/lib/src/Makefile.am 2008-06-12 18:40:44.720352249 +0200
-@@ -15,13 +15,13 @@
+@@ -15,13 +15,14 @@
#
@@ -14,6 +14,7 @@
-libh4toh5_a_SOURCES = $(CSOURCES)
+libh4toh5_la_SOURCES = $(CSOURCES)
++libh4toh5_la_LIBADD = -lmfhdf
include_HEADERS = $(CHEADERS)
--- h4h5tools-1.2/lib/examples/Makefile.am.orig 2004-07-21
22:08:19.000000000 +0200
================================================================
Index: packages/h4h5tools/h4h5tools.spec
diff -u packages/h4h5tools/h4h5tools.spec:1.10
packages/h4h5tools/h4h5tools.spec:1.11
--- packages/h4h5tools/h4h5tools.spec:1.10 Thu Jun 12 19:30:04 2008
+++ packages/h4h5tools/h4h5tools.spec Sat Oct 9 13:43:01 2010
@@ -2,20 +2,16 @@
Summary: HDF 4.x to/from HDF5 conversion tools
Summary(pl.UTF-8): Narzędzia do konwersji pomiędzy HDF 4.x i HDF5
Name: h4h5tools
-Version: 2.0
+Version: 2.1.1
Release: 1
Group: Applications/File
License: BSD-like, but changed sources must be marked
-Source0: ftp://ftp.hdfgroup.org/HDF5/h4toh5/src/%{name}_20.tar.gz
-# Source0-md5: fda518fb9441fb04ca9f9b3ae0688260
-Source1: http://hdf.ncsa.uiuc.edu/h4toh5/h4toh5lib_UG.pdf
-# Source1-md5: 59dbe83604d64bcca35145899456c96e
-Source2: http://hdf.ncsa.uiuc.edu/h4toh5/h4toh5lib_RM.pdf
-# Source2-md5: dd9e2ca98a87e5f808b67ba5767b07ef
+Source0: ftp://ftp.hdfgroup.org/HDF5/h4toh5/src/%{name}-%{version}.tar.gz
+# Source0-md5: 1ce777f77fe434a677cfdf9669cd2b29
Patch0: %{name}-config.patch
Patch1: %{name}-shared.patch
URL: http://hdf.ncsa.uiuc.edu/h4toh5/
-BuildRequires: autoconf
+BuildRequires: autoconf >= 2.50
BuildRequires: automake
BuildRequires: hdf-devel >= 4.0
BuildRequires: hdf5-devel
@@ -77,34 +73,26 @@
oraz z HDF5 do HDF 4.x.
%prep
-%setup -q -n %{name}_20
+%setup -q
%patch0 -p1
%patch1 -p1
-install %{SOURCE1} %{SOURCE2} .
-
%build
%{__libtoolize}
%{__aclocal}
%{__autoconf}
%{__automake}
-CPPFLAGS="-I/usr/include/hdf -DH5_USE_16_API"
+CPPFLAGS="%{rpmcppflags} -I/usr/include/hdf -DH5_USE_16_API"
%configure
%{__make} \
- libh4toh5_la_LIBADD="-lmfhdf" \
h5toh4_LDADD="-lmfhdf"
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_includedir}
%{__make} install \
- libdir=$RPM_BUILD_ROOT%{_libdir} \
- includedir=$RPM_BUILD_ROOT%{_includedir} \
- bindir=$RPM_BUILD_ROOT%{_bindir}
-
-find doc -name Dependencies -o -name Makefile\* | xargs rm -f
+ DESTDIR=$RPM_BUILD_ROOT
%clean
rm -rf $RPM_BUILD_ROOT
@@ -114,7 +102,7 @@
%files
%defattr(644,root,root,755)
-%doc COPYING release_docs/RELEASE.txt
+%doc COPYING release_docs/{HISTORY,RELEASE}.txt
%attr(755,root,root) %{_bindir}/h4toh5
%attr(755,root,root) %{_bindir}/h5toh4
@@ -125,7 +113,7 @@
%files devel
%defattr(644,root,root,755)
-%doc h4toh5lib_UG.pdf h4toh5lib_RM.pdf
+%doc doc/*.pdf
%attr(755,root,root) %{_libdir}/libh4toh5.so
%{_libdir}/libh4toh5.la
%{_includedir}/H4TOH5api_adpt.h
@@ -141,6 +129,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.11 2010/10/09 11:43:01 qboosh
+- updated to 2.1.1
+- updated shared patch
+
Revision 1.10 2008/06/12 17:30:04 qboosh
- updated to 2.0
- updated shared patch
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/h4h5tools/h4h5tools-shared.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/h4h5tools/h4h5tools.spec?r1=1.10&r2=1.11&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
