[packages/hdf5_hl_region] - updated to 1.1.3 - updated shared,destdir patches
qboosh
qboosh at pld-linux.org
Thu Jan 29 21:18:24 CET 2015
commit 3492b3f89fe3a697e3b589a548a6e9e02ad6773c
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Thu Jan 29 21:20:30 2015 +0100
- updated to 1.1.3
- updated shared,destdir patches
hdf5_hl_region-destdir.patch | 15 +++++++++------
hdf5_hl_region-shared.patch | 41 ++++++++++++++++++++---------------------
hdf5_hl_region.spec | 20 ++++++++++++--------
3 files changed, 41 insertions(+), 35 deletions(-)
---
diff --git a/hdf5_hl_region.spec b/hdf5_hl_region.spec
index 06f754d..0c49f0c 100644
--- a/hdf5_hl_region.spec
+++ b/hdf5_hl_region.spec
@@ -6,12 +6,12 @@
Summary: High-Level Library for handling HDF5 object and region references
Summary(pl.UTF-8): Wysokopoziomowa biblioteka do obsługi odniesień do obiektów i regionów HDF5
Name: hdf5_hl_region
-Version: 1.1.2
-Release: 3
+Version: 1.1.3
+Release: 1
License: BSD-like, changed sources must be marked
Group: Libraries
Source0: http://www.hdfgroup.uiuc.edu/ftp/pub/outgoing/NPOESS/source/hdf5_HL_REGION-%{version}.tar
-# Source0-md5: 800af3c22b8fa8571e48ad17b87b8707
+# Source0-md5: 72b64bca020e8657f4e54ca7d9dfa57d
Patch0: %{name}-shared.patch
Patch1: %{name}-destdir.patch
URL: http://www.hdfgroup.org/projects/npoess/HL_index.html
@@ -121,28 +121,31 @@ Statyczna biblioteka HDF5 HL_REGION dla Fortranu.
%patch1 -p1
%build
-%{__make} -f Makefile-F03 -j1 \
+%{__make} -j1 \
CC="%{__cc}" \
FC="%{_target_alias}-gfortran" \
CCFLAGS="%{rpmcflags}" \
FCFLAGS="%{rpmcflags}" \
+ CHCK_H5FC2003="Fortran 2003 Compiler: yes" \
HDF5_INSTALL_DIR=/usr \
HDF5_USE_SHLIB=yes \
- LIBDIR=%{_libdir}
+ LIBDIR=%{_libdir} \
+ enable-fortran=yes
%if %{with tests}
-%{__make} -f Makefile-F03 tests \
+%{__make} tests \
HDF5_INSTALL_DIR=/usr
%endif
%install
rm -rf $RPM_BUILD_ROOT
-%{__make} -f Makefile-F03 install \
+%{__make} install \
DESTDIR=$RPM_BUILD_ROOT \
PREFIX=%{_prefix} \
LIBDIR=%{_libdir} \
- HDF5_INSTALL_DIR=/usr
+ HDF5_INSTALL_DIR=/usr \
+ enable-fortran=yes
%clean
rm -rf $RPM_BUILD_ROOT
@@ -163,6 +166,7 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libhdf5_hl_region.so
%{_libdir}/libhdf5_hl_region.la
+%{_includedir}/h5hl_api.h
%{_includedir}/h5hl_region.h
%{_includedir}/hl_region_H5LRpublic.h
%{_includedir}/hl_region_H5LTpublic.h
diff --git a/hdf5_hl_region-destdir.patch b/hdf5_hl_region-destdir.patch
index 0413ec8..39c9221 100644
--- a/hdf5_hl_region-destdir.patch
+++ b/hdf5_hl_region-destdir.patch
@@ -1,6 +1,6 @@
---- hdf5_HL_REGION-1.1.1/Makefile-F03.orig 2011-12-20 21:39:38.000000000 +0100
-+++ hdf5_HL_REGION-1.1.1/Makefile-F03 2013-03-04 18:36:32.351679663 +0100
-@@ -44,16 +44,16 @@
+--- hdf5_HL_REGION-1.1.3/Makefile.orig 2015-01-28 21:43:03.733570959 +0100
++++ hdf5_HL_REGION-1.1.3/Makefile 2015-01-28 21:43:08.200237439 +0100
+@@ -70,17 +70,17 @@
cd ../test; $(MAKE));fi
install:
@@ -10,18 +10,21 @@
- (cp src/hl_region_H5LRpublic.h $(PREFIX)/include )
- (cp src/hl_region_H5LTpublic.h $(PREFIX)/include )
- (cp src/h5hl_region.h $(PREFIX)/include )
+- (cp src/h5hl_api.h $(PREFIX)/include )
+ (mkdir -p $(DESTDIR)$(LIBDIR))
+ (mkdir -p $(DESTDIR)$(PREFIX)/include)
+ ($(MAKE) -C src install)
+ (cp src/hl_region_H5LRpublic.h $(DESTDIR)$(PREFIX)/include )
+ (cp src/hl_region_H5LTpublic.h $(DESTDIR)$(PREFIX)/include )
+ (cp src/h5hl_region.h $(DESTDIR)$(PREFIX)/include )
- # if h5fc is available then install FORTRAN source
- if test -e $(HDF5_INSTALL_DIR)/bin/h5fc; then \
++ (cp src/h5hl_api.h $(DESTDIR)$(PREFIX)/include )
+ # if fortran enabled then compile FORTRAN source
+- if test -e fortran/src/h5hl_region.o ; then \
- (cp fortran/src/libhdf5_hl_region_fortran.a $(PREFIX)/lib; \
- cp fortran/src/*.mod $(PREFIX)/include );fi
++ if test -e fortran/src/h5hl_region.lo ; then \
+ ($(MAKE) -C fortran/src install; \
+ cp fortran/src/*.mod $(DESTDIR)$(PREFIX)/include );fi
-
tests:
+ (cd test; $(MAKE) tests )
diff --git a/hdf5_hl_region-shared.patch b/hdf5_hl_region-shared.patch
index 02cf0e3..2744a74 100644
--- a/hdf5_hl_region-shared.patch
+++ b/hdf5_hl_region-shared.patch
@@ -107,9 +107,9 @@
tests:
./test.sh
---- hdf5_HL_REGION-1.1.1/fortran/src/Makefile.orig 2011-12-20 21:39:38.000000000 +0100
-+++ hdf5_HL_REGION-1.1.1/fortran/src/Makefile 2013-03-03 18:03:26.355388871 +0100
-@@ -17,10 +17,12 @@
+--- hdf5_HL_REGION-1.1.3/fortran/src/Makefile.orig 2014-12-08 23:28:30.000000000 +0100
++++ hdf5_HL_REGION-1.1.3/fortran/src/Makefile 2015-01-28 21:30:56.476934812 +0100
+@@ -21,24 +21,26 @@
SRC_C = hl_region_H5LTf.c hl_region_H5LRf.c
SRC_F90 = hl_region_H5LTff.f90 hl_region_H5LRff.f90 h5hl_region.f90
@@ -125,7 +125,6 @@
# include directories
INCLUDES = -I$(HDF5_INSTALL_DIR)/include
-@@ -33,14 +35,14 @@
default: $(OUT)
@@ -134,9 +133,9 @@
+%.lo: %.c
+ $(LIBTOOL) --mode=compile --tag=CC $(CC) $(INCLUDES) $(CCFLAGS) -c $< -o $@
--.f90.o:
+-%.o %.mod: %.f90
- $(FC) $(INCLUDES) $(FCFLAGS) -c $< -o $@
-+%.lo: %.f90
++%.lo %.mod: %.f90
+ $(LIBTOOL) --mode=compile --tag=F77 $(FC) $(INCLUDES) $(FCFLAGS) -c $< -o $@
$(OUT): $(OBJ_C) $(OBJ_F90)
@@ -145,7 +144,7 @@
# link the module files so the compiler can find them
# to avoid setting the module path explicitly
ln -sf ../src/hl_region_h5lr.mod ../examples/hl_region_h5lr.mod
-@@ -50,5 +52,9 @@
+@@ -48,6 +50,10 @@
ln -sf ../src/hl_region_h5lt.mod ../test/hl_region_h5lt.mod
ln -sf ../src/h5hl_region.mod ../test/h5hl_region.mod
@@ -154,7 +153,8 @@
+ $(LIBTOOL) --mode=install install $(OUT) $(DESTDIR)$(LIBDIR)
+
clean:
- \rm -f $(OBJ_C) $(OBJ_F90) $(OUT) *.mod
+ \rm -f $(OBJ_C) $(OBJ_F90) $(OUT) *.mod
+
--- hdf5_HL_REGION-1.1.1/fortran/examples/Makefile.orig 2011-12-20 21:39:38.000000000 +0100
+++ hdf5_HL_REGION-1.1.1/fortran/examples/Makefile 2013-03-03 18:07:22.965378941 +0100
@@ -13,8 +13,8 @@
@@ -202,9 +202,11 @@
tests:
---- hdf5_HL_REGION-1.1.1/fortran/test/Makefile.orig 2011-12-20 21:39:38.000000000 +0100
-+++ hdf5_HL_REGION-1.1.1/fortran/test/Makefile 2013-03-03 18:08:25.478709653 +0100
-@@ -16,20 +16,21 @@
+--- hdf5_HL_REGION-1.1.3/fortran/test/Makefile.orig 2015-01-28 21:24:12.416951770 +0100
++++ hdf5_HL_REGION-1.1.3/fortran/test/Makefile 2015-01-28 21:35:49.700255840 +0100
+@@ -14,9 +14,10 @@
+ ##############################################################################
+
# include directories
-INCLUDES = -I../src -I../../src
+INCLUDES = -I../src -I../../src -I/usr/include
@@ -213,21 +215,18 @@
+LIBTOOL = libtool
+LIBS = ../src/libhdf5_hl_region_fortran.la ../../src/libhdf5_hl_region.la -lhdf5hl_fortran
- FC = $(HDF5_INSTALL_DIR)/bin/h5fc
+ .SUFFIXES: .f90
- all: test_util test_bitfield test_regref_hyper
+@@ -25,10 +26,10 @@
+ all: test_util.o test_bitfield test_regref_hyper
test_bitfield: test_bitfield.f90 test_util.o
- $(FC) test_bitfield.f90 -o test_bitfield test_util.o $(LIBS) $(INCLUDES)
-+ $(LIBTOOL) --mode=link --tag=F77 $(FC) test_bitfield.f90 -o test_bitfield test_util.lo $(LIBS) $(INCLUDES)
++ $(LIBTOOL) --mode=link --tag=F77 $(FC) test_bitfield.f90 -o test_bitfield test_util.o $(LIBS) $(INCLUDES)
test_regref_hyper: test_regref_hyper.f90 test_util.o
- $(FC) test_regref_hyper.f90 -o test_regref_hyper test_util.o $(LIBS) $(INCLUDES)
-+ $(LIBTOOL) --mode=link --tag=F77 $(FC) test_regref_hyper.f90 -o test_regref_hyper test_util.lo $(LIBS) $(INCLUDES)
++ $(LIBTOOL) --mode=link --tag=F77 $(FC) test_regref_hyper.f90 -o test_regref_hyper test_util.o $(LIBS) $(INCLUDES)
- test_util: test_util.f90
-- $(FC) -c test_util.f90 $(LIBS) $(INCLUDES)
-+ $(LIBTOOL) --mode=compile --tag=F77 $(FC) -c test_util.f90 -o test_util.lo $(INCLUDES)
-
- tests:
- ./test_bitfield; ./test_regref_hyper
+ test_util.o: test_util.f90
+ $(FC) -c test_util.f90 $(LIBS) $(INCLUDES)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/hdf5_hl_region.git/commitdiff/3492b3f89fe3a697e3b589a548a6e9e02ad6773c
More information about the pld-cvs-commit
mailing list