rpms/freefem++/devel freefem++-tex.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 freefem++-rpm.patch, 1.1, 1.2 freefem++.spec, 1.12, 1.13 sources, 1.4, 1.5 freefem++-gcc43.patch, 1.4, NONE
Dominik Mierzejewski
rathann at fedoraproject.org
Wed Dec 10 00:26:59 UTC 2008
Author: rathann
Update of /cvs/pkgs/rpms/freefem++/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25294
Modified Files:
.cvsignore freefem++-rpm.patch freefem++.spec sources
Added Files:
freefem++-tex.patch
Removed Files:
freefem++-gcc43.patch
Log Message:
* Fri Dec 05 2008 Dominik Mierzejewski <rpm at greysector.net> 3.0-1.1
- update to 3.0
- fixed build of pdf doc
- dropped obsolete patch
freefem++-tex.patch:
--- NEW FILE freefem++-tex.patch ---
diff -up freefem++-3.0-1/DOC/freefem++doc.tex.t freefem++-3.0-1/DOC/freefem++doc.tex
--- freefem++-3.0-1/DOC/freefem++doc.tex.t 2008-12-04 17:49:24.000000000 +0100
+++ freefem++-3.0-1/DOC/freefem++doc.tex 2008-12-08 18:32:39.000000000 +0100
@@ -167,7 +167,7 @@ visualization.}
\includegraphics[height=1.7cm]{LogoLJLL} \hss
\includegraphics[height=1.7cm]{LogoUPMC} \hss
%\includegraphics[height=1.7cm]{LogoCNRS} \hss
-\includegraphics[height=1.7cm]{logo-finance-par-anr} \hss
+%\includegraphics[height=1.7cm]{logo-finance-par-anr} \hss
}
\bigskip
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/freefem++/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 27 Sep 2008 13:12:21 -0000 1.4
+++ .cvsignore 10 Dec 2008 00:26:28 -0000 1.5
@@ -1,2 +1,2 @@
FreeFem++.1
-freefem++-2.24-2.tar.gz
+freefem++-3.0-1.tar.gz
freefem++-rpm.patch:
Index: freefem++-rpm.patch
===================================================================
RCS file: /cvs/pkgs/rpms/freefem++/devel/freefem++-rpm.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- freefem++-rpm.patch 20 Feb 2008 18:19:46 -0000 1.1
+++ freefem++-rpm.patch 10 Dec 2008 00:26:28 -0000 1.2
@@ -1,7 +1,81 @@
-diff -up freefem++-2.22/src/Carbon.r freefem++-2.22/src/Carbon
-diff -up freefem++-2.22/src/lglib/Makefile.am.r freefem++-2.22/src/lglib/Makefile.am
---- freefem++-2.22/src/lglib/Makefile.am.r 2006-04-10 22:51:52.000000000 +0200
-+++ freefem++-2.22/src/lglib/Makefile.am 2008-01-02 00:37:59.000000000 +0100
+diff -up freefem++-3.0-1/configure.ac.r freefem++-3.0-1/configure.ac
+--- freefem++-3.0-1/configure.ac.r 2008-11-25 23:03:40.000000000 +0100
++++ freefem++-3.0-1/configure.ac 2008-12-08 18:33:31.000000000 +0100
+@@ -340,10 +340,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)
+@@ -1071,7 +1068,7 @@ then
+ AC_CHECK_LIB(umfpack,umf_i_malloc,
+ ff_umfpack_libs=" -lumfpack $ff_umfpack_libs"
+ ff_umfpack_ok=yes,,$ff_umfpack_libs)
+- if test "$ff_umfpack_ok" != yes -o "$ff_umfpack_header" = yes ; then
++ if test "$ff_umfpack_ok" != yes -o "$ff_umfpack_header" != yes ; then
+ AC_MSG_WARN([ Sorry we find UMFPACK lib but not the include umfpack.h file])
+ fi
+ fi
+diff -up freefem++-3.0-1/configure.r freefem++-3.0-1/configure
+--- freefem++-3.0-1/configure.r 2008-11-29 18:59:30.000000000 +0100
++++ freefem++-3.0-1/configure 2008-12-08 18:33:31.000000000 +0100
+@@ -7679,10 +7679,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
+
+ echo "$as_me:$LINENO: result: $ff_x11" >&5
+@@ -13718,7 +13715,7 @@ if test $ac_cv_lib_umfpack_umf_i_malloc
+ ff_umfpack_ok=yes
+ fi
+
+- if test "$ff_umfpack_ok" != yes -o "$ff_umfpack_header" = yes ; then
++ if test "$ff_umfpack_ok" != yes -o "$ff_umfpack_header" != yes ; then
+ { echo "$as_me:$LINENO: WARNING: Sorry we find UMFPACK lib but not the include umfpack.h file" >&5
+ echo "$as_me: WARNING: Sorry we find UMFPACK lib but not the include umfpack.h file" >&2;}
+ fi
+diff -up freefem++-3.0-1/examples++-load/Makefile.in.r freefem++-3.0-1/examples++-load/Makefile.in
+--- freefem++-3.0-1/examples++-load/Makefile.in.r 2008-12-04 23:31:41.000000000 +0100
++++ freefem++-3.0-1/examples++-load/Makefile.in 2008-12-08 20:01:40.000000000 +0100
+@@ -574,15 +574,15 @@ ff-c++:load.link
+ chmod a+x ff-c++
+
+ install-exec-local:: load_compile
+- mkdir -p $(ff_prefix_dir)/lib
+- mkdir -p $(ff_prefix_dir)/include
+- mkdir -p $(ff_prefix_dir)/etc
+- mkdir -p $(ff_prefix_dir)/edp
+- $(INSTALL_DATA) include/* $(ff_prefix_dir)/include
+- $(INSTALL) -m 555 $(LIST_COMPILE) $(ff_prefix_dir)/lib
+- echo loadpath += \"$(ff_prefix_dir)/lib\" >$(ff_prefix_dir)/etc/freefem++.pref
+- echo includepath += \"$(ff_prefix_dir)/edp\" >>$(ff_prefix_dir)/etc/freefem++.pref
+- $(INSTALL_SCRIPT) ff-c++ ${bindir}
++ mkdir -p $(DESTDIR)$(libdir)
++ mkdir -p $(DESTDIR)$(includedir)
++ mkdir -p $(DESTDIR)$(sysconfdir)
++ mkdir -p $(DESTDIR)$(datadir)/freefem++/edp
++ $(INSTALL_DATA) include/* $(DESTDIR)$(includedir)
++ $(INSTALL) -m 555 $(LIST_COMPILE) $(DESTDIR)$(libdir)
++ echo loadpath += \"$(libdir)\" >$(DESTDIR)$(sysconfdir)/freefem++.pref
++ echo includepath += \"$(datadir)/freefem++/edp\" >>$(DESTDIR)$(sysconfdir)/freefem++.pref
++ $(INSTALL_SCRIPT) ff-c++ $(DESTDIR)$(bindir)
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+diff -up freefem++-3.0-1/src/Carbon.r freefem++-3.0-1/src/Carbon
+diff -up freefem++-3.0-1/src/lglib/Makefile.am.r freefem++-3.0-1/src/lglib/Makefile.am
+--- freefem++-3.0-1/src/lglib/Makefile.am.r 2006-04-10 22:51:52.000000000 +0200
++++ freefem++-3.0-1/src/lglib/Makefile.am 2008-12-08 18:33:31.000000000 +0100
@@ -9,9 +9,9 @@ INCLUDES=-I../fflib -I../bamglib -I../Gr
BUILT_SOURCES=lg.tab.hpp lg.tab.cpp
@@ -14,44 +88,18 @@
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
-diff -up freefem++-2.22/Makefile.am.r freefem++-2.22/Makefile.am
---- freefem++-2.22/Makefile.am.r 2007-11-18 13:20:20.000000000 +0100
-+++ freefem++-2.22/Makefile.am 2008-01-02 00:37:59.000000000 +0100
-@@ -7,7 +7,7 @@
- # $Id$
-
- SUBDIRS=download src DOC examples++-tutorial examples++ \
-- examples++-eigen examples++-load examples++-mpi \
-+ examples++-eigen examples++-mpi \
- examples++-bug examples++-chapt3 examples++-other
-
- EXTRA_DIST=regtests.sh config-wrapper.h \
-diff -up freefem++-2.22/configure.ac.r freefem++-2.22/configure.ac
---- freefem++-2.22/configure.ac.r 2007-12-18 16:43:52.000000000 +0100
-+++ freefem++-2.22/configure.ac 2008-01-02 00:39:42.000000000 +0100
-@@ -307,10 +307,7 @@ ff_x11=no
+diff -up freefem++-3.0-1/src/lglib/Makefile.in.r freefem++-3.0-1/src/lglib/Makefile.in
+--- freefem++-3.0-1/src/lglib/Makefile.in.r 2008-11-29 19:02:26.000000000 +0100
++++ freefem++-3.0-1/src/lglib/Makefile.in 2008-12-08 18:33:31.000000000 +0100
+@@ -483,9 +483,9 @@ uninstall-am: uninstall-info-am
- 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)
-diff -up freefem++-2.22/examples++-load/load.link.r freefem++-2.22/examples++-load/load.link
---- freefem++-2.22/examples++-load/load.link.r 2007-11-13 16:40:13.000000000 +0100
-+++ freefem++-2.22/examples++-load/load.link 2008-01-02 00:37:59.000000000 +0100
-@@ -128,9 +128,9 @@ if [ -n "$files$fileso" ] ; then
- exit 1;
- fi
- if [ "$files" ] ;then
-- echo $CXX -c $FLAGS $INC $PIC $files
-+ echo $CXX -c $FLAGS $CXXFLAGS $INC $PIC $files
- if [ $do = yes ] ; then
-- $CXX -c $INC $FLAGS $PIC $files
-+ $CXX -c $INC $FLAGS $CXXFLAGS $PIC $files
- ret=$?; if [ $ret -ne 0 ] ; then exit $ret ;fi
- fi
- fi
+ lg.tab.hpp lg.tab.cpp: lg.y
+- -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
+ libfreefem++.dylib: lg.tab.o ../fflib/libff.a
+ g++ -bundle lg.tab.o ../fflib/libff.a $(UMFPACKLIB) $(ARPACKLIB) $(BLASLIB) $(LIBS) -o libfreefem++.dylib
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
Index: freefem++.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freefem++/devel/freefem++.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- freefem++.spec 1 Dec 2008 21:33:33 -0000 1.12
+++ freefem++.spec 10 Dec 2008 00:26:28 -0000 1.13
@@ -1,22 +1,21 @@
-%define dotpl .2
-%define dashpl -2
+%define dotpl .1
+%define dashpl -1
Summary: PDE solving tool
Name: freefem++
-Version: 2.24
-Release: 5%{dotpl}%{?dist}
+Version: 3.0
+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}-gcc43.patch
Patch2: %{name}-name.patch
+Patch3: %{name}-tex.patch
License: LGPLv2+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
BuildRequires: arpack-devel
BuildRequires: atlas-devel
-BuildRequires: automake
BuildRequires: bison
BuildRequires: environment-modules
BuildRequires: fftw-devel
@@ -29,7 +28,8 @@
BuildRequires: libXpm-devel
BuildRequires: libXxf86vm-devel
BuildRequires: lam-devel
-BuildRequires: ufsparse-devel
+BuildRequires: suitesparse-devel
+#BuildRequires: superlu-devel
BuildRequires: %{_bindir}/dvips
BuildRequires: %{_bindir}/epstopdf
BuildRequires: %{_bindir}/pdflatex
@@ -67,10 +67,9 @@
%prep
%setup -q -n %{name}-%{version}%{dashpl}
%patch0 -p1 -b .r
-%patch1 -p1 -b .gcc43
%patch2 -p1
-chmod -x src/fflib/mt19937ar.cpp
-chmod -x src/lglib/mymain.cpp
+%patch3 -p1 -b .t
+find . -type f -perm 755 \( -name "*.c*" -o -name "*.h*" \) | 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 && \
@@ -80,8 +79,9 @@
%build
. /etc/profile.d/modules.sh
module load %{_libdir}/lam/lam.module
-autoreconf
%configure \
+ --disable-download \
+ --disable-optim \
--with-x \
--with-blas="-L%{_libdir}/atlas -llapack -lf77blas -lcblas -latlas" \
--with-mpi=mpic++
@@ -131,6 +131,11 @@
%{_bindir}/FreeFem++-mpi
%changelog
+* Fri Dec 05 2008 Dominik Mierzejewski <rpm at greysector.net> 3.0-1.1
+- update to 3.0
+- fixed build of pdf doc
+- dropped obsolete patch
+
* Wed Oct 01 2008 Dominik Mierzejewski <rpm at greysector.net> 2.24-5.2
- fix encoding of some doc files
- fix author's name in COPYRIGHT
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/freefem++/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 27 Sep 2008 13:12:21 -0000 1.4
+++ sources 10 Dec 2008 00:26:28 -0000 1.5
@@ -1,2 +1,2 @@
f1accc292794bbafb66e963080f9d15b FreeFem++.1
-1b83214422a4d81717a8ce6e0be7ecca freefem++-2.24-2.tar.gz
+f1ce589dc0d8cc500aec6537bd2d20ca freefem++-3.0-1.tar.gz
--- freefem++-gcc43.patch DELETED ---
More information about the fedora-extras-commits
mailing list