rpms/imlib2/devel imlib2.spec,1.8,1.9

[Ville Skytta (scop)]

Author: scop

Update of /cvs/extras/rpms/imlib2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23492

Modified Files:
	imlib2.spec 
Log Message:
Link loaders with the main lib, fixes load/save problems with some apps.
http://bugs.debian.org/293815
http://www.linuxtv.org/mailinglists/vdr/2005/02-2005/threads.html#00140



Index: imlib2.spec
===================================================================
RCS file: /cvs/extras/rpms/imlib2/devel/imlib2.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- imlib2.spec	18 Jan 2005 20:45:26 -0000	1.8
+++ imlib2.spec	9 Feb 2005 22:06:39 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: 	A graphic library for file loading, saving, rendering, and manipulation
 Name: 		imlib2
 Version: 	1.2.0
-Release: 	4
+Release: 	5
 Epoch:		0
 License: 	BSD
 Group: 		System Environment/Libraries
@@ -10,10 +10,7 @@
 Patch0:         imlib2-1.2.0-configure-xlib64.patch
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires:	XFree86-devel libjpeg-devel libpng-devel libtiff-devel
-BuildRequires:	libungif-devel freetype-devel libtool bzip2-devel
-%ifarch x86_64
-BuildRequires:	perl
-%endif
+BuildRequires:	libungif-devel freetype-devel libtool bzip2-devel %{__perl}
 
 %package devel
 Summary: 	Development package for %{name}
@@ -46,6 +43,10 @@
 %ifarch x86_64
 %patch0 -b .patch0
 %endif
+# loaders need to link with the main lib
+%{__perl} -pi -e \
+  's|^(\w+_la_LDFLAGS .*)|$1 -L\$(top_builddir)/src/lib| ;
+   s|^(\w+_la_LIBADD .*)|$1 -lImlib2|' src/modules/loaders/Makefile.*
 
 # -----------------------------------------------------------------------------
 
@@ -61,7 +62,8 @@
 %ifarch x86_64
 # fix hardcoded rpath im Makefiles on x86_64 due to freetype-config --libs
 # returning "-L/usr/lib64 -Wl,--rpath -Wl,/usr/lib64 -lfreetype -lz":
-perl -pi.orig -e 's|-Wl,--rpath -Wl,/usr/lib64||g;' Makefile */Makefile */*/Makefile imlib2-config
+%{__perl} -pi.orig -e 's|-Wl,--rpath -Wl,/usr/lib64||g;' \
+  Makefile */Makefile */*/Makefile imlib2-config
 %endif
 
 make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
@@ -122,6 +124,9 @@
 # -----------------------------------------------------------------------------
 
 %changelog
+* Wed Feb  9 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:1.2.0-5
+- Link loaders with the main lib, fixes load/save problems with some apps.
+
 * Tue Jan 18 2005 Michael Schwendt <mschwendt[AT[users.sf.net> - 0:1.2.0-4
 - Really include libtool archives to fix fedora.us bug #2284.