X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=hdf.spec;h=7760888476126558c74fc4668db6ff3bc2f570f2;hb=255f079ac2da59d068148ae9c678827583d128ce;hp=3645032bfc9ad7d8da0b01d210075861c30ab87a;hpb=c6b5e74159e08e6888d249474c3837b5171e2fc0;p=packages%2Fhdf.git

diff --git a/hdf.spec b/hdf.spec
index 3645032..7760888 100644
--- a/hdf.spec
+++ b/hdf.spec
@@ -5,20 +5,21 @@
 Summary:	Hierarchical Data Format library
 Summary(pl.UTF-8):	Biblioteka HDF (Hierarchical Data Format)
 Name:		hdf
-Version:	4.2r1
-Release:	5
+Version:	4.2.15
+Release:	1
+Epoch:		1
 Group:		Libraries
 License:	Nearly BSD, but changed sources must be marked
-Source0:	ftp://ftp.ncsa.uiuc.edu/HDF/HDF/HDF_Current/src/HDF%{version}.tar.gz
-# Source0-md5:	9082c6fa913b9188452fa6c5217e1573
+Source0:	https://support.hdfgroup.org/ftp/HDF/releases/HDF%{version}/src/hdf-%{version}.tar.bz2
+# Source0-md5:	27ab87b22c31906883a0bfaebced97cb
 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}-nosz.patch
-Patch4:		%{name}-link.patch
-URL:		http://hdf.ncsa.uiuc.edu/
+Patch1:		%{name}-morearchs.patch
+Patch2:		%{name}-link.patch
+Patch3:		%{name}-szip.patch
+Patch4:		%{name}-tirpc.patch
+URL:		http://portal.hdfgroup.org/display/HDF4/HDF4
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
 BuildRequires:	bison
@@ -26,11 +27,12 @@ BuildRequires:	flex
 BuildRequires:	gcc-fortran
 BuildRequires:	groff
 BuildRequires:	libjpeg-devel >= 6b
+BuildRequires:	libtirpc-devel
 BuildRequires:	libtool >= 2:1.4d-3
-BuildRequires:	netcdf-devel
+BuildRequires:	rpmbuild(macros) >= 1.750
 %{?with_szip:BuildRequires:	szip-devel >= 2.0}
 BuildRequires:	which
-BuildRequires:	zlib-devel >= 1.1.3
+BuildRequires:	zlib-devel >= 1.1.4
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -61,10 +63,11 @@ zestawów danych itp.
 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
+Requires:	libtirpc-devel
 %{?with_szip:Requires:	szip-devel >= 2.0}
-Requires:	zlib-devel >= 1.1.3
+Requires:	zlib-devel >= 1.1.4
 
 %description devel
 Header files for HDF library.
@@ -76,7 +79,7 @@ Pliki nagłówkowe biblioteki HDF.
 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.
@@ -88,7 +91,7 @@ Statyczna wersja biblioteki HDF.
 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,8 +99,19 @@ Utilities to convert from/to HDF format.
 %description progs -l pl.UTF-8
 Narzędzia do konwersji z i do formatu HDF.
 
+%package examples
+Summary:	HDF example programs (source code)
+Summary(pl.UTF-8):	Przykładowe programy dla biblioteki HDF (w postaci źródłowej)
+Group:		Documentation
+
+%description examples
+HDF example programs (source code).
+
+%description examples -l pl.UTF-8
+Przykładowe programy dla biblioteki HDF (w postaci źródłowej).
+
 %prep
-%setup -q -n HDF%{version}
+%setup -q
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -105,38 +119,50 @@ Narzędzia do konwersji z i do formatu HDF.
 %patch4 -p1
 
 %build
-cp -f /usr/share/automake/config.* hdf/fmpool
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
 %{__autoheader}
 %{__automake}
 # need to pass F77 to override F77=g77 in config/linux-gnu
+%ifarch x32
+%define	gfortran	x86_64-pld-linux-gnux32-gfortran
+%else
+%define	gfortran	%{_target_cpu}-pld-linux-gfortran
+%endif
 %configure \
-	F77="%{_target_cpu}-pld-linux-gfortran" \
+	F77="%{gfortran}" \
+%if "%{_ver_ge '%(%{gfortran} -dumpversion)' '10.0'}" == "1"
+	FFLAGS="%{rpmcflags} -fallow-argument-mismatch" \
+%endif
+	--enable-shared \
 	%{?with_szip:--with-szlib}
 
 %{__make}
 
 %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
+	DESTDIR=$RPM_BUILD_ROOT \
+	EXAMPLETOPDIR=$RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} \
+	EXAMPLEDIR=$RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}/c \
 
-mv -f $RPM_BUILD_ROOT%{_includedir}/*.{h,inc,f90} $RPM_BUILD_ROOT%{_includedir}/hdf
+%{__mv} $RPM_BUILD_ROOT%{_includedir}/*.{h,inc,f90} $RPM_BUILD_ROOT%{_includedir}/hdf
 
-install man/gr_chunk.3 $RPM_BUILD_ROOT%{_mandir}/man3
-mv -f $RPM_BUILD_ROOT%{_mandir}/man1/hdf.1 $RPM_BUILD_ROOT%{_mandir}/man7/hdf.7
+cp -p man/gr_chunk.3 $RPM_BUILD_ROOT%{_mandir}/man3
+%{__mv} $RPM_BUILD_ROOT%{_mandir}/man1/hdf.1 $RPM_BUILD_ROOT%{_mandir}/man7/hdf.7
 
 # resolve conflict with netcdf
 for i in ncdump ncgen ; do
-	mv -f $RPM_BUILD_ROOT%{_bindir}/$i $RPM_BUILD_ROOT%{_bindir}/hdf$i
-	mv -f $RPM_BUILD_ROOT%{_mandir}/man1/$i.1 $RPM_BUILD_ROOT%{_mandir}/man1/hdf$i.1
+	%{__mv} $RPM_BUILD_ROOT%{_bindir}/$i $RPM_BUILD_ROOT%{_bindir}/hdf$i
+	%{__mv} $RPM_BUILD_ROOT%{_mandir}/man1/$i.1 $RPM_BUILD_ROOT%{_mandir}/man1/hdf$i.1
 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
@@ -146,9 +172,12 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc COPYING README release_notes/*
-%attr(755,root,root) %{_libdir}/libdf.so.*.*
-%attr(755,root,root) %{_libdir}/libmfhdf.so.*.*
+%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)
@@ -157,7 +186,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libdf.la
 %{_libdir}/libmfhdf.la
 %{_includedir}/hdf
-%{_mandir}/man[37]/*
+%{_mandir}/man3/gr_chunk.3*
+%{_mandir}/man7/hdf.7*
 
 %files static
 %defattr(644,root,root,755)
@@ -166,5 +196,62 @@ 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*
+
+%files examples
+%defattr(644,root,root,755)
+%dir %{_examplesdir}/%{name}-%{version}
+%{_examplesdir}/%{name}-%{version}/README
+%attr(755,root,root) %{_examplesdir}/%{name}-%{version}/run-all-ex.sh
+%dir %{_examplesdir}/%{name}-%{version}/c
+%{_examplesdir}/%{name}-%{version}/c/*.c
+%{_examplesdir}/%{name}-%{version}/c/*.f
+%attr(755,root,root) %{_examplesdir}/%{name}-%{version}/c/run-c-ex.sh
+%attr(755,root,root) %{_examplesdir}/%{name}-%{version}/c/run-fortran-ex.sh