rpms/uniconvertor/F-7 UniConvertor-1.1.0-simplify.patch, NONE, 1.1 sources, 1.2, 1.3 uniconvertor.spec, 1.2, 1.3

[Andy Shevchenko (andriy)]

Author: andriy

Update of /cvs/extras/rpms/uniconvertor/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10071

Modified Files:
	sources uniconvertor.spec 
Added Files:
	UniConvertor-1.1.0-simplify.patch 
Log Message:
Update to 1.1.1

UniConvertor-1.1.0-simplify.patch:

--- NEW FILE UniConvertor-1.1.0-simplify.patch ---
--- UniConvertor-1.1.0/src/app/__init__.py.simplify	2007-12-20 14:33:27.000000000 +0200
+++ UniConvertor-1.1.0/src/app/__init__.py	2008-01-11 21:34:18.000000000 +0200
@@ -9,28 +9,20 @@
 
 import os, sys, string
 
-path_separator='/'
-if os.name=='nt':
-	path_separator='\\'
-
 _pkgdir = __path__[0]
 
-temp=string.split(_pkgdir,path_separator)
-temp.remove(temp[-1])
-_parentdir=string.join(temp,path_separator)
+_parentdir, dummy = os.path.split(_pkgdir)
 
 sKVersion = string.strip(open(os.path.join(_pkgdir, 'VERSION')).read())
 
 for _dir in ('modules', 'Base'):
 	__path__.insert(0, os.path.join(_pkgdir, _dir))
 
-dir = os.path.join(_parentdir, 'app')
-dir = os.path.join(dir, 'modules')
+dir = os.path.join(_parentdir, 'app', 'modules')
 if os.path.isdir(dir):
 	sys.path.insert(1, dir)
 
-message_dir = os.path.join(sys.path[0], 'Resources')
-message_dir = os.path.join(message_dir, 'Messages')
+message_dir = os.path.join(sys.path[0], 'Resources', 'Messages')
 try:
 	from intl import gettext, dgettext, bindtextdomain
 	import intl, locale


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/uniconvertor/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Nov 2007 21:03:08 -0000	1.2
+++ sources	14 Feb 2008 10:34:14 -0000	1.3
@@ -1 +1 @@
-e334c28f42820784d6a9445173e082a0  uniconvertor-1.0.0.tar.gz
+5200180c71709e68c0309d1bad5d86b8  uniconvertor-1.1.1.tar.gz


Index: uniconvertor.spec
===================================================================
RCS file: /cvs/extras/rpms/uniconvertor/F-7/uniconvertor.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- uniconvertor.spec	30 Nov 2007 08:41:48 -0000	1.2
+++ uniconvertor.spec	14 Feb 2008 10:34:14 -0000	1.3
@@ -1,14 +1,15 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           uniconvertor
-Version:        1.0.0
-Release:        5%{?dist}
+Version:        1.1.1
+Release:        1%{?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/%{name}-%{version}.tar.gz
+Patch0:         UniConvertor-1.1.0-simplify.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel
@@ -22,6 +23,7 @@
 
 %prep
 %setup -q -n UniConvertor-%{version}
+%patch0 -p1 -b .simplify
 
 # Prepare for inclusion into documentation part
 install -p -m644 src/COPYRIGHTS COPYRIGHTS
@@ -65,6 +67,12 @@
 
 
 %changelog
+* Wed Feb 13 2008 Andy Shevchenko <andy at smile.org.ua> 1.1.1-1
+- update to 1.1.1
+
+* Sat Jan 12 2008 Andy Shevchenko <andy at smile.org.ua> 1.1.0-1
+- update to 1.1.0
+
 * Thu Nov 29 2007 Andy Shevchenko <andy at smile.org.ua> 1.0.0-5
 - fix conflict with netatalk: rename uniconv to uniconvertor (#405011)