rpms/octave-forge/devel .cvsignore, 1.9, 1.10 octave-forge.spec, 1.35, 1.36 sources, 1.9, 1.10 octave-forge-2006.07.09-imread.patch, 1.1, NONE octave-forge-2006.07.09-legend.patch, 1.1, NONE octave-forge-2006.07.09-path.patch, 1.1, NONE
Orion Poplawski (orion)
fedora-extras-commits at redhat.com
Tue Oct 16 22:09:10 UTC 2007
Author: orion
Update of /cvs/pkgs/rpms/octave-forge/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15672
Modified Files:
.cvsignore octave-forge.spec sources
Removed Files:
octave-forge-2006.07.09-imread.patch
octave-forge-2006.07.09-legend.patch
octave-forge-2006.07.09-path.patch
Log Message:
* Tue Oct 16 2007 Orion Poplawski <orion at cora.nwra.com> 20071014-1
- Rewrite to handle new "bundle" method to releasing packages and
new octave package manager
- Prepare for eventual splitting of the package with provides
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/octave-forge/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore 10 Jul 2006 18:48:25 -0000 1.9
+++ .cvsignore 16 Oct 2007 22:08:37 -0000 1.10
@@ -1 +1 @@
-octave-forge-2006.07.09.patched.tar.gz
+octave-forge-bundle-20071014.patched.tar.gz
Index: octave-forge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/octave-forge/devel/octave-forge.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- octave-forge.spec 24 Sep 2007 17:16:56 -0000 1.35
+++ octave-forge.spec 16 Oct 2007 22:08:37 -0000 1.36
@@ -1,78 +1,217 @@
+%{!?octave_api: %define octave_api %(octave-config -p API_VERSION || echo 0)}
+
Name: octave-forge
-Version: 2006.07.09
-Release: 10%{?dist}
+Version: 20071014
+Release: 1%{?dist}
Summary: Contributed functions for octave
Group: Applications/Engineering
-License: Public Domain
+License: GPLv2+ and Public Domain
URL: http://octave.sourceforge.net
-## Source0: http://umn.dl.sourceforge.net/sourceforge/octave/%{name}-%{version}.tar.gz
+## Source0: http://downloads.sourceforge.net/sourceforge/octave/%{name}-bundle-%{version}.tar.gz
## The original sources contain a non-free tree of functions that are
## GPL incompatible. A patched version with the non-free sources removed
## is created as follows:
-## tar xzf octave-forge-%{version}.tar.gz
-## rm -Rf octave-forge-%{version}/nonfree/
-## tar czf octave-forge-%{version}.patched.tar.gz octave-forge-%{version}
-## rm -Rf octave-forge-%{version}
-Source0: %{name}-%{version}.patched.tar.gz
-Patch0: octave-forge-2006.07.09-legend.patch
-Patch1: octave-forge-2006.07.09-imread.patch
-Patch2: octave-forge-2006.07.09-path.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+## tar xzf octave-forge-bundle-%{version}.tar.gz
+## rm -Rf octave-forge-bundle-%{version}/nonfree/
+## tar czf octave-forge-bundle-%{version}.patched.tar.gz octave-forge-bundle-%{version}
+## rm -Rf octave-forge-bundle-%{version}
+Source0: %{name}-bundle-%{version}.patched.tar.gz
+buIldRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: octave octave(api) = api-v26 ImageMagick
+Requires: octave(api) = %{octave_api} ImageMagick
BuildRequires: octave-devel tetex gcc-gfortran ginac-devel qhull-devel
BuildRequires: ImageMagick-c++-devel libnc-dap-devel pcre-devel gsl-devel
BuildRequires: libjpeg-devel libpng-devel ncurses-devel
+BuildRequires: openssl-devel java-devel dos2unix
+Provides: octave-audio = 1.0.2
+Provides: octave-combinatorics = 1.0.3
+Provides: octave-communications = 1.0.3
+Provides: octave-control = 1.0.2
+Provides: octave-econometrics = 1.0.3
+Provides: octave-fixed = 0.7.3
+Provides: octave-general = 1.0.3
+Provides: octave-gsl = 1.0.2
+Provides: octave-ident = 1.0.2
+Provides: octave-image = 1.0.3
+Provides: octave-informationtheory = 0.1.2
+Provides: octave-io = 1.0.3
+Provides: octave-irsa = 1.0.2
+Provides: octave-linear-algebra = 1.0.2
+Provides: octave-miscellaneous = 1.0.3
+Provides: octave-nnet = 0.1.4
+Provides: octave-octcdf = 1.0.6
+Provides: octave-odebvp = 1.0.1
+Provides: octave-odepkg = 0.3.3
+Provides: octave-optim = 1.0.0
+Provides: octave-optiminterp = 0.2.4
+Provides: octave-outliers = 0.13.4
+%ifnarch x86_64 ppc64
+Provides: octave-parallel = 1.0.3
+%endif
+Provides: octave-physicalconstants = 0.1.2
+Provides: octave-plot = 1.0.2
+Provides: octave-signal = 1.0.4
+Provides: octave-sockets = 1.0.2
+Provides: octave-specfun = 1.0.3
+Provides: octave-special-matrix = 1.0.2
+Provides: octave-splines = 1.0.2
+Provides: octave-statistics = 1.0.3
+Provides: octave-strings = 1.0.2
+Provides: octave-struct = 1.0.2
+Provides: octave-symbolic = 1.0.3
+Provides: octave-time = 1.0.2
+Provides: octave-vrml = 1.0.3
+Provides: octave-zenity = 0.5.2
+Provides: octave-bim = 0.0.2
+Provides: octave-civil-engineering = 1.0.2
+Provides: octave-fpl = 0.0.2
+Provides: octave-graceplot = 1.0.2
+Provides: octave-integration = 1.0.2
+Provides: octave-java = 1.2.1
+Provides: octave-mapping = 1.0.2
+Provides: octave-msh = 0.0.2
+Provides: octave-nan = 1.0.2
+Provides: octave-pdb = 1.0.2
+Provides: octave-secs1d = 0.0.3
+Provides: octave-secs2d = 0.0.3
+Provides: octave-symband = 1.0.3
+Provides: octave-tcl-octave = 0.1.3
+Provides: octave-triangular = 1.0.1
+Provides: octave-tsa = 3.10.3
+Provides: octave-xraylib = 1.0.3
+Provides: octave-language-pt_br = 1.0.3
%description
Octave-forge is a community project for collaborative development of
octave extensions. The extensions in this package include additional
data types such as sparse matrices, and functions for a variety of
different applications including signal and image processing,
-communications, control, optimization, statistics, geometry, and
-symbolic math.
+communications, control, optimization, statistics, and symbolic math.
+
%prep
-%setup -q
-%patch0 -p0
-%patch1 -p0
-%patch2 -p0
-# For octave >= 2.9.7, don't install the mex stuff or path stuff
-touch extra/mex/NOINSTALL
-touch main/path/NOINSTALL
+%setup -q -n octave-forge-bundle-%{version}
+#Not 64-bit safe
+%ifarch x86_64 ppc64
+rm main/parallel-*.tar.gz
+%endif
+#Don't install engine - not a real octave package
+rm extra/engine-*.tar.gz
+#Can't handle jhandles yet
+rm extra/jhandles-*.tar.gz
+#Not MacOSX
+rm extra/macosx-*.tar.gz
+#Not Windows
+rm extra/windows-*.tar.gz
+
+#Unpack everything
+for pkg in main extra language
+do
+ cd $pkg
+ for tgz in *.tar.gz
+ do
+ tar xzf $tgz
+
+ #Collect provides
+ echo $tgz | sed 's/\(.*\)-\([0-9]*\.[0-9]*\.[0-9]*\)\.tar\.gz/Provides: octave-\1 = \2/' >> ../octave-forge-provides
+ done
+ cd ..
+done
+
+#Cleanup some CVS directories
+find -name CVS | xargs rm -rf
+
+#Install with -nodeps
+sed -i -e "s/pkg('install',/pkg('install','-nodeps',/" */*/Makefile
+
+#Fix permissions
+find -name COPYING -o -name INDEX -o -name DESCRIPTION -o -name \*.m | xargs chmod -x
+
+#Fix line endings
+find -name \*.m | xargs dos2unix
+
%build
-ALTMPATHNAME=%{_datadir}/octave/site/octave-forge-alternatives/m/octave-forge
-XPATHNAME=`octave-config -p LOCALARCHLIBDIR`/octave-forge
-%configure --with-altmpath=$ALTMPATHNAME --with-xpath=$XPATHNAME
-make %{?_smp_mflags}
+#Prevents escape sequence from being inserted into octave version string
+export TERM=""
+for pkg in main extra language
+do
+ cd $pkg
+ for dir in *.[0-9]
+ do
+ cd $dir
+ if [ -f configure ]
+ then
+ %configure
+ elif [ -f src/configure ]
+ then
+ cd src
+ %configure
+ cd ..
+ fi
+ if [ -f Makefile ]
+ then
+ make %{?_smp_mflags} TMPDIR=%{_tmppath}
+ elif [ -f src/Makefile ]
+ then
+ cd src
+ make %{?_smp_mflags} TMPDIR=%{_tmppath}
+ cd ..
+ fi
+ cd ..
+ done
+ cd ..
+done
+
%install
rm -rf $RPM_BUILD_ROOT
-ALTPATHNAME=octave/site/octave-forge-alternatives
-HOSTTYPE=`octave-config -p CANONICAL_HOST_TYPE`
-%makeinstall \
- MPATH=$RPM_BUILD_ROOT`octave-config -p LOCALFCNFILEDIR`/octave-forge \
- OPATH=$RPM_BUILD_ROOT`octave-config -p LOCALAPIOCTFILEDIR`/octave-forge \
- XPATH=$RPM_BUILD_ROOT`octave-config -p LOCALARCHLIBDIR`/octave-forge \
- ALTPATH=$RPM_BUILD_ROOT%{_datadir}/$ALTPATHNAME/m \
- ALTMPATH=$RPM_BUILD_ROOT%{_datadir}/$ALTPATHNAME/m/octave-forge \
- ALTOPATH=$RPM_BUILD_ROOT%{_libexecdir}/$ALTPATHNAME/oct/$HOSTTYPE
+export TERM=""
+
+for pkg in main extra language
+do
+ cd $pkg
+ for dir in *.[0-9]
+ do
+ cd $dir
+ make install TMPDIR=%{_tmppath} DESTDIR=$RPM_BUILD_ROOT DISTPKG=redhat
+ cd ..
+ done
+ cd ..
+done
+
+#Move aurecord to arch-dependent dir
+archdir=%{_libexecdir}/octave/packages/`octave-config -p CANONICAL_HOST_TYPE`-%{octave_api}
+audiover=`basename $RPM_BUILD_ROOT%{_datadir}/octave/packages/audio-*`
+mkdir -p $RPM_BUILD_ROOT${archdir}/${audiover}
+mv $RPM_BUILD_ROOT%{_datadir}/octave/packages/${audiover}/bin \
+ $RPM_BUILD_ROOT%{archdir}/${audiover}/
+
%clean
rm -rf $RPM_BUILD_ROOT
+
+%post
+octave -q -H --no-site-file --eval "pkg('rebuild');"
+
+%postun
+octave -q -H --no-site-file --eval "pkg('rebuild');"
+
+
%files
-%defattr(-,root,root)
-%doc COPYING* README RELEASE-NOTES TODO
-%doc doc/*.html doc/coda/*.sgml doc/coda/appendices/*.sgml
-%doc doc/coda/oct/*.sgml doc/coda/standalone/*.sgml
-%{_datadir}/octave/*
-%{_libexecdir}/octave/*
+%defattr(-,root,root,-)
+%{_datadir}/octave/packages/*
+%{_libexecdir}/octave/packages/*
%changelog
+* Tue Oct 16 2007 Orion Poplawski <orion at cora.nwra.com> 20071014-1
+- Rewrite to handle new "bundle" method to releasing packages and
+ new octave package manager
+- Prepare for eventual splitting of the package with provides
+
* Mon Sep 24 2007 Jesse Keating <jkeating at redhat.com> - 2006.07.09-10
- Rebuild for new octave
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/octave-forge/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources 10 Jul 2006 18:48:25 -0000 1.9
+++ sources 16 Oct 2007 22:08:37 -0000 1.10
@@ -1 +1 @@
-49efa08b2b68267d87173ffef8866485 octave-forge-2006.07.09.patched.tar.gz
+f237bd3e3e16cf40e5da77ca2aed3e51 octave-forge-bundle-20071014.patched.tar.gz
--- octave-forge-2006.07.09-imread.patch DELETED ---
--- octave-forge-2006.07.09-legend.patch DELETED ---
--- octave-forge-2006.07.09-path.patch DELETED ---
More information about the fedora-extras-commits
mailing list