rpms/freefem++/devel .cvsignore, 1.9, 1.10 freefem++-rpm.patch, 1.6, 1.7 freefem++.spec, 1.25, 1.26 sources, 1.9, 1.10
Dominik Mierzejewski
rathann at fedoraproject.org
Fri Jan 15 20:37:44 UTC 2010
Author: rathann
Update of /cvs/pkgs/rpms/freefem++/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10832
Modified Files:
.cvsignore freefem++-rpm.patch freefem++.spec sources
Log Message:
* Fri Jan 15 2010 Dominik Mierzejewski <rpm at greysector.net> 3.7-1.1
- update to 3.7-1
- disable testsuite again (rhbz #524511)
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/freefem++/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore 5 Dec 2009 23:53:20 -0000 1.9
+++ .cvsignore 15 Jan 2010 20:37:44 -0000 1.10
@@ -1,2 +1,2 @@
FreeFem++.1
-freefem++-3.6-1.tar.gz
+freefem++-3.7-1.tar.gz
freefem++-rpm.patch:
Makefile.am | 10 +++++-----
acoptim.m4 | 22 +++++++++++-----------
configure.ac | 4 ++--
examples++-3d/Makefile.am | 4 ++--
examples++-load/Makefile.am | 20 ++++++++++----------
examples++-load/load.link.in | 18 +++++++++---------
src/lglib/Makefile.am | 4 ++--
7 files changed, 41 insertions(+), 41 deletions(-)
Index: freefem++-rpm.patch
===================================================================
RCS file: /cvs/pkgs/rpms/freefem++/devel/freefem++-rpm.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- freefem++-rpm.patch 5 Dec 2009 23:53:21 -0000 1.6
+++ freefem++-rpm.patch 15 Jan 2010 20:37:44 -0000 1.7
@@ -1,6 +1,6 @@
-diff -up freefem++-3.6-1/acoptim.m4.r freefem++-3.6-1/acoptim.m4
---- freefem++-3.6-1/acoptim.m4.r 2009-10-26 09:46:52.000000000 +0100
-+++ freefem++-3.6-1/acoptim.m4 2009-12-05 23:56:25.000000000 +0100
+diff -up freefem++-3.7-1/acoptim.m4.r freefem++-3.7-1/acoptim.m4
+--- freefem++-3.7-1/acoptim.m4.r 2009-10-26 09:46:52.000000000 +0100
++++ freefem++-3.7-1/acoptim.m4 2010-01-15 19:14:17.000000000 +0100
@@ -47,14 +47,6 @@ AC_MSG_CHECKING(whether to generate debu
AC_ARG_ENABLE(debug,[ --enable-debug Turn on debug versions of FreeFem++])
AC_ARG_ENABLE(optim,[ --enable-optim Turn on compiler optimization])
@@ -44,10 +44,10 @@ diff -up freefem++-3.6-1/acoptim.m4.r fr
# MacOS X Darwin
if test -x /usr/bin/hostinfo
then
-diff -up freefem++-3.6-1/configure.ac.r freefem++-3.6-1/configure.ac
---- freefem++-3.6-1/configure.ac.r 2009-11-10 20:28:06.000000000 +0100
-+++ freefem++-3.6-1/configure.ac 2009-12-05 23:56:25.000000000 +0100
-@@ -284,7 +284,7 @@ AC_DEFINE_UNQUOTED(VersionFreeFempp,$ff_
+diff -up freefem++-3.7-1/configure.ac.r freefem++-3.7-1/configure.ac
+--- freefem++-3.7-1/configure.ac.r 2010-01-13 18:03:58.000000000 +0100
++++ freefem++-3.7-1/configure.ac 2010-01-15 19:14:17.000000000 +0100
+@@ -319,7 +319,7 @@ AC_DEFINE_UNQUOTED(VersionFreeFempp,$ff_
# date is only useful for config-version.h
test "$prefix" = NONE && prefix="$ac_default_prefix"
@@ -56,7 +56,7 @@ diff -up freefem++-3.6-1/configure.ac.r
AC_MSG_CHECKING(prefix dir freefem++ )
AC_MSG_RESULT($ff_prefix_dir)
-@@ -1150,7 +1150,7 @@ then
+@@ -1185,7 +1185,7 @@ then
AC_CHECK_LIB(umfpack,umf_i_malloc,
ff_umfpack_libs=" -lumfpack $ff_umfpack_libs"
ff_umfpack_ok=yes,,$ff_umfpack_libs)
@@ -65,9 +65,9 @@ diff -up freefem++-3.6-1/configure.ac.r
AC_MSG_WARN([ Sorry we find UMFPACK lib but not the include umfpack.h file])
fi
fi
-diff -up freefem++-3.6-1/examples++-3d/Makefile.am.r freefem++-3.6-1/examples++-3d/Makefile.am
---- freefem++-3.6-1/examples++-3d/Makefile.am.r 2009-11-10 20:28:06.000000000 +0100
-+++ freefem++-3.6-1/examples++-3d/Makefile.am 2009-12-05 23:56:25.000000000 +0100
+diff -up freefem++-3.7-1/examples++-3d/Makefile.am.r freefem++-3.7-1/examples++-3d/Makefile.am
+--- freefem++-3.7-1/examples++-3d/Makefile.am.r 2009-11-10 20:28:06.000000000 +0100
++++ freefem++-3.7-1/examples++-3d/Makefile.am 2010-01-15 19:14:18.000000000 +0100
@@ -31,8 +31,8 @@ freefem++.pref:
echo loadpath += \"./\" >>freefem++.pref
@@ -79,10 +79,10 @@ diff -up freefem++-3.6-1/examples++-3d/M
-diff -up freefem++-3.6-1/examples++-load/load.link.in.r freefem++-3.6-1/examples++-load/load.link.in
---- freefem++-3.6-1/examples++-load/load.link.in.r 2009-11-03 21:41:00.000000000 +0100
-+++ freefem++-3.6-1/examples++-load/load.link.in 2009-12-05 23:56:25.000000000 +0100
-@@ -10,11 +10,11 @@ INCFF=
+diff -up freefem++-3.7-1/examples++-load/load.link.in.r freefem++-3.7-1/examples++-load/load.link.in
+--- freefem++-3.7-1/examples++-load/load.link.in.r 2009-12-04 15:53:45.000000000 +0100
++++ freefem++-3.7-1/examples++-load/load.link.in 2010-01-15 19:17:45.000000000 +0100
+@@ -12,13 +12,13 @@ INCFF=
if [ -z "$CXX" ] ; then CXX='@CXX@' ; fi
if [ -z "$MPICXX" ] ; then MPICXX='@MPICXX@' ; fi
if [ -z "$F77" ] ; then F77='@F77@' ; fi
@@ -90,16 +90,20 @@ diff -up freefem++-3.6-1/examples++-load
-if [ "$MPICXX" = '@'MPICXX'@' ] ; then MPICXX=""; fi
-if [ "$F77" = '@'F77'@' ] ; then F77=""; fi
-if [ "$FFCXXFLAGS" = '@'CXXFLAGS'@' ] ; then FFCXXFLAGS=""; fi
+-if [ "$FFFFLAGS" = '@'FFLAGS'@' ] ; then FFFFLAGS=""; fi
+-if [ "$FFFLIBS" = '@'FLIBS'@' ] ; then FFFLIBS=""; fi
-if [ "$FFVERSION" = '@'VERSION'@' ] ; then FFVERSION=""; fi
+if [ "$CXX" = '@CXX@' ] ; then CXX=""; fi
+if [ "$MPICXX" = '@MPICXX@' ] ; then MPICXX=""; fi
+if [ "$F77" = '@F77@' ] ; then F77=""; fi
+if [ "$FFCXXFLAGS" = '@CXXFLAGS@' ] ; then FFCXXFLAGS=""; fi
++if [ "$FFFFLAGS" = '@FFLAGS@' ] ; then FFFFLAGS=""; fi
++if [ "$FFFLIBS" = '@FLIBS@' ] ; then FFFLIBS=""; fi
+if [ "$FFVERSION" = '@VERSION@' ] ; then FFVERSION=""; fi
if [ -z "$INCFF" ] ; then
if [ -f "@INCFF@/ff++.hpp" ] ; then
INCFF="-I at INCFF@"
-@@ -22,8 +22,8 @@ if [ -z "$INCFF" ] ; then
+@@ -26,8 +26,8 @@ if [ -z "$INCFF" ] ; then
INCFF="-Iinclude"
elif [ -f "FFAPPLI_INC/ff++.hpp" ] ; then
INCFF="-IFFAPPLI_INC"
@@ -110,19 +114,10 @@ diff -up freefem++-3.6-1/examples++-load
else
ff=`which freefem++.exe`;
ffinc=`dirname "$ff"`/examples++-load/include
-diff -up freefem++-3.6-1/examples++-load/Makefile.am.r freefem++-3.6-1/examples++-load/Makefile.am
---- freefem++-3.6-1/examples++-load/Makefile.am.r 2009-11-10 21:20:31.000000000 +0100
-+++ freefem++-3.6-1/examples++-load/Makefile.am 2009-12-06 00:19:31.000000000 +0100
-@@ -71,7 +71,7 @@ include: include.tar.gz
- rm -rf include
- gunzip -c include.tar.gz| tar xvf -
- -rm -f include/._*
-- -cp -rf ../download/include/* include/.
-+ @-cp -rf ../download/include/* include/.
-
- Ref: makeref.edp
- ../src/nw/FreeFem++-nw makeref.edp
-@@ -94,7 +94,7 @@ all.edp:
+diff -up freefem++-3.7-1/examples++-load/Makefile.am.r freefem++-3.7-1/examples++-load/Makefile.am
+--- freefem++-3.7-1/examples++-load/Makefile.am.r 2009-12-04 15:36:17.000000000 +0100
++++ freefem++-3.7-1/examples++-load/Makefile.am 2010-01-15 19:14:20.000000000 +0100
+@@ -95,7 +95,7 @@ all.edp:
regtests.edp: regtests.m4 ../regtests.m4
m4 -DASSERT regtests.m4 > regtests.edp
@@ -131,7 +126,7 @@ diff -up freefem++-3.6-1/examples++-load
clean-local:
-rm *.o load.link WHERE_LIBRARY-download ff-get-dep ff-c++ ff-pkg-download \
-@@ -120,19 +120,19 @@ WHERE_LIBRARY-download:ff-pkg-download
+@@ -121,19 +121,19 @@ WHERE_LIBRARY-download:ff-pkg-download
freefem++.pref:
echo loadpath = \"./\" >freefem++.pref
install-exec-local:: load_compile
@@ -160,9 +155,9 @@ diff -up freefem++-3.6-1/examples++-load
-diff -up freefem++-3.6-1/Makefile.am.r freefem++-3.6-1/Makefile.am
---- freefem++-3.6-1/Makefile.am.r 2009-11-10 14:33:47.000000000 +0100
-+++ freefem++-3.6-1/Makefile.am 2009-12-05 23:56:25.000000000 +0100
+diff -up freefem++-3.7-1/Makefile.am.r freefem++-3.7-1/Makefile.am
+--- freefem++-3.7-1/Makefile.am.r 2009-11-10 14:33:47.000000000 +0100
++++ freefem++-3.7-1/Makefile.am 2010-01-15 19:14:20.000000000 +0100
@@ -25,14 +25,14 @@ examples-bamg/test/dotest*.pl 0ldUserRea
FF_MAC_PREFIX=FreeFem++v$(VERSION)$(ADD_PACKAGE_NAME)
@@ -200,18 +195,18 @@ diff -up freefem++-3.6-1/Makefile.am.r f
find . -name '*.[ei]dp' -o -name '*.h*' -o -name '*.cpp' |egrep '[.]/examples++' >>$@
find . -name '*.h*' -o -name '*.cpp' |egrep '[.]/examples++' >>$@
List-agl-dylib: src/nw/FreeFem++
-diff -up freefem++-3.6-1/src/lglib/Makefile.am.r freefem++-3.6-1/src/lglib/Makefile.am
---- freefem++-3.6-1/src/lglib/Makefile.am.r 2006-04-10 22:51:52.000000000 +0200
-+++ freefem++-3.6-1/src/lglib/Makefile.am 2009-12-05 23:56:25.000000000 +0100
+diff -up freefem++-3.7-1/src/lglib/Makefile.am.r freefem++-3.7-1/src/lglib/Makefile.am
+--- freefem++-3.7-1/src/lglib/Makefile.am.r 2010-01-10 22:47:14.000000000 +0100
++++ freefem++-3.7-1/src/lglib/Makefile.am 2010-01-15 19:15:25.000000000 +0100
@@ -9,9 +9,9 @@ INCLUDES=-I../fflib -I../bamglib -I../Gr
BUILT_SOURCES=lg.tab.hpp lg.tab.cpp
- lg.tab.hpp lg.tab.cpp: lg.y
+ lg.tab.hpp lg.tab.cpp: lg.ypp
- -rm lg.tab.hpp lg.tab.cpp lg.tab.cpp.h
+ -rm -f lg.tab.hpp lg.tab.cpp lg.tab.cpp.h
bison -dtv -p lg $< -o lg.tab.cpp
- -mv lg.tab.cpp.h lg.tab.hpp # pour un pb entre des versions de bison
-+ -mv -f lg.tab.cpp.h lg.tab.hpp
++ -mv -f lg.tab.cpp.h lg.tab.hpp # pour un pb entre des versions de bison
libfreefem++.dylib: lg.tab.o ../fflib/libff.a
g++ -bundle lg.tab.o ../fflib/libff.a $(UMFPACKLIB) $(ARPACKLIB) $(BLASLIB) $(LIBS) -o libfreefem++.dylib
- EXTRA_DIST=lg.y
+ EXTRA_DIST=lg.ypp
Index: freefem++.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freefem++/devel/freefem++.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- freefem++.spec 5 Dec 2009 23:53:21 -0000 1.25
+++ freefem++.spec 15 Jan 2010 20:37:44 -0000 1.26
@@ -3,7 +3,7 @@
Summary: PDE solving tool
Name: freefem++
-Version: 3.6
+Version: 3.7
Release: 1%{dotpl}%{?dist}
URL: http://www.freefem.org/ff++/index.htm
Group: Applications/Engineering
@@ -121,7 +121,7 @@ rm $RPM_BUILD_ROOT%{_bindir}/ff-pkg-down
%clean
rm -rf $RPM_BUILD_ROOT
-%if 1
+%if 0
%check
. /etc/profile.d/modules.sh
module load openmpi-%{_arch}
@@ -165,6 +165,10 @@ export CFLAGS="$CFLAGS $RPM_OPT_FLAGS"
%{_bindir}/FreeFem++-mpi
%changelog
+* Fri Jan 15 2010 Dominik Mierzejewski <rpm at greysector.net> 3.7-1.1
+- update to 3.7-1
+- disable testsuite again (rhbz #524511)
+
* Sat Dec 5 2009 Dominik Mierzejewski <rpm at greysector.net> 3.6-1.1
- update to 3.6-1
- drop upstream'd/obsolete patches
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/freefem++/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources 5 Dec 2009 23:53:21 -0000 1.9
+++ sources 15 Jan 2010 20:37:44 -0000 1.10
@@ -1,2 +1,2 @@
f1accc292794bbafb66e963080f9d15b FreeFem++.1
-664b3838eb977461e3b92ac37d32d699 freefem++-3.6-1.tar.gz
+76ecbb753c979c6e68d443a2f1365431 freefem++-3.7-1.tar.gz
More information about the scm-commits
mailing list