[freefem++] - update to 3.9-1

Dominik Mierzejewski rathann at fedoraproject.org
Sun Aug 29 16:39:10 UTC 2010 

commit 5fd7073216b85ab24f5341524ac647744c3d957e
Author: Dominik Mierzejewski <dominik at greysector.net>
Date:   Sun Aug 29 18:39:05 2010 +0200

    - update to 3.9-1

 .gitignore          |    2 +-
 freefem++-rpm.patch |   56 +++++++++++++++++++++++++-------------------------
 freefem++.spec      |    9 +++++--
 sources             |    2 +-
 4 files changed, 36 insertions(+), 33 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 93cb01d..44c5d60 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/freefem++-3.9.tar.gz
+/freefem++-3.9-1.tar.gz
diff --git a/freefem++-rpm.patch b/freefem++-rpm.patch
index c79ede0..ee3268a 100644
--- a/freefem++-rpm.patch
+++ b/freefem++-rpm.patch
@@ -1,6 +1,6 @@
-diff -up freefem++-3.8/acoptim.m4.r freefem++-3.8/acoptim.m4
---- freefem++-3.8/acoptim.m4.r	2009-10-26 09:46:52.000000000 +0100
-+++ freefem++-3.8/acoptim.m4	2010-02-25 22:41:45.000000000 +0100
+diff -up freefem++-3.9-1/acoptim.m4.r freefem++-3.9-1/acoptim.m4
+--- freefem++-3.9-1/acoptim.m4.r	2010-06-16 14:33:49.000000000 +0200
++++ freefem++-3.9-1/acoptim.m4	2010-08-29 18:06:48.000000000 +0200
 @@ -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.8/acoptim.m4.r freefem++-3.8/acoptim.m4
      # MacOS X Darwin
      if test -x /usr/bin/hostinfo
  	then
