rpms/gimp/devel gimp.spec,1.141,1.142

[Nils Philippsen (nphilipp)]

Author: nphilipp

Update of /cvs/pkgs/rpms/gimp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1749

Modified Files:
	gimp.spec 
Log Message:
build internal print plugin, don't require external print plugins on Fedora 8 and later



Index: gimp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/devel/gimp.spec,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- gimp.spec	27 Sep 2007 13:25:02 -0000	1.141
+++ gimp.spec	12 Oct 2007 12:42:49 -0000	1.142
@@ -4,7 +4,8 @@
 # 
 # modular_x:   modular X deps
 # lcms:        lcms support
-# gutenprint:  gutenprint support (instead of gimp-print)
+# gutenprint:  require gutenprint-plugin (instead of gimp-print-plugin) if
+#              internal print plugin isn't built
 # python:      python support
 # mp:          multi processor support
 # static:      build static libraries
@@ -25,10 +26,15 @@
 %define _enable_gutenprint 0%{?_with_gutenprint:1}
 %endif
 
+%if 0%{?fedora}%{?rhel} == 0 || 0%{?fedora} >= 8 || 0%{?rhel} >= 6
+%define _enable_print 0%{?_without_print:1}
+%else
+%define _enable_print 0%{?_with_print: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}
 
 #
@@ -45,7 +51,7 @@
 %define age 0
 %define minorver 400
 %define microver %(ver=%{version}; echo ${ver##*.*.})
-Release:        %{?rcver:0.%{rcver}.}1%{?dist}
+Release:        %{?rcver:0.%{rcver}.}2%{?dist}
 Epoch:          2
 License:        GPLv2+
 Group:          Applications/Multimedia
@@ -97,11 +103,13 @@
 Requires:       pango >= 1.12.2
 Requires:       freetype >= 2.1.7
 Requires:       fontconfig >= 2.2.0
+%if ! %_enable_print
 %if %_enable_gutenprint
 Requires:       gutenprint-plugin
 %else
 Requires:       gimp-print-plugin
 %endif
+%endif
 Requires(post): /usr/bin/update-desktop-database
 Requires(post): hicolor-icon-theme
 Requires(postun):   /usr/bin/update-desktop-database
@@ -421,6 +429,10 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Fri Sep 07 2007 Nils Philippsen <nphilipp at redhat.com> - 2:2.4.0-0.rc3.2
+- build internal print plugin, don't require external print plugins on Fedora 8
+  and later
+
 * Fri Sep 07 2007 Nils Philippsen <nphilipp at redhat.com> - 2:2.4.0-0.rc3.1
 - version 2.4.0-rc3