- updated to 4.2.6

- removed obsolete jpeg patch
- added CC/FC options processing fix to opt patch
- added link patch (replacing makefile hack)

Changed files:
    hdf-jpeg.patch -> 1.2
    hdf-link.patch -> 1.4
    hdf-opt.patch -> 1.3
    hdf.spec -> 1.43

diff --git a/hdf-jpeg.patch b/hdf-jpeg.patch
deleted file mode 100644 (file)
index ec72922..0000000
--- a/hdf-jpeg.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- hdf-4.2.5/configure.ac.orig        2010-10-09 08:33:48.931742720 +0200
-+++ hdf-4.2.5/configure.ac     2010-10-09 08:38:43.991734339 +0200
-@@ -381,33 +381,6 @@
-     ;;
- esac
- 
--dnl Check version number of jpeg library. Fail if higher than 7.
--dnl We are doing this because our tests are currently failing
--dnl with jpeg version 7. Until we can acceptably test and
--dnl support jpeg 7, we will require that users use an earlier
--dnl version of the library. (MAM - 1/26/2010).
--AC_MSG_CHECKING([for supported version of jpeg library])
--
--JPEG_7_ERROR="
--  jpeg library version 7 and higher is not currently supported.
--  Please use version 6b, obtainable at: 
--    http://www.hdfgroup.org/ftp/lib-external/jpeg/src/jpegsrc.v6b.tar.gz
--  For further questions, please contact help@hdfgroup.org."
--
--AC_RUN_IFELSE([
--    #include <stdlib.h>
--    #include <stdio.h>
--    #include <jpeglib.h>
--    int main(void)
--    {
--            #if JPEG_LIB_VERSION >= 70
--                exit(1);
--            #else
--                exit(0);
--            #endif
--    }
--    ], [AC_MSG_RESULT([yes])], [AC_MSG_ERROR([$JPEG_7_ERROR])],)
--
- dnl ----------------------------------------------------------------------
- dnl Is the szip library present?
- AC_SUBST(USE_COMP_SZIP) USE_COMP_SZIP="no"

diff --git a/hdf-link.patch b/hdf-link.patch
new file mode 100644 (file)
index 0000000..c58f060
--- /dev/null
+++ b/hdf-link.patch
@@ -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

diff --git a/hdf-opt.patch b/hdf-opt.patch
index 106c32fdc83f6dcf8aa235d5bb3f77473c7baadf..defd18b078ea3d14ccfc22166736223a254be039 100644 (file)
--- a/hdf-opt.patch
+++ b/hdf-opt.patch
@@ -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

diff --git a/hdf.spec b/hdf.spec
index 6d87ab05cca49dfc5cdc00bc095aa46eb1b35773..202f8e1414b9ce542d5417560ca8c69f427edb93 100644 (file)
--- a/hdf.spec
+++ b/hdf.spec
@@ -5,19 +5,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
@@ -104,7 +104,7 @@ Narzędzia do konwersji z i do formatu HDF.
 %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}
@@ -118,8 +118,7 @@ Narzędzia do konwersji z i do formatu HDF.
        --enable-shared \
        %{?with_szip:--with-szlib}
 
-%{__make} \
-       libmfhdf_la_LIBADD=$(pwd)/hdf/src/libdf.la
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -140,6 +139,8 @@ for i in ncdump ncgen ; do
 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
@@ -173,5 +174,51 @@ rm -rf $RPM_BUILD_ROOT
 
 %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*