rpms/vips/FC-5 vips-7.10.20-no-undef-vipsCC.patch, 1.1, 1.2 vips.spec, 1.1, 1.2

[Adam Goode (agoode)]

Author: agoode

Update of /cvs/extras/rpms/vips/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2330

Modified Files:
	vips-7.10.20-no-undef-vipsCC.patch vips.spec 
Log Message:
fix patch for automake

vips-7.10.20-no-undef-vipsCC.patch:

Index: vips-7.10.20-no-undef-vipsCC.patch
===================================================================
RCS file: /cvs/extras/rpms/vips/FC-5/vips-7.10.20-no-undef-vipsCC.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vips-7.10.20-no-undef-vipsCC.patch	27 Jul 2006 02:44:41 -0000	1.1
+++ vips-7.10.20-no-undef-vipsCC.patch	28 Jul 2006 04:37:39 -0000	1.2
@@ -1,6 +1,7 @@
-diff -ur vips-7.10.20/libsrcCC/Makefile.am /home/adam/rpmbuild/BUILD/vips-7.10.20/libsrcCC/Makefile.am
---- vips-7.10.20/libsrcCC/Makefile.am	2005-02-08 10:19:20.000000000 -0500
-+++ /home/adam/rpmbuild/BUILD/vips-7.10.20/libsrcCC/Makefile.am	2006-07-24 22:01:34.000000000 -0400
+Only in vips-7.10.20: autom4te.cache
+diff -ur vips-7.10.20~/libsrcCC/Makefile.am vips-7.10.20/libsrcCC/Makefile.am
+--- vips-7.10.20~/libsrcCC/Makefile.am	2005-02-08 10:19:20.000000000 -0500
++++ vips-7.10.20/libsrcCC/Makefile.am	2006-07-28 00:05:31.000000000 -0400
 @@ -8,6 +8,9 @@
  	VDisplay.cc \
  	VMask.cc
@@ -11,3 +12,25 @@
  libvipsCC_la_LDFLAGS = \
  	-version-info @LIBRARY_CURRENT@:@LIBRARY_REVISION@:@LIBRARY_AGE@
  
+diff -ur vips-7.10.20~/libsrcCC/Makefile.in vips-7.10.20/libsrcCC/Makefile.in
+--- vips-7.10.20~/libsrcCC/Makefile.in	2006-06-09 09:20:38.000000000 -0400
++++ vips-7.10.20/libsrcCC/Makefile.in	2006-07-28 00:05:45.000000000 -0400
+@@ -55,7 +55,7 @@
+ am__installdirs = "$(DESTDIR)$(libdir)"
+ libLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+-libvipsCC_la_LIBADD =
++libvipsCC_la_DEPENDENCIES = ../libsrc/libvips.la
+ am_libvipsCC_la_OBJECTS = VImage.lo VError.lo VDisplay.lo VMask.lo
+ libvipsCC_la_OBJECTS = $(am_libvipsCC_la_OBJECTS)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+@@ -261,6 +261,9 @@
+ 	VDisplay.cc \
+ 	VMask.cc
+ 
++libvipsCC_la_LIBADD = \
++	../libsrc/libvips.la
++
+ libvipsCC_la_LDFLAGS = \
+ 	-version-info @LIBRARY_CURRENT@:@LIBRARY_REVISION@:@LIBRARY_AGE@
+ 


Index: vips.spec
===================================================================
RCS file: /cvs/extras/rpms/vips/FC-5/vips.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vips.spec	27 Jul 2006 02:44:41 -0000	1.1
+++ vips.spec	28 Jul 2006 04:37:39 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		vips
 Version:	7.10.20
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary: 	Library for processing large images
 
 Group:		System Environment/Libraries
@@ -15,7 +15,7 @@
 BuildRequires:	libjpeg-devel libtiff-devel zlib-devel fftw-devel lcms-devel
 BuildRequires:	libpng-devel glib2-devel ImageMagick-devel pango-devel
 BuildRequires:	pkgconfig gettext perl(XML::Parser)
-BuildRequires:	libtool automake autoconf
+BuildRequires:	libtool
 #Requires:
 
 
@@ -63,8 +63,6 @@
 
 # link libvipsCC to libvips, so prelinking can work
 %patch -P 0 -p1 -b .no-undef-vipsCC
-automake
-autoconf
 
 
 %build
@@ -127,6 +125,10 @@
 
 
 %changelog
+* Fri Jul 28 2006 Adam Goode <adam at spicenitz.org> - 7.10.20-3
+- Include results of running automake in the patch for undefined symbols
+- No longer run automake or autoconf (autoconf was never actually necessary)
+
 * Mon Jul 24 2006 Adam Goode <adam at spicenitz.org> - 7.10.20-2
 - Eliminate undefined non-weak symbols in libvipsCC.so