diff --git a/imlib2.spec b/imlib2.spec index ae0fc4f..77fd901 100644 --- a/imlib2.spec +++ b/imlib2.spec @@ -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 @@ Source0: http://download.sf.net/enlightenment/%{name}-%{version}.tar.gz 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 @@ long description of the differences. %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 @@ long description of the differences. %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 @@ rm -rf $RPM_BUILD_ROOT # ----------------------------------------------------------------------------- %changelog +* Wed Feb 9 2005 Ville Skyttä - 0:1.2.0-5 +- Link loaders with the main lib, fixes load/save problems with some apps. + * Tue Jan 18 2005 Michael Schwendt - 0:1.2.0-4 - Really include libtool archives to fix fedora.us bug #2284.