rpms/octave-forge/FC-3 octave-forge-2005.06.13-pcre.patch, NONE, 1.1 octave-forge.spec, 1.10, 1.11

[Quentin Spencer (qspencer)]

Author: qspencer

Update of /cvs/extras/rpms/octave-forge/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2442

Modified Files:
	octave-forge.spec 
Added Files:
	octave-forge-2005.06.13-pcre.patch 
Log Message:
Add patch so that it looks for pcre.h in the right place.



octave-forge-2005.06.13-pcre.patch:

--- NEW FILE octave-forge-2005.06.13-pcre.patch ---
*** main/strings/pcregexp.cc.~1~	2005-03-01 10:38:21.000000000 -0600
--- main/strings/pcregexp.cc	2005-06-14 08:13:28.000000000 -0500
***************
*** 23,29 ****
    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
  
  #include <octave/oct.h>
! #include <pcre.h>
  #include <iostream>
  
  DEFUN_DLD( pcregexp, args, nargout, "\
--- 23,29 ----
    IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
  
  #include <octave/oct.h>
! #include <pcre/pcre.h>
  #include <iostream>
  
  DEFUN_DLD( pcregexp, args, nargout, "\


Index: octave-forge.spec
===================================================================
RCS file: /cvs/extras/rpms/octave-forge/FC-3/octave-forge.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- octave-forge.spec	18 Jun 2005 01:32:02 -0000	1.10
+++ octave-forge.spec	20 Jun 2005 13:24:34 -0000	1.11
@@ -15,7 +15,8 @@
 ## tar czf octave-forge-%{version}.patched.tar.gz octave-forge-%{version}
 ## rm -Rf octave-forge-%{version}
 Source0:        %{name}-%{version}.patched.tar.gz
-Patch0:         %{name}-2005.06.13-legend.patch
+Patch0:         %{name}-2005.06.13-pcre.patch
+Patch1:         %{name}-2005.06.13-legend.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
@@ -24,10 +25,10 @@
 %define octave_ep  %(rpm -q --qf '%%{epoch}' octave)
 %define octave_ver %(rpm -q --qf '%%{version}' octave)
 Requires:	octave = %{octave_ep}:%{octave_ver} ImageMagick
-BuildRequires:  octave-devel tetex gcc-gfortran GiNaC-devel fftw3-devel
+BuildRequires:  octave-devel tetex gcc-g77 GiNaC-devel fftw3-devel
 BuildRequires:  xorg-x11-devel libjpeg-devel libpng-devel zlib-devel
 BuildRequires:  ncurses-devel libtermcap-devel gsl-devel qhull-devel
-BuildRequires:  pcre-devel
+BuildRequires:  pcre-devel octave
 
 %description
 Octave-forge is a community project for collaborative development of
@@ -40,6 +41,7 @@
 %prep
 %setup -q
 %patch0 -p0
+%patch1 -p0
 
 %build
 %configure
@@ -74,13 +76,15 @@
 
 
 %changelog
-* Fri Jun 17 2005 Quentin Spencer <qspencer at users.sf.net> 2005.06.13-1
+* Mon Jun 20 2005 Quentin Spencer <qspencer at users.sf.net> 2005.06.13-1
 - New upstream release. Now requires pcre-devel to build.
 - Corrected instructions on creating patched source tarball.
 - Remove explicit BuildRequires for c++ compiler and libs
   (not needed and causes build failure in the build system for x86_64).
 - Add patch for problem with main/plot/legend.m
 - Add fftw3-devel to BuildRequires.
+- Added patch for FC-3 (pcre.h is in a different place).
+- Require octave (FC-3 octave-devel package doesn't).
 
 * Sat Jun 11 2005 Quentin Spencer <qspencer at users.sf.net> 2004.11.16-7
 - Cleanup of unneeded things in build section