rpms/gimp/FC-3 .cvsignore, 1.18, 1.19 gimp.spec, 1.50, 1.51 sources, 1.18, 1.19

[fedora-cvs-commits redhat com]

Author: nphilipp

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

Modified Files:
	.cvsignore gimp.spec sources 
Log Message:
rebuild from FC-4



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gimp/FC-3/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	11 Apr 2005 11:32:20 -0000	1.18
+++ .cvsignore	26 Jul 2005 17:37:26 -0000	1.19
@@ -1 +1 @@
-gimp-2.2.6.tar.bz2
+gimp-2.2.8.tar.bz2


Index: gimp.spec
===================================================================
RCS file: /cvs/dist/rpms/gimp/FC-3/gimp.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- gimp.spec	28 Apr 2005 12:52:52 -0000	1.50
+++ gimp.spec	26 Jul 2005 17:37:26 -0000	1.51
@@ -6,7 +6,7 @@
 
 Summary:	The GNU Image Manipulation Program
 Name: 		gimp
-Version: 	2.2.6
+Version: 	2.2.8
 %define binver 2.2
 %define gimp_lang_ver 20
 %define interfacever 2.0
@@ -14,7 +14,7 @@
 %define minorver 200
 %define microver %(ver=%{version}; echo ${ver##*.*.})
 #define prever pre2
-Release: 	0.fc3.%{?prever:0.0.%{prever}.}2
+Release: 	0.fc3.%{?prever:0.0.%{prever}.}1
 Epoch:		2
 License: 	GPL, LGPL
 Group: 		Applications/Multimedia
@@ -55,7 +55,7 @@
 Patch0:		gimp-2.0pre3-buildroot.patch
 Patch1:		gimp-2.0.1-gimphelpmissing.patch
 Patch2:		gimp-2.2.3-icontheme.patch
-Patch3:		gimp-2.2.4-gcc4.patch
+Patch3:		gimp-2.2.7-gcc4.patch
 Patch4:		gimp-2.2.4-gifload.patch
 
 %description
@@ -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.
@@ -168,7 +165,7 @@
 ln -snf gimp-remote-%{binver} %{buildroot}/%{_bindir}/gimp-remote
 ln -snf gimp-remote-%{binver}.1 %{buildroot}/%{_mandir}/man1/gimp-remote.1
 ln -snf gimptool-%{interfacever} %{buildroot}/%{_bindir}/gimptool
-ln -snf gimptool-%{binver}.5 %{buildroot}/%{_mandir}/man5/gimptool.5
+ln -snf gimptool-%{binver}.1 %{buildroot}/%{_mandir}/man1/gimptool.1
 %endif
 
 %clean
@@ -287,33 +284,57 @@
 %{_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
-* Wed Apr 27 2005 Jeremy Katz <katzj redhat com> - 2:2.2.6-0.fc3.2
+* Mon Jul 25 2005 Nils Philippsen <nphilipp redhat com> - 2.2.8
+- version 2.2.8
+- clean up file list generation a bit
+- gimptool manpage is in section 1 not 5
+
+* Fri May 13 2005 Nils Philippsen <nphilipp redhat com>
+- fix inline asm of MMX/SSE optimizations instead of using -mmmx and the like
+
+* Fri May 13 2005 Nils Philippsen <nphilipp redhat com>
+- fix cpuinstructionset patch so that it actually uses CPU-specific
+  optimizations
+
+* Wed May 11 2005 Nils Philippsen <nphilipp redhat com>
+- use -mmmx/sse/sse2/... only for the relevant source files so that extended
+  instruction sets only get used on suitable CPUs (#157409)
+
+* Mon May 09 2005 Nils Philippsen <nphilipp redhat com>
+- version 2.2.7, fixes bug in SSE2 assembly for Lighten Only layer mode
+  (#145771) and various other bugs
+- on x86 and x86_64, use -msse and -msse2 to accomodate newer compilers
+
+* Wed Apr 27 2005 Jeremy Katz <katzj redhat com> - 2:2.2.6-2
 - silence %%post
 
 * Mon Apr 11 2005 Nils Philippsen <nphilipp redhat com>


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gimp/FC-3/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	11 Apr 2005 11:32:20 -0000	1.18
+++ sources	26 Jul 2005 17:37:26 -0000	1.19
@@ -1 +1 @@
-cf7de255739bf5abc2e90d7882eda6c9  gimp-2.2.6.tar.bz2
+0db3fca2f741d6dd51eb61dc85778b16  gimp-2.2.8.tar.bz2