rpms/imlib/devel imlib-1.9.10-cppflags.patch, 1.1, 1.2 imlib-1.9.15-lib-bloat.patch, 1.1, 1.2 imlib.spec, 1.12, 1.13

[Paul Howarth]

Author: pghmcfc

Update of /cvs/pkgs/rpms/imlib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12905

Modified Files:
	imlib-1.9.10-cppflags.patch imlib-1.9.15-lib-bloat.patch 
	imlib.spec 
Log Message:
fix patches to apply without fuzz

imlib-1.9.10-cppflags.patch:

Index: imlib-1.9.10-cppflags.patch
===================================================================
RCS file: /cvs/pkgs/rpms/imlib/devel/imlib-1.9.10-cppflags.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- imlib-1.9.10-cppflags.patch	3 Jul 2006 23:05:07 -0000	1.1
+++ imlib-1.9.10-cppflags.patch	29 Aug 2008 17:03:13 -0000	1.2
@@ -1,8 +1,8 @@
---- imlib-1.9.10/configure.in.cppflags	Tue Jan  8 15:05:58 2002
-+++ imlib-1.9.10/configure.in	Tue Jan  8 15:06:11 2002
-@@ -160,8 +160,6 @@
-   GX_LIBS="$GTK_LIBS"
+--- imlib-1.9.15/configure.in.cppflags	2004-09-23 02:13:45.000000000 +0100
++++ imlib-1.9.15/configure.in		2008-08-29 09:11:06.000000000 +0100
+@@ -141,8 +141,6 @@
  fi
+ AC_SUBST(GX_LIBS)
  
 -CPPFLAGS="$CPPFLAGS -I$includedir -I$prefix/include"
 -

imlib-1.9.15-lib-bloat.patch:

Index: imlib-1.9.15-lib-bloat.patch
===================================================================
RCS file: /cvs/pkgs/rpms/imlib/devel/imlib-1.9.15-lib-bloat.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- imlib-1.9.15-lib-bloat.patch	3 Apr 2007 09:51:01 -0000	1.1
+++ imlib-1.9.15-lib-bloat.patch	29 Aug 2008 17:03:13 -0000	1.2
@@ -1,5 +1,5 @@
---- imlib-1.9.15/configure.in	2007-03-27 15:02:59.000000000 +0100
-+++ imlib-1.9.15/configure.in	2007-03-27 16:18:49.000000000 +0100
+--- imlib-1.9.15/configure.in	2008-08-29 16:05:28.000000000 +0100
++++ imlib-1.9.15/configure.in	2008-08-29 16:06:57.000000000 +0100
 @@ -204,16 +204,12 @@
  
  
@@ -17,7 +17,7 @@
    [AC_MSG_ERROR(*** GIF header not found ***)])
  
  AC_CHECK_LIB(png, png_read_info,
-@@ -237,9 +237,9 @@
+@@ -237,9 +233,9 @@
  fi
  
  if test "$png_ok" = yes; then
@@ -29,11 +29,11 @@
  fi
  
  SUPPORT_LIBS="$SUPPORT_LIBS -lm"
---- imlib-1.9.15/Imlib/Makefile.am	2007-03-27 17:45:17.000000000 +0100
-+++ imlib-1.9.15/Imlib/Makefile.am	2007-03-27 17:45:46.000000000 +0100
+--- imlib-1.9.15/Imlib/Makefile.am	2004-09-21 01:22:59.000000000 +0100
++++ imlib-1.9.15/Imlib/Makefile.am	2008-08-29 16:06:57.000000000 +0100
 @@ -32,8 +32,7 @@
  
- libImlib_la_LDFLAGS    = -version-info 11:0:0
+ libImlib_la_LDFLAGS    = -version-info 10:15:9
  #libImlib_la_LDDADD     = $(SUPPORT_LIBS)
 -libImlib_la_LIBADD     = $(SUPPORT_LIBS) $(X_PRE_LIBS) \
 -			 $(X_LIBS) $(X_EXTRA_LIBS)
@@ -41,8 +41,8 @@
  
  DEFS =  -DSYSTEM_IMRC=\"$(sysconfdir)/imrc\" \
  	-DSYSCONFDIR=\"$(sysconfdir)\"
---- imlib-1.9.15/gdk_imlib/Makefile.am	2007-03-27 18:45:24.000000000 +0100
-+++ imlib-1.9.15/gdk_imlib/Makefile.am	2007-03-27 18:48:05.000000000 +0100
+--- imlib-1.9.15/gdk_imlib/Makefile.am	2008-08-29 16:05:28.000000000 +0100
++++ imlib-1.9.15/gdk_imlib/Makefile.am	2008-08-29 16:06:57.000000000 +0100
 @@ -20,11 +20,11 @@
  
  libimlib_tiff_la_SOURCES = io-tiff.c


Index: imlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/imlib/devel/imlib.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- imlib.spec	13 Feb 2008 12:11:33 -0000	1.12
+++ imlib.spec	29 Aug 2008 17:03:13 -0000	1.13
@@ -3,7 +3,7 @@
 Summary:	An image loading and rendering library for X11R6
 Name:		imlib
 Version:	1.9.15
-Release:	7%{?dist}
+Release:	8%{?dist}
 Epoch:		1
 License:	LGPLv2+
 Group:		System Environment/Libraries
@@ -151,6 +151,9 @@
 %{_mandir}/man1/imlib-config.1*
 
 %changelog
+* Fri Aug 29 2008 Paul Howarth <paul at city-fan.org> 1:1.9.15-8
+- fix patches to apply without fuzz
+
 * Wed Feb 13 2008 Paul Howarth <paul at city-fan.org> 1:1.9.15-7
 - rebuild with gcc 4.3.0 for Fedora 9