packages: hdf/hdf-opt.patch, hdf/hdf.spec, hdf/hdf-link.patch, hdf/hdf-jpeg...

qboosh qboosh at pld-linux.org
Sun Jun 26 10:45:00 CEST 2011 

Author: qboosh                       Date: Sun Jun 26 08:45:00 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 4.2.6
- removed obsolete jpeg patch
- added CC/FC options processing fix to opt patch
- added link patch (replacing makefile hack)

---- Files affected:
packages/hdf:
   hdf-opt.patch (1.2 -> 1.3) , hdf.spec (1.42 -> 1.43) , hdf-link.patch (1.3 -> 1.4) , hdf-jpeg.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/hdf/hdf-opt.patch
diff -u packages/hdf/hdf-opt.patch:1.2 packages/hdf/hdf-opt.patch:1.3
--- packages/hdf/hdf-opt.patch:1.2	Sun Feb 27 22:49:03 2005
+++ packages/hdf/hdf-opt.patch	Sun Jun 26 10:44:54 2011
@@ -36,3 +36,23 @@
      PROFILE_FFLAGS="-pg"
      ;;
  esac
+--- hdf-4.2.6/configure.ac.orig	2011-06-26 10:00:09.921294977 +0200
++++ hdf-4.2.6/configure.ac	2011-06-26 10:25:04.111345008 +0200
+@@ -808,7 +808,7 @@
+ dnl Report anything stripped as a flag in CFLAGS and 
+ dnl only the compiler in CC_VERSION.
+ CC_NOFLAGS=`echo $CC | sed 's/ -.*//'`
+-CFLAGS_TO_ADD=`echo $CC | grep - | sed 's/.* -/-/'`
++CFLAGS_TO_ADD=`echo $CC | grep ' -' | sed 's/.* -/-/'`
+ if test -n $CFLAGS_TO_ADD; then
+   CFLAGS="$CFLAGS_TO_ADD$CFLAGS"
+ fi
+@@ -836,7 +836,7 @@
+ dnl Report anything stripped as a flag in RFLAGS and 
+ dnl only the compiler in F77_VERSION.
+ F77_NOFLAGS=`echo $F77 | sed 's/ -.*//'`
+-FFLAGS_TO_ADD=`echo $F77 | grep - | sed 's/.* -/-/'`
++FFLAGS_TO_ADD=`echo $F77 | grep ' -' | sed 's/.* -/-/'`
+ if test -n $FFLAGS_TO_ADD; then
+  FFLAGS="$FFLAGS_TO_ADD$FFLAGS"
+ fi

================================================================
Index: packages/hdf/hdf.spec
diff -u packages/hdf/hdf.spec:1.42 packages/hdf/hdf.spec:1.43
--- packages/hdf/hdf.spec:1.42	Sat Oct  9 09:20:36 2010
+++ packages/hdf/hdf.spec	Sun Jun 26 10:44:54 2011
@@ -6,19 +6,19 @@
 Summary:	Hierarchical Data Format library
 Summary(pl.UTF-8):	Biblioteka HDF (Hierarchical Data Format)
 Name:		hdf
-Version:	4.2.5
+Version:	4.2.6
 Release:	1
 Epoch:		1
 Group:		Libraries
 License:	Nearly BSD, but changed sources must be marked
 Source0:	ftp://ftp.hdfgroup.org/HDF/HDF_Current/src/hdf-%{version}.tar.bz2
-# Source0-md5:	91bc17ec735b52736507570a530fe8a9
+# Source0-md5:	eed281ded7f81f6ba1a3b1b1d5109bfe
 Source1:	http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-man-pages.tar.bz2
 # Source1-md5:	607df78cacc131b37dfdb443e61e789a
 Patch0:		%{name}-shared.patch
 Patch1:		%{name}-opt.patch
 Patch2:		%{name}-morearchs.patch
-Patch3:		%{name}-jpeg.patch
+Patch3:		%{name}-link.patch
 URL:		http://hdf.ncsa.uiuc.edu/
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
@@ -105,7 +105,7 @@
 %patch3 -p1
 
 # evil -R
-:> config/commence.am
+sed -i '/^if HDF_BUILD_XDR/,/^endif/d;/^if HDF_BUILD_SHARED/,/^endif/d' config/commence.am
 
 %build
 %{__libtoolize}
@@ -119,8 +119,7 @@
 	--enable-shared \
 	%{?with_szip:--with-szlib}
 
