- updated to 1.5.0 (note: new soname)auto/th/matio-1.5.0-1

- updated link patch, removed obsolete ac,separate-fortran patches
- fortran interface and doxygen docs have been dropped upstream

4 files changed, 28 insertions, 68 deletions

diff --git a/matio-ac.patch b/matio-ac.patch
deleted file mode 100644
index abe6376..0000000
--- a/matio-ac.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- matio-1.3.4/configure.ac.orig	2010-03-30 17:05:53.000000000 +0200
-+++ matio-1.3.4/configure.ac	2012-01-29 19:38:20.187928466 +0100
-@@ -5,7 +5,7 @@
- AC_INIT([MATIO],[1.3.4],[cch@isl-inc.com],[])
- AC_CONFIG_SRCDIR([src/matio.h])
- AC_CONFIG_AUX_DIR(config)
--AC_CONFIG_MACRO_DIR([m4])
-+AC_CONFIG_MACRO_DIR([config])
- dnl AM_INIT_AUTOMAKE([-no-undefined])
- AM_INIT_AUTOMAKE
- AM_MAINTAINER_MODE
---- matio-1.3.4/Makefile.am.orig	2010-03-30 16:48:00.000000000 +0200
-+++ matio-1.3.4/Makefile.am	2012-01-29 19:40:02.501265224 +0100
-@@ -3,7 +3,7 @@
- AUTOMAKE_OPTIONS = foreign 1.8 no-dependencies
- VPATH = @srcdir@
- 
--ACLOCAL_AMFLAGS = -I config/
-+ACLOCAL_AMFLAGS = -I config
- 
- datadir = $(prefix)/share/matio
- EXTRA_DIST = matio.pc.in bootstrap patches/inflate.patch \
diff --git a/matio-link.patch b/matio-link.patch
index 1ffa282..0b212ab 100644
--- a/matio-link.patch
+++ b/matio-link.patch
@@ -1,10 +1,10 @@
---- matio-1.3.4/src/Makefile.am.orig	2008-05-18 23:45:41.000000000 +0200
-+++ matio-1.3.4/src/Makefile.am	2012-01-29 19:31:12.697914151 +0100
-@@ -15,6 +15,7 @@
- noinst_HEADERS      = matio_private.h mat4.h mat5.h
- include_HEADERS     = matio.h matioConfig.h
- lib_LTLIBRARIES     = libmatio.la
-+libmatio_la_LIBADD  = $(ZLIB_LIBS)
- libmatio_la_SOURCES = snprintf.c endian.c io.c $(ZLIB_SRC) read_data.c \
-                       mat5.c mat4.c mat.c
+--- matio-1.5.0/src/Makefile.am.orig	2012-04-15 20:43:08.000000000 +0200
++++ matio-1.5.0/src/Makefile.am	2013-03-05 20:06:41.367826801 +0100
+@@ -49,6 +49,7 @@
  
+ if MAT73
+ libmatio_la_SOURCES+= mat73.c
++libmatio_la_LIBADD += $(HDF5_LIBS)
+ endif
+ 
+ dosubst = sed -e 's,[@]PACKAGE[@],$(PACKAGE),g' \
diff --git a/matio-separate-fortran.patch b/matio-separate-fortran.patch
deleted file mode 100644
index a1c2c4f..0000000
--- a/matio-separate-fortran.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- matio-1.3.4/src/Makefile.am.orig	2012-01-29 20:12:30.941330465 +0100
-+++ matio-1.3.4/src/Makefile.am	2012-01-29 21:28:43.894816918 +0100
-@@ -21,11 +21,12 @@
- 
- if ENABLE_FORTRAN
-     AM_FCFLAGS             = -I. -I$(top_builddir)/src/fortran
--    AM_LDFLAGS            +=  $(FCLDFLAGS)
-+    lib_LTLIBRARIES       += libmatio-fortran.la
-+    libmatio_fortran_la_LIBADD = libmatio.la $(FCLDFLAGS)
-     nodist_include_HEADERS =  $(top_builddir)/src/matio.mod
-     noinst_HEADERS        += fortran/create.f90 fortran/read_data.f90 \
-                              fortran/write_data.f90 fortran/write.f90
--    libmatio_la_SOURCES   += fortran/matio_internal.c fortran/matio.f90
-+    libmatio_fortran_la_SOURCES = fortran/matio_internal.c fortran/matio.f90
- endif
- 
- dosubst = sed -e 's,[@]PACKAGE[@],$(PACKAGE),g' \
diff --git a/matio.spec b/matio.spec
index a3a4c6a..5c17c17 100644
--- a/matio.spec
+++ b/matio.spec
@@ -1,25 +1,25 @@
 #
 # Conditional build:
