rpms/imlib/devel imlib.spec,1.15,1.16

[Paul Howarth]

Author: pghmcfc

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

Modified Files:
	imlib.spec 
Log Message:
- 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



Index: imlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/imlib/devel/imlib.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- imlib.spec	25 Feb 2009 07:05:55 -0000	1.15
+++ imlib.spec	21 Apr 2009 11:04:36 -0000	1.16
@@ -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:	10%{?dist}
+Release:	11%{?dist}
 Epoch:		1
 License:	LGPLv2+
 Group:		System Environment/Libraries
@@ -18,14 +16,13 @@
 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:	glib-devel%{?_isa}
-BuildRequires:	gtk+-devel
+BuildRequires:	gtk+-devel%{?_isa}
 BuildRequires:	libpng-devel%{?_isa} >= 1.2.2
-BuildRequires:	libjpeg-devel
+BuildRequires:	libjpeg-devel%{?_isa}
 BuildRequires:	libtiff-devel%{?_isa}
-BuildRequires:	libtool
 BuildRequires:	libX11-devel%{?_isa}
 BuildRequires:	libXt-devel%{?_isa}
 BuildRequires:	zlib-devel
@@ -49,9 +46,16 @@
 Summary:	Development tools for Imlib applications
 Group:		Development/Libraries
 Requires:	imlib%{?_isa} = %{epoch}:%{version}-%{release}
-Requires:	giflib-devel, glib-devel%{?_isa}, gtk+-devel, libjpeg-devel, libtiff-devel
-Requires:	libX11-devel, zlib-devel
-Requires:	%{_datadir}/aclocal, pkgconfig
+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
@@ -87,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}
@@ -152,8 +159,14 @@
 %{_mandir}/man1/imlib-config.1*
 
 %changelog
-* 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
+* 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