packages: hdf/hdf-morearchs.patch, hdf/hdf.spec, hdf/hdf-jpeg.patch (NEW) -...
qboosh
qboosh at pld-linux.org
Sat Oct 9 09:20:41 CEST 2010
Author: qboosh Date: Sat Oct 9 07:20:41 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- updated to 4.2.5
- updated morearchs patch, added jpeg patch (allow libjpeg>6b)
- epoch 1 (4.2.5 ? 4.2r4)
---- Files affected:
packages/hdf:
hdf-morearchs.patch (1.2 -> 1.3) , hdf.spec (1.41 -> 1.42) , hdf-jpeg.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/hdf/hdf-morearchs.patch
diff -u packages/hdf/hdf-morearchs.patch:1.2 packages/hdf/hdf-morearchs.patch:1.3
--- packages/hdf/hdf-morearchs.patch:1.2 Sat Mar 6 15:35:11 2004
+++ packages/hdf/hdf-morearchs.patch Sat Oct 9 09:20:36 2010
@@ -1,6 +1,6 @@
---- HDF4.2r0/hdf/src/hdfi.h.orig 2003-11-01 01:17:14.000000000 +0100
-+++ HDF4.2r0/hdf/src/hdfi.h 2004-03-06 15:39:09.628963696 +0100
-@@ -161,7 +161,7 @@
+--- hdf-4.2.5/hdf/src/hdfi.h.orig 2010-01-29 05:57:57.000000000 +0100
++++ hdf-4.2.5/hdf/src/hdfi.h 2010-10-09 08:33:07.215741882 +0200
+@@ -155,7 +155,7 @@
* be renamed as LONGNEINT32.
*/
@@ -9,7 +9,7 @@
#ifdef __STDC__
#define ANSISUN
#else /* __STDC__ */
-@@ -292,7 +292,7 @@
+@@ -282,7 +282,7 @@
#endif /* SUN */
@@ -18,13 +18,13 @@
#ifndef IBM6000
#define IBM6000
-@@ -336,6 +336,9 @@
+@@ -326,6 +326,9 @@
typedef int hdf_pint_t; /* an integer the same size as a pointer */
#endif /*AIX5L64 */
#define _fcdtocp(desc) (desc)
+#ifdef __GNUC__
+#define FNAME_POST_UNDERSCORE
+#endif
- #ifdef HAVE_FMPOOL
- #define FILELIB PAGEBUFIO /* enable page buffering */
- #else
+ #define FILELIB UNIXBUFIO
+
+ /* JPEG #define's - Look in the JPEG docs before changing - (Q) */
================================================================
Index: packages/hdf/hdf.spec
diff -u packages/hdf/hdf.spec:1.41 packages/hdf/hdf.spec:1.42
--- packages/hdf/hdf.spec:1.41 Thu Jan 28 19:21:57 2010
+++ packages/hdf/hdf.spec Sat Oct 9 09:20:36 2010
@@ -6,17 +6,19 @@
Summary: Hierarchical Data Format library
Summary(pl.UTF-8): Biblioteka HDF (Hierarchical Data Format)
Name: hdf
-Version: 4.2r4
-Release: 3
+Version: 4.2.5
+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.gz
-# Source0-md5: cbcfcdb65f27b743c6001c17619704a8
+Source0: ftp://ftp.hdfgroup.org/HDF/HDF_Current/src/hdf-%{version}.tar.bz2
+# Source0-md5: 91bc17ec735b52736507570a530fe8a9
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
URL: http://hdf.ncsa.uiuc.edu/
BuildRequires: autoconf >= 2.50
BuildRequires: automake
@@ -60,7 +62,7 @@
Summary: HDF library development package
Summary(pl.UTF-8): Pliki nagłówkowe biblioteki HDF
Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: libjpeg-devel >= 6b
%{?with_szip:Requires: szip-devel >= 2.0}
Requires: zlib-devel >= 1.1.3
@@ -75,7 +77,7 @@
Summary: HDF static library
Summary(pl.UTF-8): Statyczna biblioteka HDF
Group: Development/Libraries
-Requires: %{name}-devel = %{version}-%{release}
+Requires: %{name}-devel = %{epoch}:%{version}-%{release}
%description static
Static version of HDF library.
@@ -87,7 +89,7 @@
Summary: HDF utilities
Summary(pl.UTF-8): Narzędzia do plików HDF
Group: Applications/File
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{epoch}:%{version}-%{release}
%description progs
Utilities to convert from/to HDF format.
@@ -96,16 +98,16 @@
Narzędzia do konwersji z i do formatu HDF.
%prep
-%setup -q -n HDF%{version}
+%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
# evil -R
:> config/commence.am
%build
-cp -f /usr/share/automake/config.* hdf/fmpool
%{__libtoolize}
%{__aclocal}
%{__autoconf}
@@ -122,7 +124,7 @@
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_libdir},%{_mandir}/man{3,7},%{_includedir}/hdf}
+install -d $RPM_BUILD_ROOT{%{_mandir}/man{3,7},%{_includedir}/hdf}
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
@@ -148,11 +150,12 @@
%files
%defattr(644,root,root,755)
-%doc COPYING README release_notes/*
+%doc COPYING README.txt release_notes/{HISTORY,RELEASE,bugs_fixed,misc_docs}.txt
%attr(755,root,root) %{_libdir}/libdf.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libdf.so.0
%attr(755,root,root) %{_libdir}/libmfhdf.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libmfhdf.so.0
+%{_libdir}/libhdf4.settings
%files devel
%defattr(644,root,root,755)
@@ -180,6 +183,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.42 2010/10/09 07:20:36 qboosh
+- updated to 4.2.5
+- updated morearchs patch, added jpeg patch (allow libjpeg>6b)
+- epoch 1 (4.2.5 ? 4.2r4)
+
Revision 1.41 2010/01/28 18:21:57 arekm
- release 3
================================================================
Index: packages/hdf/hdf-jpeg.patch
diff -u /dev/null packages/hdf/hdf-jpeg.patch:1.1
--- /dev/null Sat Oct 9 09:20:41 2010
+++ packages/hdf/hdf-jpeg.patch Sat Oct 9 09:20:36 2010
@@ -0,0 +1,36 @@
+--- 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 at 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"
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/hdf/hdf-morearchs.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/hdf/hdf.spec?r1=1.41&r2=1.42&f=u
More information about the pld-cvs-commit
mailing list