rpms/octave-forge/devel octave-forge-image-1.0.8-build.patch, NONE, 1.1 octave-forge.spec, 1.63, 1.64

[Alex Lancaster]

Author: alexlan

Update of /cvs/pkgs/rpms/octave-forge/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6265

Modified Files:
	octave-forge.spec 
Added Files:
	octave-forge-image-1.0.8-build.patch 
Log Message:
* Mon Jan  5 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 20080831-4
- Patch to temporarily get image subpackage to build (#477577)


octave-forge-image-1.0.8-build.patch:

--- NEW FILE octave-forge-image-1.0.8-build.patch ---
--- main/image-1.0.8/src/Makefile.orig	2009-01-05 00:27:11.000000000 -0700
+++ main/image-1.0.8/src/Makefile	2009-01-05 00:32:41.000000000 -0700
@@ -30,6 +30,6 @@
 	$(MKOCTFILE) $< -lpng
 
 __magick_read__.oct: __magick_read__.cc
-	$(MKOCTFILE) $< `Magick++-config --cppflags` `Magick++-config --ldflags`
+	$(MKOCTFILE) $< `for i in $$(Magick++-config --cppflags); do echo -Wp,$${i}; done` `for l in $$(Magick++-config --ldflags); do echo -Wl,$${l}; done`
 
 clean: ; -$(RM) *.o octave-core core *.oct *~


Index: octave-forge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/octave-forge/devel/octave-forge.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- octave-forge.spec	3 Jan 2009 19:16:55 -0000	1.63
+++ octave-forge.spec	5 Jan 2009 07:51:57 -0000	1.64
@@ -2,7 +2,7 @@
 
 Name:           octave-forge
 Version:        20080831
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Contributed functions for octave
 
 Group:          Applications/Engineering
@@ -17,6 +17,7 @@
 ## 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
+Patch0:         %{name}-image-1.0.8-build.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:	octave(api) = %{octave_api} ImageMagick
@@ -131,6 +132,9 @@
    cd ..
 done
 
+#apply patch to build image-1.0.8 (bug #477577)
+%patch0 -p0
+
 #Install with -nodeps
 sed -i -e "s/pkg('install',/pkg('install','-nodeps',/" */*/Makefile
 
@@ -203,6 +207,9 @@
 
 
 %changelog
+* Mon Jan  5 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 20080831-4
+- Patch to temporarily get image subpackage to build (#477577)
+
 * Sun Jan 04 2009 Rakesh Pandit <rakesh at fedoraproject.org> 20080831-3
 - Fixed unowned directories (BZ 474675)