diff --git a/.cvsignore b/.cvsignore index 1d95bc3..eda3ebb 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -uniconvertor-1.0.0.tar.gz +uniconvertor-1.1.0.tar.gz diff --git a/UniConvertor-1.1.0-simplify.patch b/UniConvertor-1.1.0-simplify.patch new file mode 100644 index 0000000..b305acd --- /dev/null +++ b/UniConvertor-1.1.0-simplify.patch @@ -0,0 +1,34 @@ +--- 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 diff --git a/sources b/sources index b262a71..cce4bad 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e334c28f42820784d6a9445173e082a0 uniconvertor-1.0.0.tar.gz +93dc0af0df8f2c3c8aa4393f05213b12 uniconvertor-1.1.0.tar.gz diff --git a/uniconvertor.spec b/uniconvertor.spec index 923059a..6eedd50 100644 --- a/uniconvertor.spec +++ b/uniconvertor.spec @@ -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.0 +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 @@ It uses sK1 engine to convert one format to another. %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,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Jan 12 2008 Andy Shevchenko 1.1.0-1 +- update to 1.1.0 + * Thu Nov 29 2007 Andy Shevchenko 1.0.0-5 - fix conflict with netatalk: rename uniconv to uniconvertor (#405011)