rpms/matio/EL-6 sources, 1.2, 1.3 .cvsignore, 1.2, 1.3 matio.spec, 1.2, 1.3 matio-1.3.3-automake.patch, 1.1, NONE matio-1.3.3-fortranpath2.patch, 1.1, NONE matio-1.3.3-fortranpath.patch, 1.1, NONE matio-1.3.3-zlibldflag.patch, 1.1, NONE

[Nicolas Chauvet]

Author: kwizart

Update of /cvs/pkgs/rpms/matio/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv16334

Modified Files:
	sources .cvsignore matio.spec 
Removed Files:
	matio-1.3.3-automake.patch matio-1.3.3-fortranpath2.patch 
	matio-1.3.3-fortranpath.patch matio-1.3.3-zlibldflag.patch 
Log Message:
Update and build for EL-6



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/matio/EL-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	26 May 2009 21:58:54 -0000	1.2
+++ sources	2 Jul 2010 14:05:04 -0000	1.3
@@ -1 +1 @@
-5c12a98f391de000e88b5a1b20d74abf  matio-1.3.3.tar.gz
+a91208cf18f2456a5855bc1a9fdb90fd  matio-1.3.4.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/matio/EL-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	26 May 2009 21:58:53 -0000	1.2
+++ .cvsignore	2 Jul 2010 14:05:04 -0000	1.3
@@ -1 +1 @@
-matio-1.3.3.tar.gz
+matio-1.3.4.tar.gz


Index: matio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/matio/EL-6/matio.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- matio.spec	25 Jul 2009 11:50:20 -0000	1.2
+++ matio.spec	2 Jul 2010 14:05:04 -0000	1.3
@@ -1,16 +1,12 @@
 Name:           matio
-Version:        1.3.3
-Release:        4%{?dist}
+Version:        1.3.4
+Release:        1%{?dist}
 Summary:        Library for reading/writing Matlab MAT files
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://sourceforge.net/projects/matio
 Source0:        http://downloads.sourceforge.net/matio/matio-%{version}.tar.gz
-Patch0:         matio-1.3.3-zlibldflag.patch
-Patch1:         matio-1.3.3-fortranpath.patch
-Patch2:         matio-1.3.3-fortranpath2.patch
-Patch3:         matio-1.3.3-automake.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  doxygen
@@ -30,6 +26,7 @@ Summary:        Development files for %{
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 Requires:       zlib-devel
+Requires:       pkgconfig
 
 %description    devel
 The %{name}-devel package contains libraries and header files for
@@ -38,12 +35,6 @@ developing applications that use %{name}
 
 %prep
 %setup -q
-#To fix matio.x86_64: W: undefined-non-weak-symbol /usr/lib64/libmatio.so.0.0.0 inflateEnd, etc.
-%patch0 -p1 -b .zlibldflag
-%patch1 -p1 -b .fortranpath
-#sed -i.fortranpath2 -e 's|src/fortran/matio_t.inc|src/matio_t.inc|' configure.ac configure
-%patch2 -p1 -b .fortranpath2
-%patch3 -p1 -b .automake
 
 
 #Doxygen
@@ -54,9 +45,6 @@ pushd doxygen
   touch latex/refman.pdf
 popd
 
-#Prevent some files to be missed at -debuginfo extraction
-mv src/fortran/* src
-
 
 %build
 export FCFLAGS=$RPM_OPT_FLAGS
@@ -92,6 +80,9 @@ for f in $(find doxygen/html -type f); d
   touch -r doxygen/Makefile.am ${f}
 done
 
+#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
@@ -116,12 +107,21 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(-,root,root,-)
 %doc doxygen/html
-%{_includedir}/*
+%{_includedir}/matio*.h
+%{_fmoddir}/matio.mod
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
 
 
 %changelog
+* Mon Apr 19 2010 Nicolas Chauvet <kwizart at fedoraproject.org> - 1.3.4-1
+- Update to 1.3.4
+- Remove uneeded patches.
+
+* Wed Sep 30 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.3.3-5
+- Fix location of Fortran module.
+- Add Requires: pkgconfig on -devel.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.3-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- matio-1.3.3-automake.patch DELETED ---


--- matio-1.3.3-fortranpath2.patch DELETED ---


--- matio-1.3.3-fortranpath.patch DELETED ---


--- matio-1.3.3-zlibldflag.patch DELETED ---