-%bcond_without	apidocs		# do not build and package API docs
-%bcond_without	fortran		# Fortran interface
+%bcond_with	apidocs		# build and package API docs (withdrawn in 1.5)
+%bcond_with	fortran		# Fortran interface (removed from 1.5 sources)
+%bcond_without	hdf5		# HDF5-based MAT v7.3 files support
 #
 Summary:	MATIO - Matlab MAT file I/O library
 Summary(pl.UTF-8):	MATIO - biblioteka wejścia/wyjścia do plików MAT (Matlaba)
 Name:		matio
-Version:	1.3.4
+Version:	1.5.0
 Release:	1
-License:	LGPL v2.1+
+License:	BSD
 Group:		Libraries
 Source0:	http://downloads.sourceforge.net/matio/%{name}-%{version}.tar.gz
-# Source0-md5:	a91208cf18f2456a5855bc1a9fdb90fd
+# Source0-md5:	42045916d470d038e4141b37bf33ca20
 Patch0:		%{name}-link.patch
-Patch1:		%{name}-ac.patch
-Patch2:		%{name}-separate-fortran.patch
 URL:		http://matio.sourceforge.net/
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake >= 1:1.8
 %{?with_apidocs:BuildRequires:	doxygen}
 %{?with_fortran:BuildRequires:	gcc-fortran}
+%{?with_hdf5:BuildRequires:	hdf5-devel}
 BuildRequires:	libtool >= 2:1.5
 BuildRequires:	sed >= 4.0
 BuildRequires:	zlib-devel
@@ -29,6 +29,10 @@ BuildRequires:	texlive-format-pdflatex
 BuildRequires:	texlive-latex-ams
 BuildRequires:	texlive-makeindex
 %endif
+Obsoletes:	matio-apidocs
+Obsoletes:	matio-fortran
+Obsoletes:	matio-fortran-devel
+Obsoletes:	matio-fortran-static
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -48,6 +52,7 @@ Summary:	Header files for MATIO library
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki MATIO
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
+%{?with_hdf5:Requires:	hdf5-devel}
 Requires:	zlib-devel
 
 %description devel
@@ -119,8 +124,6 @@ Dokumentacja API biblioteki MATIO.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %build
 %{__libtoolize}
@@ -128,12 +131,11 @@ Dokumentacja API biblioteki MATIO.
 %{__autoconf}
 %{__automake}
 %configure \
-	%{?with_apidocs:--enable-docs} \
 	%{?with_fortran:--enable-fortran} \
+	%{!?with_hdf5:--disable-mat73} \
 	--enable-shared
 
-# parallel build is broken (matio.mod, docs)
-%{__make} -j1
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -141,11 +143,6 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-# keep .la - needed for -fortran
-
-# packaged in -apidocs
-%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/matio
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -154,9 +151,10 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc ChangeLog NEWS README
+%doc COPYING NEWS README
+%attr(755,root,root) %{_bindir}/matdump
 %attr(755,root,root) %{_libdir}/libmatio.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libmatio.so.0
+%attr(755,root,root) %ghost %{_libdir}/libmatio.so.2
 
 %files devel
 %defattr(644,root,root,755)
@@ -164,6 +162,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libmatio.la
 %{_includedir}/matio*.h
 %{_pkgconfigdir}/matio.pc
+%{_mandir}/man3/Mat_*.3*
 
 %files static
 %defattr(644,root,root,755)
@@ -173,7 +172,7 @@ rm -rf $RPM_BUILD_ROOT
 %files fortran
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libmatio-fortran.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libmatio-fortran.so.0
+%attr(755,root,root) %ghost %{_libdir}/libmatio-fortran.so.2
 
 %files fortran-devel
 %defattr(644,root,root,755)