Author: baggins Date: Thu Feb 26 11:18:25 2009 GMT Module: SPECS Tag: HEAD ---- Log message: - merge from DEVEL
---- Files affected: SPECS: octave-forge.spec (1.18 -> 1.19) ---- Diffs: ================================================================ Index: SPECS/octave-forge.spec diff -u SPECS/octave-forge.spec:1.18 SPECS/octave-forge.spec:1.19 --- SPECS/octave-forge.spec:1.18 Sun Feb 8 15:27:47 2009 +++ SPECS/octave-forge.spec Thu Feb 26 12:18:19 2009 @@ -2,37 +2,52 @@ Summary: Extensions for GNU Octave Summary(pl.UTF-8): Rozszerzenia dla GNU Octave Name: octave-forge -Version: 2006.07.09 -Release: 2 +Version: 20080831 +Release: 0.1 License: GPL Group: Applications/Math -Source0: http://dl.sourceforge.net/octave/%{name}-%{version}.tar.gz -# Source0-md5: 94a844d1e41aca9580fde00e023e4e5b -Patch0: %{name}-make.patch +Source0: http://dl.sourceforge.net/octave/%{name}-bundle-%{version}.tar.gz +# Source0-md5: 680ea705eb7434e219eb4a3eaffd7fba +Patch0: %{name}-postgresql.patch +Patch1: %{name}-mysql.patch URL: http://octave.sourceforge.net/ -# no ginac-config anyway -#BuildRequires: GiNaC-devel +BuildRequires: GiNaC-devel BuildRequires: ImageMagick-c++-devel +# for jhandlers which doesn't build :/ +#BuildRequires: OpenGL-devel BuildRequires: autoconf +BuildRequires: bash +BuildRequires: blas-devel +BuildRequires: ffmpeg-devel BuildRequires: fftw3-devel +BuildRequires: ftplib-devel BuildRequires: gcc-fortran +BuildRequires: ghostscript BuildRequires: gsl-devel BuildRequires: hdf5-devel +BuildRequires: jar +BuildRequires: jdk BuildRequires: lapack-devel +BuildRequires: libgcj-devel BuildRequires: libjpeg-devel BuildRequires: libpng-devel -BuildRequires: octave-devel >= 2:2.1.58 +#BuildRequires: mysql-devel +BuildRequires: octave-devel >= 2:2.9.15 BuildRequires: pcre-devel -BuildRequires: readline-devel +#BuildRequires: postgresql-devel BuildRequires: qhull-devel -BuildRequires: xorg-lib-libICE-devel -BuildRequires: xorg-lib-libSM-devel +#BuildRequires: sqlite3-devel +BuildRequires: swig >= 1.3.38 +BuildRequires: tetex +BuildRequires: tetex-dvips +BuildRequires: texinfo +BuildRequires: texinfo-texi2dvi +#BuildRequires: unixODBC-devel BuildRequires: xorg-lib-libX11-devel +Requires: octave >= 2:2.9.15 +Requires: ImageMagick BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define octave_m_site_dir %(octave-config --m-site-dir 2>/dev/null) -%define octave_oct_site_dir %(octave-config --oct-site-dir 2>/dev/null) - %description Set of custom scripts, functions and extensions for GNU Octave. octave-forge (http://octave.sf.net/) is a community project for @@ -49,62 +64,73 @@ do istniejącego pakietu, octave-forge jest odpowiednim miejscem. %prep -%setup -q -%patch0 -p1 +%setup -q -n %{name}-bundle-%{version} +for d in main extra; do + cd $d + for pkg in *.tar.gz ; do + tar zxf $pkg + done + cd .. +done + +# needs very old ffmpeg? +rm -rf main/video-1.0.1 +# needs jogl, WTF is jogl? java sucks +rm -rf extra/jhandles-0.3.4 +# If someone really wants the pain, then uncomment stuff below +rm -rf main/database-1.0.1 +#patch0 -p1 +#patch1 -p1 +#cd main/database-1.0.1/src +#./autogen.sh +#rm mysql_wrap.cpp %build -export CXXFLAGS="%{rpmcflags} -fno-use-cxa-atexit" -./autogen.sh -%configure -# NOTE: as this is an ancient version of octave-forge, some things -# wont't compile with octave 2.9+. -%{__make} || : +CFLAGS="%{rpmcflags} -I/usr/include/ncurses"; export CFLAGS +for d in main extra; do + cd $d + for pkg in * ; do + [ -d $pkg ] || continue + cd $pkg + if [ -e src/configure ]; then + cd src + %configure + cd .. + fi + %{__make} + cd .. + done + cd .. +done %install rm -rf $RPM_BUILD_ROOT -%{__make} install \ - MPATH="$RPM_BUILD_ROOT%{octave_m_site_dir}/%{name}" \ - OPATH="$RPM_BUILD_ROOT%{octave_oct_site_dir}/%{name}" \ - XPATH="$RPM_BUILD_ROOT%{octave_oct_site_dir}" \ - ALTMPATH="$RPM_BUILD_ROOT%{octave_m_site_dir}/%{name}" \ - ALTOPATH="$RPM_BUILD_ROOT%{octave_oct_site_dir}/%{name}" \ - mandir="$RPM_BUILD_ROOT%{_mandir}" \ - bindir="$RPM_BUILD_ROOT%{_bindir}" -find $RPM_BUILD_ROOT -name PKG_ADD -print0 | xargs -0 rm -f - -mv $RPM_BUILD_ROOT%{_bindir}/mex $RPM_BUILD_ROOT%{_bindir}/mex-octave +for d in main extra; do + cd $d + for pkg in * ; do + [ -d $pkg ] || continue + cd $pkg + %{__make} install \ + DESTDIR=$RPM_BUILD_ROOT + cd .. + done + cd .. +done %clean rm -rf $RPM_BUILD_ROOT %post -if [ -f "%{_datadir}/octave/site/m/startup/octaverc" ] && \ - ! grep -q "octave-forge" "%{_datadir}/octave/site/m/startup/octaverc" -then - echo "LOADPATH = [ '%{octave_oct_site_dir}/octave-forge:%{octave_m_site_dir}/octave-forge/:', LOADPATH ];" >> "%{_datadir}/octave/site/m/startup/octaverc" -fi +octave -q -H --no-site-file --eval "pkg('rebuild');" %postun -if [ "$1" = "0" ]; then - umask 027 - grep -E -v "octave-forge" "%{_datadir}/octave/site/m/startup/octaverc" > "%{_datadir}/octave/site/m/startup/octaverc.tmp" - mv -f "%{_datadir}/octave/site/m/startup/octaverc.tmp" "%{_datadir}/octave/site/m/startup/octaverc" -fi +octave -q -H --no-site-file --eval "pkg('rebuild');" %files %defattr(644,root,root,755) -%doc AUTHORS ChangeLog README RELEASE-NOTES TODO -%doc doc/*.html doc/coda/*.sgml doc/coda/appendices/*.sgml -%doc doc/coda/oct/*.sgml doc/coda/standalone/*.sgml -%attr(755,root,root) %{_bindir}/* -%{_mandir}/man*/* -%{octave_m_site_dir}/%{name} -%dir %{octave_oct_site_dir}/%{name} -%{octave_oct_site_dir}/%{name}/*.[ho] -%attr(755,root,root) %{octave_oct_site_dir}/%{name}/*.oct -%attr(755,root,root) %{octave_oct_site_dir}/aurecord -%attr(755,root,root) %{octave_oct_site_dir}/rasmol.sh +%{_libdir}/octave/packages/* +%{_datadir}/octave/packages/* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -112,12 +138,46 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.19 2009/02/26 11:18:19 baggins +- merge from DEVEL + +Revision 1.16.2.4 2009/02/26 11:13:53 baggins +- install, post(un) and files done + +Revision 1.16.2.3 2009/02/26 01:08:54 baggins +- disable database stuff, more pain than gain +- compiles now + +Revision 1.16.2.2 2009/02/25 23:53:06 baggins +- added mysql patch +- remove unmakeable modules + +Revision 1.16.2.1 2009/02/25 23:28:03 baggins +- 20080831 +- updated BRs +- almost compiles ;) + Revision 1.18 2009/02/08 14:27:47 arekm - release 2 Revision 1.17 2009/02/08 13:51:59 gotar - downgraded HEAD to 2006.07.09 (updated from rev. 1.14 with 1.16, as 1.15 was never finished), moved 1.16 to DEVEL + +Revision 1.16 2008/03/12 14:11:55 glen +- use macros + +Revision 1.15 2007-12-07 22:23:55 baggins +- first attempt at new build + +Revision 1.14 2007/02/13 07:16:50 glen +- tabs in preamble + +Revision 1.13 2007/02/12 00:49:14 baggins +- converted to UTF-8 + +Revision 1.12 2006/08/12 17:39:50 ankry +- formatting Revision 1.11.2.1 2008/03/12 15:12:10 glen - release 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/octave-forge.spec?r1=1.18&r2=1.19&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
