rpms/freefem++/devel .cvsignore, 1.7, 1.8 freefem++-gcc44-link.patch, 1.1, 1.2 freefem++-gcc44.patch, 1.1, 1.2 freefem++-rpm.patch, 1.4, 1.5 freefem++.spec, 1.21, 1.22 sources, 1.7, 1.8
Dominik Mierzejewski
rathann at fedoraproject.org
Sun Sep 20 20:57:18 UTC 2009
Author: rathann
Update of /cvs/pkgs/rpms/freefem++/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24159
Modified Files:
.cvsignore freefem++-gcc44-link.patch freefem++-gcc44.patch
freefem++-rpm.patch freefem++.spec sources
Log Message:
* Sun Sep 20 2009 Dominik Mierzejewski <rpm at greysector.net> 3.5-1
- update to 3.5
- adjust environment modules setup for current version
- use openmpi instead of lam (regression tests pass)
- remove irrelevant READMEs and old changelogs from docs
- add examples to -devel subpackage
- fix some minor build problems
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/freefem++/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore 3 Mar 2009 01:55:48 -0000 1.7
+++ .cvsignore 20 Sep 2009 20:57:16 -0000 1.8
@@ -1,2 +1,2 @@
FreeFem++.1
-freefem++-3.0-5.tar.gz
+freefem++-3.5.tar.gz
freefem++-gcc44-link.patch:
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: freefem++-gcc44-link.patch
===================================================================
RCS file: /cvs/pkgs/rpms/freefem++/devel/freefem++-gcc44-link.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- freefem++-gcc44-link.patch 3 Mar 2009 01:55:48 -0000 1.1
+++ freefem++-gcc44-link.patch 20 Sep 2009 20:57:17 -0000 1.2
@@ -1,12 +1,12 @@
-diff -up freefem++-3.0-5/src/fflib/Makefile.link freefem++-3.0-5/src/fflib/Makefile
---- freefem++-3.0-5/src/fflib/Makefile.link 2009-03-03 02:39:02.000000000 +0100
-+++ freefem++-3.0-5/src/fflib/Makefile 2009-03-03 02:39:52.000000000 +0100
-@@ -464,7 +464,7 @@ libmesh5.obj: ../femlib/libmesh5.c
+diff -up freefem++-3.5/src/fflib/Makefile.gcc44-link freefem++-3.5/src/fflib/Makefile
+--- freefem++-3.5/src/fflib/Makefile.gcc44-link 2009-09-20 19:42:36.000000000 +0200
++++ freefem++-3.5/src/fflib/Makefile 2009-09-20 19:47:02.000000000 +0200
+@@ -472,7 +472,7 @@ libmesh5.obj: ../femlib/libmesh5.c
# $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
Drawing.o: ../femlib/Drawing.cpp
- $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Drawing.o -MD -MP -MF $(DEPDIR)/Drawing.Tpo -c -o Drawing.o `test -f '../femlib/Drawing.cpp' || echo '$(srcdir)/'`../femlib/Drawing.cpp
+ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -O1 -MT Drawing.o -MD -MP -MF $(DEPDIR)/Drawing.Tpo -c -o Drawing.o `test -f '../femlib/Drawing.cpp' || echo '$(srcdir)/'`../femlib/Drawing.cpp
- mv -f $(DEPDIR)/Drawing.Tpo $(DEPDIR)/Drawing.Po
+ $(am__mv) $(DEPDIR)/Drawing.Tpo $(DEPDIR)/Drawing.Po
# source='../femlib/Drawing.cpp' object='Drawing.o' libtool=no \
# DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
freefem++-gcc44.patch:
ppm2rnm.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
Index: freefem++-gcc44.patch
===================================================================
RCS file: /cvs/pkgs/rpms/freefem++/devel/freefem++-gcc44.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- freefem++-gcc44.patch 3 Mar 2009 01:55:48 -0000 1.1
+++ freefem++-gcc44.patch 20 Sep 2009 20:57:17 -0000 1.2
@@ -1,12 +1,13 @@
-diff -up freefem++-3.0-5/src/fflib/environment.cpp.gcc44 freefem++-3.0-5/src/fflib/environment.cpp
---- freefem++-3.0-5/src/fflib/environment.cpp.gcc44 2008-12-12 15:17:22.000000000 +0100
-+++ freefem++-3.0-5/src/fflib/environment.cpp 2009-02-27 00:55:12.000000000 +0100
-@@ -57,7 +57,7 @@ const char BACKSLACH='\\';
-
- string DirName(const char * f)
- {
-- char *c= strrchr(f,dirsep);
-+ const char *c= strrchr(f,dirsep);
- if(!c) return string("");
- else return string(f,strlen(f)-strlen(c));
- }
+diff -up freefem++-3.5/examples++-load/ppm2rnm.cpp.gcc44 freefem++-3.5/examples++-load/ppm2rnm.cpp
+--- freefem++-3.5/examples++-load/ppm2rnm.cpp.gcc44 2009-05-07 18:57:31.000000000 +0200
++++ freefem++-3.5/examples++-load/ppm2rnm.cpp 2009-09-20 20:01:58.000000000 +0200
+@@ -29,7 +29,8 @@ extern "C" {
+ pPPMimage result;
+ FILE *fp;
+ int i,k,typimg,ret,r,g,b,s,maxval,bitsize;
+- char *ptr,c,buff[1024],data[256];
++ char c,buff[1024],data[256];
++ const char*ptr;
+
+ /* search for image */
+ fprintf(stdout," Loading image: %s\n",imgname);
freefem++-rpm.patch:
Makefile.am | 10 +++++-----
acoptim.m4 | 22 +++++++++++-----------
configure.ac | 4 ++--
examples++-3d/Makefile.am | 4 ++--
examples++-load/Makefile.am | 18 +++++++++---------
examples++-load/load.link.in | 12 ++++++------
src/lglib/Makefile.am | 4 ++--
7 files changed, 37 insertions(+), 37 deletions(-)
Index: freefem++-rpm.patch
===================================================================
RCS file: /cvs/pkgs/rpms/freefem++/devel/freefem++-rpm.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- freefem++-rpm.patch 3 Mar 2009 01:55:48 -0000 1.4
+++ freefem++-rpm.patch 20 Sep 2009 20:57:17 -0000 1.5
@@ -1,7 +1,7 @@
-diff -up freefem++-3.0-5/acoptim.m4.r freefem++-3.0-5/acoptim.m4
---- freefem++-3.0-5/acoptim.m4.r 2006-01-27 16:51:16.000000000 +0100
-+++ freefem++-3.0-5/acoptim.m4 2009-03-03 01:29:12.000000000 +0100
-@@ -16,14 +16,6 @@ AC_MSG_CHECKING(whether to generate debu
+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
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.0-5/acoptim.m4.r fr
if test "$enable_debug" = yes;
then
AC_MSG_RESULT(yes)
-@@ -32,9 +24,9 @@ else
+@@ -46,9 +38,9 @@ else
# No debugging information in optimized code
@@ -29,7 +29,7 @@ diff -up freefem++-3.0-5/acoptim.m4.r fr
fi
# Hardware-independant optimization
-@@ -68,6 +60,14 @@ if test "$enable_debug" != yes \
+@@ -82,6 +74,14 @@ if test "$enable_debug" != yes \
-a "$enable_generic" != yes
then
@@ -44,30 +44,19 @@ diff -up freefem++-3.0-5/acoptim.m4.r fr
# MacOS X Darwin
if test -x /usr/bin/hostinfo
then
-diff -up freefem++-3.0-5/configure.ac.r freefem++-3.0-5/configure.ac
---- freefem++-3.0-5/configure.ac.r 2009-01-20 20:56:56.000000000 +0100
-+++ freefem++-3.0-5/configure.ac 2009-03-03 01:31:15.000000000 +0100
+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_
# date is only useful for config-version.h
test "$prefix" = NONE && prefix="$ac_default_prefix"
-ff_prefix_dir="${prefix}/lib/ff++/$VERSION"
-+ff_prefix_dir="${libdir}/freefem++"
++ff_prefix_dir="${libdir}/freefem++"
AC_MSG_CHECKING(prefix dir freefem++ )
AC_MSG_RESULT($ff_prefix_dir)
-@@ -344,10 +344,7 @@ ff_x11=no
-
- if test "$ff_mingw" = no && test "$with_x" != "no";
- then
-- if test -d /usr/X11R6
-- then
- ff_x11=yes
-- fi
- fi
-
- AC_MSG_RESULT($ff_x11)
-@@ -1082,7 +1079,7 @@ then
+@@ -1093,7 +1093,7 @@ then
AC_CHECK_LIB(umfpack,umf_i_malloc,
ff_umfpack_libs=" -lumfpack $ff_umfpack_libs"
ff_umfpack_ok=yes,,$ff_umfpack_libs)
@@ -76,60 +65,122 @@ diff -up freefem++-3.0-5/configure.ac.r
AC_MSG_WARN([ Sorry we find UMFPACK lib but not the include umfpack.h file])
fi
fi
-diff -up freefem++-3.0-5/examples++-load/load.link.in.r freefem++-3.0-5/examples++-load/load.link.in
---- freefem++-3.0-5/examples++-load/load.link.in.r 2009-01-20 20:56:57.000000000 +0100
-+++ freefem++-3.0-5/examples++-load/load.link.in 2009-03-03 01:04:15.000000000 +0100
-@@ -5,9 +5,9 @@ FFVERSION='@VERSION@'
- FFCXXFLAGS='@CXXFLAGS@ @CPPFLAGS@'
+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
+@@ -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++
+
+
+ # 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=
if [ -z "$CXX" ] ; then CXX='@CXX@' ; fi
+ if [ -z "$F77" ] ; then F77='@F77@' ; fi
-if [ "$CXX" = '@'CXX'@' ] ; then CXX=""; 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 [ "$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@"
-@@ -15,8 +15,8 @@ if [ -z "$INCFF" ] ; then
+@@ -17,8 +17,8 @@ if [ -z "$INCFF" ] ; then
INCFF="-Iinclude"
elif [ -f "FFAPPLI_INC/ff++.hpp" ] ; then
INCFF="-IFFAPPLI_INC"
- elif [ -f '@ff_prefix_dir@/include/ff++.hpp' ] ; then
- INCFF='-I at ff_prefix_dir@/include'
-+ elif [ -f '@includedir@/freefem++/ff++.hpp' ] ; then
-+ INCFF='-I at includedir@/freefem++'
++ elif [ -f '@includedir@/freefem++/ff++.hpp' ] ; then
++ INCFF='-I at includedir@/freefem++'
else
- echo " erreur PB include freefem++ directory " ;
- exit 1;
-diff -up freefem++-3.0-5/examples++-load/Makefile.am.r freefem++-3.0-5/examples++-load/Makefile.am
---- freefem++-3.0-5/examples++-load/Makefile.am.r 2009-01-06 20:30:40.000000000 +0100
-+++ freefem++-3.0-5/examples++-load/Makefile.am 2009-03-03 01:04:15.000000000 +0100
-@@ -132,13 +132,13 @@ load.link:load.link.in Makefile
- chmod a+x load.link
-
+ 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
+ freefem++.pref:
+ echo loadpath = \"./\" >freefem++.pref
install-exec-local:: load_compile
- $(mkinstalldirs) -m 755 $(DESTDIR)$(ff_prefix_dir)/lib
- $(mkinstalldirs) -m 755 $(DESTDIR)$(ff_prefix_dir)/include
- $(mkinstalldirs) -m 755 $(DESTDIR)$(ff_prefix_dir)/etc
- $(INSTALL_DATA) include/* $(DESTDIR)$(ff_prefix_dir)/include
- $(INSTALL) -m 555 $(LIST_COMPILE) $(DESTDIR)$(ff_prefix_dir)/lib
-- echo loadpath += \"$(ff_prefix_dir)/lib\" >$(DESTDIR)$(ff_prefix_dir)/etc/freefem++.pref
+- echo loadpath += \"./\" >$(DESTDIR)$(ff_prefix_dir)/etc/freefem++.pref
+- echo loadpath += \"$(ff_prefix_dir)/lib\" >>$(DESTDIR)$(ff_prefix_dir)/etc/freefem++.pref
- echo includepath += \"$(ff_prefix_dir)/edp\" >>$(DESTDIR)$(ff_prefix_dir)/etc/freefem++.pref
+ $(mkinstalldirs) -m 755 $(DESTDIR)$(libdir)/freefem++
+ $(mkinstalldirs) -m 755 $(DESTDIR)$(includedir)/freefem++
+ $(mkinstalldirs) -m 755 $(DESTDIR)$(sysconfdir)
+ $(INSTALL_DATA) include/* $(DESTDIR)$(includedir)/freefem++
-+ $(INSTALL) -m 555 $(LIST_COMPILE) $(DESTDIR)$(libdir)/freefem++
-+ echo loadpath += \"$(ff_prefix_dir)/lib\" >$(DESTDIR)$(sysconfdir)/freefem++.pref
++ $(INSTALL) -m 755 $(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
$(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++
+
-diff -up freefem++-3.0-5/src/lglib/Makefile.am.r freefem++-3.0-5/src/lglib/Makefile.am
---- freefem++-3.0-5/src/lglib/Makefile.am.r 2006-04-10 22:51:52.000000000 +0200
-+++ freefem++-3.0-5/src/lglib/Makefile.am 2009-03-03 01:04:15.000000000 +0100
+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
+@@ -25,14 +25,14 @@ examples-bamg/test/dotest*.pl 0ldUserRea
+
+ FF_MAC_PREFIX=FreeFem++v$(VERSION)$(ADD_PACKAGE_NAME)
+
+-FF_EXAMPLES_FILES = COPYRIGHT HISTORY HISTORY_BEFORE_2005 README BUGS TODO INSTALL INSTALL-MacOSX INNOVATION \
++FF_EXAMPLES_FILES = COPYRIGHT HISTORY HISTORY_BEFORE_2005 README BUGS TODO INSTALL INNOVATION \
+ mode-mi-edp.zip \
+ examples++-tutorial/aile.msh examples++-tutorial/xyf \
+ examples++-3d/dodecaedre01.mesh \
+ examples++-3d/lac-leman-v4.msh \
+ examples++-load/load.link \
+ ./examples++-mpi/regtests.sh ./examples++-other/speedtest.sh \
+-./download/fftw/Makefile ./download/fftw/Makefile.am \
++./download/fftw/Makefile \
+ examples++*/*.[ie]dp
+
+
+@@ -148,8 +148,8 @@ clean-local::
+ # Native MacOS packaging
+ # ----------------------
+ install-exec-local::
+- $(mkinstalldirs) -m 755 $(DESTDIR)$(pkgdatadir)/$(VERSION)
+- tar cvf - $(FF_EXAMPLES_FILES)| (cd $(DESTDIR)$(pkgdatadir)/$(VERSION); tar xvf -)
++ $(mkinstalldirs) -m 755 $(DESTDIR)$(pkgdatadir)
++ tar cvf - $(FF_EXAMPLES_FILES)| (cd $(DESTDIR)$(pkgdatadir); tar xvf -)
+
+ ListFiles-natives: .FORCE
+ # echo COPYRIGHT HISTORY HISTORY_BEFORE_2005 README BUGS TODO INSTALL INSTALL-MacOSX INNOVATION >$@
+@@ -159,7 +159,7 @@ ListFiles-natives: .FORCE
+ # echo examples++-3d/dodecaedre01.mesh >> $@
+ # echo examples++-load/load.link >> $@
+ # echo ./examples++-mpi/regtests.sh ./examples++-other/speedtest.sh >> $@
+- echo ./download/fftw/Makefile ./download/fftw/Makefile.am >>$@
++ echo ./download/fftw/Makefile ./download/fftw/Makefile >>$@
+ 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
@@ -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.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- freefem++.spec 24 Jul 2009 23:08:46 -0000 1.21
+++ freefem++.spec 20 Sep 2009 20:57:17 -0000 1.22
@@ -1,10 +1,10 @@
-%define dotpl .5
-%define dashpl -5
+%define dotpl %{nil}
+%define dashpl %{nil}
Summary: PDE solving tool
Name: freefem++
-Version: 3.0
-Release: 6%{dotpl}%{?dist}
+Version: 3.5
+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
@@ -26,13 +26,13 @@ BuildRequires: fltk-devel
BuildRequires: gcc-gfortran
BuildRequires: glut-devel
BuildRequires: ImageMagick
-BuildRequires: lam-devel
BuildRequires: lapack-devel
BuildRequires: libGLU-devel
BuildRequires: libtool
BuildRequires: libXpm-devel
BuildRequires: libXt-devel
BuildRequires: libXxf86vm-devel
+BuildRequires: openmpi-devel >= 1.3.3-2
BuildRequires: suitesparse-devel
#BuildRequires: superlu-devel
%{?_with_tetgen:BuildRequires: tetgen-devel}
@@ -85,7 +85,7 @@ This package contains the MPI version of
%patch1 -p1 -b .gcc44
%patch2 -p1
%patch3 -p1 -b .t
-find . -type f -perm 755 \( -name "*.c*" -o -name "*.h*" \) | xargs chmod 644
+find . -type f -perm 755 \( -name "*.c*" -o -name "*.h*" -o -name "*.edp" \) | xargs chmod 644
for file in AUTHORS ChangeLog COPYRIGHT COPYING HISTORY ; do
iconv -f iso8859-1 -t utf8 -o $file.utf8 $file && \
touch -r $file $file.utf8 && \
@@ -94,7 +94,7 @@ done
%build
. /etc/profile.d/modules.sh
-module load %{_libdir}/lam/lam.module
+module load openmpi-%{_arch}
export CFLAGS="$CFLAGS $RPM_OPT_FLAGS"
autoreconf -vif
%configure \
@@ -116,22 +116,23 @@ 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/
+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
%clean
rm -rf $RPM_BUILD_ROOT
-%if 0
%check
. /etc/profile.d/modules.sh
-module load %{_libdir}/lam/lam.module
+module load openmpi-%{_arch}
+export CFLAGS="$CFLAGS $RPM_OPT_FLAGS"
%{__make} check
-pkill lamd
-%endif
%files
%defattr(-,root,root,-)
-%doc AUTHORS BUGS COPYING COPYRIGHT ChangeLog HISTORY HISTORY_BEFORE_2005
-%doc INNOVATION README* TODO
+%doc AUTHORS BUGS COPYING COPYRIGHT HISTORY INNOVATION README TODO
%doc DOC/freefem++doc.pdf
%{_mandir}/man1/*
%{_bindir}/FreeFem++
@@ -144,11 +145,13 @@ pkill lamd
%{_bindir}/ffmedit
%{_libdir}/freefem++
%{_sysconfdir}/freefem++.pref
+%dir %{_datadir}/freefem++
%files devel
%defattr(-,root,root,-)
%{_bindir}/ff-c++
%{_includedir}/freefem++
+%{_datadir}/freefem++/examples*
%files glx
%defattr(-,root,root,-)
@@ -159,6 +162,14 @@ pkill lamd
%{_bindir}/FreeFem++-mpi
%changelog
+* Sun Sep 20 2009 Dominik Mierzejewski <rpm at greysector.net> 3.5-1
+- update to 3.5
+- adjust environment modules setup for current version
+- use openmpi instead of lam (regression tests pass)
+- remove irrelevant READMEs and old changelogs from docs
+- add examples to -devel subpackage
+- fix some minor build problems
+
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0-6.5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/freefem++/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources 3 Mar 2009 01:55:48 -0000 1.7
+++ sources 20 Sep 2009 20:57:17 -0000 1.8
@@ -1,2 +1,2 @@
f1accc292794bbafb66e963080f9d15b FreeFem++.1
-fcdaff128c57fb95427954cbe2f52a61 freefem++-3.0-5.tar.gz
+3dea51f61d8f04ca1d2382c55589816d freefem++-3.5.tar.gz
More information about the fedora-extras-commits
mailing list