rpms/imlib/EL-5 imlib-1.9.10-cppflags.patch, 1.1, 1.2 imlib-1.9.15-lib-bloat.patch, 1.1, 1.2 imlib.spec, 1.6, 1.7

Paul Howarth pghmcfc at fedoraproject.org
Tue Apr 21 14:44:32 UTC 2009 

Author: pghmcfc

Update of /cvs/pkgs/rpms/imlib/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20395

Modified Files:
	imlib-1.9.10-cppflags.patch imlib-1.9.15-lib-bloat.patch 
	imlib.spec 
Log Message:
Resync with Fedora

imlib-1.9.10-cppflags.patch:

Index: imlib-1.9.10-cppflags.patch
===================================================================
RCS file: /cvs/pkgs/rpms/imlib/EL-5/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	21 Apr 2009 14:44:29 -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/EL-5/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	10 Apr 2007 16:50:30 -0000	1.1
+++ imlib-1.9.15-lib-bloat.patch	21 Apr 2009 14:44:29 -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/EL-5/imlib.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- imlib.spec	19 Dec 2007 17:53:17 -0000	1.6
+++ imlib.spec	21 Apr 2009 14:44:29 -0000	1.7
@@ -1,9 +1,7 @@
-%define libtool_hack LIBTOOL=/usr/bin/libtool
-
 Summary:	An image loading and rendering library for X11R6
 Name:		imlib
 Version:	1.9.15
-Release:	6%{?dist}
+Release:	11%{?dist}
 Epoch:		1
 License:	LGPLv2+
 Group:		System Environment/Libraries
@@ -18,15 +16,15 @@
 Patch9:		imlib-1.9.15-multilib-config.patch
 Patch10:	imlib-1.9.15-check-for-shm-pixmaps.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
-BuildRequires:	automake
+BuildRequires:	automake, libtool
 BuildRequires:	giflib-devel
-BuildRequires:	gtk+-devel
-BuildRequires:	libpng-devel >= 1.2.2
-BuildRequires:	libjpeg-devel
-BuildRequires:	libtiff-devel
-BuildRequires:	libtool
-BuildRequires:	libX11-devel
-BuildRequires:	libXt-devel
+BuildRequires:	glib-devel%{?_isa}
+BuildRequires:	gtk+-devel%{?_isa}
+BuildRequires:	libpng-devel%{?_isa} >= 1.2.2
+BuildRequires:	libjpeg-devel%{?_isa}
+BuildRequires:	libtiff-devel%{?_isa}
+BuildRequires:	libX11-devel%{?_isa}
+BuildRequires:	libXt-devel%{?_isa}
 BuildRequires:	zlib-devel
 Obsoletes:	imlib-cfgeditor <= %{version}-%{release}, Imlib <= %{version}-%{release}
 Provides:	imlib-cfgeditor = %{version}-%{release}, Imlib = %{version}-%{release}
@@ -47,10 +45,17 @@
 %package devel
 Summary:	Development tools for Imlib applications
 Group:		Development/Libraries
-Requires:	imlib = %{epoch}:%{version}-%{release}
-Requires:	giflib-devel, gtk+-devel, libjpeg-devel, libtiff-devel
-Requires:	libX11-devel, zlib-devel
-Requires:	%{_datadir}/aclocal, pkgconfig
+Requires:	imlib%{?_isa} = %{epoch}:%{version}-%{release}
+Requires:	giflib-devel
+Requires:	glib-devel%{?_isa}
+Requires:	gtk+-devel%{?_isa}
+Requires:	libjpeg-devel%{?_isa}
+Requires:	libtiff-devel%{?_isa}
+Requires:	libX11-devel%{?_isa}
+Requires:	libXt-devel%{?_isa}
+Requires:	zlib-devel
+Requires:	%{_datadir}/aclocal
+Requires:	pkgconfig
 
 %description devel
 The header files, static libraries and documentation needed for
@@ -86,28 +91,31 @@
 
 %build
 /usr/bin/autoreconf -i -f
-%configure
+%configure --disable-static
 
 ## Remove -L%{_libdir} from imlib-config if present;
 ## it's redundant and breaks multilib compatibility
 %{__sed} -i -e 's,-L%{_libdir} ,,g' imlib-config
 
+## Kill bogus RPATHs
+%{__sed} -i 's|^sys_lib_dlsearch_path_spec="/lib /usr/lib|sys_lib_dlsearch_path_spec="/%{_lib} %{_libdir}|' libtool
+
 ## Build local gmodule hack
-tagname=CC %{__make} -C gdk_imlib/local-hack-gmodule %{libtool_hack}
+tagname=CC %{__make} -C gdk_imlib/local-hack-gmodule
 %{__cp} gdk_imlib/local-hack-gmodule/gmodule-local.h gdk_imlib/
 
 ## Avoid unnecessary library linkage in libgdk_imlib
 GX_LIBS=$(/usr/bin/gtk-config --libs | %{__sed} -e 's/-lgtk //; s/-lgmodule //; s/-lXi //')
 
 ## Note: build with %{?_smp_mflags} doesn't work reliably
-%{__make} %{libtool_hack} GX_LIBS="${GX_LIBS}"
+%{__make} GX_LIBS="${GX_LIBS}"
 
 %install
 %{__rm} -rf %{buildroot}
-%{__make} install DESTDIR=%{buildroot} %{libtool_hack}
+%{__make} install DESTDIR=%{buildroot} INSTALL="%{__install} -p"
 
-## Don't package static or libtool archives
-%{__rm} -f %{buildroot}%{_libdir}/*a
+## Don't package libtool archives
+%{__rm} -f %{buildroot}%{_libdir}/*.la
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -151,6 +159,25 @@
 %{_mandir}/man1/imlib-config.1*
 
 %changelog
+* Wed Apr  1 2009 Paul Howarth <paul at city-fan.org> 1:1.9.15-11
+- add libXt-devel dependency for -devel package (#478357)
+- use install -p to maintain timestamps where reasonable
+- Use an alternative approach to rpath-fixing - hacking the supplied libtool
+  rather than trying to use the system one
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> 1:1.9.15-10
+- rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Tue Sep 23 2008 Paul Howarth <paul at city-fan.org> 1:1.9.15-9
+- specify Instruction Set Architecture (%%{?_isa}) in devel package requires
+  (where available)
+
+* 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
+
 * Tue Dec 18 2007 Paul Howarth <paul at city-fan.org> 1:1.9.15-6
 - include patch to fix a DoS caused via a BMP image with a Bits Per Page (BPP)
   value of 0 (#426091, CVE-2007-3568); thanks to Peter Volkov at Gentoo for

More information about the fedora-extras-commits mailing list