From 8d2d97e2932d085d4d4f03f689c1365129a405b0 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak@fedoraproject.org>
Date: Wed, 9 Jul 2008 10:13:28 +0000
Subject: [PATCH] - Subversion snapshot

---
 .cvsignore                        |  2 +-
 inkscape-0.46+devel-desktop.patch | 12 ++++++++++++
 inkscape-0.46+devel-icons.patch   | 23 +++++++++++++++++++++++
 inkscape.spec                     | 21 +++++++++++----------
 sources                           |  2 +-
 5 files changed, 48 insertions(+), 12 deletions(-)
 create mode 100644 inkscape-0.46+devel-desktop.patch
 create mode 100644 inkscape-0.46+devel-icons.patch

diff --git a/.cvsignore b/.cvsignore
index 883ac0a..4ea153d 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-inkscape-0.46.tar.bz2
+inkscape-0.46+devel.tar.gz
diff --git a/inkscape-0.46+devel-desktop.patch b/inkscape-0.46+devel-desktop.patch
new file mode 100644
index 0000000..e0fda7d
--- /dev/null
+++ b/inkscape-0.46+devel-desktop.patch
@@ -0,0 +1,12 @@
+inkscape.desktop: error: file contains multiple assignments of key "Name"
+
+--- inkscape-0.46+devel/inkscape.desktop.in.orig	2008-07-05 20:16:01.000000000 +0200
++++ inkscape-0.46+devel/inkscape.desktop.in	2008-07-05 20:17:06.000000000 +0200
+@@ -1,7 +1,6 @@
+ [Desktop Entry]
+ Version=1.0
+ Encoding=UTF-8
+-Name=No name
+ _Name=Inkscape Vector Graphics Editor
+ _Comment=Create and edit Scalable Vector Graphics images
+ Type=Application
diff --git a/inkscape-0.46+devel-icons.patch b/inkscape-0.46+devel-icons.patch
new file mode 100644
index 0000000..effece3
--- /dev/null
+++ b/inkscape-0.46+devel-icons.patch
@@ -0,0 +1,23 @@
+Default to small icons and Sans font.
+Lubomir Rintel <lkundrak@v3.sk>
+
+--- inkscape-0.46+devel/src/preferences-skeleton.h.icons	2008-06-24 13:38:52.000000000 +0200
++++ inkscape-0.46+devel/src/preferences-skeleton.h	2008-07-05 04:50:19.000000000 +0200
+@@ -86,7 +86,7 @@
+ "    </eventcontext>\n"
+ "    <eventcontext id=\"text\"  usecurrent=\"0\" gradientdrag=\"1\"\n"
+ "                       font_sample=\"AaBbCcIiPpQq12369$\342\202\254\302\242?.;/()\"\n"
+-"                  style=\"fill:black;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;font-style:normal;font-weight:normal;font-size:40px;\" selcue=\"1\"/>\n"
++"                  style=\"fill:black;fill-opacity:1;stroke:none;font-family:Sans;font-style:normal;font-weight:normal;font-size:40px;\" selcue=\"1\"/>\n"
+ "    <eventcontext id=\"nodes\" selcue=\"1\" gradientdrag=\"1\" highlight_color=\"4278190335\" pathflash_enabled=\"1\" pathflash_timeout=\"500\" show_handles=\"1\" show_helperpath=\"0\" sculpting_profile=\"1\" />\n"
+ "    <eventcontext id=\"tweak\" selcue=\"0\" gradientdrag=\"0\" show_handles=\"0\" width=\"0.2\" force=\"0.2\" fidelity=\"0.5\" usepressure=\"1\" style=\"fill:red;stroke:none;\" usecurrent=\"0\"/>\n"
+ "    <eventcontext id=\"gradient\" selcue=\"1\"/>\n"
+@@ -327,7 +327,7 @@
+ "    <group\n"
+ "       id=\"tools\"\n"
+ "       icononly=\"1\"\n"
+-"       small=\"0\" />\n"
++"       small=\"1\" />\n"
+ "  </group>\n"
+ "\n"
+ "  <group\n"
diff --git a/inkscape.spec b/inkscape.spec
index 7d5531e..8665395 100644
--- a/inkscape.spec
+++ b/inkscape.spec
@@ -1,17 +1,16 @@
 Name:           inkscape
-Version:        0.46
-Release:        4%{?dist}
+Version:        0.47
+Release:        0.1.20080705svn%{?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
+#Source0:        http://download.sourceforge.net/inkscape/%{name}-%{version}.tar.bz2
+Source0:        %{name}-0.46+devel.tar.gz
 Patch0:         inkscape-16571-cxxinclude.patch
-Patch1:         inkscape-0.45.1-desktop.patch
-Patch2:         inkscape-0.46pre2-icons.patch
-Patch3:         inkscape-0.46-fixlatex.patch
-Patch4:         inkscape-0.46-gtkopen.patch
+Patch1:         inkscape-0.46+devel-desktop.patch
+Patch2:         inkscape-0.46+devel-icons.patch
 Patch5:         inkscape-0.46-gtk2.13.3.patch
 Patch6:         inkscape-0.46-poppler-0.8.3.patch
 
@@ -39,6 +38,7 @@ BuildRequires:  python-devel
 BuildRequires:  poppler-devel
 BuildRequires:  loudmouth-devel
 BuildRequires:  boost-devel
+BuildRequires:  gsl-devel
 
 # Use popt-devel if Fedora 8, RHEL 6, newer or unknown,
 # rely on popt otherwise
@@ -72,12 +72,10 @@ C and C++, using the Gtk+ toolkit and optionally some Gnome libraries.
 
 
 %prep
-%setup -q
+%setup -q -n %{name}-0.46+devel
 %patch0 -p1 -b .cxxinclude
 %patch1 -p1 -b .desktop
 %patch2 -p1 -b .icons
-%patch3 -p1 -b .fixlatex
-%patch4 -p0 -b .gtkopen
 %patch5 -p1 -b .gtk2.13.3
 %patch6 -p1 -b .poppler-0.8.3
 find -type f -regex '.*\.\(cpp\|h\)' -perm +111 -exec chmod -x {} ';'
@@ -139,6 +137,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 
 %changelog
+* Wed Jul 09 2008 Lubomir Rintel <lkundrak@v3.sk> - 0.47-0.1.20080705svn
+- Subversion snapshot
+
 * Wed Jul 09 2008 Lubomir Rintel <lkundrak@v3.sk> - 0.46-4
 - Fix compile issues with newer gtk and poppler
 
diff --git a/sources b/sources
index deb5c8b..56bc8d0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-59997096c3640b2601c2b4afba8a3d75  inkscape-0.46.tar.bz2
+17af28857c3b07c08e87e0475c09d85c  inkscape-0.46+devel.tar.gz