- Update to newer SVN

- Drop upstreamed patched
- Enable WordPerfect Graphics support
- Enable embedded Perl scripting
- Enable Imagemagick support
- Disable OpenSSL due to licensing issues

.cvsignore

@@ -1 +1 @@
-inkscape-0.46.tar.bz2
+inkscape-0.46+devel.tar.gz

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

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"

inkscape-0.46+devel-uniconv.patch

@@ -0,0 +1,113 @@
+See https://bugs.launchpad.net/inkscape/+bug/226383
+https://bugzilla.redhat.com/show_bug.cgi?id=458845
+
+Lubomir Rintel <lkundrak@v3.sk>
+
+diff -up inkscape-0.46+devel/inkscape.desktop.in.uniconv inkscape-0.46+devel/inkscape.desktop.in
+--- inkscape-0.46+devel/inkscape.desktop.in.uniconv	2008-08-14 00:04:02.000000000 +0200
++++ inkscape-0.46+devel/inkscape.desktop.in	2008-08-14 00:10:28.000000000 +0200
+@@ -5,7 +5,7 @@ _Name=Inkscape Vector Graphics Editor
+ _Comment=Create and edit Scalable Vector Graphics images
+ Type=Application
+ Categories=Graphics;VectorGraphics;GTK;
+-MimeType=image/svg+xml;image/svg+xml-compressed;
++MimeType=image/svg+xml;image/svg+xml-compressed;image/cgm;image/x-wmf;application/vnd.corel-draw;application/x-xccx;application/x-xcgm;application/x-xcdt;application/x-xsk1;application/x-xcmx;image/x-xcdr;
+ FilePattern=inkscape;
+ Exec=inkscape %F
+ TryExec=inkscape
+diff -up inkscape-0.46+devel/share/extensions/ccx_input.inx.uniconv inkscape-0.46+devel/share/extensions/ccx_input.inx
+--- inkscape-0.46+devel/share/extensions/ccx_input.inx.uniconv	2008-08-14 00:15:10.000000000 +0200
++++ inkscape-0.46+devel/share/extensions/ccx_input.inx	2008-08-14 00:14:20.000000000 +0200
+@@ -2,7 +2,7 @@
+ <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
+     <_name>Corel DRAW Compressed Exchange files input</_name>
+     <id>org.inkscape.input.ccx</id>
+-    <dependency type="executable" location="path">uniconv</dependency>
++    <dependency type="executable" location="path">uniconvertor</dependency>
+     <dependency type="executable" location="extensions">uniconv-ext.py</dependency>
+     <input>
+         <extension>.ccx</extension>
+diff -up inkscape-0.46+devel/share/extensions/cdr_input.inx.uniconv inkscape-0.46+devel/share/extensions/cdr_input.inx
+--- inkscape-0.46+devel/share/extensions/cdr_input.inx.uniconv	2008-08-14 00:15:10.000000000 +0200
++++ inkscape-0.46+devel/share/extensions/cdr_input.inx	2008-08-14 00:14:20.000000000 +0200
+@@ -2,7 +2,7 @@
+ <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
+     <_name>Corel DRAW Input</_name>
+     <id>org.inkscape.input.cdr</id>
+-    <dependency type="executable" location="path">uniconv</dependency>
++    <dependency type="executable" location="path">uniconvertor</dependency>
+     <dependency type="executable" location="extensions">uniconv-ext.py</dependency>
+     <input>
+         <extension>.cdr</extension>
+diff -up inkscape-0.46+devel/share/extensions/cdt_input.inx.uniconv inkscape-0.46+devel/share/extensions/cdt_input.inx
+--- inkscape-0.46+devel/share/extensions/cdt_input.inx.uniconv	2008-08-14 00:15:10.000000000 +0200
++++ inkscape-0.46+devel/share/extensions/cdt_input.inx	2008-08-14 00:14:20.000000000 +0200
+@@ -2,7 +2,7 @@
+ <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
+     <_name>Corel DRAW templates input</_name>
+     <id>org.inkscape.input.cdt</id>
+-    <dependency type="executable" location="path">uniconv</dependency>
++    <dependency type="executable" location="path">uniconvertor</dependency>
+     <dependency type="executable" location="extensions">uniconv-ext.py</dependency>
+     <input>
+         <extension>.cdt</extension>
+diff -up inkscape-0.46+devel/share/extensions/cgm_input.inx.uniconv inkscape-0.46+devel/share/extensions/cgm_input.inx
+--- inkscape-0.46+devel/share/extensions/cgm_input.inx.uniconv	2008-08-14 00:15:10.000000000 +0200
++++ inkscape-0.46+devel/share/extensions/cgm_input.inx	2008-08-14 00:14:20.000000000 +0200
+@@ -2,7 +2,7 @@
+ <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
+     <_name>Computer Graphics Metafile files input</_name>
+     <id>org.inkscape.input.cgm</id>
+-    <dependency type="executable" location="path">uniconv</dependency>
++    <dependency type="executable" location="path">uniconvertor</dependency>
+     <dependency type="executable" location="extensions">uniconv-ext.py</dependency>
+     <input>
+         <extension>.cgm</extension>
+diff -up inkscape-0.46+devel/share/extensions/cmx_input.inx.uniconv inkscape-0.46+devel/share/extensions/cmx_input.inx
+--- inkscape-0.46+devel/share/extensions/cmx_input.inx.uniconv	2008-08-14 00:15:10.000000000 +0200
++++ inkscape-0.46+devel/share/extensions/cmx_input.inx	2008-08-14 00:14:20.000000000 +0200
+@@ -2,7 +2,7 @@
+ <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
+     <_name>Corel DRAW Presentation Exchange files input</_name>
+     <id>org.inkscape.input.cmx</id>
+-    <dependency type="executable" location="path">uniconv</dependency>
++    <dependency type="executable" location="path">uniconvertor</dependency>
+     <dependency type="executable" location="extensions">uniconv-ext.py</dependency>
+     <input>
+         <extension>.cmx</extension>
+diff -up inkscape-0.46+devel/share/extensions/sk1_input.inx.uniconv inkscape-0.46+devel/share/extensions/sk1_input.inx
+--- inkscape-0.46+devel/share/extensions/sk1_input.inx.uniconv	2008-08-14 00:15:10.000000000 +0200
++++ inkscape-0.46+devel/share/extensions/sk1_input.inx	2008-08-14 00:14:20.000000000 +0200
+@@ -2,7 +2,7 @@
+ <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
+     <_name>sK1 vector graphics files input</_name>
+     <id>org.inkscape.input.sk1</id>
+-    <dependency type="executable" location="path">uniconv</dependency>
++    <dependency type="executable" location="path">uniconvertor</dependency>
+     <dependency type="executable" location="extensions">uniconv-ext.py</dependency>
+     <input>
+         <extension>.sk1</extension>
+diff -up inkscape-0.46+devel/share/extensions/uniconv-ext.py.uniconv inkscape-0.46+devel/share/extensions/uniconv-ext.py
+--- inkscape-0.46+devel/share/extensions/uniconv-ext.py.uniconv	2008-08-14 00:01:21.000000000 +0200
++++ inkscape-0.46+devel/share/extensions/uniconv-ext.py	2008-08-14 00:01:31.000000000 +0200
+@@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fi
+ import sys
+ from run_command import run
+ 
+-run('uniconv "%s" "%%s"' % sys.argv[1].replace("%","%%"), "UniConvertor")
++run('uniconvertor "%s" "%%s"' % sys.argv[1].replace("%","%%"), "UniConvertor")
+ 
+ 
+ # vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 encoding=utf-8 textwidth=99
+diff -up inkscape-0.46+devel/share/extensions/wmf_input.inx.uniconv inkscape-0.46+devel/share/extensions/wmf_input.inx
+--- inkscape-0.46+devel/share/extensions/wmf_input.inx.uniconv	2008-08-14 00:15:10.000000000 +0200
++++ inkscape-0.46+devel/share/extensions/wmf_input.inx	2008-08-14 00:14:20.000000000 +0200
+@@ -2,7 +2,7 @@
+ <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
+     <_name>Windows Metafile Input</_name>
+     <id>org.inkscape.input.wmf</id>
+-    <dependency type="executable" location="path">uniconv</dependency>
++    <dependency type="executable" location="path">uniconvertor</dependency>
+     <dependency type="executable" location="extensions">uniconv-ext.py</dependency>
+     <input>
+         <extension>.wmf</extension>

