rpms/gimp/FC-5 .cvsignore, 1.26, 1.27 gimp.spec, 1.95, 1.96 sources, 1.26, 1.27 gimp-2.2.7-gcc4.patch, 1.2, NONE

Mon Jul 10 12:17:39 UTC 2006

Author: nphilipp

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

Modified Files:
	.cvsignore gimp.spec sources 
Removed Files:
	gimp-2.2.7-gcc4.patch 
Log Message:
version 2.2.12
use %dist/%fedora/%redhat
remove obsolete gcc4, libpng patches
show build options in %prep
require gettext for building
cope with pygobject2/-devel being split off (#193368)



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gimp/FC-5/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27

--- .cvsignore	18 Apr 2006 06:39:47 -0000	1.26
+++ .cvsignore	10 Jul 2006 12:17:36 -0000	1.27
@@ -1 +1 @@
-gimp-2.2.11.tar.bz2
+gimp-2.2.12.tar.bz2


Index: gimp.spec
===================================================================
RCS file: /cvs/dist/rpms/gimp/FC-5/gimp.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- gimp.spec	20 Apr 2006 12:59:55 -0000	1.95
+++ gimp.spec	10 Jul 2006 12:17:36 -0000	1.96
@@ -1,17 +1,35 @@
-%define _enable_modularX %{?enable_modularX:%{enable_modularX}}%{?!enable_modularX:1}
-%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:1}
+#### options:
+# Use the following --with/--without <option> switches to control how the
+# package will be built:
+# 
+# modular_x:   modular X deps
+# lcms:        lcms support
+# python:      python support
+# mp:          multi processor support
+# static:      build static libraries
+# print:       build the print plugin (if you don't build it externally)
+# convenience: install convenience symlinks
+
+%if 0%{?fedora} >= 5 || 0%{?redhat} >= 5
+%define _enable_modularX 0%{!?_without_modular_x:1}
+%define _enable_lcms 0%{!?_without_lcms:1}
+%else
+%define _enable_modularX 0%{?_with_modular_x:1}
+%define _enable_lcms 0%{?_with_lcms:1}
+%endif
+
+%define _enable_python 0%{!?_without_python:1}
+%define _enable_mp 0%{!?_without_mp:1}
+%define _enable_static 0%{!?_without_static:1}
+%define _enable_print 0%{?_with_print:1}
+%define _enable_convenience %{!?_without_convenience:1}
 
 #
 #
 
 Summary:	The GNU Image Manipulation Program
 Name: 		gimp
-Version: 	2.2.11
+Version: 	2.2.12
 %define binver 2.2
 %define gimp_lang_ver 20
 %define interfacever 2.0
@@ -19,7 +37,7 @@
 %define minorver 200
 %define microver %(ver=%{version}; echo ${ver##*.*.})
 #define prever pre2
-Release: 0.fc5.%{?prever:0.0.%{prever}.}3
+Release: %{?prever:0.0.%{prever}.}1%{?dist}
 Epoch:		2
 License: 	GPL, LGPL
 Group: 		Applications/Multimedia
@@ -34,6 +52,8 @@
 BuildRequires:	gtkhtml2-devel
 BuildRequires:	python-devel
 BuildRequires:	pygtk2-devel
+# cope with pygobject2/-devel being split off as well:
+BuildRequires:  %{_libdir}/pkgconfig/pygobject-2.0.pc
 BuildRequires:	librsvg2-devel
 BuildRequires:	libjpeg-devel
 BuildRequires:	libtiff-devel
@@ -55,8 +75,9 @@
 BuildRequires:	perl
 BuildRequires:	libwmf-devel >= 0.2.8
 BuildRequires:  intltool
+BuildRequires:  gettext
 BuildRequires:  findutils
-%if %_with_lcms
+%if %_enable_lcms
 BuildRequires:	lcms-devel
 %endif
 Requires:	desktop-file-utils >= 0.9
@@ -75,7 +96,6 @@
 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
 Patch6:     gimp-2.2.11-gimptool.patch
@@ -104,11 +124,24 @@
 extensions.
 
 %prep
+cat << EOF
+
+Build options:
+modular X:                    %_enable_modularX
+LCMS support:                 %_enable_lcms
+Python support:               %_enable_python
+MP support:                   %_enable_mp
+build static libs:            %_enable_static
+build print plugin:           %_enable_print
+include convenience symlinks: %_enable_convenience
+
+
+EOF
+
 %setup -q -n gimp-%{version}%{?prever:-%{prever}}
 %patch0 -p1 -b .buildroot
 %patch1 -p1 -b .gimphelpmissing
 %patch2 -p1 -b .icontheme
-%patch3 -p1 -b .gcc4
 %patch4 -p1 -b .gifload
 %patch5 -p1 -b .htmlview
 %patch6 -p1 -b .gimptool
@@ -147,7 +180,7 @@
 %else
 	--disable-print \
 %endif
-%if %_with_lcms
+%if %_enable_lcms
 	--with-lcms \
 %else
 	--without-lcms \
@@ -359,7 +392,20 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
-* Thu Apr 20 2006 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.11-0.fc5.3
+* Mon Jul 10 2006 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.12-1
+- version 2.2.12
+- use %%dist/%%fedora/%%redhat
+- remove obsolete gcc4, libpng patches
+- show build options in %%prep
+- require gettext for building
+
+* Wed May 31 2006 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.11-5
+- cope with pygobject2/-devel being split off (#193368)
+
+* Tue May 09 2006 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.11-4
+- don't use long deprecated libpng API (#191027, patch by Manish Singh)
+
+* Thu Apr 20 2006 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.11-3
 - only use pkgconfig if needed in gimptool, require pkgconfig in devel
   subpackage (#189314, #189371)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gimp/FC-5/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	18 Apr 2006 06:39:47 -0000	1.26
+++ sources	10 Jul 2006 12:17:36 -0000	1.27
@@ -1 +1 @@
-0403e9b4e0415c99cd27b137b9839212  gimp-2.2.11.tar.bz2
+6a1906db60166a88317f2df5f195a57d  gimp-2.2.12.tar.bz2


--- gimp-2.2.7-gcc4.patch DELETED ---


