rpms/gimp/FC-4 .cvsignore, 1.24, 1.25 gimp.spec, 1.78, 1.79 sources, 1.24, 1.25

[fedora-cvs-commits at redhat.com]

Author: nphilipp

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

Modified Files:
	.cvsignore gimp.spec sources 
Log Message:
version 2.2.11



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gimp/FC-4/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	29 Dec 2005 12:42:39 -0000	1.24
+++ .cvsignore	18 Apr 2006 06:46:54 -0000	1.25
@@ -1 +1 @@
-gimp-2.2.10.tar.bz2
+gimp-2.2.11.tar.bz2


Index: gimp.spec
===================================================================
RCS file: /cvs/dist/rpms/gimp/FC-4/gimp.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- gimp.spec	29 Dec 2005 12:42:39 -0000	1.78
+++ gimp.spec	18 Apr 2006 06:46:54 -0000	1.79
@@ -1,12 +1,17 @@
+%define _enable_modularX %{?enable_modularX:%{enable_modularX}}%{?!enable_modularX:0}
 %define _enable_python %{?enable_python:%{enable_python}}%{?!enable_python:1}
 %define _enable_mp %{?enable_mp:%{enable_mp}}%{?!enable_mp:1}
 %define _enable_static %{?enable_static:%{enable_static}}%{?!enable_static:1}
 %define _enable_print %{?enable_print:%{enable_print}}%{?!enable_print:0}
 %define _enable_convenience %{?enable_convenience:%{enable_convenience}}%{?!enable_convenience:1}
+%define _with_lcms %{?with_lcms:%{with_lcms}}%{?!with_lcms:0}
+
+#
+#
 
 Summary:	The GNU Image Manipulation Program
 Name: 		gimp
-Version: 	2.2.10
+Version: 	2.2.11
 %define binver 2.2
 %define gimp_lang_ver 20
 %define interfacever 2.0
@@ -14,7 +19,7 @@
 %define minorver 200
 %define microver %(ver=%{version}; echo ${ver##*.*.})
 #define prever pre2
-Release: 	0.fc4.%{?prever:0.0.%{prever}.}1
+Release: 0.fc4.%{?prever:0.0.%{prever}.}1
 Epoch:		2
 License: 	GPL, LGPL
 Group: 		Applications/Multimedia
@@ -35,7 +40,14 @@
 BuildRequires:	libpng-devel
 BuildRequires:	libmng-devel
 BuildRequires:	libexif-devel
+%if %_enable_modularX
+BuildRequires:	libX11-devel
+BuildRequires:	libXmu-devel
+# these are req's for libXmu but not yet required by libXmu-devel
+BuildRequires:	libXt-devel
+%else
 BuildRequires:	xorg-x11-devel
+%endif
 BuildRequires:	gimp-print-devel >= 4.2.0
 BuildRequires:	automake >= 1.7
 BuildRequires:	autoconf >= 2.54
@@ -43,20 +55,29 @@
 BuildRequires:	perl
 BuildRequires:	libwmf-devel >= 0.2.8
 BuildRequires:  intltool
+BuildRequires:  findutils
+%if %_with_lcms
+BuildRequires:	lcms-devel
+%endif
 Requires:	desktop-file-utils >= 0.9
 Requires:	glib2 >= 2.4.8
 Requires: 	gtk2 >= 2.4.14
 Requires:	pango >= 1.6.0
 Requires:	fontconfig >= 2.2.0
 Requires:	gimp-print >= 4.2.0
-Requires(post): /sbin/ldconfig /usr/bin/update-desktop-database
-Requires(postun): /sbin/ldconfig /usr/bin/update-desktop-database
+Requires(post): /sbin/ldconfig
+Requires(post): /usr/bin/update-desktop-database
+Requires(post): hicolor-icon-theme
+Requires(postun): /sbin/ldconfig
+Requires(postun): /usr/bin/update-desktop-database
+Requires(postun): hicolor-icon-theme
 Source0: 	ftp://ftp.gimp.org/pub/gimp/v%{binver}/%{?prever:testing/}gimp-%{version}%{?prever:-%{prever}}.tar.bz2
 Patch0:		gimp-2.0pre3-buildroot.patch
 Patch1:		gimp-2.0.1-gimphelpmissing.patch
 Patch2:		gimp-2.2.3-icontheme.patch
 Patch3:		gimp-2.2.7-gcc4.patch
 Patch4:		gimp-2.2.4-gifload.patch
+Patch5:     gimp-2.2.11-htmlview.patch
 
 %description
 The GIMP (GNU Image Manipulation Program) is a powerful image
@@ -85,6 +106,7 @@
 %patch2 -p1 -b .icontheme
 %patch3 -p1 -b .gcc4
 %patch4 -p1 -b .gifload
+%patch5 -p1 -b .htmlview
 
 %build
 libtoolize --copy --force
@@ -95,8 +117,9 @@
 autoconf
 LIBAA="disable"; export LIBAA
 if [ ! -f configure ]; then
-  CFLAGS="$RPM_OPT_FLAGS" ./autogen.sh --quiet $MYARCH_FLAGS --prefix=%{_prefix}
+  ./autogen.sh --quiet $MYARCH_FLAGS --prefix=%{_prefix}
 fi
+CFLAGS="%optflags -fomit-frame-pointer" \
 %configure \
 	--disable-perl \
 %if %_enable_python
@@ -119,6 +142,11 @@
 %else
 	--disable-print \
 %endif
+%if %_with_lcms
+	--with-lcms \
+%else
+	--without-lcms \
+%endif
 ;
 
 make %{?_smp_mflags}
@@ -134,6 +162,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
 
@@ -305,17 +338,55 @@
 
 %{_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 Apr 18 2006 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.11-0.fc4.1
+- version 2.2.11
+
+* Fri Mar 03 2006 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.10-4
+- use htmlview as default web browser (#183730, patch by Ben Levenson)
+- require hicolor-icon-theme (#182784, #182785)
+
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2:2.2.10-2.2
+- bump again for double-long bug on ppc(64)
+
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 2:2.2.10-2.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
+* Tue Jan 10 2006 Nils Philippsen <nphilipp at redhat.com>
+- rebuild with lcms
+
 * Thu Dec 29 2005 Nils Philippsen <nphilipp at redhat.com> - 2.2.10
 - version 2.2.10
 
+* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
+- rebuilt
+
+* Fri Dec 09 2005 Nils Philippsen <nphilipp at redhat.com>
+- build with -fomit-frame-pointer to let assembly build with gcc 4.1
+
+* Fri Dec 02 2005 Nils Philippsen <nphilipp at redhat.com>
+- build with gcc 4.1
+
+* 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
+
+* Tue Aug 16 2005 Nils Philippsen <nphilipp at redhat.com>
+- rebuild
+
 * Thu Jul 28 2005 Nils Philippsen <nphilipp at redhat.com>
 - fix gimptool manpage symlink
 
@@ -323,6 +394,7 @@
 - version 2.2.8
 - clean up file list generation a bit
 - gimptool manpage is in section 1 not 5
+- list auto-generated .pyc and .pyo files
 
 * Fri May 13 2005 Nils Philippsen <nphilipp at redhat.com>
 - fix inline asm of MMX/SSE optimizations instead of using -mmmx and the like


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gimp/FC-4/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	29 Dec 2005 12:42:39 -0000	1.24
+++ sources	18 Apr 2006 06:46:54 -0000	1.25
@@ -1 +1 @@
-aa29506ed2272af02941a7a601a7a097  gimp-2.2.10.tar.bz2
+0403e9b4e0415c99cd27b137b9839212  gimp-2.2.11.tar.bz2