rpms/awn-extras-applets/devel awn-extras-applets-0.3.2.1-python-platform.patch, NONE, 1.1 awn-extras-applets.spec, 1.18, 1.19

[Sindre Pedersen Bjørdal]

Author: sindrepb

Update of /cvs/pkgs/rpms/awn-extras-applets/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14803

Modified Files:
	awn-extras-applets.spec 
Added Files:
	awn-extras-applets-0.3.2.1-python-platform.patch 
Log Message:
fix 64bit build issue

awn-extras-applets-0.3.2.1-python-platform.patch:

--- NEW FILE awn-extras-applets-0.3.2.1-python-platform.patch ---
diff -up ./src/libawn-extras/bindings/python/Makefile.am.orig ./src/libawn-extras/bindings/python/Makefile.am
--- ./src/libawn-extras/bindings/python/Makefile.am.orig	2009-04-02 18:59:53.000000000 +0200
+++ ./src/libawn-extras/bindings/python/Makefile.am	2009-04-02 19:40:14.000000000 +0200
@@ -1,7 +1,7 @@
 NULL =
 
 # awn python scripts
-pyawn_extrasdir = $(PYTHON_SITE_PKG)/awn/extras
+pyawn_extrasdir = $(PYTHON_PLATFORM_PKG)/awn/extras
 pyawn_extras_PYTHON =	\
 	__init__.py	\
 	awnlib.py	\
@@ -19,7 +19,7 @@ INCLUDES = \
 	$(NULL)
 
 # libawn-extras python extensions
-pyawn_extrasexecdir = $(PYTHON_SITE_PKG)/awn/extras
+pyawn_extrasexecdir = $(PYTHON_PLATFORM_PKG)/awn/extras
 pyawn_extrasexec_LTLIBRARIES = _extras.la
 
 common_ldflags = -module -avoid-version
diff -up ./src/libawn-extras/bindings/python/Makefile.in.orig ./src/libawn-extras/bindings/python/Makefile.in
--- ./src/libawn-extras/bindings/python/Makefile.in.orig	2009-04-02 18:59:58.000000000 +0200
+++ ./src/libawn-extras/bindings/python/Makefile.in	2009-04-02 19:42:03.000000000 +0200
@@ -246,6 +246,7 @@ PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDF
 PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@
 PYTHON_LDFLAGS = @PYTHON_LDFLAGS@
 PYTHON_SITE_PKG = @PYTHON_SITE_PKG@
+PYTHON_SITE_PKG = @PYTHON_PLATFORM_PKG@
 PYTHON_VERSION = @PYTHON_VERSION@
 RANLIB = @RANLIB@
 SED = @SED@
@@ -331,7 +332,7 @@ top_srcdir = @top_srcdir@
 NULL = 
 
 # awn python scripts
-pyawn_extrasdir = $(PYTHON_SITE_PKG)/awn/extras
+pyawn_extrasdir = $(PYTHON_PLATFORM_PKG)/awn/extras
 pyawn_extras_PYTHON = \
 	__init__.py	\
 	awnlib.py	\
@@ -350,7 +351,7 @@ INCLUDES = \
 
 
 # libawn-extras python extensions
-pyawn_extrasexecdir = $(PYTHON_SITE_PKG)/awn/extras
+pyawn_extrasexecdir = $(PYTHON_PLATFORM_PKG)/awn/extras
 pyawn_extrasexec_LTLIBRARIES = _extras.la
 common_ldflags = -module -avoid-version
 AWN_EXTRAS_DEFS = awn_extras.defs


Index: awn-extras-applets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/awn-extras-applets/devel/awn-extras-applets.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- awn-extras-applets.spec	2 Apr 2009 15:31:00 -0000	1.18
+++ awn-extras-applets.spec	2 Apr 2009 18:05:08 -0000	1.19
@@ -2,13 +2,14 @@
 
 Name:           awn-extras-applets
 Version:        0.3.2.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Extras applets for avant window navigator
 
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            https://launchpad.net/awn-extras/
 Source0:        https://edge.launchpad.net/awn-extras/0.3/%{version}/+download/%{name}-%{version}.tar.gz
+Patch0:         %{name}-%{version}-python-platform.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  avant-window-navigator-devel >= 0.3.2
@@ -55,8 +56,6 @@
 Requires(post): GConf2
 Requires(preun): GConf2
 
-#Patch0: awn-extras-applets-0.2.6.configure.patch
-
 
 %description
 awn-extras-applets includes extras applets of Avant Window Navigator (Awn).
@@ -73,7 +72,8 @@
 
 %prep
 %setup -q
-#%patch0 -p1
+%patch0 -p1
+
 #for f in `find -name '*.py'`; do
 #  head -n 1 $f | grep python && echo -e '1d\nwq' | ed $f 
 #done
@@ -178,6 +178,9 @@
 
 
 %changelog
+* Tue Apr 02 2009 Sindre Pedersen Bjørdal <sindrepb at fedoraproject.org> - 0.3.2.1-5
+- Add patch to fix build on x86_64
+
 * Tue Apr 02 2009 Sindre Pedersen Bjørdal <sindrepb at fedoraproject.org> - 0.3.2.1-4
 - New upstream release
 - Add devel package