dist-git conversion

#2781)

.cvsignore

@@ -1 +0,0 @@
-uniconvertor-1.1.1.tar.gz

.gitignore

@@ -0,0 +1 @@
+uniconvertor-1.1.3.tar.gz

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: uniconvertor
-# $Id$
-NAME := uniconvertor
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

UniConvertor-1.1.1-rename-in-help.patch

@@ -0,0 +1,21 @@
+diff -urNad uniconvertor-1.1.1~/src/__init__.py uniconvertor-1.1.1/src/__init__.py
+--- uniconvertor-1.1.1~/src/__init__.py	2008-03-13 00:10:44.000000000 +0100
++++ uniconvertor-1.1.1/src/__init__.py	2008-03-15 11:38:34.000000000 +0100
+@@ -7,7 +7,7 @@
+ # For more info see COPYRIGHTS file in root directory.
+ 
+ '''
+-USAGE: uniconv [INPUT FILE] [OUTPUT FILE]
++USAGE: uniconvertor [INPUT FILE] [OUTPUT FILE]
+ 
+ Converts one vector graphics format to another using sK1 engine.
+ sK1 Team (http://sk1project.org), copyright (C) 2007,2008 by Igor E. Novikov
+@@ -36,7 +36,7 @@
+      PDF - Portable Document Format
+      PS  - PostScript
+ 
+-Example: uniconv drawing.cdr drawing.svg\n
++Example: uniconvertor drawing.cdr drawing.svg\n
+ '''
+ 
+ import sys, os, string

UniConvertor-1.1.1-use-exec.patch

@@ -0,0 +1,10 @@
+diff -urNad python-uniconvertor-1.1.1~/src/uniconv python-uniconvertor-1.1.1/src/uniconv
+--- python-uniconvertor-1.1.1~/src/uniconv	2008-03-13 00:10:44.000000000 +0100
++++ python-uniconvertor-1.1.1/src/uniconv	2008-03-15 15:11:01.000000000 +0100
+@@ -20,4 +20,4 @@
+ #
+ 
+ 
+-python -c "import uniconvertor" "$1" "$2"
+\ No newline at end of file
++exec python -c "import uniconvertor" "$1" "$2"

UniConvertor-1.1.3-cover_by_func.patch

@@ -0,0 +1,95 @@
+diff -up UniConvertor-1.1.3/src/__init__.py.orig UniConvertor-1.1.3/src/__init__.py
+--- UniConvertor-1.1.3/src/__init__.py.orig	2009-02-11 18:56:57.000000000 +0200
++++ UniConvertor-1.1.3/src/__init__.py	2009-02-11 19:01:24.000000000 +0200
+@@ -41,43 +41,44 @@ Example: uniconvertor drawing.cdr drawin
+ 
+ import sys, os, string
+ 
+-_pkgdir = __path__[0]
+-app_dir = os.path.join(_pkgdir, 'app')
+-app_ver = string.strip(open(os.path.join(app_dir, 'VERSION')).read())
+-
+-if len(sys.argv)<2 or sys.argv[1]=='--help':
+-	print '\nUniConvertor',app_ver
+-	print __doc__
++def uniconv():
++	_pkgdir = __path__[0]
++	app_dir = os.path.join(_pkgdir, 'app')
++	app_ver = string.strip(open(os.path.join(app_dir, 'VERSION')).read())
++	
++	if len(sys.argv) < 2 or sys.argv[1] == '--help':
++		print '\nUniConvertor', app_ver
++		print __doc__
++		sys.exit(0)
++	if not os.path.isfile(sys.argv[1]):
++		print '\nERROR: %s file is not found!' % sys.argv[1]
++		print '\nUniConvertor',app_ver
++		print __doc__
++		sys.exit(1)
++	if len(sys.argv) != 3:
++		print '\nERROR: incorrect arguments!'
++		print '\nUniConvertor', app_ver
++		print __doc__
++		sys.exit(1)
++	
++	
++	sys.path.insert(1, _pkgdir)
++	
++	from app.io import load
++	from app.plugins import plugins
++	import app
++	
++	app.init_lib()
++	
++	doc = load.load_drawing(sys.argv[1])
++	extension = os.path.splitext(sys.argv[2])[1]
++	plugins.load_plugin_configuration()
++	fileformat = plugins.guess_export_plugin(extension)
++	if fileformat:
++		saver = plugins.find_export_plugin(fileformat)
++		saver(doc, sys.argv[2])
++	else:
++		sys.stderr.write('ERROR: unrecognized extension %s\n' % extension)
++		sys.exit(1)
++	doc.Destroy()
+ 	sys.exit(0)
+-if not os.path.isfile(sys.argv[1]):
+-	print '\nERROR: %s file is not found!' % sys.argv[1]
+-	print '\nUniConvertor',app_ver
+-	print __doc__
+-	sys.exit(1)
+-if len(sys.argv) != 3:
+-	print '\nERROR: incorrect arguments!'
+-	print '\nUniConvertor',app_ver
+-	print __doc__
+-	sys.exit(1)
+-
+-
+-sys.path.insert(1, _pkgdir)
+-
+-from app.io import load
+-from app.plugins import plugins
+-import app
+-
+-app.init_lib()
+-
+-doc = load.load_drawing(sys.argv[1])
+-extension = os.path.splitext(sys.argv[2])[1]
+-plugins.load_plugin_configuration()
+-fileformat = plugins.guess_export_plugin(extension)
+-if fileformat:
+-	saver = plugins.find_export_plugin(fileformat)
+-	saver(doc, sys.argv[2])
+-else:
+-	sys.stderr.write('ERROR: unrecognized extension %s\n' % extension)
+-	sys.exit(1)
+-doc.Destroy()
+-sys.exit(0)
+--- UniConvertor-1.1.3/src/uniconv.orig	2009-02-11 19:21:28.000000000 +0200
++++ UniConvertor-1.1.3/src/uniconv	2009-02-11 19:23:51.000000000 +0200
+@@ -20,4 +20,4 @@
+ #
+ 
+ 
+-exec python -c "import uniconvertor" "$1" "$2"
++exec python -c "from uniconvertor import uniconv; uniconv();" "$1" "$2"

