rpms/freefem++/devel freefem++-gcc43.patch, 1.5, 1.6 .cvsignore, 1.5, 1.6 freefem++-rpm.patch, 1.2, 1.3 freefem++.spec, 1.13, 1.14 sources, 1.5, 1.6
Dominik Mierzejewski
rathann at fedoraproject.org
Thu Dec 11 00:12:59 UTC 2008
Author: rathann
Update of /cvs/pkgs/rpms/freefem++/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12637
Modified Files:
.cvsignore freefem++-rpm.patch freefem++.spec sources
Added Files:
freefem++-gcc43.patch
Log Message:
* Wed Dec 10 2008 Dominik Mierzejewski <rpm at greysector.net> 3.0-2.2
- update to 3.0-2
- fix compilation
- fix installation paths and path substitution in ff-c++
- preserve timestamps in make install
- add missing BR
- disable regression tests for now
freefem++-gcc43.patch:
Index: freefem++-gcc43.patch
===================================================================
RCS file: freefem++-gcc43.patch
diff -N freefem++-gcc43.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ freefem++-gcc43.patch 11 Dec 2008 00:12:58 -0000 1.6
@@ -0,0 +1,11 @@
+diff -up freefem++-3.0-2/src/Graphics/ffthreads.cpp.gcc43 freefem++-3.0-2/src/Graphics/ffthreads.cpp
+--- freefem++-3.0-2/src/Graphics/ffthreads.cpp.gcc43 2008-11-23 10:07:31.000000000 +0100
++++ freefem++-3.0-2/src/Graphics/ffthreads.cpp 2008-12-10 12:09:29.000000000 +0100
+@@ -26,6 +26,7 @@
+ #include <string>
+ #include <cerrno>
+ #include <cstring>
++#include <cstdlib>
+ #include <iostream>
+ using namespace std;
+
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/freefem++/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 10 Dec 2008 00:26:28 -0000 1.5
+++ .cvsignore 11 Dec 2008 00:12:58 -0000 1.6
@@ -1,2 +1,2 @@
FreeFem++.1
-freefem++-3.0-1.tar.gz
+freefem++-3.0-2.tar.gz
freefem++-rpm.patch:
Index: freefem++-rpm.patch
===================================================================
RCS file: /cvs/pkgs/rpms/freefem++/devel/freefem++-rpm.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- freefem++-rpm.patch 10 Dec 2008 00:26:28 -0000 1.2
+++ freefem++-rpm.patch 11 Dec 2008 00:12:58 -0000 1.3
@@ -1,7 +1,7 @@
-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
+diff -up freefem++-3.0-2/configure.ac.r freefem++-3.0-2/configure.ac
+--- freefem++-3.0-2/configure.ac.r 2008-12-09 23:56:07.000000000 +0100
++++ freefem++-3.0-2/configure.ac 2008-12-10 23:27:23.000000000 +0100
+@@ -344,10 +344,7 @@ ff_x11=no
if test "$ff_mingw" = no && test "$with_x" != "no";
then
@@ -12,19 +12,19 @@
fi
AC_MSG_RESULT($ff_x11)
-@@ -1071,7 +1068,7 @@ then
+@@ -1075,7 +1072,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
+- if test "$ff_umfpack_ok" != yes -o "$ff_umfpack_header" != yes ; then
++ if test "$ff_umfpack_ok" = yes -a "$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
+diff -up freefem++-3.0-2/configure.r freefem++-3.0-2/configure
+--- freefem++-3.0-2/configure.r 2008-12-09 23:16:21.000000000 +0100
++++ freefem++-3.0-2/configure 2008-12-10 23:27:23.000000000 +0100
+@@ -7689,10 +7689,7 @@ ff_x11=no
if test "$ff_mingw" = no && test "$with_x" != "no";
then
@@ -35,19 +35,46 @@
fi
echo "$as_me:$LINENO: result: $ff_x11" >&5
-@@ -13718,7 +13715,7 @@ if test $ac_cv_lib_umfpack_umf_i_malloc
+@@ -13728,7 +13725,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
+- if test "$ff_umfpack_ok" != yes -o "$ff_umfpack_header" != yes ; then
++ if test "$ff_umfpack_ok" = yes -a "$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
+diff -up freefem++-3.0-2/examples++-load/load.link.r freefem++-3.0-2/examples++-load/load.link
+--- freefem++-3.0-2/examples++-load/load.link.r 2008-12-09 17:03:50.000000000 +0100
++++ freefem++-3.0-2/examples++-load/load.link 2008-12-10 23:27:23.000000000 +0100
+@@ -5,9 +5,9 @@ FFVERSION='@VERSION@'
+ FFCXXFLAGS='@CXXFLAGS@ @CPPFLAGS@'
+ INCFF=
+ if [ -z "$CXX" ] ; then CXX='@CXX@' ; fi
+-if [ "$CXX" = '@'CXX'@' ] ; then CXX=""; fi
+-if [ "$FFCXXFLAGS" = '@'CXXFLAGS'@' ] ; then FFCXXFLAGS=""; fi
+-if [ "$FFVERSION" = '@'VERSION'@' ] ; then FFVERSION=""; fi
++if [ "$CXX" = '@CXX@' ] ; then CXX=""; fi
++if [ "$FFCXXFLAGS" = '@CXXFLAGS@' ] ; then FFCXXFLAGS=""; fi
++if [ "$FFVERSION" = '@VERSION@' ] ; then FFVERSION=""; fi
+ if [ -z "$INCFF" ] ; then
+ if [ -d "@INCFF@/." ] ; then
+ INCFF="-I at INCFF@"
+@@ -15,8 +15,8 @@ if [ -z "$INCFF" ] ; then
+ INCFF="-Iinclude"
+ elif [ -d "FFAPPLI_INC/." ] ; then
+ INCFF="-IFFAPPLI_INC"
+- elif [ -d '@ff_prefix_dir@/include/.' ] ; then
+- INCFF='-I at ff_prefix_dir@/include'
++ elif [ -d '@includedir@/freefem++/.' ] ; then
++ INCFF='-I at includedir@/freefem++'
+ else
+ echo " erreur PB include freefem++ directory " ;
+ exit 1;
+diff -up freefem++-3.0-2/examples++-load/Makefile.am.r freefem++-3.0-2/examples++-load/Makefile.am
+--- freefem++-3.0-2/examples++-load/Makefile.am.r 2008-12-08 22:55:59.000000000 +0100
++++ freefem++-3.0-2/examples++-load/Makefile.am 2008-12-10 23:27:23.000000000 +0100
+@@ -130,15 +130,15 @@ ff-c++:load.link
chmod a+x ff-c++
install-exec-local:: load_compile
@@ -60,22 +87,49 @@
- 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)$(libdir)/freefem++
++ mkdir -p $(DESTDIR)$(includedir)/freefem++
+ mkdir -p $(DESTDIR)$(sysconfdir)
+ mkdir -p $(DESTDIR)$(datadir)/freefem++/edp
-+ $(INSTALL_DATA) include/* $(DESTDIR)$(includedir)
-+ $(INSTALL) -m 555 $(LIST_COMPILE) $(DESTDIR)$(libdir)
++ $(INSTALL_DATA) include/* $(DESTDIR)$(includedir)/freefem++
++ $(INSTALL) -m 555 $(LIST_COMPILE) $(DESTDIR)$(libdir)/freefem++
++ echo loadpath += \"$(libdir)\" >$(DESTDIR)$(sysconfdir)/freefem++.pref
++ echo includepath += \"$(datadir)/freefem++/edp\" >>$(DESTDIR)$(sysconfdir)/freefem++.pref
++ $(INSTALL_SCRIPT) ff-c++ $(DESTDIR)$(bindir)
+
+
+
+diff -up freefem++-3.0-2/examples++-load/Makefile.in.r freefem++-3.0-2/examples++-load/Makefile.in
+--- freefem++-3.0-2/examples++-load/Makefile.in.r 2008-12-09 23:56:08.000000000 +0100
++++ freefem++-3.0-2/examples++-load/Makefile.in 2008-12-10 23:27:23.000000000 +0100
+@@ -606,15 +606,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)/freefem++
++ mkdir -p $(DESTDIR)$(includedir)/freefem++
++ mkdir -p $(DESTDIR)$(sysconfdir)
++ mkdir -p $(DESTDIR)$(datadir)/freefem++/edp
++ $(INSTALL_DATA) include/* $(DESTDIR)$(includedir)/freefem++
++ $(INSTALL) -m 755 $(LIST_COMPILE) $(DESTDIR)$(libdir)/freefem++
+ 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
+diff -up freefem++-3.0-2/src/lglib/Makefile.am.r freefem++-3.0-2/src/lglib/Makefile.am
+--- freefem++-3.0-2/src/lglib/Makefile.am.r 2006-04-10 22:51:52.000000000 +0200
++++ freefem++-3.0-2/src/lglib/Makefile.am 2008-12-10 23:27:23.000000000 +0100
@@ -9,9 +9,9 @@ INCLUDES=-I../fflib -I../bamglib -I../Gr
BUILT_SOURCES=lg.tab.hpp lg.tab.cpp
@@ -88,9 +142,9 @@
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++-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
+diff -up freefem++-3.0-2/src/lglib/Makefile.in.r freefem++-3.0-2/src/lglib/Makefile.in
+--- freefem++-3.0-2/src/lglib/Makefile.in.r 2008-12-09 23:56:09.000000000 +0100
++++ freefem++-3.0-2/src/lglib/Makefile.in 2008-12-10 23:27:23.000000000 +0100
@@ -483,9 +483,9 @@ uninstall-am: uninstall-info-am
Index: freefem++.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freefem++/devel/freefem++.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- freefem++.spec 10 Dec 2008 00:26:28 -0000 1.13
+++ freefem++.spec 11 Dec 2008 00:12:58 -0000 1.14
@@ -1,15 +1,16 @@
-%define dotpl .1
-%define dashpl -1
+%define dotpl .2
+%define dashpl -2
Summary: PDE solving tool
Name: freefem++
Version: 3.0
-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
Source1: FreeFem++.1
Patch0: %{name}-rpm.patch
+Patch1: %{name}-gcc43.patch
Patch2: %{name}-name.patch
Patch3: %{name}-tex.patch
License: LGPLv2+
@@ -22,14 +23,17 @@
BuildRequires: flex
BuildRequires: fltk-devel
BuildRequires: gcc-gfortran
+BuildRequires: glut-devel
BuildRequires: ImageMagick
BuildRequires: lapack-devel
BuildRequires: libGLU-devel
BuildRequires: libXpm-devel
+BuildRequires: libXt-devel
BuildRequires: libXxf86vm-devel
BuildRequires: lam-devel
BuildRequires: suitesparse-devel
#BuildRequires: superlu-devel
+%{?_with_tetgen:BuildRequires: tetgen-devel}
BuildRequires: %{_bindir}/dvips
BuildRequires: %{_bindir}/epstopdf
BuildRequires: %{_bindir}/pdflatex
@@ -48,6 +52,15 @@
Homepage: http://www.freefem.org/
+%package devel
+Summary: FreeFem++ development headers
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description devel
+This package contains the headers necessary for writing FreeFem++
+extensions.
+
%package glx
Summary: PDE solving tool - OpenGL version
Group: Applications/Engineering
@@ -67,6 +80,7 @@
%prep
%setup -q -n %{name}-%{version}%{dashpl}
%patch0 -p1 -b .r
+%patch1 -p1 -b .gcc43
%patch2 -p1
%patch3 -p1 -b .t
find . -type f -perm 755 \( -name "*.c*" -o -name "*.h*" \) | xargs chmod 644
@@ -80,6 +94,7 @@
. /etc/profile.d/modules.sh
module load %{_libdir}/lam/lam.module
%configure \
+ INSTALL="%{__install} -p" \
--disable-download \
--disable-optim \
--with-x \
@@ -98,6 +113,7 @@
%clean
rm -rf $RPM_BUILD_ROOT
+%if 0
%ifnarch ppc64
%check
. /etc/profile.d/modules.sh
@@ -105,6 +121,7 @@
%{__make} check
pkill lamd
%endif
+%endif
%files
%defattr(-,root,root,-)
@@ -113,14 +130,20 @@
%doc DOC/freefem++doc.pdf
%{_mandir}/man1/*
%{_bindir}/FreeFem++
-%{_bindir}/FreeFem++-client
-%{_bindir}/FreeFem++-cs
-%{_bindir}/FreeFem++-ide
%{_bindir}/FreeFem++-nw
-%{_bindir}/FreeFem++-server
+%{_bindir}/FreeFem++-x11
%{_bindir}/bamg
%{_bindir}/cvmsh2
%{_bindir}/drawbdmesh
+%{_bindir}/ffglut
+%{_bindir}/ffmedit
+%{_libdir}/freefem++
+%{_sysconfdir}/freefem++.pref
+
+%files devel
+%defattr(-,root,root,-)
+%{_bindir}/ff-c++
+%{_includedir}/freefem++
%files glx
%defattr(-,root,root,-)
@@ -131,6 +154,14 @@
%{_bindir}/FreeFem++-mpi
%changelog
+* Wed Dec 10 2008 Dominik Mierzejewski <rpm at greysector.net> 3.0-2.2
+- update to 3.0-2
+- fix compilation
+- fix installation paths and path substitution in ff-c++
+- preserve timestamps in make install
+- add missing BR
+- disable regression tests for now
+
* Fri Dec 05 2008 Dominik Mierzejewski <rpm at greysector.net> 3.0-1.1
- update to 3.0
- fixed build of pdf doc
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/freefem++/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 10 Dec 2008 00:26:28 -0000 1.5
+++ sources 11 Dec 2008 00:12:58 -0000 1.6
@@ -1,2 +1,2 @@
f1accc292794bbafb66e963080f9d15b FreeFem++.1
-f1ce589dc0d8cc500aec6537bd2d20ca freefem++-3.0-1.tar.gz
+75b7e8faae3afe01a6800a523ebb54f6 freefem++-3.0-2.tar.gz
More information about the fedora-extras-commits
mailing list