rpms/deskbar-applet/devel deskbar-applet-2.26.0-py_sitearch.patch, NONE, 1.1 deskbar-applet.spec, 1.80, 1.81
Michel Alexandre Salim
salimma at fedoraproject.org
Mon Apr 13 01:35:53 UTC 2009
Author: salimma
Update of /cvs/pkgs/rpms/deskbar-applet/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18756
Modified Files:
deskbar-applet.spec
Added Files:
deskbar-applet-2.26.0-py_sitearch.patch
Log Message:
* Sun Apr 12 2009 Michel Salim <salimma at fedoraproject.org> - 2.26.0-2
- Fix site-packages location for 64-bit platforms
deskbar-applet-2.26.0-py_sitearch.patch:
--- NEW FILE deskbar-applet-2.26.0-py_sitearch.patch ---
--- deskbar-applet-2.26.0/configure.py_sitearch 2009-04-12 21:03:45.569274941 -0400
+++ deskbar-applet-2.26.0/configure 2009-04-12 21:13:12.450525690 -0400
@@ -14354,7 +14354,7 @@
if test "${am_cv_python_pythondir+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null ||
+ am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_PREFIX')" 2>/dev/null ||
echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
fi
{ echo "$as_me:$LINENO: result: $am_cv_python_pythondir" >&5
Index: deskbar-applet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/deskbar-applet/devel/deskbar-applet.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- deskbar-applet.spec 8 Apr 2009 13:53:37 -0000 1.80
+++ deskbar-applet.spec 13 Apr 2009 01:35:50 -0000 1.81
@@ -1,9 +1,9 @@
%{!?pyver: %define pyver %(%{__python} -c 'import sys;print(sys.version[0:3])')}
-%{!?python_sitelib: %define python_sitelib %(%{__python}%{pyver} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
Name: deskbar-applet
Version: 2.26.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A Gnome applet to allow easy access to various search engines
Group: Applications/Internet
@@ -13,6 +13,7 @@
Source1: fedorabz.py
Source2: fedorabz.png
Patch0: %{name}-2.26.0-gapplet.patch
+Patch1: %{name}-2.26.0-py_sitearch.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gtk2-devel python-devel pygtk2-devel gnome-python2-extras
BuildRequires: gettext evolution-data-server-devel gnome-desktop-devel
@@ -40,6 +41,8 @@
%prep
%setup -q
%patch0 -p1 -b .gapplet
+# http://bugzilla.gnome.org/show_activity.cgi?id=578803
+%patch1 -p1 -b .py_sitearch
%build
%configure --disable-schemas-install --disable-scrollkeeper
@@ -98,7 +101,7 @@
%{_libdir}/%{name}
%{_libdir}/bonobo/servers/Deskbar_Applet.server
%{_libdir}/pkgconfig/%{name}.pc
-%{python_sitelib}/deskbar
+%{python_sitearch}/deskbar
%{_datadir}/%{name}
%{_datadir}/icons/hicolor/*/apps/%{name}.*
%{_datadir}/omf/deskbar/
@@ -106,6 +109,9 @@
%changelog
+* Sun Apr 12 2009 Michel Salim <salimma at fedoraproject.org> - 2.26.0-2
+- Fix site-packages location for 64-bit platforms
+
* Wed Apr 8 2009 Michel Salim <salimma at fedoraproject.org> - 2.26.0-1
- Update to 2.26.0
More information about the scm-commits
mailing list