[cinepaint] Update to 1.0

[Nicolas Chauvet]

commit 05aa609aa81783191e021d71df4c59039b8bb005
Author: Nicolas Chauvet <kwizart at gmail.com>
Date:   Sat Mar 10 18:12:20 2012 +0100

    Update to 1.0

 .gitignore     |    2 ++
 cinepaint.spec |   36 +++++++++++-------------------------
 sources        |    4 ++--
 3 files changed, 15 insertions(+), 27 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5f0e2df..9817be6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,5 @@ icc_examin-0.46.tar.gz
 /cinepaint-0.22-1.tar.gz
 /icc_examin-0.47.tar.gz
 /cinepaint-0.25.0.tar.bz2
+/cinepaint-1.0.tgz
+/icc_examin-0.50.tar.bz2
diff --git a/cinepaint.spec b/cinepaint.spec
index 3d0e9d7..1add737 100644
--- a/cinepaint.spec
+++ b/cinepaint.spec
@@ -1,20 +1,17 @@
-%define cinever_m 0.25
-%define cinever %{cinever_m}.0
-
 %{!?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)")}
 
 Name:           cinepaint
-Version:        %(echo %{cinever} |sed 's|-|.|')
-Release:        0.5%{?dist}
+Version:        1.0
+Release:        1%{?dist}
 Summary:        CinePaint is a tool for manipulating images
 
 Group:          Applications/Multimedia
 License:        GPLv2+ and LGPLv2+ and MIT
 URL:            http://www.cinepaint.org/
-Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{cinever}.tar.bz2
+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.47.tar.gz
+Source1:        http://downloads.sourceforge.net/oyranos/icc_examin-0.50.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
@@ -90,26 +87,26 @@ Requires:       gtk2-devel
 This package contains development files for %{name}.
 
 %prep
-%setup -q -n cinepaint-%{cinever}
-%setup -q -D -T -a 1 -n cinepaint-%{cinever}
+%setup -q -n cinepaint
+%setup -q -D -T -a 1 -n cinepaint
 #patch1 -p1 -b .symbol rewrite
 %patch2 -p1 -b .rm_rpath
 %patch3 -p1 -b .req
 %patch4 -p1 -b .libdir
 #patch6 -p1 -b .multilib rewrite
-%patch10 -p1 -b .gcc44
+#patch10 -p1 -b .gcc44 fuzz
 #patch12 -p1 -b .oy19
-%patch13 -p1 -b .dso
+#patch13 -p1 -b .dso fuzz
 #patch14 -p1 -b .upd
 %patch15 -p1 -b .enoy
 %patch16 -p0 -b .inc
 %patch17 -p0 -b .cms
 %patch18 -p0 -b .headers
-%patch19 -p1 -b .nopygimp
+#patch19 -p1 -b .nopygimp fuzz
 
 # Update bundled version of icc_examin
 rm -rf plug-ins/icc_examin/icc_examin
-cp -pR icc_examin-0.47 plug-ins/icc_examin/icc_examin
+cp -pR icc_examin-0.50 plug-ins/icc_examin/icc_examin
 
 sed -i -e 's|AC_PATH_PROGS(RPMBUILD, rpm, :)||' configure.in
 
@@ -127,23 +124,12 @@ sed -i 's|\r||'  NEWS COPYING
 
 
 %build
-export CFLAGS="$RPM_OPT_FLAGS -DOYRANOS_NVERSION=110 -DOYRANOS_VERSION=110"
-export CXXFLAGS="$RPM_OPT_FLAGS -DOYRANOS_NVERSION=110 -DOYRANOS_VERSION=110"
 %configure \
   --disable-static \
   --enable-gtk2 \
   --with-pixmap=%{_datadir}/pixmaps \
   --with-python=%{_bindir}/python
-
-#   --enable-pygimp \
-# This is a hack
-mkdir plug-ins/pygimp
-cat > plug-ins/pygimp/Makefile <<EOF
-all:
-
-install:
-
-EOF
+  --enable-pygimp
 
 # remove rpath from libtool
 sed -i.rpath 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
diff --git a/sources b/sources
index 85112fa..0ad7519 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-1070a62d16a2910f5e1f18049d6990cf  cinepaint-0.25.0.tar.bz2
-cd451499601310d5e8aeb2c20847a12a  icc_examin-0.47.tar.gz
+7dfdb005d246578392ac9bd500534804  cinepaint-1.0.tgz
+80d0f98df3ad5f23f6bc8211155b016b  icc_examin-0.50.tar.bz2