rpms/gimp/FC-4 gimp.spec,1.74,1.75

[fedora-cvs-commits redhat com]

Author: nphilipp

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

Modified Files:
	gimp.spec 
Log Message:
clean up file list generation a bit



Index: gimp.spec
===================================================================
RCS file: /cvs/dist/rpms/gimp/FC-4/gimp.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- gimp.spec	25 Jul 2005 15:55:28 -0000	1.74
+++ gimp.spec	26 Jul 2005 07:20:51 -0000	1.75
@@ -141,20 +141,17 @@
 # Plugins and modules change often (grab the executeable ones)
 #
 echo "%defattr (-, root, root)" > gimp-plugin-files
-find $RPM_BUILD_ROOT/%{_libdir}/gimp/%{interfacever} -type f -exec file {} \; | grep -v perl | cut -d':' -f 1 | sed "s ^$RPM_BUILD_ROOT@@g" | grep -v /usr/lib/gimp/%{interfacever}/modules/.*\.a$ >>gimp-plugin-files
+#find $RPM_BUILD_ROOT/%{_libdir}/gimp/%{interfacever} -type f -exec file {} \; | grep -v perl | cut -d':' -f 1 | sed "s ^$RPM_BUILD_ROOT@@g" | grep -v /usr/lib/gimp/%{interfacever}/modules/.*\.a$ >>gimp-plugin-files
+find $RPM_BUILD_ROOT/%{_libdir}/gimp/%{interfacever} -type f | sed "s ^$RPM_BUILD_ROOT@@g" | egrep -v 'modules/.*\.a$|modules/.*\.la$' >>gimp-plugin-files
 
 #
 # Auto detect the lang files.
 #
-if [ -f /usr/lib/rpm/find-lang.sh ] ; then
- /usr/lib/rpm/find-lang.sh $RPM_BUILD_ROOT gimp%{gimp_lang_ver}
- /usr/lib/rpm/find-lang.sh $RPM_BUILD_ROOT gimp%{gimp_lang_ver}-std-plug-ins
- /usr/lib/rpm/find-lang.sh $RPM_BUILD_ROOT gimp%{gimp_lang_ver}-script-fu
- /usr/lib/rpm/find-lang.sh $RPM_BUILD_ROOT gimp%{gimp_lang_ver}-libgimp
- cat gimp%{gimp_lang_ver}.lang gimp%{gimp_lang_ver}-std-plug-ins.lang gimp%{gimp_lang_ver}-script-fu.lang gimp%{gimp_lang_ver}-libgimp.lang > gimp-all.lang
-else
- echo '%{_datadir}/locale/*/*/*' > gimp-all.lang
-fi
+%find_lang gimp%{gimp_lang_ver}
+%find_lang gimp%{gimp_lang_ver}-std-plug-ins
+%find_lang gimp%{gimp_lang_ver}-script-fu
+%find_lang gimp%{gimp_lang_ver}-libgimp
+cat gimp%{gimp_lang_ver}.lang gimp%{gimp_lang_ver}-std-plug-ins.lang gimp%{gimp_lang_ver}-script-fu.lang gimp%{gimp_lang_ver}-libgimp.lang > gimp-all.lang
 
 #
 # Build the master filelists generated from the above mess.
@@ -287,34 +284,38 @@
 %{_bindir}/gimptool
 %endif
 
-%defattr (-, root, root)
 %{_mandir}/man1/gimp-%{binver}.1*
 %{_mandir}/man1/gimp-remote-%{binver}.1*
 %{_mandir}/man1/gimptool-%{interfacever}.1*
-#%{_mandir}/man1/escputil-%{interfacever}.1.*
 %{_mandir}/man5/gimprc-%{binver}.5*
 
+%if %_enable_convenience
+%{_mandir}/man1/gimp.1*
+%{_mandir}/man1/gimp-remote.1*
+%{_mandir}/man1/gimptool.1*
+%{_mandir}/man5/gimprc.5*
+%endif
+
 %{_datadir}/icons/hicolor/48x48/apps/gimp.png
 
 %files devel
 %defattr (-, root, root, 0755)
-#%{_bindir}/gimp-config-1.4
-%{_libdir}/*.so
-%{_libdir}/*.la
-%{_libdir}/gimp/%{interfacever}/modules/*.la
-
-%defattr (-, root, root, 0755)
 %doc HACKING
 %doc %{_datadir}/gtk-doc/*
-%{_datadir}/aclocal/*.m4
+
+%{_libdir}/*.so
 %{_libdir}/*.a
+%{_libdir}/*.la
+%{_datadir}/aclocal/*.m4
 %{_libdir}/gimp/%{interfacever}/modules/*.a
+%{_libdir}/gimp/%{interfacever}/modules/*.la
 %{_includedir}/gimp-%{interfacever}
 %{_libdir}/pkgconfig/*
 
 %changelog
 * Mon Jul 25 2005 Nils Philippsen <nphilipp redhat com> - 2.2.8
 - version 2.2.8
+- clean up file list generation a bit
 
 * Fri May 13 2005 Nils Philippsen <nphilipp redhat com>
 - fix inline asm of MMX/SSE optimizations instead of using -mmmx and the like