rpms/octave/devel octave-2.9.4-header.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 octave.spec, 1.23, 1.24 sources, 1.5, 1.6

[Quentin Spencer (qspencer)]

Author: qspencer

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

Modified Files:
	.cvsignore octave.spec sources 
Added Files:
	octave-2.9.4-header.patch 
Log Message:
New upstream release (2.9.4). Other minor changes (see ChangeLog)

octave-2.9.4-header.patch:

--- NEW FILE octave-2.9.4-header.patch ---
src/ChangeLog:

2005-11-11  John W. Eaton  <jwe at 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


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/octave/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	2 Aug 2005 18:40:09 -0000	1.5
+++ .cvsignore	12 Nov 2005 06:02:28 -0000	1.6
@@ -1 +1 @@
-octave-2.9.3.tar.bz2
+octave-2.9.4.tar.bz2


Index: octave.spec
===================================================================
RCS file: /cvs/extras/rpms/octave/devel/octave.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- octave.spec	27 Oct 2005 13:45:53 -0000	1.23
+++ octave.spec	12 Nov 2005 06:02:28 -0000	1.24
@@ -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 @@
 
 %prep
 %setup -q
+%patch0 -p0
 ./autogen.sh
 
 
@@ -80,6 +82,7 @@
 
 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 @@
 
 
 %changelog
-* Thu Oct 27 2005 Quentin Spencer <qspencer at users.sourceforge.net> 2.9.3-7
+* Fri Nov 11 2005 Quentin Spencer <qspencer at 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 at users.sourceforge.net> 2.9.3-6


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/octave/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	2 Aug 2005 18:40:09 -0000	1.5
+++ sources	12 Nov 2005 06:02:28 -0000	1.6
@@ -1 +1 @@
-bb2e0ea0159e592c87d74e8d3fdf9125  octave-2.9.3.tar.bz2
+43561b0d8432847f5eae349c6e89b30a  octave-2.9.4.tar.bz2