rpms/matio/F-10 import.log, NONE, 1.1 matio-1.3.3-automake.patch, NONE, 1.1 matio-1.3.3-fortranpath.patch, NONE, 1.1 matio-1.3.3-fortranpath2.patch, NONE, 1.1 matio-1.3.3-zlibldflag.patch, NONE, 1.1 matio.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Nicolas Chauvet kwizart at fedoraproject.org
Tue May 26 22:03:42 UTC 2009


Author: kwizart

Update of /cvs/pkgs/rpms/matio/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21214/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log matio-1.3.3-automake.patch 
	matio-1.3.3-fortranpath.patch matio-1.3.3-fortranpath2.patch 
	matio-1.3.3-zlibldflag.patch matio.spec 
Log Message:
Initial import for F-11



--- NEW FILE import.log ---
matio-1_3_3-3_fc11:F-10:matio-1.3.3-3.fc11.src.rpm:1243375376

matio-1.3.3-automake.patch:

--- NEW FILE matio-1.3.3-automake.patch ---
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@
- at ENABLE_FORTRAN_TRUE@am__append_1 = $(FCLDFLAGS)
- at ENABLE_FORTRAN_TRUE@am__append_2 = fortran/create.f90 fortran/read_data.f90 \
- at ENABLE_FORTRAN_TRUE@                             fortran/write_data.f90 fortran/write.f90
+ at HAVE_ZLIB_TRUE@am__append_1 = inflate.c
+ at HAVE_ZLIB_TRUE@am__append_2 = $(ZLIB_LIBS)
+ at ENABLE_FORTRAN_TRUE@am__append_3 = $(FCLDFLAGS)
+ at ENABLE_FORTRAN_TRUE@am__append_4 = create.f90 read_data.f90 \
+ at ENABLE_FORTRAN_TRUE@                             write_data.f90 write.f90
 
- at ENABLE_FORTRAN_TRUE@am__append_3 = fortran/matio_internal.c fortran/matio.f90
+ at 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 =
+ at 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 at am__objects_1 = inflate.lo
 @ENABLE_FORTRAN_TRUE at 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. at 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)
- at 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)
- at 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)
+ at ENABLE_FORTRAN_TRUE@AM_FCFLAGS = -I. -I$(top_builddir)/src
 @ENABLE_FORTRAN_TRUE at 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
 

matio-1.3.3-fortranpath.patch:

--- NEW FILE matio-1.3.3-fortranpath.patch ---
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' \

matio-1.3.3-fortranpath2.patch:

--- NEW FILE matio-1.3.3-fortranpath2.patch ---
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

matio-1.3.3-zlibldflag.patch:

--- NEW FILE matio-1.3.3-zlibldflag.patch ---
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


--- NEW FILE matio.spec ---
Name:           matio
Version:        1.3.3
Release:        3%{?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
BuildRequires:  gcc-gfortran
#According to the README - zlib 1.2.2 is possible but require a patch
BuildRequires:  zlib-devel >= 1.2.3
     

%description
matio is an open-source library for reading/writing Matlab MAT files.  This
library is designed for use by programs/libraries that do not have access or
do not want to rely on Matlab's libmat shared library.


%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       zlib-devel

%description    devel
The %{name}-devel package contains libraries and header files for
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
pushd doxygen
  doxygen -u doxygen.config
  #Fake the pdf creation
  mkdir -p latex
  touch latex/refman.pdf
popd

#Prevent some files to be missed at -debuginfo extraction
mv src/fortran/* src


%build
export FCFLAGS=$RPM_OPT_FLAGS
%configure \
  --enable-shared \
  --disable-static \
  --enable-fortran \
  --enable-extended-sparse=yes \
  --enable-test=no \
  --enable-docs=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}



%install
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 html docs timestramps generation.
for f in $(find doxygen/html -type f); do
  touch -r doxygen/Makefile.am ${f}
done


%check
pushd test
  make check
popd


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc ChangeLog COPYING NEWS README
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%doc doxygen/html
%{_includedir}/*
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc


%changelog
* Sat May 23 2009 kwizart < kwizart at gmail.com > - 1.3.3-3
- Remove the test subpackage 
- Enable make check
- Various typo and clean-up

* Wed Sep 24 2008 kwizart < kwizart at gmail.com > - 1.3.3-2
- Fix undefined-non-weak-symbol 
- Fix missing f90 files in the debuginfo package

* Wed Sep 24 2008 kwizart < kwizart at gmail.com > - 1.3.3-1
- Initial package for fedora




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/matio/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	26 May 2009 21:50:22 -0000	1.1
+++ .cvsignore	26 May 2009 22:03:12 -0000	1.2
@@ -0,0 +1 @@
+matio-1.3.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/matio/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	26 May 2009 21:50:22 -0000	1.1
+++ sources	26 May 2009 22:03:12 -0000	1.2
@@ -0,0 +1 @@
+5c12a98f391de000e88b5a1b20d74abf  matio-1.3.3.tar.gz




More information about the fedora-extras-commits mailing list