Author: ghibo
Date: Sun Feb 18 17:50:06 2007
New Revision: 122426
Added:
packages/cooker/cinepaint/current/SOURCES/cinepaint-0.21-2.tar.bz2
(contents, props changed)
packages/cooker/cinepaint/current/SOURCES/cinepaint-0.21-app_procs.patch
packages/cooker/cinepaint/current/SOURCES/cinepaint-0.21-openexr.patch
Removed:
packages/cooker/cinepaint/current/SOURCES/cinepaint-0.21-1.tar.bz2
packages/cooker/cinepaint/current/SOURCES/cinepaint-0.21-gcc411.patch.bz2
Modified:
packages/cooker/cinepaint/current/SPECS/cinepaint.spec
Log:
- Release 0.21-2.
Added: packages/cooker/cinepaint/current/SOURCES/cinepaint-0.21-2.tar.bz2
==============================================================================
Binary file. No diff available.
Added: packages/cooker/cinepaint/current/SOURCES/cinepaint-0.21-app_procs.patch
==============================================================================
--- (empty file)
+++ packages/cooker/cinepaint/current/SOURCES/cinepaint-0.21-app_procs.patch
Sun Feb 18 17:50:06 2007
@@ -0,0 +1,19 @@
+--- cinepaint-0.21-2/app/app_procs.c.app_procs 2006-09-27 10:28:43.000000000
+0200
++++ cinepaint-0.21-2/app/app_procs.c 2007-02-18 16:43:54.000000000 +0100
+@@ -96,6 +96,7 @@
+ static void splash_text_draw (GtkWidget *widget);
+ static void splash_logo_expose (GtkWidget *widget);
+ static void server_start(int port, char *log); /* added by IMAGEWORKS (doug
creel 02/21/02) */
++static void app_update_prefix (void);
+
+ static gint is_app_exit_finish_done = FALSE;
+
+@@ -710,7 +711,7 @@
+ */
+ }
+
+-void
++static void
+ app_update_prefix (void)
+ {
+ if(strcmp(GetDirStaticPrefix(), GetDirPrefix()) != 0)
Added: packages/cooker/cinepaint/current/SOURCES/cinepaint-0.21-openexr.patch
==============================================================================
--- (empty file)
+++ packages/cooker/cinepaint/current/SOURCES/cinepaint-0.21-openexr.patch
Sun Feb 18 17:50:06 2007
@@ -0,0 +1,22 @@
+--- cinepaint-0.21-2/plug-ins/openexr/Makefile.am.openexr 2007-02-18
17:06:16.000000000 +0100
++++ cinepaint-0.21-2/plug-ins/openexr/Makefile.am 2007-02-18
17:06:16.000000000 +0100
+@@ -26,7 +26,7 @@
+ LDADD = \
+ $(top_builddir)/lib/libcinepaint.la \
+ $(X_LIBS) \
+- $(OPENEXR_LIBS) \
++ @OPENEXR_LIBS@ \
+ @LCMS_LIB@ \
+ -lc
+
+--- cinepaint-0.21-2/configure.in.openexr 2007-02-18 17:11:04.000000000
+0100
++++ cinepaint-0.21-2/configure.in 2007-02-18 17:13:56.000000000 +0100
+@@ -251,7 +251,7 @@
+ openexr_version=`$OPENEXR_CONFIG --modversion`
+ if expr "$openexr_version" \>= 1.0.0 >/dev/null; then
+ AC_MSG_RESULT([checking for OpenEXR... (version $openexr_version)
yes])
+- OPENEXR_LIBS=`$OPENEXR_CONFIG --libs`
++ OPENEXR_LIBS="`$OPENEXR_CONFIG --libs` -lpthread"
+ OPENEXR_INCLUDES=`$OPENEXR_CONFIG --cflags`
+ else
+ dnl second Test for OpenEXR
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
17:50:06 2007
@@ -5,7 +5,7 @@
%define ver %{major}.%{revision}
%define rel %mkrel 1
-%define subver 1
+%define subver 2
Summary: A tool for manipulating high-colordepth images
Name: cinepaint
@@ -16,8 +16,8 @@
URL: http://www.cinepaint.org
Source0: %{name}-%{version}-%{subver}.tar.bz2
Source1: icons-%{name}.tar.bz2
-# from http://people.freenet.de/hsbosny/Download/0.21-1-br2hdr-1.diff.gz
-Patch0: cinepaint-0.21-gcc411.patch.bz2
+Patch1: cinepaint-0.21-app_procs.patch
+Patch2: cinepaint-0.21-openexr.patch
BuildRoot: %{_tmppath}/%{name}-%{version}
BuildRequires: libgtk+-devel >= 1.2.8
BuildRequires: libtiff-devel
@@ -27,8 +27,8 @@
BuildRequires: flex
BuildRequires: bison
BuildRequires: OpenEXR-devel
-BuildRequires: libgutenprint-devel >= 5.0.0-0.8mdk
-BuildRequires: libgutenprintui-devel >= 5.0.0-0.8mdk
+BuildRequires: libgutenprint2-devel >= 5.0.0-0.8mdk
+BuildRequires: libgutenprintui2-devel >= 5.0.0-0.8mdk
BuildRequires: fltk-devel
BuildRequires: libOpenEXR-devel
Obsoletes: filmgimp
@@ -72,15 +72,17 @@
%prep
%setup -q -n %{name}-%{version}-%{subver}
-%patch0 -p1
+%patch1 -p1 -b .app_procs
+%patch2 -p1 -b .openexr
+aclocal && autoconf && automake
%build
%configure2_5x
-make
+%make
%install
rm -rf $RPM_BUILD_ROOT
-%makeinstall_std
+%makeinstall
mkdir -p $RPM_BUILD_ROOT%{_menudir}
cat > $RPM_BUILD_ROOT%{_menudir}/cinepaint <<EOF
