From 8eede9b486e2a24c99e279ce04021486187002b0 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Thu, 12 Apr 2007 12:13:09 +0000 Subject: [PATCH] use gutenprint per default for current development/future distribution versions (Fedora >= 7, RHEL >= 6) --- gimp.spec | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/gimp.spec b/gimp.spec index 2cac65a..7921f30 100644 --- a/gimp.spec +++ b/gimp.spec @@ -4,6 +4,7 @@ # # modular_x: modular X deps # lcms: lcms support +# gutenprint: gutenprint support (instead of gimp-print) # python: python support # mp: multi processor support # static: build static libraries @@ -18,6 +19,12 @@ %define _enable_lcms 0%{?_with_lcms:1} %endif +%if 0%{?fedora}%{?rhel} == 0 || 0%{?fedora} >= 7 || 0%{?rhel} >= 6 +%define _enable_gutenprint 0%{!?_without_gutenprint:1} +%else +%define _enable_gutenprint 0%{?_with_gutenprint:1} +%endif + %define _enable_python 0%{!?_without_python:1} %define _enable_mp 0%{!?_without_mp:1} %define _enable_static 0%{!?_without_static:1} @@ -36,7 +43,7 @@ Version: 2.2.13 %define age 0 %define minorver 200 %define microver %(ver=%{version}; echo ${ver##*.*.}) -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 2 License: GPL, LGPL Group: Applications/Multimedia @@ -67,7 +74,11 @@ BuildRequires: libXt-devel %else BuildRequires: xorg-x11-devel %endif +%if %_enable_gutenprint +BuildRequires: gutenprint-devel >= 5.0.0 +%else BuildRequires: gimp-print-devel >= 4.2.0 +%endif BuildRequires: automake >= 1.7 BuildRequires: autoconf >= 2.54 BuildRequires: libtool >= 1.5 @@ -84,7 +95,11 @@ Requires: glib2 >= 2.4.8 Requires: gtk2 >= 2.4.14 Requires: pango >= 1.6.0 Requires: fontconfig >= 2.2.0 +%if %_enable_gutenprint +Requires: gutenprint >= 5.0.0 +%else Requires: gimp-print >= 4.2.0 +%endif Requires(post): /usr/bin/update-desktop-database Requires(post): hicolor-icon-theme Requires(postun): /usr/bin/update-desktop-database @@ -403,6 +418,10 @@ fi %{_libdir}/pkgconfig/* %changelog +* Mon Mar 26 2007 Nils Philippsen - 2:2.2.13-3 +- use gutenprint per default for current development/future distribution + versions (Fedora >= 7, RHEL >= 6) + * Mon Mar 26 2007 Nils Philippsen - 2:2.2.13-2 - own used directories in gimp-devel (#233794)