-diff -up freefem++-3.8/configure.ac.r freefem++-3.8/configure.ac
---- freefem++-3.8/configure.ac.r	2010-02-04 14:48:19.000000000 +0100
-+++ freefem++-3.8/configure.ac	2010-02-25 22:53:52.000000000 +0100
-@@ -353,7 +355,7 @@ AC_DEFINE_UNQUOTED(VersionFreeFempp,$ff_
+diff -up freefem++-3.9-1/configure.ac.r freefem++-3.9-1/configure.ac
+--- freefem++-3.9-1/configure.ac.r	2010-08-27 17:32:32.000000000 +0200
++++ freefem++-3.9-1/configure.ac	2010-08-29 18:06:49.000000000 +0200
+@@ -370,7 +370,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.8/configure.ac.r freefem++-3.8/configure.ac
  AC_MSG_CHECKING(prefix dir freefem++  )
  AC_MSG_RESULT($ff_prefix_dir)	 
  
-@@ -1250,7 +1252,7 @@ then
+@@ -1306,7 +1306,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.8/configure.ac.r freefem++-3.8/configure.ac
  			AC_MSG_WARN([		Sorry we find UMFPACK lib but not the include umfpack.h file])
  		fi
  	fi	
-diff -up freefem++-3.8/examples++-3d/Makefile.am.r freefem++-3.8/examples++-3d/Makefile.am
---- freefem++-3.8/examples++-3d/Makefile.am.r	2009-11-10 20:28:06.000000000 +0100
-+++ freefem++-3.8/examples++-3d/Makefile.am	2010-02-25 22:41:45.000000000 +0100
+diff -up freefem++-3.9-1/examples++-3d/Makefile.am.r freefem++-3.9-1/examples++-3d/Makefile.am
+--- freefem++-3.9-1/examples++-3d/Makefile.am.r	2010-06-16 14:33:49.000000000 +0200
++++ freefem++-3.9-1/examples++-3d/Makefile.am	2010-08-29 18:06:52.000000000 +0200
 @@ -31,8 +31,8 @@ freefem++.pref:
  	echo loadpath += \"./\" >>freefem++.pref
  
@@ -79,12 +79,12 @@ diff -up freefem++-3.8/examples++-3d/Makefile.am.r freefem++-3.8/examples++-3d/M
  
  
  
-diff -up freefem++-3.8/examples++-load/load.link.in.r freefem++-3.8/examples++-load/load.link.in
---- freefem++-3.8/examples++-load/load.link.in.r	2009-12-04 15:53:45.000000000 +0100
-+++ freefem++-3.8/examples++-load/load.link.in	2010-02-25 22:41:45.000000000 +0100
-@@ -12,13 +12,13 @@ INCFF=
- if [ -z "$CXX" ] ; then CXX='@CXX@' ; fi
+diff -up freefem++-3.9-1/examples++-load/load.link.in.r freefem++-3.9-1/examples++-load/load.link.in
+--- freefem++-3.9-1/examples++-load/load.link.in.r	2010-08-27 09:26:09.000000000 +0200
++++ freefem++-3.9-1/examples++-load/load.link.in	2010-08-29 18:08:01.000000000 +0200
+@@ -13,13 +13,13 @@ if [ -z "$CXX" ] ; then CXX='@CXX@' ; fi
  if [ -z "$MPICXX" ] ; then MPICXX='@MPICXX@' ; fi
+ if [ -z "$MPI_LIB" ] ; then MPI_LIB='@MPI_LIB@' ; fi
  if [ -z "$F77" ] ; then F77='@F77@' ; fi
 -if [ "$CXX" = '@'CXX'@' ] ; then CXX=""; fi
 -if [ "$MPICXX" = '@'MPICXX'@' ] ; then MPICXX=""; fi
@@ -103,7 +103,7 @@ diff -up freefem++-3.8/examples++-load/load.link.in.r freefem++-3.8/examples++-l
  if [ -z "$INCFF" ] ; then
      if [ -f "@INCFF@/ff++.hpp" ] ; then
  	INCFF="-I at INCFF@"
-@@ -26,8 +26,8 @@ if [ -z "$INCFF" ] ; then
+@@ -29,8 +29,8 @@ if [ -z "$INCFF" ] ; then
  	INCFF="-Iinclude"
      elif [ -f "FFAPPLI_INC/ff++.hpp" ] ; then 
  	INCFF="-IFFAPPLI_INC" 
@@ -114,10 +114,10 @@ diff -up freefem++-3.8/examples++-load/load.link.in.r freefem++-3.8/examples++-l
      else
  	ff=`which freefem++.exe`;
  	ffinc=`dirname "$ff"`/examples++-load/include
-diff -up freefem++-3.8/examples++-load/Makefile.am.r freefem++-3.8/examples++-load/Makefile.am
---- freefem++-3.8/examples++-load/Makefile.am.r	2010-01-28 20:38:21.000000000 +0100
-+++ freefem++-3.8/examples++-load/Makefile.am	2010-02-25 23:13:32.000000000 +0100
-@@ -95,7 +95,7 @@ all.edp: 
+diff -up freefem++-3.9-1/examples++-load/Makefile.am.r freefem++-3.9-1/examples++-load/Makefile.am
+--- freefem++-3.9-1/examples++-load/Makefile.am.r	2010-08-27 11:21:28.000000000 +0200
++++ freefem++-3.9-1/examples++-load/Makefile.am	2010-08-29 18:06:55.000000000 +0200
+@@ -98,7 +98,7 @@ all.edp: 
  regtests.edp: regtests.m4 ../regtests.m4
  	m4 -DASSERT regtests.m4 > regtests.edp
  
@@ -126,7 +126,7 @@ diff -up freefem++-3.8/examples++-load/Makefile.am.r freefem++-3.8/examples++-lo
  
  clean-local:
  	-rm *.o  load.link WHERE_LIBRARY-download ff-get-dep ff-c++ ff-pkg-download \
-@@ -121,19 +121,19 @@ WHERE_LIBRARY-download:ff-pkg-download 
+@@ -124,19 +124,19 @@ WHERE_LIBRARY-download:ff-pkg-download 
  freefem++.pref:
  	echo loadpath = \"./\" >freefem++.pref
  install-exec-local:: load_compile
@@ -155,9 +155,9 @@ diff -up freefem++-3.8/examples++-load/Makefile.am.r freefem++-3.8/examples++-lo
  
  
  
-diff -up freefem++-3.8/Makefile.am.r freefem++-3.8/Makefile.am
---- freefem++-3.8/Makefile.am.r	2009-11-10 14:33:47.000000000 +0100
-+++ freefem++-3.8/Makefile.am	2010-02-25 22:41:45.000000000 +0100
+diff -up freefem++-3.9-1/Makefile.am.r freefem++-3.9-1/Makefile.am
+--- freefem++-3.9-1/Makefile.am.r	2010-06-16 14:33:49.000000000 +0200
++++ freefem++-3.9-1/Makefile.am	2010-08-29 18:06:55.000000000 +0200
 @@ -25,14 +25,14 @@ examples-bamg/test/dotest*.pl 0ldUserRea
  
  FF_MAC_PREFIX=FreeFem++v$(VERSION)$(ADD_PACKAGE_NAME)
@@ -195,9 +195,9 @@ diff -up freefem++-3.8/Makefile.am.r freefem++-3.8/Makefile.am
  	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.8/src/lglib/Makefile.am.r freefem++-3.8/src/lglib/Makefile.am
---- freefem++-3.8/src/lglib/Makefile.am.r	2010-01-10 22:47:14.000000000 +0100
-+++ freefem++-3.8/src/lglib/Makefile.am	2010-02-25 22:41:45.000000000 +0100
+diff -up freefem++-3.9-1/src/lglib/Makefile.am.r freefem++-3.9-1/src/lglib/Makefile.am
+--- freefem++-3.9-1/src/lglib/Makefile.am.r	2010-06-16 14:33:50.000000000 +0200
++++ freefem++-3.9-1/src/lglib/Makefile.am	2010-08-29 18:06:57.000000000 +0200
 @@ -9,9 +9,9 @@ INCLUDES=-I../fflib -I../bamglib -I../Gr
  BUILT_SOURCES=lg.tab.hpp lg.tab.cpp
  
diff --git a/freefem++.spec b/freefem++.spec
index 3dd303c..f2890e5 100644
--- a/freefem++.spec
+++ b/freefem++.spec
@@ -1,10 +1,10 @@
-%define dotpl %{nil}
-%define dashpl %{nil}
+%define dotpl .1
+%define dashpl -1
 
 Summary: PDE solving tool
 Name: freefem++
 Version: 3.9
-Release: 1%{dotpl}%{?dist}
+Release: 2%{dotpl}%{?dist}
 URL: http://www.freefem.org/ff++/index.htm
 Group: Applications/Engineering
 Source0: http://www.freefem.org/ff++/ftp/%{name}-%{version}%{dashpl}.tar.gz
@@ -169,6 +169,9 @@ export CFLAGS="$CFLAGS $RPM_OPT_FLAGS"
 %{_bindir}/FreeFem++-mpi
 
 %changelog
+* Sun Aug 29 2010 Dominik Mierzejewski <rpm at greysector.net> 3.9-2.1
+- update to 3.9-1
+
 * Wed Aug 04 2010 Dominik Mierzejewski <rpm at greysector.net> 3.9-1
 - update to 3.9
 - fix compilation with gcc-4.5.1
diff --git a/sources b/sources
index f191103..61de12e 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 f1accc292794bbafb66e963080f9d15b  FreeFem++.1
-e0c4a1a553e9da15fc84e9ccf881f06b  freefem++-3.9.tar.gz
+df31fcbc962089dee6f44c8427b47343  freefem++-3.9-1.tar.gz

More information about the scm-commits mailing list