Author: ghibo
Date: Sun Feb 18 21:16:21 2007
New Revision: 122546
Added:
packages/cooker/cinepaint/current/SOURCES/cinepaint-0.21-gutenprint.patch
Modified:
packages/cooker/cinepaint/current/SPECS/cinepaint.spec
Log:
- Added Patch3 for using libgutenprintui2
and disabled printing by default.
Added: packages/cooker/cinepaint/current/SOURCES/cinepaint-0.21-gutenprint.patch
==============================================================================
--- (empty file)
+++ packages/cooker/cinepaint/current/SOURCES/cinepaint-0.21-gutenprint.patch
Sun Feb 18 21:16:21 2007
@@ -0,0 +1,33 @@
+--- cinepaint-0.21-2/plug-ins/print/print-lcms-funcs.c.gutenprint
2006-10-29 09:55:42.000000000 +0100
++++ cinepaint-0.21-2/plug-ins/print/print-lcms-funcs.c 2007-02-18
20:45:25.000000000 +0100
+@@ -37,7 +37,7 @@
+ //#include "../../lib/libprintut.h"
+
+
+-#include <gutenprintui/gutenprintui.h>
++#include <gutenprintui2/gutenprintui.h>
+ #include "print_gimp.h"
+
+ #include "print-intl.h"
+--- cinepaint-0.21-2/plug-ins/print/print_gimp.h.gutenprint 2005-04-12
08:52:49.000000000 +0200
++++ cinepaint-0.21-2/plug-ins/print/print_gimp.h 2007-02-18
20:45:48.000000000 +0100
+@@ -47,7 +47,7 @@
+ #ifdef INCLUDE_GIMP_PRINT_UI_H
+ #include INCLUDE_GIMP_PRINT_UI_H
+ #else
+- #include <gutenprintui/gutenprintui.h>
++ #include <gutenprintui2/gutenprintui.h>
+ #endif
+
+
+--- cinepaint-0.21-2/configure.in.gutenprint 2007-02-18 20:40:36.000000000
+0100
++++ cinepaint-0.21-2/configure.in 2007-02-18 20:40:36.000000000 +0100
+@@ -385,7 +385,7 @@
+ export PKG_CONFIG_PATH
+ AC_PATH_PROG(PRINT_CONFIG, pkg-config, no)
+ if test "x$PRINT_CONFIG" != "xno"; then
+- PRINT_CONFIG="$PRINT_CONFIG gutenprintui"
++ PRINT_CONFIG="$PRINT_CONFIG gutenprintui2"
+ AC_MSG_CHECKING(for gutenprint >= $GUTENPRINT_REQUIRED_VERSION)
+ print_version=`$PRINT_CONFIG --modversion`
+ if expr $print_version \>= $GUTENPRINT_REQUIRED_VERSION >/dev/null; then
Modified: packages/cooker/cinepaint/current/SPECS/cinepaint.spec
==============================================================================
--- packages/cooker/cinepaint/current/SPECS/cinepaint.spec (original)
+++ packages/cooker/cinepaint/current/SPECS/cinepaint.spec Sun Feb 18
21:16:21 2007
@@ -7,6 +7,10 @@
%define rel %mkrel 2
%define subver 2
+%define use_gutenprint 0
+%{?_with_print: %global use_gutenprint 1}
+%{?_without_print: %global use_gutenprint 0}
+
Summary: A tool for manipulating high-colordepth images
Name: cinepaint
Version: %ver
@@ -18,20 +22,24 @@
Source1: icons-%{name}.tar.bz2
Patch1: cinepaint-0.21-app_procs.patch
Patch2: cinepaint-0.21-openexr.patch
+Patch3: cinepaint-0.21-gutenprint.patch
BuildRoot: %{_tmppath}/%{name}-%{version}
+BuildRequires: bison
BuildRequires: desktop-file-utils
+BuildRequires: flex
+BuildRequires: fltk-devel
+BuildRequires: python-devel
BuildRequires: libgtk+-devel >= 1.2.8
-BuildRequires: libtiff-devel
BuildRequires: libjpeg-devel
-BuildRequires: libpng-devel
BuildRequires: liblcms-devel
-BuildRequires: flex
-BuildRequires: bison
+BuildRequires: libpng-devel
+BuildRequires: libtiff-devel
BuildRequires: OpenEXR-devel
+BuildRequires: libOpenEXR-devel
BuildRequires: gutenprint-devel >= 5.0.0-0.8mdk
+%if %{use_gutenprint}
BuildRequires: libgutenprintui2-devel >= 5.0.0-0.8mdk
-BuildRequires: fltk-devel
-BuildRequires: libOpenEXR-devel
+%endif
Requires(post): desktop-file-utils
Requires(postun): desktop-file-utils
Obsoletes: filmgimp
@@ -77,11 +85,17 @@
%setup -q -n %{name}-%{version}-%{subver}
%patch1 -p1 -b .app_procs
%patch2 -p1 -b .openexr
+%patch3 -p1 -b .gutenprint
aclocal && autoconf && automake
chmod +x ./mkinstalldirs
%build
-%configure2_5x
+%configure2_5x \
+%if %use_gutenprint
+ --enable-print
+%else
+ --disable-print
+%endif
%make
%install
