From ebb910fa645c60e4289d98d906ae1b4d657d5128 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Apr 29 2010 19:21:18 +0000 Subject: - Update to 1.3.4 - Remove uneeded patches. --- diff --git a/.cvsignore b/.cvsignore index 3a9a692..fd7cb57 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -matio-1.3.3.tar.gz +matio-1.3.4.tar.gz diff --git a/import.log b/import.log index 5ca88fc..3af020b 100644 --- a/import.log +++ b/import.log @@ -1 +1,2 @@ matio-1_3_3-3_fc11:HEAD:matio-1.3.3-3.fc11.src.rpm:1243375088 +matio-1_3_4-1_fc12:F-13:matio-1.3.4-1.fc12.src.rpm:1272568340 diff --git a/matio-1.3.3-automake.patch b/matio-1.3.3-automake.patch deleted file mode 100644 index 3f29c6c..0000000 --- a/matio-1.3.3-automake.patch +++ /dev/null @@ -1,96 +0,0 @@ -diff -up matio-1.3.3/src/Makefile.in.automake matio-1.3.3/src/Makefile.in ---- matio-1.3.3/src/Makefile.in.automake 2008-06-02 19:11:13.000000000 +0200 -+++ matio-1.3.3/src/Makefile.in 2008-10-13 12:02:42.000000000 +0200 -@@ -36,11 +36,13 @@ PRE_UNINSTALL = : - POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ --@ENABLE_FORTRAN_TRUE@am__append_1 = $(FCLDFLAGS) --@ENABLE_FORTRAN_TRUE@am__append_2 = fortran/create.f90 fortran/read_data.f90 \ --@ENABLE_FORTRAN_TRUE@ fortran/write_data.f90 fortran/write.f90 -+@HAVE_ZLIB_TRUE@am__append_1 = inflate.c -+@HAVE_ZLIB_TRUE@am__append_2 = $(ZLIB_LIBS) -+@ENABLE_FORTRAN_TRUE@am__append_3 = $(FCLDFLAGS) -+@ENABLE_FORTRAN_TRUE@am__append_4 = create.f90 read_data.f90 \ -+@ENABLE_FORTRAN_TRUE@ write_data.f90 write.f90 - --@ENABLE_FORTRAN_TRUE@am__append_3 = fortran/matio_internal.c fortran/matio.f90 -+@ENABLE_FORTRAN_TRUE@am__append_5 = matio_internal.c matio.f90 - subdir = src - DIST_COMMON = $(am__noinst_HEADERS_DIST) $(include_HEADERS) \ - $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ -@@ -71,14 +73,15 @@ am__installdirs = "$(DESTDIR)$(libdir)" - "$(DESTDIR)$(includedir)" - libLTLIBRARIES_INSTALL = $(INSTALL) - LTLIBRARIES = $(lib_LTLIBRARIES) --libmatio_la_LIBADD = --am__libmatio_la_SOURCES_DIST = snprintf.c endian.c io.c inflate.c \ -- read_data.c mat5.c mat4.c mat.c fortran/matio_internal.c \ -- fortran/matio.f90 -+am__DEPENDENCIES_1 = -+@HAVE_ZLIB_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) -+libmatio_la_DEPENDENCIES = $(am__DEPENDENCIES_2) -+am__libmatio_la_SOURCES_DIST = snprintf.c endian.c io.c read_data.c \ -+ mat5.c mat4.c mat.c inflate.c matio_internal.c matio.f90 - @HAVE_ZLIB_TRUE@am__objects_1 = inflate.lo - @ENABLE_FORTRAN_TRUE@am__objects_2 = matio_internal.lo matio.lo --am_libmatio_la_OBJECTS = snprintf.lo endian.lo io.lo $(am__objects_1) \ -- read_data.lo mat5.lo mat4.lo mat.lo $(am__objects_2) -+am_libmatio_la_OBJECTS = snprintf.lo endian.lo io.lo read_data.lo \ -+ mat5.lo mat4.lo mat.lo $(am__objects_1) $(am__objects_2) - libmatio_la_OBJECTS = $(am_libmatio_la_OBJECTS) - DEFAULT_INCLUDES = -I.@am__isrc@ - depcomp = -@@ -100,9 +103,8 @@ SOURCES = $(libmatio_la_SOURCES) - DIST_SOURCES = $(am__libmatio_la_SOURCES_DIST) - includeHEADERS_INSTALL = $(INSTALL_HEADER) - nodist_includeHEADERS_INSTALL = $(INSTALL_HEADER) --am__noinst_HEADERS_DIST = matio_private.h mat4.h mat5.h \ -- fortran/create.f90 fortran/read_data.f90 \ -- fortran/write_data.f90 fortran/write.f90 -+am__noinst_HEADERS_DIST = matio_private.h mat4.h mat5.h create.f90 \ -+ read_data.f90 write_data.f90 write.f90 - HEADERS = $(include_HEADERS) $(nodist_include_HEADERS) \ - $(noinst_HEADERS) - ETAGS = etags -@@ -228,14 +230,14 @@ top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - AUTOMAKE_OPTIONS = foreign 1.8 no-dependencies - AM_CFLAGS = -I. $(ZLIB_CFLAGS) --AM_LDFLAGS = $(am__append_1) --@HAVE_ZLIB_TRUE@ZLIB_SRC = inflate.c --noinst_HEADERS = matio_private.h mat4.h mat5.h $(am__append_2) -+AM_LDFLAGS = $(am__append_3) -+noinst_HEADERS = matio_private.h mat4.h mat5.h $(am__append_4) - include_HEADERS = matio.h matioConfig.h - lib_LTLIBRARIES = libmatio.la --libmatio_la_SOURCES = snprintf.c endian.c io.c $(ZLIB_SRC) read_data.c \ -- mat5.c mat4.c mat.c $(am__append_3) --@ENABLE_FORTRAN_TRUE@AM_FCFLAGS = -I. -I$(top_builddir)/src/fortran -+libmatio_la_SOURCES = snprintf.c endian.c io.c read_data.c mat5.c \ -+ mat4.c mat.c $(am__append_1) $(am__append_5) -+libmatio_la_LIBADD = $(am__append_2) -+@ENABLE_FORTRAN_TRUE@AM_FCFLAGS = -I. -I$(top_builddir)/src - @ENABLE_FORTRAN_TRUE@nodist_include_HEADERS = $(top_builddir)/src/matio.mod - dosubst = sed -e 's,[@]PACKAGE[@],$(PACKAGE),g' \ - -e 's,[@]VERSION[@],$(VERSION),g' \ -@@ -337,9 +339,6 @@ distclean-compile: - .c.lo: - $(LTCOMPILE) -c -o $@ $< - --matio_internal.lo: fortran/matio_internal.c -- $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o matio_internal.lo `test -f 'fortran/matio_internal.c' || echo '$(srcdir)/'`fortran/matio_internal.c -- - .f90.o: - $(FCCOMPILE) -c -o $@ $< - -@@ -349,9 +348,6 @@ matio_internal.lo: fortran/matio_interna - .f90.lo: - $(LTFCCOMPILE) -c -o $@ $< - --matio.lo: fortran/matio.f90 -- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(FC) $(AM_FCFLAGS) $(FCFLAGS) -c -o matio.lo `test -f 'fortran/matio.f90' || echo '$(srcdir)/'`fortran/matio.f90 -- - mostlyclean-libtool: - -rm -f *.lo - diff --git a/matio-1.3.3-fortranpath.patch b/matio-1.3.3-fortranpath.patch deleted file mode 100644 index aaa3fd5..0000000 --- a/matio-1.3.3-fortranpath.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -up matio-1.3.3/src/Makefile.am.fortranpath matio-1.3.3/src/Makefile.am ---- matio-1.3.3/src/Makefile.am.fortranpath 2008-10-13 12:01:02.000000000 +0200 -+++ matio-1.3.3/src/Makefile.am 2008-10-13 12:01:31.000000000 +0200 -@@ -21,12 +21,12 @@ if HAVE_ZLIB - endif - - if ENABLE_FORTRAN -- AM_FCFLAGS = -I. -I$(top_builddir)/src/fortran -+ AM_FCFLAGS = -I. -I$(top_builddir)/src - AM_LDFLAGS += $(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 -+ noinst_HEADERS += create.f90 read_data.f90 \ -+ write_data.f90 write.f90 -+ libmatio_la_SOURCES += matio_internal.c matio.f90 - endif - - dosubst = sed -e 's,[@]PACKAGE[@],$(PACKAGE),g' \ diff --git a/matio-1.3.3-fortranpath2.patch b/matio-1.3.3-fortranpath2.patch deleted file mode 100644 index 5685f04..0000000 --- a/matio-1.3.3-fortranpath2.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -up matio-1.3.3/configure.fortranpath2 matio-1.3.3/configure ---- matio-1.3.3/configure.fortranpath2 2008-06-02 18:54:54.000000000 +0200 -+++ matio-1.3.3/configure 2008-10-13 12:10:03.000000000 +0200 -@@ -4563,7 +4563,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS con - ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' - ac_compiler_gnu=$ac_cv_c_compiler_gnu - -- ac_config_files="$ac_config_files src/fortran/matio_t.inc" -+ ac_config_files="$ac_config_files src/matio_t.inc" - - fi - -@@ -23748,7 +23748,7 @@ for ac_config_target in $ac_config_targe - do - case $ac_config_target in - "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; -- "src/fortran/matio_t.inc") CONFIG_FILES="$CONFIG_FILES src/fortran/matio_t.inc" ;; -+ "src/matio_t.inc") CONFIG_FILES="$CONFIG_FILES src/fortran/matio_t.inc" ;; - "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; - "src/matioConfig.h") CONFIG_HEADERS="$CONFIG_HEADERS src/matioConfig.h" ;; - "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; -diff -up matio-1.3.3/configure.ac.fortranpath2 matio-1.3.3/configure.ac ---- matio-1.3.3/configure.ac.fortranpath2 2008-06-02 18:54:45.000000000 +0200 -+++ matio-1.3.3/configure.ac 2008-10-13 12:10:03.000000000 +0200 -@@ -38,7 +38,7 @@ if test "$enable_fortran" = "yes" - then - AC_PROG_FC([pgf95 pgf90 ifort gfortran g95]) - AC_FC_WRAPPERS -- AC_CONFIG_FILES([src/fortran/matio_t.inc]) -+ AC_CONFIG_FILES([src/matio_t.inc]) - fi - - dnl diff --git a/matio-1.3.3-zlibldflag.patch b/matio-1.3.3-zlibldflag.patch deleted file mode 100644 index ad09719..0000000 --- a/matio-1.3.3-zlibldflag.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -up matio-1.3.3/src/Makefile.am.zlibldflag matio-1.3.3/src/Makefile.am ---- matio-1.3.3/src/Makefile.am.zlibldflag 2008-05-18 23:45:41.000000000 +0200 -+++ matio-1.3.3/src/Makefile.am 2008-10-13 11:12:00.000000000 +0200 -@@ -8,15 +8,17 @@ VPATH = @srcdir@ - AM_CFLAGS = -I. $(ZLIB_CFLAGS) - AM_LDFLAGS = - --if HAVE_ZLIB -- ZLIB_SRC = inflate.c --endif -- - noinst_HEADERS = matio_private.h mat4.h mat5.h - include_HEADERS = matio.h matioConfig.h - lib_LTLIBRARIES = libmatio.la --libmatio_la_SOURCES = snprintf.c endian.c io.c $(ZLIB_SRC) read_data.c \ -+libmatio_la_SOURCES = snprintf.c endian.c io.c read_data.c \ - mat5.c mat4.c mat.c -+libmatio_la_LIBADD = -+ -+if HAVE_ZLIB -+ libmatio_la_SOURCES += inflate.c -+ libmatio_la_LIBADD += $(ZLIB_LIBS) -+endif - - if ENABLE_FORTRAN - AM_FCFLAGS = -I. -I$(top_builddir)/src/fortran diff --git a/matio.spec b/matio.spec index 3f6841d..5441ecf 100644 --- a/matio.spec +++ b/matio.spec @@ -1,16 +1,12 @@ Name: matio -Version: 1.3.3 -Release: 5%{?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 @@ -39,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 @@ -55,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 @@ -127,6 +114,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Apr 19 2010 Nicolas Chauvet - 1.3.4-1 +- Update to 1.3.4 +- Remove uneeded patches. + * Wed Sep 30 2009 Jussi Lehtola - 1.3.3-5 - Fix location of Fortran module. - Add Requires: pkgconfig on -devel. diff --git a/sources b/sources index 386dd2a..29a16b5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5c12a98f391de000e88b5a1b20d74abf matio-1.3.3.tar.gz +a91208cf18f2456a5855bc1a9fdb90fd matio-1.3.4.tar.gz