rpms/inkscape/devel inkscape-0.46+devel-uniconv.patch, NONE, 1.1.2.1 inkscape.spec, 1.55.2.1, 1.55.2.2

Lubomir Rintel (lkundrak) fedora-extras-commits at redhat.com
Wed Aug 13 22:19:49 UTC 2008 

Author: lkundrak

Update of /cvs/pkgs/rpms/inkscape/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31212

Modified Files:
      Tag: inkscape-0_47-devel
	inkscape.spec 
Added Files:
      Tag: inkscape-0_47-devel
	inkscape-0.46+devel-uniconv.patch 
Log Message:
* Wed Aug 13 2008 Lubomir Rintel <lkundrak at v3.sk> - 0.47-0.2.20080705svn
- Rediff patches for zero fuzz
- Use uniconvertor to handle CDR and WMF (#458845)


inkscape-0.46+devel-uniconv.patch:

--- NEW FILE inkscape-0.46+devel-uniconv.patch ---
See https://bugs.launchpad.net/inkscape/+bug/226383
https://bugzilla.redhat.com/show_bug.cgi?id=458845

Lubomir Rintel <lkundrak at 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>


Index: inkscape.spec
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/devel/inkscape.spec,v
retrieving revision 1.55.2.1
retrieving revision 1.55.2.2
diff -u -r1.55.2.1 -r1.55.2.2
--- inkscape.spec	9 Jul 2008 10:13:28 -0000	1.55.2.1
+++ inkscape.spec	13 Aug 2008 22:19:19 -0000	1.55.2.2
@@ -1,6 +1,6 @@
 Name:           inkscape
 Version:        0.47
-Release:        0.1.20080705svn%{?dist}
+Release:        0.2.20080705svn%{?dist}
 Summary:        Vector-based drawing program using SVG
 
 Group:          Applications/Productivity
@@ -8,11 +8,12 @@
 URL:            http://inkscape.sourceforge.net/
 #Source0:        http://download.sourceforge.net/inkscape/%{name}-%{version}.tar.bz2
 Source0:        %{name}-0.46+devel.tar.gz
-Patch0:         inkscape-16571-cxxinclude.patch
+Patch0:         inkscape-0.46-cxxinclude.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
+Patch7:         inkscape-0.46+devel-uniconv.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -53,6 +54,7 @@
 Requires:       numpy
 Requires:       PyXML
 Requires:       python-lxml
+Requires:       uniconvertor
 
 Requires(post):   desktop-file-utils
 Requires(postun): desktop-file-utils
@@ -78,6 +80,7 @@
 %patch2 -p1 -b .icons
 %patch5 -p1 -b .gtk2.13.3
 %patch6 -p1 -b .poppler-0.8.3
+%patch7 -p1 -b .uniconv
 find -type f -regex '.*\.\(cpp\|h\)' -perm +111 -exec chmod -x {} ';'
 find share/extensions/ -type f -regex '.*\.py' -perm +111 -exec chmod -x {} ';'
 dos2unix -k -q share/extensions/*.py
@@ -137,6 +140,10 @@
 
 
 %changelog
+* Wed Aug 13 2008 Lubomir Rintel <lkundrak at 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 at v3.sk> - 0.47-0.1.20080705svn
 - Subversion snapshot

More information about the fedora-extras-commits mailing list