sources

@@ -1 +1 @@
-5200180c71709e68c0309d1bad5d86b8  uniconvertor-1.1.1.tar.gz
+63aee3ae289e92e0b509cb2b3a1d7ac8  uniconvertor-1.1.3.tar.gz

uniconvertor.spec

@@ -1,19 +1,26 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           uniconvertor
-Version:        1.1.1
-Release:        2%{?dist}
+Version:        1.1.3
+Release:        5%{?dist}
 Summary:        Universal vector graphics translator
 
 Group:          Applications/Multimedia
 License:        LGPLv2+ and GPLv2+ and MIT
 URL:            http://sk1project.org/modules.php?name=Products&product=uniconvertor
 Source0:        http://sk1project.org/downloads/uniconvertor/v%{version}/%{name}-%{version}.tar.gz
+# Upstream notified via forum: http://sk1project.org/forum/topic.php?forum=2&topic=19
 Patch0:         UniConvertor-1.1.0-simplify.patch
+# Upstream notified via forum: http://sk1project.org/forum/topic.php?forum=2&topic=11
+Patch1:         UniConvertor-1.1.1-rename-in-help.patch
+Patch2:         UniConvertor-1.1.1-use-exec.patch
+# Upstream notified via forum: http://sk1project.org/forum/topic.php?forum=2&topic=62
+Patch3:         UniConvertor-1.1.3-cover_by_func.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel
 Requires:       python-imaging
+Requires:       python-reportlab
 
 
 %description
@@ -24,6 +31,9 @@ It uses sK1 engine to convert one format to another.
 %prep
 %setup -q -n UniConvertor-%{version}
 %patch0 -p1 -b .simplify
+%patch1 -p1 -b .rename-in-help
+%patch2 -p1 -b .use-exec
+%patch3 -p1 -b .cover_by_func
 
 # Prepare for inclusion into documentation part
 install -p -m644 src/COPYRIGHTS COPYRIGHTS
@@ -51,6 +61,9 @@ chmod 644 src/modules/*/*.{c,h}
 
 # Rename uniconv script due to conflicts with netatalk
 # (https://bugzilla.redhat.com/show_bug.cgi?id=405011)
+# Upstream notified via forum:
+#   http://sk1project.org/forum/topic.php?forum=2&topic=11
+#   http://sk1project.org/forum/topic.php?forum=2&topic=33
 mv $RPM_BUILD_ROOT%{_bindir}/uniconv $RPM_BUILD_ROOT%{_bindir}/uniconvertor
 
 
@@ -67,6 +80,23 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.3-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Wed Feb 11 2009 Andy Shevchenko <andy@smile.org.ua> - 1.1.3-4
+- cover code in __init__.py by function (#484301)
+
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm@gmail.com> - 1.1.3-3
+- Rebuild for Python 2.6
+
+* Sun Jul 27 2008 Andy Shevchenko <andy@smile.org.ua> 1.1.3-2
+- update to 1.1.3
+- new requirement python-reportlab
+
+* Sun May 04 2008 Andy Shevchenko <andy@smile.org.ua> 1.1.2-2
+- update to 1.1.2
+- apply two useful patches from Debian
+
 * Thu Mar 06 2008 Andy Shevchenko <andy@smile.org.ua> 1.1.1-2
 - just fix Source0 URL