rpms/gimp/devel gimp.spec,1.80,1.81

[fedora-cvs-commits at redhat.com]

Author: nphilipp

Update of /cvs/dist/rpms/gimp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30303

Modified Files:
	gimp.spec 
Log Message:
don't include .la files (#172626)
require findutils for building



Index: gimp.spec
===================================================================
RCS file: /cvs/dist/rpms/gimp/devel/gimp.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- gimp.spec	2 Nov 2005 16:54:34 -0000	1.80
+++ gimp.spec	8 Nov 2005 13:15:43 -0000	1.81
@@ -15,7 +15,7 @@
 %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:	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 @@
 # 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 @@
 
 %{_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 <nphilipp at redhat.com>
+- don't include .la files (#172626)
+- require findutils for building
+
 * Wed Nov 02 2005 Nils Philippsen <nphilipp at redhat.com> - 2.2.9
 - version 2.2.9
 - first attempt at dealing with modular X