rpms/octave-forge/devel .cvsignore, 1.2, 1.3 octave-forge.spec, 1.2, 1.3 sources, 1.2, 1.3

[Quentin Spencer (qspencer)]

Author: qspencer

Update of /cvs/extras/rpms/octave-forge/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19883

Modified Files:
	.cvsignore octave-forge.spec sources 
Log Message:
Modified upstream sources to remove GPL-incompatible source files.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/octave-forge/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 Apr 2005 16:20:02 -0000	1.2
+++ .cvsignore	25 Apr 2005 20:18:01 -0000	1.3
@@ -1 +1 @@
-octave-forge-2004.11.16.tar.gz
+octave-forge-2004.11.16.patched.tar.gz


Index: octave-forge.spec
===================================================================
RCS file: /cvs/extras/rpms/octave-forge/devel/octave-forge.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- octave-forge.spec	25 Apr 2005 14:09:21 -0000	1.2
+++ octave-forge.spec	25 Apr 2005 20:18:01 -0000	1.3
@@ -6,9 +6,18 @@
 Group:          Applications/Engineering
 License:        Public Domain
 URL:            http://octave.sourceforge.net
-Source0:        %{url}/cgi-bin/viewcvs.cgi/octave/%{name}-%{version}.tar.gz
+## Source0:        ftp://download.sourceforge.net/pub/sourceforge/o/oc/octave/%{name}-%{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 %{name}-%{version}.patched.tar.gz
+## rm -Rf %{name}-%{version}/nonfree/
+## tar czf %{name}-%{version}.patched.tar.gz octave-forge-2004.11.16
+## rm -Rf %{name}-%{version}
+Source0:        %{name}-%{version}.patched.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+
 ## Octave-forge installs in a directory tree specific to the installed
 ## version of octave, so the following version dependency is necessary.
 %define octave_ep  %(rpm -q --qf '%%{epoch}' octave)
@@ -70,6 +79,8 @@
   so the collection is licensed as public domain).
 - Moved ugly path hacks from build to install so that RPM_BUILD_ROOT
   doesn't end up in the code (which it did before).
+- Replaced upstream tarball with patched version that removed GPL
+  incompatible code.
 
 * Thu Apr 21 2005 Quentin Spencer <qspencer at users.sf.net> 2004.11.16-6
 - Added GiNaC-devel BuildRequires


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/octave-forge/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Apr 2005 16:20:02 -0000	1.2
+++ sources	25 Apr 2005 20:18:01 -0000	1.3
@@ -1 +1 @@
-a8e52c27159a110a26ab57c10d3883b0  octave-forge-2004.11.16.tar.gz
+3b893ef04ad0e904d269426f80eae747  octave-forge-2004.11.16.patched.tar.gz