[matio] Update to 1.5.0 License change to BSD
Nicolas Chauvet
kwizart at fedoraproject.org
Thu Apr 26 13:09:03 UTC 2012
commit b8e245c2e7f5c7aecc56af95fbd0a0880dc99ee2
Author: Nicolas Chauvet <kwizart at gmail.com>
Date: Thu Apr 26 15:08:49 2012 +0200
Update to 1.5.0
License change to BSD
.gitignore | 1 +
matio.spec | 58 +++++++++++++++++++++-------------------------------------
sources | 2 +-
3 files changed, 23 insertions(+), 38 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index fd7cb57..af0c48e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
matio-1.3.4.tar.gz
+/matio-1.5.0.tar.gz
diff --git a/matio.spec b/matio.spec
index 393433b..f9173d8 100644
--- a/matio.spec
+++ b/matio.spec
@@ -1,18 +1,18 @@
Name: matio
-Version: 1.3.4
-Release: 3%{?dist}
+Version: 1.5.0
+Release: 1%{?dist}
Summary: Library for reading/writing Matlab MAT files
Group: System Environment/Libraries
-License: LGPLv2+
+License: BSD
URL: http://sourceforge.net/projects/matio
Source0: http://downloads.sourceforge.net/matio/matio-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: doxygen
-BuildRequires: gcc-gfortran
#According to the README - zlib 1.2.2 is possible but require a patch
BuildRequires: zlib-devel >= 1.2.3
+BuildRequires: hdf5-devel >= 1.8
%description
@@ -25,6 +25,7 @@ do not want to rely on Matlab's libmat shared library.
Summary: Development files for %{name}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
+Requires: hdf5-devel
Requires: zlib-devel
Requires: pkgconfig
@@ -37,33 +38,18 @@ developing applications that use %{name}.
%setup -q
-#Doxygen
-pushd doxygen
- doxygen -u doxygen.config
- #Fake the pdf creation
- mkdir -p latex
- touch latex/refman.pdf
-popd
-
-
%build
-export FCFLAGS=$RPM_OPT_FLAGS
%configure \
--enable-shared \
--disable-static \
- --enable-fortran \
- --enable-extended-sparse=yes \
- --enable-test=no \
- --enable-docs=yes
+ --enable-mat73=yes \
+ --enable-extended-sparse=yes
# remove rpath from libtool
sed -i.rpath 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i.rpath 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-make
-#Parallele make fails with
-#make[2]: *** No rule to make target `../src/matio.mod', needed by `all-am'. Stop.
-#{?_smp_mflags}
+make %{?_smp_mflags}
@@ -72,22 +58,15 @@ rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
-#Remove pdf - really needed along with doxygen ?
-rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/matio/libmatio.pdf
+#Fix timestamp
+touch -r $RPM_BUILD_ROOT%{_includedir}/matio_pubconf.h NEWS
-#Fix html docs timestramps generation.
-for f in $(find doxygen/html -type f); do
- touch -r doxygen/Makefile.am ${f}
-done
+rm -rf $RPM_BUILD_ROOT%{_datadir}/info/dir
-#Fix location of Fortran module
-mkdir -p $RPM_BUILD_ROOT%{_fmoddir}
-mv $RPM_BUILD_ROOT%{_includedir}/matio.mod $RPM_BUILD_ROOT%{_fmoddir}
%check
-pushd test
- make check
-popd
+#Needed to avoid rpath
+export LD_LIBRARY_PATH=%{_builddir}/%{?buildsubdir}/src/.libs/ ; make check
%clean
@@ -101,19 +80,24 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
-%doc ChangeLog COPYING NEWS README
+%doc COPYING NEWS README
+%{_bindir}/matdump
%{_libdir}/*.so.*
%files devel
%defattr(-,root,root,-)
-%doc doxygen/html
%{_includedir}/matio*.h
-%{_fmoddir}/matio.mod
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc
+%{_mandir}/man3/Mat_*.3.*
%changelog
+* Sun Apr 22 2012 Nicolas Chauvet <kwizart at gmail.com> - 1.5.0-1
+- Update to 1.5.0
+- Enable mat73 support
+- License change from LGPLv2+ to BSD
+
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.4-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
diff --git a/sources b/sources
index 29a16b5..485668b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a91208cf18f2456a5855bc1a9fdb90fd matio-1.3.4.tar.gz
+42045916d470d038e4141b37bf33ca20 matio-1.5.0.tar.gz
More information about the scm-commits
mailing list