From 920fe075dc237480251b800a99bfd2db77c34afb Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak@fedoraproject.org>
Date: Wed, 25 Nov 2009 17:46:20 +0000
Subject: [PATCH] - Stable release

---
 .cvsignore                     |  2 +-
 inkscape-20090925svn-el5.patch | 35 ----------------------------------
 inkscape.spec                  | 23 ++++++++++------------
 sources                        |  2 +-
 4 files changed, 12 insertions(+), 50 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 9b42f8c..d7517e1 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-inkscape.tar.gz
+inkscape-0.47.tar.bz2
diff --git a/inkscape-20090925svn-el5.patch b/inkscape-20090925svn-el5.patch
index bbf6719..6c167b2 100644
--- a/inkscape-20090925svn-el5.patch
+++ b/inkscape-20090925svn-el5.patch
@@ -29,41 +29,6 @@ URIs.
  src/xml/rebase-hrefs.cpp                |   13 ++++++++++++-
  6 files changed, 30 insertions(+), 7 deletions(-)
 
-diff --git a/autogen.sh b/autogen.sh
-index 6a7c631..5c4e34a 100755
---- a/autogen.sh
-+++ b/autogen.sh
-@@ -15,7 +15,7 @@ TEST_TYPE=-f
- FILE=inkscape.spec.in
- 
- AUTOCONF_REQUIRED_VERSION=2.52
--AUTOMAKE_REQUIRED_VERSION=1.10
-+AUTOMAKE_REQUIRED_VERSION=1.9.6
- GLIB_REQUIRED_VERSION=2.0.0
- INTLTOOL_REQUIRED_VERSION=0.17
- 
-@@ -86,9 +86,9 @@ fi
- 
- echo -n "checking for automake >= $AUTOMAKE_REQUIRED_VERSION ... "
- # Prefer earlier versions just so that the earliest supported version gets test coverage by developers.
--if (automake-1.10 --version) < /dev/null > /dev/null 2>&1; then
--   AUTOMAKE=automake-1.10
--   ACLOCAL=aclocal-1.10
-+if (automake-$AUTOMAKE_REQUIRED_VERSION --version) < /dev/null > /dev/null 2>&1; then
-+   AUTOMAKE=automake-$AUTOMAKE_REQUIRED_VERSION
-+   ACLOCAL=aclocal-$AUTOMAKE_REQUIRED_VERSION
- elif (automake --version) < /dev/null > /dev/null 2>&1; then
-    # Leave unversioned automake for a last resort: it may be a version earlier
-    # than what we require.
-@@ -98,7 +98,7 @@ elif (automake --version) < /dev/null > /dev/null 2>&1; then
-    ACLOCAL=aclocal
- else
-     echo
--    echo "  You must have automake 1.10 or newer installed to compile $PROJECT."
-+    echo "  You must have automake $AUTOMAKE_REQUIRED_VERSION or newer installed to compile $PROJECT."
-     DIE=1
- fi
- if test x$AUTOMAKE != x; then
 diff --git a/configure.ac b/configure.ac
 index fbfa2e5..32ff5a4 100644
 --- a/configure.ac
diff --git a/inkscape.spec b/inkscape.spec
index 49d7acd..db85600 100644
--- a/inkscape.spec
+++ b/inkscape.spec
@@ -1,15 +1,12 @@
 Name:           inkscape
 Version:        0.47
-Release:        0.17.pre4.20091101svn%{?dist}
+Release:        1%{?dist}
 Summary:        Vector-based drawing program using SVG
 
 Group:          Applications/Productivity
 License:        GPLv2+
 URL:            http://inkscape.sourceforge.net/
-#Source0:        http://download.sourceforge.net/inkscape/%{name}-%{version}.tar.bz2
-# svn export -r22548 https://inkscape.svn.sourceforge.net/svnroot/inkscape/inkscape/trunk@22548 inkscape
-# tar czf inkscape.tar.gz inkscape
-Source0:        %{name}.tar.gz
+Source0:        http://download.sourceforge.net/inkscape/%{name}-%{version}.tar.bz2
 
 Patch0:         inkscape-20090410svn-uniconv.patch
 Patch4:         inkscape-20090410svn-formats.patch
@@ -45,16 +42,11 @@ BuildRequires:  perl(XML::Parser)
 BuildRequires:  perl(ExtUtils::Embed)
 BuildRequires:  intltool
 # A packaging bug in EL-5
-%if 0%{?fedora > 6}
+%if 0%{?fedora > 6}%{?rhel > 5}
 BuildRequires:  popt-devel
 %else
 BuildRequires:  popt
 %endif
-BuildRequires:  autoconf
-BuildRequires:  automake
-
-# Incompatible license
-BuildConflicts: openssl-devel
 
 # Disable all for now. TODO: Be smarter
 %if 0
@@ -128,7 +120,7 @@ graphics in W3C standard Scalable Vector Graphics (SVG) file format.
 
 
 %prep
-%setup -q -n %{name}
+%setup -q
 %patch0 -p1 -b .uniconv
 %patch4 -p1 -b .formats
 %patch5 -p1 -b .el5
@@ -146,7 +138,6 @@ dos2unix -k -q share/extensions/*.py
 
 
 %build
-sh autogen.sh
 %configure                      \
         --with-python           \
         --with-perl             \
@@ -222,6 +213,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Nov 25 2009 Lubomir Rintel <lkundrak@v3.sk> - 0.47-1
+- Stable release
+
+* Mon Nov 23 2009 Adam Jackson <ajax@redhat.com> 0.47-0.18.pre4.20091101svn
+- Fix RHEL6 build.
+
 * Mon Sep 07 2009 Lubomir Rintel <lkundrak@v3.sk> - 0.47-0.17.pre4.20091101svn
 - Icon for main window (#532325)
 
diff --git a/sources b/sources
index 0bf61d9..72df1e8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e92cc0964ccc2c2b190b6c557f8008b3  inkscape.tar.gz
+7b497c8f673e40b05295a29f6e2111f4  inkscape-0.47.tar.bz2