From 8ea2d60b76b69725502a799e7707409c85ce5ddc Mon Sep 17 00:00:00 2001
From: Quentin Spencer <qspencer@fedoraproject.org>
Date: Nov 12 2005 06:02:28 +0000
Subject: New upstream release (2.9.4). Other minor changes (see ChangeLog)


---

diff --git a/.cvsignore b/.cvsignore
index 5b2575b..e6b37bb 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-octave-2.9.3.tar.bz2
+octave-2.9.4.tar.bz2
diff --git a/octave-2.9.4-header.patch b/octave-2.9.4-header.patch
new file mode 100644
index 0000000..80a4169
--- /dev/null
+++ b/octave-2.9.4-header.patch
@@ -0,0 +1,27 @@
+src/ChangeLog:
+
+2005-11-11  John W. Eaton  <jwe@octave.org>
+
+	* Makefile.in (install-oct): Fix thinko in previous change.
+
+
+Index: src/Makefile.in
+===================================================================
+RCS file: /cvs/octave/src/Makefile.in,v
+retrieving revision 1.389
+diff -u -r1.389 Makefile.in
+--- src/Makefile.in	11 Nov 2005 17:45:51 -0000	1.389
++++ src/Makefile.in	12 Nov 2005 02:29:32 -0000
+@@ -398,12 +398,12 @@
+ 
+ install-oct:
+ 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(octfiledir)
++	$(srcdir)/mk-pkg-add --prefix $(octfiledir) $(DLD_DEF_FILES) > $(DESTDIR)$(octfiledir)/PKG_ADD
+ 	if [ -n "$(OCT_FILES)" ]; then \
+ 	  xfiles="$(OCT_FILES)"; \
+ 	  for f in $$xfiles; do \
+ 	    $(INSTALL_PROGRAM) $$f $(DESTDIR)$(octfiledir)/$$f; \
+ 	  done; \
+-	  $(srcdir)/mk-pkg-add --prefix $(octfiledir) $(DLD_DEF_FILES) > $(DESTDIR)$(octfiledir)/PKG_ADD
+ 	fi
+ .PHONY: install-oct
diff --git a/octave.spec b/octave.spec
index 8b4ee53..4a0cb29 100644
--- a/octave.spec
+++ b/octave.spec
@@ -1,12 +1,13 @@
 Name:           octave
-Version:        2.9.3
-Release:        7%{?dist}
+Version:        2.9.4
+Release:        1%{?dist}
 Summary:        A high-level language for numerical computations
 Epoch:          6
 
 Group:          Applications/Engineering
 License:        GPL
 Source:         ftp://ftp.octave.org/pub/octave/bleeding-edge/octave-%{version}.tar.bz2
+Patch0:         octave-2.9.4-header.patch
 URL:            http://www.octave.org
 Requires:       gnuplot less info texinfo 
 Requires(post): /sbin/install-info
@@ -49,6 +50,7 @@ applications which use GNU Octave.
 
 %prep
 %setup -q
+%patch0 -p0
 ./autogen.sh
 
 
@@ -80,6 +82,7 @@ echo "%{_libdir}/octave-%{version}" > $RPM_BUILD_ROOT/etc/ld.so.conf.d/octave-%{
 
 perl -pi -e "s,$RPM_BUILD_ROOT,," $RPM_BUILD_ROOT/%{_libexecdir}/%{name}/ls-R
 perl -pi -e "s,$RPM_BUILD_ROOT,," $RPM_BUILD_ROOT/%{_datadir}/%{name}/ls-R
+perl -pi -e "s,$RPM_BUILD_ROOT,," $RPM_BUILD_ROOT/%{_libexecdir}/%{name}/%{version}/oct/*/PKG_ADD
 
 
 # XXX Nuke unpackaged files
@@ -126,7 +129,10 @@ fi
 
 
 %changelog
-* Thu Oct 27 2005 Quentin Spencer <qspencer@users.sourceforge.net> 2.9.3-7
+* Fri Nov 11 2005 Quentin Spencer <qspencer@users.sourceforge.net> 2.9.4-1
+- New upstream release.
+- Patch to make sure all headers are included in -devel.
+- PKG_ADD file now needs $RPM_BUILD_ROOT stripped from it.
 - Cleanup errors in dependencies.
 
 * Tue Oct 25 2005 Quentin Spencer <qspencer@users.sourceforge.net> 2.9.3-6
diff --git a/sources b/sources
index 5b28d24..ce0fd4c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bb2e0ea0159e592c87d74e8d3fdf9125  octave-2.9.3.tar.bz2
+43561b0d8432847f5eae349c6e89b30a  octave-2.9.4.tar.bz2