rpms/freefem++/devel freefem++-rpm.patch, NONE, 1.1 freefem++.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Wed Feb 20 18:20:21 UTC 2008

Author: rathann

Update of /cvs/pkgs/rpms/freefem++/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10113

Modified Files:
	.cvsignore sources 
Added Files:
	freefem++-rpm.patch freefem++.spec 
Log Message:
initial import + 2.23 update

freefem++-rpm.patch:

--- NEW FILE freefem++-rpm.patch ---
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
@@ -9,9 +9,9 @@ INCLUDES=-I../fflib -I../bamglib -I../Gr
 BUILT_SOURCES=lg.tab.hpp lg.tab.cpp
 
 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
 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: Makefile.am,v 1.91 2007/11/18 12:20:20 hecht Exp $
 
 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
 
 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


--- NEW FILE freefem++.spec ---
Summary: PDE solving tool
Name: freefem++
Version: 2.23
Release: 1%{?dist}
URL: http://www.freefem.org/ff++/index.htm
Group: Applications/Engineering
Source0: http://www.freefem.org/ff++/ftp/%{name}-%{version}.tar.gz
Source1: FreeFem++.1
Patch0: %{name}-rpm.patch
License: LGPLv2+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
BuildRequires:	arpack-devel
BuildRequires:	atlas-devel
BuildRequires:	automake
BuildRequires:	bison
BuildRequires:	fftw-devel
BuildRequires:	flex
BuildRequires:	fltk-devel
BuildRequires:	gcc-gfortran
BuildRequires:	ImageMagick
BuildRequires:	lapack-devel
BuildRequires:	libGLU-devel
BuildRequires:	libXpm-devel
BuildRequires:	libXxf86vm-devel
BuildRequires:	lam-devel
BuildRequires:	tetex-dvips
BuildRequires:	tetex-latex
BuildRequires:	ufsparse-devel

%description
A PDE oriented language using Finite Element Method FreeFem++ is an
implementation of a language dedicated to the finite element method. It
provides you a way to solve Partial Differential Equations (PDE) simply.

Problems involving partial differential equations (pde) of  several
branches of physics such as fluid-structure interactions require
interpolations of data on several meshes and their manipulation within
one program.

FreeFem++ is an extension of freefem, freefem+ written in C++.

Homepage: http://www.freefem.org/

%package glx
Summary: PDE solving tool - OpenGL version
Group: Applications/Engineering
Requires: %{name} = %{version}-%{release}

%description glx
This package contains the OpenGL version of FreeFem++.

%package mpi
Summary: PDE solving tool - MPI version
Group: Applications/Engineering
Requires: %{name} = %{version}-%{release}

%description mpi
This package contains the MPI version of FreeFem++.

%prep
%setup -q -n %{name}-%{version}
%patch0 -p1 -b .r
chmod -x src/fflib/mt19937ar.cpp
chmod -x src/lglib/mymain.cpp

%build
autoreconf
#sed -i -e 's/^\(\s*hardcode_libdir_flag_spec\s*=\).*/\1/' configure
#CPPFLAGS="`pkg-config --cflags lam`"
#export CPPFLAGS
%configure \
	--enable-generic \
	--with-x \
	--with-blas="-L%{_libdir}/atlas -llapack -lf77blas -lcblas -latlas" \
	--with-mpi=mpic++


%{__make} CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
%{__make} documentation

%install
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/

%clean
rm -rf $RPM_BUILD_ROOT

#%%check
#%{__make} check

%files
%defattr(-,root,root,-)
%doc AUTHORS BUGS COPYING COPYRIGHT ChangeLog HISTORY HISTORY_BEFORE_2005
%doc INNOVATION README* TODO
%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}/bamg
%{_bindir}/cvmsh2
%{_bindir}/drawbdmesh

%files glx
%defattr(-,root,root,-)
%{_bindir}/FreeFem++-glx

%files mpi
%defattr(-,root,root,-)
%{_bindir}/FreeFem++-mpi

%changelog
* Wed Feb 20 2008 Dominik Mierzejewski <rpm at greysector.net> 2.23-1
- updated to 2.23

* Sun Apr 29 2007 Dominik Mierzejewski <rpm at greysector.net> 2.16-2
- enable testsuite
- remove load tests from testsuite, the rest completes fine

* Sat Apr 28 2007 Dominik Mierzejewski <rpm at greysector.net> 2.16-1
- updated to 2.16-2
- simplified defattr
- work around X11 "detection"
- work around lam's mpicxx.h misdetection in configure

* Tue Mar 27 2007 Dominik Mierzejewski <rpm at greysector.net> 2.14-2
- updated to 2.14-2

* Mon Mar 19 2007 Dominik Mierzejewski <rpm at greysector.net> 2.14-1
- updated to 2.14-1
- removed redundant builddeps

* Thu Nov 23 2006 Dominik Mierzejewski <rpm at greysector.net> 2.11-2
- specfile cleanups
- added manpage from CVS

* Fri Nov 17 2006 Dominik Mierzejewski <rpm at greysector.net> 2.11-1
- updated to 2.11
- specfile cleanups

* Tue Jun 27 2006 Dominik Mierzejewski <rpm at greysector.net>
- updated to latest CVS

* Mon May 15 2006 Dominik Mierzejewski <rpm at greysector.net>
- split into subpackages

* Wed Apr 26 2006 Dominik Mierzejewski <rpm at greysector.net>
- initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/freefem++/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	1 Jan 2008 23:09:23 -0000	1.1
+++ .cvsignore	20 Feb 2008 18:19:46 -0000	1.2
@@ -0,0 +1,2 @@
+FreeFem++.1
+freefem++-2.23.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/freefem++/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	1 Jan 2008 23:09:23 -0000	1.1
+++ sources	20 Feb 2008 18:19:46 -0000	1.2
@@ -0,0 +1,2 @@
+f1accc292794bbafb66e963080f9d15b  FreeFem++.1
+f8a98b0f4a204b04a0d8cc77806d9279  freefem++-2.23.tar.gz