-%{__make} \
-	libmfhdf_la_LIBADD=$(pwd)/hdf/src/libdf.la
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -141,6 +140,8 @@
 done
 
 bzip2 -dc %{SOURCE1} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/README.hdf-man-pages
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/diff.*
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -174,8 +175,54 @@
 
 %files progs
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/*
-%{_mandir}/man1/*
+%attr(755,root,root) %{_bindir}/gif2hdf
+%attr(755,root,root) %{_bindir}/h4cc
+%attr(755,root,root) %{_bindir}/h4fc
+%attr(755,root,root) %{_bindir}/h4redeploy
+%attr(755,root,root) %{_bindir}/hdf24to8
+%attr(755,root,root) %{_bindir}/hdf2gif
+%attr(755,root,root) %{_bindir}/hdf2jpeg
+%attr(755,root,root) %{_bindir}/hdf8to24
+%attr(755,root,root) %{_bindir}/hdfcomp
+%attr(755,root,root) %{_bindir}/hdfed
+%attr(755,root,root) %{_bindir}/hdfimport
+%attr(755,root,root) %{_bindir}/hdfls
+%attr(755,root,root) %{_bindir}/hdfncdump
+%attr(755,root,root) %{_bindir}/hdfncgen
+%attr(755,root,root) %{_bindir}/hdfpack
+%attr(755,root,root) %{_bindir}/hdftopal
+%attr(755,root,root) %{_bindir}/hdftor8
+%attr(755,root,root) %{_bindir}/hdfunpac
+%attr(755,root,root) %{_bindir}/hdiff
+%attr(755,root,root) %{_bindir}/hdp
+%attr(755,root,root) %{_bindir}/hrepack
+%attr(755,root,root) %{_bindir}/jpeg2hdf
+%attr(755,root,root) %{_bindir}/paltohdf
+%attr(755,root,root) %{_bindir}/r8tohdf
+%attr(755,root,root) %{_bindir}/ristosds
+%attr(755,root,root) %{_bindir}/vmake
+%attr(755,root,root) %{_bindir}/vshow
+%{_mandir}/man1/fp2hdf.1*
+%{_mandir}/man1/gif2hdf.1*
+%{_mandir}/man1/hdf24to8.1*
+%{_mandir}/man1/hdf2gif.1*
+%{_mandir}/man1/hdf2jpeg.1*
+%{_mandir}/man1/hdf8to24.1*
+%{_mandir}/man1/hdfcomp.1*
+%{_mandir}/man1/hdfed.1*
+%{_mandir}/man1/hdfls.1*
+%{_mandir}/man1/hdfncdump.1*
+%{_mandir}/man1/hdfncgen.1*
+%{_mandir}/man1/hdfpack.1*
+%{_mandir}/man1/hdftopal.1*
+%{_mandir}/man1/hdftor8.1*
+%{_mandir}/man1/hdp.1*
+%{_mandir}/man1/jpeg2hdf.1*
+%{_mandir}/man1/paltohdf.1*
+%{_mandir}/man1/r8tohdf.1*
+%{_mandir}/man1/ristosds.1*
+%{_mandir}/man1/vmake.1*
+%{_mandir}/man1/vshow.1*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -183,6 +230,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.43  2011/06/26 08:44:54  qboosh
+- updated to 4.2.6
+- removed obsolete jpeg patch
+- added CC/FC options processing fix to opt patch
+- added link patch (replacing makefile hack)
+
 Revision 1.42  2010/10/09 07:20:36  qboosh
 - updated to 4.2.5
 - updated morearchs patch, added jpeg patch (allow libjpeg>6b)

================================================================
Index: packages/hdf/hdf-link.patch
diff -u /dev/null packages/hdf/hdf-link.patch:1.4
--- /dev/null	Sun Jun 26 10:45:00 2011
+++ packages/hdf/hdf-link.patch	Sun Jun 26 10:44:54 2011
@@ -0,0 +1,15 @@
+--- hdf-4.2.6/mfhdf/libsrc/Makefile.am.orig	2011-04-13 20:51:13.000000000 +0200
++++ hdf-4.2.6/mfhdf/libsrc/Makefile.am	2011-06-26 10:26:56.004682088 +0200
+@@ -32,10 +32,11 @@
+ else
+ libmfhdf_la_SOURCES = $(CSOURCES)
+ endif
++libmfhdf_la_LIBADD = $(top_builddir)/hdf/src/libdf.la
+ 
+ if HDF_BUILD_XDR
+ XDRLIB = ../xdr/libxdr.la
+-libmfhdf_la_LIBADD = $(XDRLIB)
++libmfhdf_la_LIBADD += $(XDRLIB)
+ endif
+ 
+ if HDF_BUILD_NETCDF
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/hdf/hdf-opt.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/hdf/hdf.spec?r1=1.42&r2=1.43&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/hdf/hdf-link.patch?r1=1.3&r2=1.4&f=u

More information about the pld-cvs-commit mailing list