diff --git a/gimp.spec b/gimp.spec index 6d7a475..34fd0d7 100644 --- a/gimp.spec +++ b/gimp.spec @@ -15,7 +15,7 @@ Version: 2.2.9 %define minorver 200 %define microver %(ver=%{version}; echo ${ver##*.*.}) #define prever pre2 -Release: %{?prever:0.0.%{prever}.}1 +Release: %{?prever:0.0.%{prever}.}2 Epoch: 2 License: GPL, LGPL Group: Applications/Multimedia @@ -51,6 +51,7 @@ BuildRequires: libtool >= 1.5 BuildRequires: perl BuildRequires: libwmf-devel >= 0.2.8 BuildRequires: intltool +BuildRequires: findutils PreReq: desktop-file-utils >= 0.9 Requires: glib2 >= 2.4.8 Requires: gtk2 >= 2.4.14 @@ -142,6 +143,11 @@ mkdir -p $RPM_BUILD_ROOT/%{_infodir} $RPM_BUILD_ROOT/%{_includedir} \ # makeinstall macro won't work here - libexec is overriden make DESTDIR=$RPM_BUILD_ROOT install +%ifos linux +# remove .la files +find %buildroot -name \*.la -exec %__rm -f {} \; +%endif + # symlink desktop icon ln -s ../../../../gimp/%{interfacever}/images/wilber-icon.png $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/gimp.png @@ -319,14 +325,20 @@ fi %{_libdir}/*.so %{_libdir}/*.a -%{_libdir}/*.la -%{_datadir}/aclocal/*.m4 %{_libdir}/gimp/%{interfacever}/modules/*.a +%ifnos linux +%{_libdir}/*.la %{_libdir}/gimp/%{interfacever}/modules/*.la +%endif +%{_datadir}/aclocal/*.m4 %{_includedir}/gimp-%{interfacever} %{_libdir}/pkgconfig/* %changelog +* Tue Nov 08 2005 Nils Philippsen +- don't include .la files (#172626) +- require findutils for building + * Wed Nov 02 2005 Nils Philippsen - 2.2.9 - version 2.2.9 - first attempt at dealing with modular X