rpms/freefem++/devel .cvsignore, 1.8, 1.9 freefem++-rpm.patch, 1.5, 1.6 freefem++.spec, 1.24, 1.25 sources, 1.8, 1.9 freefem++-gcc44-link.patch, 1.2, NONE freefem++-gcc44.patch, 1.2, NONE

Dominik Mierzejewski rathann at fedoraproject.org
Sat Dec 5 23:53:21 UTC 2009 

Author: rathann

Update of /cvs/pkgs/rpms/freefem++/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13830

Modified Files:
	.cvsignore freefem++-rpm.patch freefem++.spec sources 
Removed Files:
	freefem++-gcc44-link.patch freefem++-gcc44.patch 
Log Message:
* Sat Dec  5 2009 Dominik Mierzejewski <rpm at greysector.net> 3.6-1.1
- update to 3.6-1
- drop upstream'd/obsolete patches
- move scripts to %{_datadir}
- reenable testsuite



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/freefem++/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	20 Sep 2009 20:57:16 -0000	1.8
+++ .cvsignore	5 Dec 2009 23:53:20 -0000	1.9
@@ -1,2 +1,2 @@
 FreeFem++.1
-freefem++-3.5.tar.gz
+freefem++-3.6-1.tar.gz

freefem++-rpm.patch:
 Makefile.am                  |   10 +++++-----
 acoptim.m4                   |   22 +++++++++++-----------
 configure.ac                 |    4 ++--
 examples++-3d/Makefile.am    |    4 ++--
 examples++-load/Makefile.am  |   22 +++++++++++-----------
 examples++-load/load.link.in |   14 +++++++-------
 src/lglib/Makefile.am        |    4 ++--
 7 files changed, 40 insertions(+), 40 deletions(-)

Index: freefem++-rpm.patch
===================================================================
RCS file: /cvs/pkgs/rpms/freefem++/devel/freefem++-rpm.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- freefem++-rpm.patch	20 Sep 2009 20:57:17 -0000	1.5
+++ freefem++-rpm.patch	5 Dec 2009 23:53:21 -0000	1.6
@@ -1,7 +1,7 @@
-diff -up freefem++-3.5/acoptim.m4.r freefem++-3.5/acoptim.m4
---- freefem++-3.5/acoptim.m4.r	2009-05-17 21:03:14.000000000 +0200
-+++ freefem++-3.5/acoptim.m4	2009-09-20 21:42:32.000000000 +0200
-@@ -30,14 +30,6 @@ AC_MSG_CHECKING(whether to generate debu
+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
+@@ -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])
  
@@ -16,7 +16,7 @@ diff -up freefem++-3.5/acoptim.m4.r free
  if test "$enable_debug" = yes;
  then
  	AC_MSG_RESULT(yes)
-@@ -46,9 +38,9 @@ else
+@@ -63,9 +55,9 @@ else
  
  	# No debugging information in optimized code
  
@@ -29,7 +29,7 @@ diff -up freefem++-3.5/acoptim.m4.r free
  fi
  
  # Hardware-independant optimization
-@@ -82,6 +74,14 @@ if test "$enable_debug" != yes \
+@@ -99,6 +91,14 @@ if test "$enable_debug" != yes \
      -a "$enable_generic" != yes
  then
  
@@ -44,10 +44,10 @@ diff -up freefem++-3.5/acoptim.m4.r free
      # MacOS X Darwin
      if test -x /usr/bin/hostinfo
  	then
