rpms/python-kiwi/F-12 kiwi-distutils.patch, NONE, 1.1 .cvsignore, 1.15, 1.16 python-kiwi.spec, 1.22, 1.23 sources, 1.15, 1.16

[Haïkel Guémar]

Author: hguemar

Update of /cvs/pkgs/rpms/python-kiwi/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30258

Modified Files:
	.cvsignore python-kiwi.spec sources 
Added Files:
	kiwi-distutils.patch 
Log Message:
upstream 1.9.26 and patch fixing installation to site-packages instead of dist-packages

kiwi-distutils.patch:
 dist.py |    8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

--- NEW FILE kiwi-distutils.patch ---
--- kiwi-1.9.26/kiwi/dist.py.orig	2009-12-14 23:37:15.000000000 +0100
+++ kiwi-1.9.26/kiwi/dist.py	2009-12-14 23:41:53.000000000 +0100
@@ -156,14 +156,10 @@ def get_site_packages_dir(*dirs):
 
     @param dirs: directory names to be appended
     """
-    python_version = sys.version_info[:2]
+
     libdir = get_python_lib(plat_specific=False,
                             standard_lib=True, prefix='')
-    if python_version < (2, 6):
-        site = 'site-packages'
-    else:
-        site = 'dist-packages'
-    return os.path.join(libdir, site, *dirs)
+    return os.path.join(libdir, 'site-packages', *dirs)
 
 def listfiles(*dirs):
     """


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-kiwi/F-12/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	12 Aug 2009 19:27:48 -0000	1.15
+++ .cvsignore	15 Dec 2009 14:45:08 -0000	1.16
@@ -1 +1 @@
-kiwi-1.9.25.tar.bz2
+kiwi-1.9.26.tar.bz2


Index: python-kiwi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-kiwi/F-12/python-kiwi.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- python-kiwi.spec	12 Aug 2009 19:27:48 -0000	1.22
+++ python-kiwi.spec	15 Dec 2009 14:45:08 -0000	1.23
@@ -2,14 +2,16 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           python-kiwi
-Version:        1.9.25
-Release:        3%{?dist}
+Version:        1.9.26
+Release:        1%{?dist}
 Summary:        Framework for Python GUI applications
 
 Group:          Development/Libraries
 License:        LGPLv2+
 URL:            http://www.async.com.br/projects/kiwi/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/kiwi/1.9/kiwi-%{version}.tar.bz2
+# fix kiwi custom distutils to conform python packaging guidelines
+Patch0:		kiwi-distutils.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildArch:      noarch
@@ -48,7 +50,7 @@ useful for reference when writing softwa
 %prep
 %setup -q -n kiwi-%{version}
 sed -i -e 's|share/doc/kiwi|share/doc/%{name}-%{version}|' setup.py
-
+%patch0 -p1 -b .distutils
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
@@ -94,6 +96,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec 15 2009 Haïkel Guémar <karlthered at gmail.com> - 1.9.26-1
+- Upstream 1.9.26
+- Fix kiwi custom distutils to conform fedora python packaging guidelines.
+
 * Tue Aug 11 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.9.25-3
 - Use bzipped upstream tarball.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-kiwi/F-12/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	12 Aug 2009 19:27:48 -0000	1.15
+++ sources	15 Dec 2009 14:45:08 -0000	1.16
@@ -1 +1 @@
-9cc66b79a5991c28a88d7991f6694dbc  kiwi-1.9.25.tar.bz2
+43c2aab9acf8d95321ee1ccec2c5e4e4  kiwi-1.9.26.tar.bz2