[cinepaint] Update to 1.3
Nicolas Chauvet
kwizart at fedoraproject.org
Mon Apr 9 18:53:49 UTC 2012
commit 1af0b7519063853e662da4ebe9309c7579be1b2c
Author: Nicolas Chauvet <kwizart at gmail.com>
Date: Mon Apr 9 20:53:38 2012 +0200
Update to 1.3
.gitignore | 2 +
cinepaint-1.3-c++half.patch | 12 ++
cinepaint-1.3-fixlink.patch | 255 ++++++++++++++++++++++++++++++++++++++++++
cinepaint-1.3-fixlink2.patch | 12 ++
cinepaint-1.3-oy040.patch | 26 +++++
cinepaint-nohalf.patch | 54 +++++++++
cinepaint.spec | 58 ++++++++--
icc_examin-0.51-x11.patch | 13 ++
sources | 4 +-
9 files changed, 421 insertions(+), 15 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9817be6..631b869 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,5 @@ icc_examin-0.46.tar.gz
/cinepaint-0.25.0.tar.bz2
/cinepaint-1.0.tgz
/icc_examin-0.50.tar.bz2
+/cinepaint-1.3.tgz
+/icc_examin-0.51.tar.bz2
diff --git a/cinepaint-1.3-c++half.patch b/cinepaint-1.3-c++half.patch
new file mode 100644
index 0000000..432be1d
--- /dev/null
+++ b/cinepaint-1.3-c++half.patch
@@ -0,0 +1,12 @@
+diff -up cinepaint/libhalf/Makefile.am.c++half cinepaint/libhalf/Makefile.am
+--- cinepaint/libhalf/Makefile.am.c++half 2012-03-31 09:40:40.000000000 +0200
++++ cinepaint/libhalf/Makefile.am 2012-04-09 16:29:47.891630208 +0200
+@@ -9,6 +9,8 @@ libcinepaintHalf_la_SOURCES = half.cpp h
+ halfFunction.h halfLimits.h
+
+ libcinepaintHalf_la_LDFLAGS = -version-info $(MAJOR_VERSION):$(MINOR_VERSION):0
++libcinepaintHalf_la_CXXFLAGS = -Wall
++
+ #libHalf_la_LDFLAGS = -version-info @LIBTOOL_VERSION@ -no-undefined
+
+ #libHalfincludedir = $(includedir)/OpenEXR
diff --git a/cinepaint-1.3-fixlink.patch b/cinepaint-1.3-fixlink.patch
new file mode 100644
index 0000000..e764444
--- /dev/null
+++ b/cinepaint-1.3-fixlink.patch
@@ -0,0 +1,255 @@
+diff -up cinepaint/app/Makefile.am.fixlink cinepaint/app/Makefile.am
+--- cinepaint/app/Makefile.am.fixlink 2008-10-26 08:47:29.000000000 +0100
++++ cinepaint/app/Makefile.am 2012-04-09 20:12:18.371494279 +0200
+@@ -425,7 +425,9 @@ cinepaint_LDADD = \
+ cinepaint_remote_LDADD = \
+ $(GTK_LIBS) \
+ $(X_LIBS) \
+- $(XMU_LIB)
++ $(XMU_LIB) \
++ -lX11
++
+
+ ## DEPS = $(top_builddir)/lib/libcinepainti.a
+
+diff -up cinepaint/app/depth/Makefile.am.fixlink cinepaint/app/depth/Makefile.am
+--- cinepaint/app/depth/Makefile.am.fixlink 2007-10-25 12:14:01.000000000 +0200
++++ cinepaint/app/depth/Makefile.am 2012-04-09 20:07:45.522607182 +0200
+@@ -11,7 +11,8 @@ noinst_LTLIBRARIES = libdepth.la
+
+ libdepth_la_LIBADD = \
+ $(top_builddir)/lib/libcinepaint.la \
+- $(GTK_LIBS)
++ $(GTK_LIBS) \
++ -lX11 -lm
+
+ libdepth_la_SOURCES = \
+ bezier_select.c \
+diff -up cinepaint/plug-ins/blur/Makefile.am.fixlink cinepaint/plug-ins/blur/Makefile.am
+--- cinepaint/plug-ins/blur/Makefile.am.fixlink 2011-11-28 07:42:23.000000000 +0100
++++ cinepaint/plug-ins/blur/Makefile.am 2012-04-09 20:02:07.457481469 +0200
+@@ -17,9 +17,7 @@ INCLUDES = \
+ LDADD = \
+ $(top_builddir)/lib/libcinepaint.la \
+ $(X_LIBS) \
+- $(top_builddir)/libhalf/cinepaint_half.lo \
+- $(OPENEXR_LIBS) \
+- -lc
++ $(OPENEXR_LIBS)
+
+ DEPS = $(top_builddir)/lib/libcinepaint.la
+
+diff -up cinepaint/plug-ins/edge/Makefile.am.fixlink cinepaint/plug-ins/edge/Makefile.am
+--- cinepaint/plug-ins/edge/Makefile.am.fixlink 2011-11-28 08:00:48.000000000 +0100
++++ cinepaint/plug-ins/edge/Makefile.am 2012-04-09 20:02:07.458481472 +0200
+@@ -15,9 +15,8 @@ INCLUDES = \
+ LDADD = \
+ $(top_builddir)/lib/libcinepaint.la \
+ $(X_LIBS) \
+- $(top_builddir)/libhalf/cinepaint_half.lo \
+ $(OPENEXR_LIBS) \
+- -lc
++ -lm
+
+ DEPS = $(top_builddir)/lib/libcinepaint.la
+
+diff -up cinepaint/plug-ins/gauss_rle/Makefile.am.fixlink cinepaint/plug-ins/gauss_rle/Makefile.am
+--- cinepaint/plug-ins/gauss_rle/Makefile.am.fixlink 2004-02-10 01:02:52.000000000 +0100
++++ cinepaint/plug-ins/gauss_rle/Makefile.am 2012-04-09 20:02:07.458481472 +0200
+@@ -15,8 +15,7 @@ INCLUDES = \
+ LDADD = \
+ $(top_builddir)/lib/libcinepaint.la \
+ $(X_LIBS) \
+- \
+- -lc
++ -lm
+
+ DEPS = $(top_builddir)/lib/libcinepaint.la
+
+diff -up cinepaint/plug-ins/gbr/Makefile.am.fixlink cinepaint/plug-ins/gbr/Makefile.am
+--- cinepaint/plug-ins/gbr/Makefile.am.fixlink 2011-11-28 08:08:31.000000000 +0100
++++ cinepaint/plug-ins/gbr/Makefile.am 2012-04-09 20:02:07.458481472 +0200
+@@ -15,9 +15,7 @@ INCLUDES = \
+ LDADD = \
+ $(top_builddir)/lib/libcinepaint.la \
+ $(X_LIBS) \
+- $(top_builddir)/libhalf/cinepaint_half.lo \
+- $(OPENEXR_LIBS) \
+- -lc
++ $(OPENEXR_LIBS)
+
+ DEPS = $(top_builddir)/lib/libcinepaint.la
+
+diff -up cinepaint/plug-ins/iol/Makefile.am.fixlink cinepaint/plug-ins/iol/Makefile.am
+--- cinepaint/plug-ins/iol/Makefile.am.fixlink 2011-11-28 17:10:24.000000000 +0100
++++ cinepaint/plug-ins/iol/Makefile.am 2012-04-09 20:02:07.458481472 +0200
+@@ -35,7 +35,6 @@ INCLUDES = \
+ LDADD = \
+ $(top_builddir)/lib/libcinepaint.la \
+ $(X_LIBS) \
+- $(top_builddir)/libhalf/cinepaint_half.lo \
+ $(OPENEXR_LIBS) \
+ -lc \
+ -lm \
+diff -up cinepaint/plug-ins/jpeg/Makefile.am.fixlink cinepaint/plug-ins/jpeg/Makefile.am
+--- cinepaint/plug-ins/jpeg/Makefile.am.fixlink 2011-11-28 09:01:16.000000000 +0100
++++ cinepaint/plug-ins/jpeg/Makefile.am 2012-04-09 20:02:07.458481472 +0200
+@@ -21,9 +21,7 @@ LDADD = \
+ $(OYRANOS_LIBS) \
+ @LCMS_LIB@ \
+ @LIBJPEG_LIB@ \
+- $(top_builddir)/libhalf/cinepaint_half.lo \
+- $(OPENEXR_LIBS) \
+- -lc
++ $(OPENEXR_LIBS)
+
+ DEPS = $(top_builddir)/lib/libcinepaint.la
+
+diff -up cinepaint/plug-ins/mblur/Makefile.am.fixlink cinepaint/plug-ins/mblur/Makefile.am
+--- cinepaint/plug-ins/mblur/Makefile.am.fixlink 2011-11-28 17:30:24.000000000 +0100
++++ cinepaint/plug-ins/mblur/Makefile.am 2012-04-09 20:02:07.458481472 +0200
+@@ -15,9 +15,8 @@ INCLUDES = \
+ LDADD = \
+ $(top_builddir)/lib/libcinepaint.la \
+ $(X_LIBS) \
+- $(top_builddir)/libhalf/cinepaint_half.lo \
+- $(OPENEXR_LIBS) \
+- -lc
++ $(OPENEXR_LIBS) \
++ -lm
+
+ DEPS = $(top_builddir)/lib/libcinepaint.la
+
+diff -up cinepaint/plug-ins/noisify/Makefile.am.fixlink cinepaint/plug-ins/noisify/Makefile.am
+--- cinepaint/plug-ins/noisify/Makefile.am.fixlink 2011-11-28 17:47:31.000000000 +0100
++++ cinepaint/plug-ins/noisify/Makefile.am 2012-04-09 20:02:07.459481476 +0200
+@@ -15,9 +15,7 @@ INCLUDES = \
+ LDADD = \
+ $(top_builddir)/lib/libcinepaint.la \
+ $(X_LIBS) \
+- $(top_builddir)/libhalf/cinepaint_half.lo \
+- $(OPENEXR_LIBS) \
+- -lc
++ $(OPENEXR_LIBS)
+
+ DEPS = $(top_builddir)/lib/libcinepaint.la
+
+diff -up cinepaint/plug-ins/psd/Makefile.am.fixlink cinepaint/plug-ins/psd/Makefile.am
+--- cinepaint/plug-ins/psd/Makefile.am.fixlink 2004-02-10 02:14:55.000000000 +0100
++++ cinepaint/plug-ins/psd/Makefile.am 2012-04-09 20:02:07.459481476 +0200
+@@ -15,7 +15,7 @@ INCLUDES = \
+ LDADD = \
+ $(top_builddir)/lib/libcinepaint.la \
+ $(X_LIBS) \
+- -lc
++ -lm
+
+ DEPS = \
+ $(top_builddir)/lib/libcinepaint.la
+diff -up cinepaint/plug-ins/retinex/Makefile.am.fixlink cinepaint/plug-ins/retinex/Makefile.am
+--- cinepaint/plug-ins/retinex/Makefile.am.fixlink 2011-11-28 17:57:28.000000000 +0100
++++ cinepaint/plug-ins/retinex/Makefile.am 2012-04-09 20:02:07.459481476 +0200
+@@ -18,9 +18,8 @@ INCLUDES = \
+ LDADD = \
+ $(top_builddir)/lib/libcinepaint.la \
+ $(X_LIBS) \
+- $(top_builddir)/libhalf/cinepaint_half.lo \
+ $(OPENEXR_LIBS) \
+- -lc
++ -lm
+
+ DEPS = $(top_builddir)/lib/libcinepaint.la
+
+diff -up cinepaint/plug-ins/script-fu/Makefile.am.fixlink cinepaint/plug-ins/script-fu/Makefile.am
+--- cinepaint/plug-ins/script-fu/Makefile.am.fixlink 2008-02-16 19:19:53.000000000 +0100
++++ cinepaint/plug-ins/script-fu/Makefile.am 2012-04-09 20:02:07.459481476 +0200
+@@ -59,7 +59,7 @@ LDADD = \
+ $(top_builddir)/plug-ins/dbbrowser/dbbrowser_utils.o \
+ $(top_builddir)/lib/libcinepaint.la \
+ $(X_LIBS) \
+- -lc
++ -lm
+
+ DEPS = \
+ $(top_builddir)/plug-ins/dbbrowser/dbbrowser_utils.o \
+diff -up cinepaint/plug-ins/sharpen/Makefile.am.fixlink cinepaint/plug-ins/sharpen/Makefile.am
+--- cinepaint/plug-ins/sharpen/Makefile.am.fixlink 2011-11-28 18:03:59.000000000 +0100
++++ cinepaint/plug-ins/sharpen/Makefile.am 2012-04-09 20:02:07.459481476 +0200
+@@ -15,9 +15,7 @@ INCLUDES = \
+ LDADD = \
+ $(top_builddir)/lib/libcinepaint.la \
+ $(X_LIBS) \
+- $(top_builddir)/libhalf/cinepaint_half.lo \
+- $(OPENEXR_LIBS) \
+- -lc
++ $(OPENEXR_LIBS)
+
+ DEPS = $(top_builddir)/lib/libcinepaint.la
+
+diff -up cinepaint/plug-ins/snoise/Makefile.am.fixlink cinepaint/plug-ins/snoise/Makefile.am
+--- cinepaint/plug-ins/snoise/Makefile.am.fixlink 2011-11-28 18:11:31.000000000 +0100
++++ cinepaint/plug-ins/snoise/Makefile.am 2012-04-09 20:02:07.459481476 +0200
+@@ -14,9 +14,8 @@ INCLUDES = \
+
+ LDADD = $(top_builddir)/lib/libcinepaint.la \
+ $(X_LIBS) \
+- $(top_builddir)/libhalf/cinepaint_half.lo \
+ $(OPENEXR_LIBS) \
+- -lc
++ -lm
+
+ DEPS = \
+ $(top_builddir)/lib/libcinepaint.la
+diff -up cinepaint/plug-ins/sobel/Makefile.am.fixlink cinepaint/plug-ins/sobel/Makefile.am
+--- cinepaint/plug-ins/sobel/Makefile.am.fixlink 2011-11-28 18:18:52.000000000 +0100
++++ cinepaint/plug-ins/sobel/Makefile.am 2012-04-09 20:02:07.459481476 +0200
+@@ -15,9 +15,8 @@ INCLUDES = \
+ LDADD = \
+ $(top_builddir)/lib/libcinepaint.la \
+ $(X_LIBS) \
+- $(top_builddir)/libhalf/cinepaint_half.lo \
+ $(OPENEXR_LIBS) \
+- -lc
++ -lm
+
+ DEPS = $(top_builddir)/lib/libcinepaint.la
+
+diff -up cinepaint/plug-ins/spread/Makefile.am.fixlink cinepaint/plug-ins/spread/Makefile.am
+--- cinepaint/plug-ins/spread/Makefile.am.fixlink 2004-02-10 01:43:07.000000000 +0100
++++ cinepaint/plug-ins/spread/Makefile.am 2012-04-09 20:02:07.459481476 +0200
+@@ -15,8 +15,7 @@ INCLUDES = \
+ LDADD = \
+ $(top_builddir)/lib/libcinepaint.la \
+ $(X_LIBS) \
+- \
+- -lc
++ -lm
+
+ DEPS = $(top_builddir)/lib/libcinepaint.la
+
+diff -up cinepaint/plug-ins/tiff/Makefile.am.fixlink cinepaint/plug-ins/tiff/Makefile.am
+--- cinepaint/plug-ins/tiff/Makefile.am.fixlink 2011-11-28 18:26:23.000000000 +0100
++++ cinepaint/plug-ins/tiff/Makefile.am 2012-04-09 20:02:07.459481476 +0200
+@@ -26,9 +26,8 @@ LDADD = \
+ $(OYRANOS_LIBS) \
+ @LCMS_LIB@ \
+ @LIBTIFF_LIB@ \
+- $(top_builddir)/libhalf/cinepaint_half.lo \
+ $(OPENEXR_LIBS) \
+- -lc
++ -lm
+
+ DEPS = $(top_builddir)/lib/libcinepaint.la
+
+diff -up cinepaint/plug-ins/unsharp/Makefile.am.fixlink cinepaint/plug-ins/unsharp/Makefile.am
+--- cinepaint/plug-ins/unsharp/Makefile.am.fixlink 2004-02-10 01:47:34.000000000 +0100
++++ cinepaint/plug-ins/unsharp/Makefile.am 2012-04-09 20:02:07.459481476 +0200
+@@ -15,7 +15,7 @@ INCLUDES = \
+ LDADD = \
+ $(top_builddir)/lib/libcinepaint.la \
+ $(X_LIBS) \
+- -lc
++ -lm
+
+ DEPS = $(top_builddir)/lib/libcinepaint.la
+
diff --git a/cinepaint-1.3-fixlink2.patch b/cinepaint-1.3-fixlink2.patch
new file mode 100644
index 0000000..df65ece
--- /dev/null
+++ b/cinepaint-1.3-fixlink2.patch
@@ -0,0 +1,12 @@
+diff -up cinepaint/plug-ins/cineon/Makefile.am.fixlink2 cinepaint/plug-ins/cineon/Makefile.am
+--- cinepaint/plug-ins/cineon/Makefile.am.fixlink2 2004-02-10 00:05:23.000000000 +0100
++++ cinepaint/plug-ins/cineon/Makefile.am 2012-04-09 16:37:32.667405168 +0200
+@@ -27,7 +27,7 @@ INCLUDES = \
+ LDADD = \
+ $(top_builddir)/lib/libcinepaint.la \
+ $(X_LIBS) \
+- -lc
++ -lm
+
+ DEPS = $(top_builddir)/lib/libcinepaint.la
+
diff --git a/cinepaint-1.3-oy040.patch b/cinepaint-1.3-oy040.patch
new file mode 100644
index 0000000..4b2b502
--- /dev/null
+++ b/cinepaint-1.3-oy040.patch
@@ -0,0 +1,26 @@
+diff -up cinepaint/app/cms.c.oy040 cinepaint/app/cms.c
+--- cinepaint/app/cms.c.oy040 2012-04-09 19:46:21.516977295 +0200
++++ cinepaint/app/cms.c 2012-04-09 19:58:44.813702424 +0200
+@@ -37,14 +37,6 @@
+ #endif
+
+ #ifdef HAVE_OY
+-#ifndef OYRANOS_VERSION
+-#define OYRANOS_VERSION 0
+-#endif
+-#if OYRANOS_VERSION < 108
+-#include <oyranos/oyranos.h>
+-#include <arpa/inet.h> /* ntohl */
+-#include <oyranos/oyranos_monitor.h>
+-#else
+ #include <oyranos.h>
+ #if OYRANOS_VERSION < 110
+ #include <oyranos_alpha.h>
+@@ -52,7 +44,6 @@
+ #include <alpha/oyranos_alpha.h>
+ #endif
+ #endif
+-#endif
+
+ #include "config.h"
+ #include "../lib/version.h"
diff --git a/cinepaint-nohalf.patch b/cinepaint-nohalf.patch
new file mode 100644
index 0000000..84dee01
--- /dev/null
+++ b/cinepaint-nohalf.patch
@@ -0,0 +1,54 @@
+diff -up cinepaint/configure.in.nohalf cinepaint/configure.in
+--- cinepaint/configure.in.nohalf 2012-04-09 16:00:12.846256389 +0200
++++ cinepaint/configure.in 2012-04-09 16:00:12.903256582 +0200
+@@ -750,7 +750,7 @@ ioldata=`echo $ioldata`
+
+ dnl This is for making the rpm's
+ dnl rsr: AC_PATH_PROGS(RPMBUILD, rpmbuild, :)
+-AC_PATH_PROGS(RPMBUILD, rpm, :)
++
+
+ AC_SUBST(MAJOR_VERSION)
+ AC_SUBST(MINOR_VERSION)
+@@ -828,7 +828,6 @@ lib/wire/Makefile
+ lib/fl_i18n/Makefile
+ libgimp/Makefile
+ libgimp/gimpintl.h
+-libhalf/Makefile
+ plug-ins/Makefile
+ plug-ins/blur/Makefile
+ plug-ins/bmp/Makefile
+diff -up cinepaint/lib/Makefile.am.nohalf cinepaint/lib/Makefile.am
+--- cinepaint/lib/Makefile.am.nohalf 2007-10-25 12:17:36.000000000 +0200
++++ cinepaint/lib/Makefile.am 2012-04-09 16:02:18.532680182 +0200
+@@ -18,7 +18,6 @@ lib_LTLIBRARIES = libcinepaint.la
+
+ libcinepaint_la_LIBADD = \
+ ./wire/libwire.la \
+- $(top_builddir)/libhalf/libcinepaintHalf.la
+
+ libcinepaint_la_SOURCES = \
+ chain.xpm \
+diff -up cinepaint/Makefile.am.nohalf cinepaint/Makefile.am
+--- cinepaint/Makefile.am.nohalf 2008-10-26 08:47:29.000000000 +0100
++++ cinepaint/Makefile.am 2012-04-09 16:00:12.876256490 +0200
+@@ -2,7 +2,7 @@
+
+ ## Process this file with automake to produce Makefile.in
+
+-SUBDIRS = libhalf lib libgimp plug-ins app po po-plug-ins po-script-fu data
++SUBDIRS = lib libgimp plug-ins app po po-plug-ins po-script-fu data
+
+ bin_SCRIPTS = cinepainttool
+
+diff -up cinepaint/plug-ins/blur/Makefile.am.nohalf cinepaint/plug-ins/blur/Makefile.am
+--- cinepaint/plug-ins/blur/Makefile.am.nohalf 2011-11-28 07:42:23.000000000 +0100
++++ cinepaint/plug-ins/blur/Makefile.am 2012-04-09 16:00:12.876256490 +0200
+@@ -17,7 +17,6 @@ INCLUDES = \
+ LDADD = \
+ $(top_builddir)/lib/libcinepaint.la \
+ $(X_LIBS) \
+- $(top_builddir)/libhalf/cinepaint_half.lo \
+ $(OPENEXR_LIBS) \
+ -lc
+
diff --git a/cinepaint.spec b/cinepaint.spec
index 295c9c9..611b40b 100644
--- a/cinepaint.spec
+++ b/cinepaint.spec
@@ -1,8 +1,7 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%global icc_version 0.51
Name: cinepaint
-Version: 1.0
+Version: 1.3
Release: 1%{?dist}
Summary: CinePaint is a tool for manipulating images
@@ -11,7 +10,7 @@ License: GPLv2+ and LGPLv2+ and MIT
URL: http://www.cinepaint.org/
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tgz
# http://www.behrmann.name/index.php?option=com_content&task=view&id=33&Itemid=69
-Source1: http://downloads.sourceforge.net/oyranos/icc_examin-0.50.tar.bz2
+Source1: http://downloads.sourceforge.net/oyranos/icc_examin-%{icc_version}.tar.bz2
Patch2: cinepaint-0.22-0-rm_rpath.patch
Patch3: cinepaint-0.22-0-pc_req.patch
Patch4: cinepaint-0.22-0-libdir.patch
@@ -22,17 +21,26 @@ Patch16: cinepaint-0.25-oyranos_include.patch
Patch17: cinepaint-0.25-oyranos_cms.patch
Patch18: cinepaint-0.25-oyranos_header.patch
Patch19: cinepaint-0.25.0-nopygimp.patch
+Patch20: cinepaint-nohalf.patch
+Patch21: cinepaint-1.3-c++half.patch
+Patch22: cinepaint-1.3-fixlink.patch
+Patch23: cinepaint-1.3-fixlink2.patch
+#Patch24: cinepaint-1.3-png15.patch
+Patch25: cinepaint-1.3-oy040.patch
+Patch30: icc_examin-0.51-x11.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
#ifnarch %{ix86} ppc
-BuildRequires: autoconf
+BuildRequires: autoconf libtool
#endif
BuildRequires: desktop-file-utils
BuildRequires: docbook-utils
-BuildRequires: flex
+BuildRequires: flex, flex-static
BuildRequires: fltk-devel
BuildRequires: ftgl-devel
BuildRequires: gettext
+#Needed by autogen.sh
+BuildRequires: gtk+-devel
BuildRequires: gtk2-devel >= 2.10.8
BuildRequires: gutenprint-devel >= 5.0.0
BuildRequires: python-devel
@@ -103,15 +111,31 @@ This package contains development files for %{name}.
%patch17 -p0 -b .cms
%patch18 -p0 -b .headers
#patch19 -p1 -b .nopygimp fuzz
+#patch20 -p1 -b .nohalf
+%patch21 -p1 -b .c++half
+%patch22 -p1 -b .fixlink
+%patch23 -p1 -b .fixlink2
+#patch24 -p1 -b .png15
+%patch25 -p1 -b .oy040
+pushd icc_examin-%{icc_version}
+%patch30 -p1 -b .x11
+popd
# Update bundled version of icc_examin
rm -rf plug-ins/icc_examin/icc_examin
-cp -pR icc_examin-0.50 plug-ins/icc_examin/icc_examin
+cp -pR icc_examin-%{icc_version} plug-ins/icc_examin/icc_examin
sed -i -e 's|AC_PATH_PROGS(RPMBUILD, rpm, :)||' configure.in
+#sed -i -e 's|PNG_CONFIG libpng|PNG_CONFIG libpng10|' configure.in
+
+#Disable png until ported to libpng15
+sed -i -e '/png/d' plug-ins/Makefile.am
#ifnarch %{ix86} ppc
-autoconf -f -i
+#autoconf -f -i
+#find . -name Makefile.in -exec rm {} ';'
+#rm *.m4
+sh autogen.sh
#endif
for i in AUTHORS COPYING LICENSE README ;do
@@ -128,7 +152,9 @@ sed -i 's|\r||' NEWS COPYING
--disable-static \
--enable-gtk2 \
--with-pixmap=%{_datadir}/pixmaps \
- --with-python=%{_bindir}/python
+ --with-python=%{_bindir}/python \
+ --enable-precision=float \
+ --enable-pygimp
# remove rpath from libtool
sed -i.rpath 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
@@ -159,6 +185,9 @@ sed -i -e 's|plug_in_dir=%{_libdir}/cinepaint/%{cinever}|plug_in_dir="$(pkg-conf
${RPM_BUILD_ROOT}%{_bindir}/cinepainttool
touch -r ChangeLog ${RPM_BUILD_ROOT}%{_bindir}/cinepainttool
+#Remove bundled fonts
+rm -rf $RPM_BUILD_ROOT%{_datadir}/fonts
+
%find_lang %{name}
%find_lang cinepaint-script-fu
@@ -190,10 +219,10 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%{_datadir}/pixmaps/%{name}.png
%{_datadir}/%{name}/
-#{python_sitelib}/*
-#if %{_lib} == "lib64"
-#{python_sitearch}/*
-#endif
+%{python_sitelib}/*
+%if %{_lib} == "lib64"
+%{python_sitearch}/*
+%endif
%files libs
%doc *.libhalf
@@ -211,6 +240,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%changelog
+* Mon Apr 09 2012 Nicolas Chauvet <kwizart at gmail.com> - 1.3-1
+- Update to 1.3
+
* Tue Feb 28 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.25.0-0.5
- Rebuilt for c++ ABI breakage
diff --git a/icc_examin-0.51-x11.patch b/icc_examin-0.51-x11.patch
new file mode 100644
index 0000000..158c9d9
--- /dev/null
+++ b/icc_examin-0.51-x11.patch
@@ -0,0 +1,13 @@
+diff -up icc_examin-0.51/configure.x11 icc_examin-0.51/configure
+--- icc_examin-0.51/configure.x11 2012-04-08 21:08:03.242901307 +0200
++++ icc_examin-0.51/configure 2012-04-08 21:09:50.560294999 +0200
+@@ -697,7 +697,7 @@ echo_=""; echo "$echo_" >> $CONF_LOG; ec
+ echo_=""; echo "$echo_" >> $CONF_LOG; echo "$echo_"
+
+ LIBS_TEST="dl iconv intl c m pthread"; export LIBS_TEST
+-X_ADD="Xpm Xext Xinerama Xxf86vm"; export X_ADD
++X_ADD="X11 Xpm Xext Xinerama Xxf86vm"; export X_ADD
+
+
+ ECHO="echo"; export ECHO
+diff -up icc_examin-0.51/makefile.in.x11 icc_examin-0.51/makefile.in
diff --git a/sources b/sources
index 0ad7519..81611ee 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-7dfdb005d246578392ac9bd500534804 cinepaint-1.0.tgz
-80d0f98df3ad5f23f6bc8211155b016b icc_examin-0.50.tar.bz2
+f8ecd5671662e71a3356213de371fee4 cinepaint-1.3.tgz
+e2db40c31596ba2d08cd2612de496289 icc_examin-0.51.tar.bz2
More information about the scm-commits
mailing list