inkscape-0.46-cxxinclude.patch

@@ -0,0 +1,13 @@
+diff -up inkscape-0.46/src/Makefile.in.cxxinclude inkscape-0.46/src/Makefile.in
+--- inkscape-0.46/src/Makefile.in.cxxinclude	2008-03-11 05:47:10.000000000 +0100
++++ inkscape-0.46/src/Makefile.in	2008-08-13 23:26:52.000000000 +0200
+@@ -1487,7 +1487,8 @@ INCLUDES = \
+ 	$(POPPLER_GLIB_CFLAGS)	\
+ 	-DPOTRACE=\"potrace\"	\
+ 	$(INKSCAPE_CFLAGS) \
+-	-I$(top_srcdir)/cxxtest
++	-I$(top_srcdir)/cxxtest \
++	-I$(top_srcdir)/src/extension/script
+ 
+ @PLATFORM_WIN32_TRUE@win32_sources = winmain.cpp registrytool.cpp registrytool.h
+ @PLATFORM_WIN32_TRUE@win32ldflags = -lcomdlg32

inkscape-0.46-poppler-0.8.3.patch

@@ -1,45 +0,0 @@
-Inkscape 0.46 fails to compile with poppler-0.8.3 
-Filed upstream: https://bugs.launchpad.net/inkscape/+bug/237574
-
-diff -NrU5 inkscape-0.46.orig/src/extension/internal/pdfinput/pdf-parser.cpp inkscape-0.46/src/extension/internal/pdfinput/pdf-parser.cpp
---- inkscape-0.46.orig/src/extension/internal/pdfinput/pdf-parser.cpp	2008-06-05 00:26:20.000000000 +0200
-+++ inkscape-0.46/src/extension/internal/pdfinput/pdf-parser.cpp	2008-06-05 00:51:47.000000000 +0200
-@@ -2194,11 +2194,11 @@
- void PdfParser::doShowText(GooString *s) {
-   GfxFont *font;
-   int wMode;
-   double riseX, riseY;
-   CharCode code;
--  Unicode u[8];
-+  Unicode *u = NULL;
-   double x, y, dx, dy, dx2, dy2, curX, curY, tdx, tdy, lineX, lineY;
-   double originX, originY, tOriginX, tOriginY;
-   double oldCTM[6], newCTM[6];
-   double *mat;
-   Object charProc;
-@@ -2242,11 +2242,11 @@
-     oldParser = parser;
-     p = s->getCString();
-     len = s->getLength();
-     while (len > 0) {
-       n = font->getNextChar(p, len, &code,
--			    u, (int)(sizeof(u) / sizeof(Unicode)), &uLen,
-+			    &u, &uLen,
- 			    &dx, &dy, &originX, &originY);
-       dx = dx * state->getFontSize() + state->getCharSpace();
-       if (n == 1 && *p == ' ') {
- 	dx += state->getWordSpace();
-       }
-@@ -2291,11 +2291,11 @@
-     state->textTransformDelta(0, state->getRise(), &riseX, &riseY);
-     p = s->getCString();
-     len = s->getLength();
-     while (len > 0) {
-       n = font->getNextChar(p, len, &code,
--			    u, (int)(sizeof(u) / sizeof(Unicode)), &uLen,
-+			    &u, &uLen,
- 			    &dx, &dy, &originX, &originY);
-       
-       if (wMode) {
- 	dx *= state->getFontSize();
- 	dy = dy * state->getFontSize() + state->getCharSpace();

inkscape-0.46-uniconv.patch

@@ -0,0 +1,54 @@
+See https://bugs.launchpad.net/inkscape/+bug/226383
+https://bugzilla.redhat.com/show_bug.cgi?id=458845
+
+Lubomir Rintel <lkundrak@v3.sk>
+
+diff -up inkscape-0.46/inkscape.desktop.in.uniconv inkscape-0.46/inkscape.desktop.in
+diff -up inkscape-0.46/inkscape.desktop.in.uniconv inkscape-0.46/inkscape.desktop.in
+--- inkscape-0.46/inkscape.desktop.in.uniconv	2008-08-13 23:31:17.000000000 +0200
++++ inkscape-0.46/inkscape.desktop.in	2008-08-13 23:32:35.000000000 +0200
+@@ -7,7 +7,7 @@ Version=1.0
+ Type=Application
+ Categories=Graphics;VectorGraphics;GTK;
+ 
+-MimeType=image/svg+xml;image/svg+xml-compressed;
++MimeType=image/svg+xml;image/svg+xml-compressed;application/vnd.corel-draw;image/x-wmf;
+ 
+ Exec=inkscape %F
+ TryExec=inkscape
+diff -up inkscape-0.46/share/extensions/cdr2svg.sh.uniconv inkscape-0.46/share/extensions/cdr2svg.sh
+--- inkscape-0.46/share/extensions/cdr2svg.sh.uniconv	2008-03-11 05:21:10.000000000 +0100
++++ inkscape-0.46/share/extensions/cdr2svg.sh	2008-08-13 23:31:17.000000000 +0200
+@@ -4,7 +4,7 @@ TMPDIR="${TMPDIR-/tmp}"
+ TEMPFILENAME=`mktemp 2>/dev/null || echo "$TMPDIR/$$"`
+ TEMPFILENAME=${TEMPFILENAME}.svg
+ 
+-uniconv "$1" "${TEMPFILENAME}" > /dev/null 2>&1 || rc=1
++unviconvertor "$1" "${TEMPFILENAME}" > /dev/null 2>&1 || rc=1
+ 
+ cat < "${TEMPFILENAME}" || rc=1
+ rm -f "${TEMPFILENAME}"
+diff -up inkscape-0.46/share/extensions/cdr_input.inx.uniconv inkscape-0.46/share/extensions/cdr_input.inx
+--- inkscape-0.46/share/extensions/cdr_input.inx.uniconv	2008-03-11 05:21:07.000000000 +0100
++++ inkscape-0.46/share/extensions/cdr_input.inx	2008-08-13 23:31:17.000000000 +0200
+@@ -1,7 +1,7 @@
+ <inkscape-extension>
+     <_name>Corel DRAW Input</_name>
+     <id>org.inkscape.input.cdr</id>
+-    <dependency type="executable" location="path">uniconv</dependency>
++    <dependency type="executable" location="path">unviconvertor</dependency>
+     <dependency type="executable" location="extensions">cdr2svg.sh</dependency>
+     <input>
+         <extension>.cdr</extension>
+diff -up inkscape-0.46/share/extensions/wmf_input.inx.uniconv inkscape-0.46/share/extensions/wmf_input.inx
+--- inkscape-0.46/share/extensions/wmf_input.inx.uniconv	2008-03-11 05:21:10.000000000 +0100
++++ inkscape-0.46/share/extensions/wmf_input.inx	2008-08-13 23:31:17.000000000 +0200
+@@ -1,7 +1,7 @@
+ <inkscape-extension>
+     <_name>Windows Metafile Input</_name>
+     <id>org.inkscape.input.wmf</id>
+-    <dependency type="executable" location="path">uniconv</dependency>
++    <dependency type="executable" location="path">unviconvertor</dependency>
+     <dependency type="executable" location="extensions">cdr2svg.sh</dependency>
+     <input>
+         <extension>.wmf</extension>

inkscape-16571-cxxinclude.patch

@@ -1,12 +0,0 @@
---- inkscape-16571/src/Makefile.in.orig	2007-11-29 13:38:13.000000000 +0100
-+++ inkscape-16571/src/Makefile.in	2007-11-29 13:38:29.000000000 +0100
-@@ -317,7 +317,8 @@
- 	$(POPPLER_GLIB_CFLAGS)	\
- 	-DPOTRACE=\"potrace\"	\
- 	$(INKSCAPE_CFLAGS) \
--	-I$(top_srcdir)/cxxtest
-+	-I$(top_srcdir)/cxxtest \
-+	-I$(top_srcdir)/src/extension/script
- 
- 
- @PLATFORM_WIN32_TRUE@win32_sources = winmain.cpp registrytool.cpp registrytool.h

inkscape.spec

@@ -1,19 +1,14 @@
 Name:           inkscape
-Version:        0.46
-Release:        4%{?dist}
+Version:        0.47
+Release:        0.2.20090105svn%{?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
-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
-Patch5:         inkscape-0.46-gtk2.13.3.patch
-Patch6:         inkscape-0.46-poppler-0.8.3.patch
+#Source0:        http://download.sourceforge.net/inkscape/%{name}-%{version}.tar.bz2
+Source0:        %{name}.tar.gz
+Patch0:         inkscape-0.46+devel-uniconv.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -32,71 +27,74 @@ BuildRequires:  pango-devel
 BuildRequires:  pkgconfig
 BuildRequires:  lcms-devel >= 1.13
 BuildRequires:  cairo-devel
-BuildRequires:  openssl-devel
 BuildRequires:  dos2unix
-BuildRequires:  perl-XML-Parser
 BuildRequires:  python-devel
 BuildRequires:  poppler-devel
 BuildRequires:  loudmouth-devel
 BuildRequires:  boost-devel
-
-# Use popt-devel if Fedora 8, RHEL 6, newer or unknown,
-# rely on popt otherwise
-%if %{!?fedora:8}%{?fedora} < 8 || %{!?rhel:6}%{?rhel} < 6
-BuildRequires:  popt
-%else
+BuildRequires:  gsl-devel
+BuildRequires:  libwpg-devel
 BuildRequires:  popt-devel
-%endif
+BuildRequires:  ImageMagick-c++-devel
+BuildRequires:  perl(XML::Parser)
+BuildRequires:  perl(ExtUtils::Embed)
 
+# Incompatible license
+BuildConflicts: openssl-devel
+
+Requires:       dia
 Requires:       pstoedit
+Requires:       ghostscript
 Requires:       perl(Image::Magick)
+Requires:       tex(latex)
+Requires:       tex(dvips)
+Requires:       transfig
+Requires:       gimp
 Requires:       numpy
-Requires:       PyXML
 Requires:       python-lxml
+Requires:       uniconvertor
 
 Requires(post):   desktop-file-utils
 Requires(postun): desktop-file-utils
 
 %description
-Inkscape is a vector-based drawing program, like CorelDraw® or Adobe
-Illustrator® from the proprietary software world, and Sketch or Karbon14 from
-the free software world. It is free software, distributed under the terms of
-the Gnu General Public License, Version 2.
+Inkscape is a vector graphics editor, with capabilities similar to
+Illustrator, CorelDraw, or Xara X, using the W3C standard Scalable Vector
+Graphics (SVG) file format.  It is therefore a very useful tool for web
+designers and as an interchange format for desktop publishing.
 
-Inkscape uses W3C SVG as its native file format. It is therefore a very useful
-tool for web designers and as an interchange format for desktop publishing.
-
-It has a relatively modern display engine, giving you finely antialiased
-display, alpha transparencies, vector fonts and so on. Inkscape is written in
-C and C++, using the Gtk+ toolkit and optionally some Gnome libraries.
+Inkscape supports many advanced SVG features (markers, clones, alpha
+blending, etc.) and great care is taken in designing a streamlined
+interface. It is very easy to edit nodes, perform complex path operations,
+trace bitmaps and much more.
 
 
 %prep
-%setup -q
-%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 {} ';'
-find share/extensions/ -type f -regex '.*\.py' -perm +111 -exec chmod -x {} ';'
+%setup -q -n %{name}
+%patch0 -p1 -b .uniconv
+
+# https://bugs.launchpad.net/inkscape/+bug/314381
+# A couple of files have executable bits set,
+# despite not being executable
+(find . \( -name '*.cpp' -o -name '*.h' \) -perm +111
+	find share/extensions -name '*.py' -perm +111
+) |xargs chmod -x
+
+# Fix end of line encodings
 dos2unix -k -q share/extensions/*.py
 
 
 %build
-%configure                     \
---disable-dependency-tracking  \
---with-xinerama                \
---enable-static=no             \
---with-python                  \
---with-perl                    \
---with-gnome-vfs               \
---with-inkjar                  \
---enable-inkboard              \
---enable-lcms                  \
---enable-poppler-cairo
+%configure                      \
+        --with-python           \
+        --with-perl             \
+        --with-gnome-vfs        \
+        --with-xft              \
+        --enable-inkboard       \
+        --enable-lcms           \
+        --enable-poppler-cairo  \
+        --disable-dependency-tracking
+
 
 make %{?_smp_mflags}
 
@@ -104,15 +102,16 @@ make %{?_smp_mflags}
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-%find_lang %{name}
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 
-rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/extensions/outline2svg.*
-rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/extensions/txt2svg.*
+desktop-file-install --vendor fedora --delete-original  \
+        --dir $RPM_BUILD_ROOT%{_datadir}/applications   \
+        $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
-desktop-file-install --vendor fedora --delete-original     \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications            \
-  $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
+# No skencil yet
+$RPM_BUILD_ROOT%{_datadir}/%{name}/extensions/sk2svg.sh
+
+%find_lang %{name}
 
 
 %clean
@@ -132,13 +131,32 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 %doc AUTHORS COPYING ChangeLog NEWS README
 %doc %{_mandir}/man1/*
 %{_bindir}/*
-%{_datadir}/%{name}/
+%{_datadir}/%{name}
 %{_datadir}/applications/*.desktop
 %{_datadir}/pixmaps/*
 %{_mandir}/fr/man1/*
 
 
 %changelog
+* Tue Jan 06 2009 Lubomir Rintel <lkundrak@v3.sk> - 0.47-0.3.20090105svn
+- Update to newer SVN
+- Drop upstreamed patched
+- Enable WordPerfect Graphics support
+- Enable embedded Perl scripting
+- Enable Imagemagick support
+- Disable OpenSSL due to licensing issues
+
+* Thu Aug 14 2008 Lubomir Rintel <lkundrak@v3.sk> - 0.47-0.3.20080814svn
+- Update to today's SVN snapshot
+- Drop the upstreamed poppler patch
+
+* Wed Aug 13 2008 Lubomir Rintel <lkundrak@v3.sk> - 0.47-0.2.20080705svn
+- Rediff patches for zero fuzz
+- Use uniconvertor to handle CDR and WMF (#458845)
+
+* 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
 

sources

@@ -1 +0,0 @@
-59997096c3640b2601c2b4afba8a3d75  inkscape-0.46.tar.bz2