-diff -up freefem++-3.5/configure.ac.r freefem++-3.5/configure.ac
---- freefem++-3.5/configure.ac.r	2009-08-27 16:03:13.000000000 +0200
-+++ freefem++-3.5/configure.ac	2009-09-20 21:42:32.000000000 +0200
-@@ -247,7 +247,7 @@ AC_DEFINE_UNQUOTED(VersionFreeFempp,$ff_
+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_
  # date is only useful for config-version.h
  
  test "$prefix" = NONE && prefix="$ac_default_prefix"
@@ -56,7 +56,7 @@ diff -up freefem++-3.5/configure.ac.r fr
  AC_MSG_CHECKING(prefix dir freefem++  )
  AC_MSG_RESULT($ff_prefix_dir)	 
  
-@@ -1093,7 +1093,7 @@ then
+@@ -1150,7 +1150,7 @@ then
  		AC_CHECK_LIB(umfpack,umf_i_malloc,
  			ff_umfpack_libs=" -lumfpack $ff_umfpack_libs"
  			ff_umfpack_ok=yes,,$ff_umfpack_libs)
@@ -65,39 +65,41 @@ diff -up freefem++-3.5/configure.ac.r fr
  			AC_MSG_WARN([		Sorry we find UMFPACK lib but not the include umfpack.h file])
  		fi
  	fi	
-diff -up freefem++-3.5/examples++-3d/Makefile.am.r freefem++-3.5/examples++-3d/Makefile.am
---- freefem++-3.5/examples++-3d/Makefile.am.r	2009-06-15 22:38:58.000000000 +0200
-+++ freefem++-3.5/examples++-3d/Makefile.am	2009-09-20 21:50:02.000000000 +0200
+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
 @@ -31,8 +31,8 @@ freefem++.pref:
  	echo loadpath += \"./\" >>freefem++.pref
  
  install-exec-local:: 
 -	$(mkinstalldirs) -m 755 $(DESTDIR)$(ff_prefix_dir)/idp
--	$(INSTALL)  -m 555 $ $(LIST_IDP)  $(DESTDIR)$(ff_prefix_dir)/lib
-+	$(mkinstalldirs) -m 755 $(DESTDIR)$(libdir)/freefem++/idp
-+	$(INSTALL)  -m 755 $ $(LIST_IDP)  $(DESTDIR)$(libdir)/freefem++
+-	$(INSTALL)  -m 555  $(LIST_IDP)  $(DESTDIR)$(ff_prefix_dir)/idp
++	$(mkinstalldirs) -m 755 $(DESTDIR)$(datadir)/freefem++/idp
++	$(INSTALL)  -m 555  $(LIST_IDP)  $(DESTDIR)$(datadir)/freefem++/idp
  
  
- # To check the scripts against their reference values
-diff -up freefem++-3.5/examples++-load/load.link.in.r freefem++-3.5/examples++-load/load.link.in
---- freefem++-3.5/examples++-load/load.link.in.r	2009-07-10 11:02:37.000000000 +0200
-+++ freefem++-3.5/examples++-load/load.link.in	2009-09-20 21:42:32.000000000 +0200
-@@ -6,10 +6,10 @@ FFCXXFLAGS='@CXXFLAGS@ @CPPFLAGS@'
- INCFF=
+ 
+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=
  if [ -z "$CXX" ] ; then CXX='@CXX@' ; fi
+ if [ -z "$MPICXX" ] ; then MPICXX='@MPICXX@' ; fi
  if [ -z "$F77" ] ; then F77='@F77@' ; 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 [ "$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 [ "$FFVERSION" = '@VERSION@' ] ; then FFVERSION=""; fi
  if [ -z "$INCFF" ] ; then
      if [ -f "@INCFF@/ff++.hpp" ] ; then
  	INCFF="-I at INCFF@"
-@@ -17,8 +17,8 @@ if [ -z "$INCFF" ] ; then
+@@ -22,8 +22,8 @@ if [ -z "$INCFF" ] ; then
  	INCFF="-Iinclude"
      elif [ -f "FFAPPLI_INC/ff++.hpp" ] ; then 
  	INCFF="-IFFAPPLI_INC" 
@@ -108,10 +110,28 @@ diff -up freefem++-3.5/examples++-load/l
      else
  	ff=`which freefem++.exe`;
  	ffinc=`dirname "$ff"`/examples++-load/include
-diff -up freefem++-3.5/examples++-load/Makefile.am.r freefem++-3.5/examples++-load/Makefile.am
---- freefem++-3.5/examples++-load/Makefile.am.r	2009-06-16 10:30:42.000000000 +0200
-+++ freefem++-3.5/examples++-load/Makefile.am	2009-09-20 21:50:15.000000000 +0200
-@@ -141,16 +141,16 @@ load.link:load.link.in  Makefile
+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: 
+ regtests.edp: regtests.m4 ../regtests.m4
+ 	m4 -DASSERT regtests.m4 > regtests.edp
+ 
+-$(LIST_COMPILE):ff-c++ include Makefile 
++$(LIST_COMPILE) $(LIST_COMPILE_PKG):ff-c++ include Makefile 
+ 
+ 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 
  freefem++.pref:
  	echo loadpath = \"./\" >freefem++.pref
  install-exec-local:: load_compile
@@ -127,19 +147,22 @@ diff -up freefem++-3.5/examples++-load/M
 +	$(mkinstalldirs) -m 755 $(DESTDIR)$(includedir)/freefem++
 +	$(mkinstalldirs) -m 755 $(DESTDIR)$(sysconfdir)
 +	$(INSTALL_DATA)  include/* $(DESTDIR)$(includedir)/freefem++
-+	$(INSTALL)  -m 755 $(LIST_COMPILE) $(DESTDIR)$(libdir)/freefem++
++	$(INSTALL)  -m 555 $(LIST_COMPILE) $(DESTDIR)$(libdir)/freefem++
 +	echo loadpath += \"./\"  >$(DESTDIR)$(sysconfdir)/freefem++.pref
-+	echo loadpath += \"$(ff_prefix_dir)/lib\"  >>$(DESTDIR)$(sysconfdir)/freefem++.pref
-+	echo includepath += \"$(ff_prefix_dir)/edp\"  >>$(DESTDIR)$(sysconfdir)/freefem++.pref
++	echo loadpath += \"$(libdir)/freefem++\"  >>$(DESTDIR)$(sysconfdir)/freefem++.pref
++	echo includepath += \"$(datadir)/freefem++/edp\"  >>$(DESTDIR)$(sysconfdir)/freefem++.pref
  	$(INSTALL_SCRIPT) ff-c++  $(DESTDIR)${bindir}
--	-$(INSTALL)  -m 555 $(LIST_COMPILE_PKG) $(DESTDIR)$(ff_prefix_dir)/lib
-+	-$(INSTALL)  -m 755 $(LIST_COMPILE_PKG) $(DESTDIR)$(libdir)/freefem++
+ 	$(INSTALL_SCRIPT) ff-pkg-download  $(DESTDIR)${bindir}
+ 	$(INSTALL_SCRIPT) ff-get-dep  $(DESTDIR)${bindir}
+ 	-for i in $(LIST_COMPILE_PKG); do \
+-	 if [ -f $$i ] ; then 	$(INSTALL)  -m 555 $$i $(DESTDIR)$(ff_prefix_dir)/lib; fi; done
++	 if [ -f $$i ] ; then 	$(INSTALL)  -m 555 $$i $(DESTDIR)$(libdir)/freefem++; fi; done
  
  
  
-diff -up freefem++-3.5/Makefile.am.r freefem++-3.5/Makefile.am
---- freefem++-3.5/Makefile.am.r	2009-07-10 09:36:21.000000000 +0200
-+++ freefem++-3.5/Makefile.am	2009-09-20 21:52:46.000000000 +0200
+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
 @@ -25,14 +25,14 @@ examples-bamg/test/dotest*.pl 0ldUserRea
  
  FF_MAC_PREFIX=FreeFem++v$(VERSION)$(ADD_PACKAGE_NAME)
@@ -154,7 +177,7 @@ diff -up freefem++-3.5/Makefile.am.r fre
  ./examples++-mpi/regtests.sh ./examples++-other/speedtest.sh  \
 -./download/fftw/Makefile ./download/fftw/Makefile.am \
 +./download/fftw/Makefile \
- examples++*/*.[ie]dp 
+ examples++*/*.[ie]dp  CheckAllEdp
  
  
 @@ -148,8 +148,8 @@ clean-local::
@@ -177,10 +200,9 @@ diff -up freefem++-3.5/Makefile.am.r fre
  	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.5/src/Carbon.r freefem++-3.5/src/Carbon
-diff -up freefem++-3.5/src/lglib/Makefile.am.r freefem++-3.5/src/lglib/Makefile.am
---- freefem++-3.5/src/lglib/Makefile.am.r	2006-04-10 22:51:52.000000000 +0200
-+++ freefem++-3.5/src/lglib/Makefile.am	2009-09-20 21:42:32.000000000 +0200
+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
 @@ -9,9 +9,9 @@ INCLUDES=-I../fflib -I../bamglib -I../Gr
  BUILT_SOURCES=lg.tab.hpp lg.tab.cpp
  


Index: freefem++.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freefem++/devel/freefem++.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- freefem++.spec	20 Sep 2009 22:04:49 -0000	1.24
+++ freefem++.spec	5 Dec 2009 23:53:21 -0000	1.25
@@ -1,19 +1,17 @@
-%define dotpl %{nil}
-%define dashpl %{nil}
+%define dotpl .1
+%define dashpl -1
 
 Summary: PDE solving tool
 Name: freefem++
-Version: 3.5
-Release: 2%{dotpl}%{?dist}
+Version: 3.6
+Release: 1%{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
 Source1: FreeFem++.1
 Patch0: %{name}-rpm.patch
-Patch1: %{name}-gcc44.patch
 Patch2: %{name}-name.patch
 Patch3: %{name}-tex.patch
-Patch4: %{name}-gcc44-link.patch
 License: LGPLv2+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
 BuildRequires:	arpack-devel
@@ -82,7 +80,6 @@ This package contains the MPI version of
 %prep
 %setup -q -n %{name}-%{version}%{dashpl}
 %patch0 -p1 -b .r
-%patch1 -p1 -b .gcc44
 %patch2 -p1
 %patch3 -p1 -b .t
 find . -type f -perm 755 \( -name "*.c*" -o -name "*.h*" -o -name "*.edp" \) | xargs chmod 644
@@ -105,10 +102,8 @@ autoreconf -vif
 	--with-blas="-L%{_libdir}/atlas -llapack -lf77blas -lcblas -latlas" \
 	--with-mpi=mpic++
 
-# work around gcc44 bug
-patch -p1 -b --suffix .gcc44-link < %{PATCH4}
-
 %{__make} %{?_smp_mflags}
+%{__make} -C examples++-load load_compile %{?_smp_mflags}
 %{__make} documentation
 
 %install
@@ -116,15 +111,17 @@ rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 install -d $RPM_BUILD_ROOT%{_mandir}/man1/
 install -pm644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1/
+install -d $RPM_BUILD_ROOT%{_datadir}/freefem++/edp
 pushd $RPM_BUILD_ROOT%{_datadir}/freefem++
 rm -r download
 rm BUGS COPYRIGHT HISTORY* INNOVATION INSTALL README TODO freefem++doc.pdf mode-mi-edp.zip
 popd
+rm $RPM_BUILD_ROOT%{_bindir}/ff-pkg-download
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%if 0
+%if 1
 %check
 . /etc/profile.d/modules.sh
 module load openmpi-%{_arch}
@@ -148,12 +145,16 @@ export CFLAGS="$CFLAGS $RPM_OPT_FLAGS"
 %{_libdir}/freefem++
 %{_sysconfdir}/freefem++.pref
 %dir %{_datadir}/freefem++
+%{_datadir}/freefem++/edp
+%{_datadir}/freefem++/idp
 
 %files devel
 %defattr(-,root,root,-)
 %{_bindir}/ff-c++
+%{_bindir}/ff-get-dep
 %{_includedir}/freefem++
 %{_datadir}/freefem++/examples*
+%{_datadir}/freefem++/CheckAllEdp
 
 %files glx
 %defattr(-,root,root,-)
@@ -164,6 +165,12 @@ export CFLAGS="$CFLAGS $RPM_OPT_FLAGS"
 %{_bindir}/FreeFem++-mpi
 
 %changelog
+* Sat Dec  5 2009 Dominik Mierzejewski <rpm at greysector.net> 3.6-1.1
+- update to 3.6-1
+- drop upstream'd/obsolete patches
+- move scripts to %%{_datadir}
+- reenable testsuite
+
 * Mon Sep 21 2009 Dominik Mierzejewski <rpm at greysector.net> 3.5-2
 - disable testsuite
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/freefem++/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	20 Sep 2009 20:57:17 -0000	1.8
+++ sources	5 Dec 2009 23:53:21 -0000	1.9
@@ -1,2 +1,2 @@
 f1accc292794bbafb66e963080f9d15b  FreeFem++.1
-3dea51f61d8f04ca1d2382c55589816d  freefem++-3.5.tar.gz
+664b3838eb977461e3b92ac37d32d699  freefem++-3.6-1.tar.gz


--- freefem++-gcc44-link.patch DELETED ---


--- freefem++-gcc44.patch DELETED ---

More information about the fedora-extras-commits mailing list