rpms/avant-window-navigator/devel avant-window-navigator-0.3.2-python-platform.patch, NONE, 1.1 avant-window-navigator.spec, 1.27, 1.28

[Sindre Pedersen Bjørdal]

Author: sindrepb

Update of /cvs/pkgs/rpms/avant-window-navigator/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2535

Modified Files:
	avant-window-navigator.spec 
Added Files:
	avant-window-navigator-0.3.2-python-platform.patch 
Log Message:
add patch to fix #486395

avant-window-navigator-0.3.2-python-platform.patch:

--- NEW FILE avant-window-navigator-0.3.2-python-platform.patch ---
diff -up ./bindings/python/Makefile.am.orig ./bindings/python/Makefile.am
--- ./bindings/python/Makefile.am.orig	2009-03-03 20:00:10.000000000 +0100
+++ ./bindings/python/Makefile.am	2009-03-03 20:01:13.000000000 +0100
@@ -1,7 +1,7 @@
 NULL = 
 
 # awn python scripts
-pyawndir = $(PYTHON_SITE_PKG)/awn
+pyawndir = $(PYTHON_PLATFORM_PKG)/awn
 pyawn_PYTHON = __init__.py
 
 INCLUDES = \
diff -up ./bindings/python/Makefile.in.orig ./bindings/python/Makefile.in
--- ./bindings/python/Makefile.in.orig	2009-03-03 20:00:17.000000000 +0100
+++ ./bindings/python/Makefile.in	2009-03-03 20:00:43.000000000 +0100
@@ -286,7 +286,7 @@ top_srcdir = @top_srcdir@
 NULL = 
 
 # awn python scripts
-pyawndir = $(PYTHON_SITE_PKG)/awn
+pyawndir = $(PYTHON_PLATFORM_PKG)/awn
 pyawn_PYTHON = __init__.py
 INCLUDES = \
 	$(PYTHON_CPPFLAGS) \


Index: avant-window-navigator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/avant-window-navigator/devel/avant-window-navigator.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- avant-window-navigator.spec	24 Feb 2009 03:37:40 -0000	1.27
+++ avant-window-navigator.spec	3 Mar 2009 19:10:15 -0000	1.28
@@ -1,10 +1,8 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-
 
 Name:           avant-window-navigator
 Version:        0.3.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 
 Provides: avant-window-navigator-python = %{version}-%{release}
 Obsoletes: avant-window-navigator-python < 0.2.6-3
@@ -16,8 +14,8 @@
 License:        GPLv2+ and LGPLv2+
 URL:            https://launchpad.net/awn
 Source0:        https://launchpad.net/awn/0.2/0.2/+download/%{name}-%{version}.tar.gz
-#fixes schemas file
-#Patch0:         avant-window-navigator-schemas.patch
+#fixes issue with python binding on x86
+Patch0:         avant-window-navigator-0.3.2-python-platform.patch
 #fixes issue where awn only appears on one desktop, #469032
 #Patch1:         avant-window-navigator-0.2.6-sticky.patch
 
@@ -51,9 +49,12 @@
 
 %prep
 %setup -q
-#%patch0 -p1
+%patch0 -p1
 #%patch1 -p0
 
+#patch alters Makefile.am
+cd bindnigs/python/ && autoreconf -i
+
 #fix permissions
 chmod 0644 $RPM_BUILD_DIR/%{name}-%{version}/src/xutils.h
 chmod 0644 $RPM_BUILD_DIR/%{name}-%{version}/src/xutils.c
@@ -155,8 +156,6 @@
 %{_datadir}/avant-window-navigator
 %{_datadir}/icons/hicolor/*/apps/*
 %{python_sitearch}/awn
-%{python_sitelib}/awn
-
 
 %files devel
 %defattr(-,root,root,-)
@@ -166,6 +165,9 @@
 
 
 %changelog
+* Tue Mar 03 2009 Sindre Pedersen Bjørdal <sindrepb at fedoraproject.org> - 0.3.2-5
+- Fix issue with arch dependent python files installed to noarch dir, #486395
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild