rpms/freefem++/devel freefem++-ld.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 freefem++-rpm.patch, 1.7, 1.8 freefem++.spec, 1.26, 1.27 sources, 1.10, 1.11
Dominik Mierzejewski
rathann at fedoraproject.org
Thu Feb 25 23:04:58 UTC 2010
Author: rathann
Update of /cvs/pkgs/rpms/freefem++/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26859
Modified Files:
.cvsignore freefem++-rpm.patch freefem++.spec sources
Added Files:
freefem++-ld.patch
Log Message:
* Sat Feb 20 2010 Dominik Mierzejewski <rpm at greysector.net> 3.8-1
- update to 3.8
- fix FTBFS (rhbz #564731)
freefem++-ld.patch:
configure.ac | 2 ++
src/medit/Makefile.am | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
--- NEW FILE freefem++-ld.patch ---
diff -up freefem++-3.8/configure.ac.ld freefem++-3.8/configure.ac
--- freefem++-3.8/configure.ac.ld 2010-02-25 22:41:45.000000000 +0100
+++ freefem++-3.8/configure.ac 2010-02-25 22:53:52.000000000 +0100
@@ -229,6 +229,8 @@ AC_LANG(C++)
# Some useful libraries
AC_CHECK_LIB(pthread,pthread_create,ff_pthread="-lpthread",ff_pthread="")
+AC_CHECK_LIB(m,tan,ff_math="-lm",ff_math="")
+AC_SUBST(LIBSMATH,$ff_math)
# Necessary absolute pathname for local directory when some libraries
# are used from several different locations (for instance locally in
diff -up freefem++-3.8/src/medit/Makefile.am.ld freefem++-3.8/src/medit/Makefile.am
--- freefem++-3.8/src/medit/Makefile.am.ld 2008-12-02 11:19:25.000000000 +0100
+++ freefem++-3.8/src/medit/Makefile.am 2010-02-25 22:54:06.000000000 +0100
@@ -17,7 +17,7 @@ chrono.h extern.h image.h mesh.h \
eigenv.h grafic.h medit.h sproto.h
-LDADD= ../libMesh/libMesh.a $(LIBSGLUT)
+LDADD= ../libMesh/libMesh.a $(LIBSGLUT) $(LIBSMATH)
INCLUDES=-I../libMesh
BUILT_SOURCES=compil.date
compil.date: $(ffmedit_SOURCES)
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/freefem++/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore 15 Jan 2010 20:37:44 -0000 1.10
+++ .cvsignore 25 Feb 2010 23:04:57 -0000 1.11
@@ -1,2 +1,2 @@
FreeFem++.1
-freefem++-3.7-1.tar.gz
+freefem++-3.8.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.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- freefem++-rpm.patch 15 Jan 2010 20:37:44 -0000 1.7
+++ freefem++-rpm.patch 25 Feb 2010 23:04:57 -0000 1.8
@@ -1,6 +1,6 @@
-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
+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
@@ -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.7-1/acoptim.m4.r fr
# MacOS X Darwin
if test -x /usr/bin/hostinfo
then
-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_
+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_
# date is only useful for config-version.h
test "$prefix" = NONE && prefix="$ac_default_prefix"
@@ -56,7 +56,7 @@ diff -up freefem++-3.7-1/configure.ac.r
AC_MSG_CHECKING(prefix dir freefem++ )
AC_MSG_RESULT($ff_prefix_dir)
-@@ -1185,7 +1185,7 @@ then
+@@ -1250,7 +1252,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.7-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.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
+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
@@ -31,8 +31,8 @@ freefem++.pref:
echo loadpath += \"./\" >>freefem++.pref
@@ -79,9 +79,9 @@ diff -up freefem++-3.7-1/examples++-3d/M
-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
+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
if [ -z "$MPICXX" ] ; then MPICXX='@MPICXX@' ; fi
@@ -114,9 +114,9 @@ diff -up freefem++-3.7-1/examples++-load
else
ff=`which freefem++.exe`;
ffinc=`dirname "$ff"`/examples++-load/include
-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
+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:
regtests.edp: regtests.m4 ../regtests.m4
m4 -DASSERT regtests.m4 > regtests.edp
@@ -137,7 +137,7 @@ diff -up freefem++-3.7-1/examples++-load
- $(INSTALL) -m 555 $(LIST_COMPILE) $(DESTDIR)$(ff_prefix_dir)/lib
- 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
+- echo includepath += \"$(ff_prefix_dir)/idp\" >>$(DESTDIR)$(ff_prefix_dir)/etc/freefem++.pref
+ $(mkinstalldirs) -m 755 $(DESTDIR)$(libdir)/freefem++
+ $(mkinstalldirs) -m 755 $(DESTDIR)$(includedir)/freefem++
+ $(mkinstalldirs) -m 755 $(DESTDIR)$(sysconfdir)
@@ -145,7 +145,7 @@ diff -up freefem++-3.7-1/examples++-load
+ $(INSTALL) -m 555 $(LIST_COMPILE) $(DESTDIR)$(libdir)/freefem++
+ echo loadpath += \"./\" >$(DESTDIR)$(sysconfdir)/freefem++.pref
+ echo loadpath += \"$(libdir)/freefem++\" >>$(DESTDIR)$(sysconfdir)/freefem++.pref
-+ echo includepath += \"$(datadir)/freefem++/edp\" >>$(DESTDIR)$(sysconfdir)/freefem++.pref
++ echo includepath += \"$(datadir)/freefem++/idp\" >>$(DESTDIR)$(sysconfdir)/freefem++.pref
$(INSTALL_SCRIPT) ff-c++ $(DESTDIR)${bindir}
$(INSTALL_SCRIPT) ff-pkg-download $(DESTDIR)${bindir}
$(INSTALL_SCRIPT) ff-get-dep $(DESTDIR)${bindir}
@@ -155,9 +155,9 @@ diff -up freefem++-3.7-1/examples++-load
-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
+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
@@ -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.7-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.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
+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
@@ -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.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- freefem++.spec 15 Jan 2010 20:37:44 -0000 1.26
+++ freefem++.spec 25 Feb 2010 23:04:57 -0000 1.27
@@ -1,9 +1,9 @@
-%define dotpl .1
-%define dashpl -1
+%define dotpl %{nil}
+%define dashpl %{nil}
Summary: PDE solving tool
Name: freefem++
-Version: 3.7
+Version: 3.8
Release: 1%{dotpl}%{?dist}
URL: http://www.freefem.org/ff++/index.htm
Group: Applications/Engineering
@@ -12,6 +12,7 @@ Source1: FreeFem++.1
Patch0: %{name}-rpm.patch
Patch2: %{name}-name.patch
Patch3: %{name}-tex.patch
+Patch4: %{name}-ld.patch
License: LGPLv2+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
BuildRequires: arpack-devel
@@ -82,6 +83,7 @@ This package contains the MPI version of
%patch0 -p1 -b .r
%patch2 -p1
%patch3 -p1 -b .t
+%patch4 -p1 -b .ld
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 && \
@@ -165,6 +167,10 @@ export CFLAGS="$CFLAGS $RPM_OPT_FLAGS"
%{_bindir}/FreeFem++-mpi
%changelog
+* Sat Feb 20 2010 Dominik Mierzejewski <rpm at greysector.net> 3.8-1
+- update to 3.8
+- fix FTBFS (rhbz #564731)
+
* 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: sources
===================================================================
RCS file: /cvs/pkgs/rpms/freefem++/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources 15 Jan 2010 20:37:44 -0000 1.10
+++ sources 25 Feb 2010 23:04:58 -0000 1.11
@@ -1,2 +1,2 @@
f1accc292794bbafb66e963080f9d15b FreeFem++.1
-76ecbb753c979c6e68d443a2f1365431 freefem++-3.7-1.tar.gz
+1d042f88c94ca3f8c5af637d9ef447d0 freefem++-3.8.tar.gz
More information about the scm-commits
mailing list