rpms/exo/FC-4 exo-0.3.0-x86_64-build.patch, NONE, 1.1 exo.spec, 1.4, 1.5

[Kevin Fenzi (kevin)]

Author: kevin

Update of /cvs/extras/rpms/exo/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6436

Modified Files:
	exo.spec 
Added Files:
	exo-0.3.0-x86_64-build.patch 
Log Message:
Forward port changes from devel branch and build


exo-0.3.0-x86_64-build.patch:

--- NEW FILE exo-0.3.0-x86_64-build.patch ---
diff -Nur exo-0.3.0.orig/python/Makefile.in exo-0.3.0/python/Makefile.in
--- exo-0.3.0.orig/python/Makefile.in   2005-03-13 11:40:09.000000000 -0700
+++ exo-0.3.0/python/Makefile.in        2005-06-02 21:28:00.000000000 -0600
@@ -261,8 +261,8 @@

 defsdir = $(datadir)/pygtk/2.0/defs/exo-$(LIBEXO_VERSION_API)
 defs_DATA = exo.defs
-pyexodir = $(pythondir)
-pyexo_PYTHON = pyexo.py
+pyexodir = $(pyexecdir)
+pyexo_PYTHON = pyexo.py
 exomoduledir = $(pyexecdir)/exo-$(LIBEXO_VERSION_API)/exo
 exomodule_PYTHON = __init__.py
 exobindingsdir = $(pyexecdir)/exo-$(LIBEXO_VERSION_API)


Index: exo.spec
===================================================================
RCS file: /cvs/extras/rpms/exo/FC-4/exo.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- exo.spec	30 May 2005 19:13:30 -0000	1.4
+++ exo.spec	5 Aug 2005 02:30:28 -0000	1.5
@@ -1,10 +1,13 @@
+%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+
 Summary: Application library for the Xfce desktop environment
 Name: exo
 Version: 0.3.0
-Release: 4
+Release: 9%{?dist}
 License: LGPL
 URL: http://libexo.os-cillation.com/
 Source0: http://download.berlios.de/xfce-goodies/exo-0.3.0.tar.bz2
+Patch0: exo-0.3.0-x86_64-build.patch
 Group: Development/Libraries
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: libxfcegui4 >= 4.2.0
@@ -14,6 +17,7 @@
 BuildRequires: gtk-doc
 BuildRequires: pygtk2-devel
 BuildRequires: gettext
+BuildRequires: python-devel
 
 %description
 Extension library for Xfce, targeted at application development.
@@ -30,6 +34,8 @@
 %prep
 %setup -q
 
+%patch0 -p1 -b x86_64-build
+
 %build
 %configure --enable-gtk-doc
 make %{?_smp_mflags}
@@ -60,10 +66,27 @@
 %{_libdir}/lib*.so
 %{_libdir}/lib*a
 %{_libdir}/pkgconfig/*.pc
-%{_libdir}/python*/site-packages
 %{_datadir}/pygtk/*/defs/exo-*/
+%{python_sitearch}/exo-*
+%{python_sitearch}/pyexo.*
 
 %changelog
+* Fri Aug  4 2005 Kevin Fenzi <kevin at tummy.com> - 0.3.0-9.fc4
+- Forward port changes from devel branch and build
+
+* Mon Jun 20 2005 Kevin Fenzi <kevin at tummy.com> - 0.3.0-8.fc4
+- Add patch to make x86_64 package build
+
+* Thu Jun  2 2005 Kevin Fenzi <kevin at tummy.com> - 0.3.0-7.fc4
+- Change python_sitelib to python_sitearch
+
+* Tue May 31 2005 Kevin Fenzi <kevin at tummy.com> - 0.3.0-6
+- Add python_sitelib to build on x86_64
+- Add dist to release
+
+* Tue May 31 2005 Kevin Fenzi <kevin at tummy.com> - 0.3.0-5
+- Add python-devel buildrequires
+
 * Mon May 30 2005 Kevin Fenzi <kevin at tummy.com> - 0.3.0-4
 - Fixed exo gtk-doc directory not being included in devel
 - Changed pygtk defs dir