rpms/openoffice.org/devel openoffice.org.spec,1.2111,1.2112

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15437

Modified Files:
	openoffice.org.spec 
Log Message:
make these site-arch


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2111
retrieving revision 1.2112
diff -u -p -r1.2111 -r1.2112
--- openoffice.org.spec	23 Dec 2009 09:36:17 -0000	1.2111
+++ openoffice.org.spec	23 Dec 2009 09:41:36 -0000	1.2112
@@ -1,6 +1,6 @@
 %define oootag OOO320
 %define ooomilestone 8
-%define rh_rpm_release 2
+%define rh_rpm_release 3
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -132,7 +132,7 @@ Patch54: openoffice.org-3.2.0.ooo106502.
 Patch55: openoffice.org-3.2.0.ooo47279.sd.objectsave.safe.patch
 Patch56: openoffice.org-3.2.0.ooo107834.sw.pseudoattribs.patch
 
-%define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
+%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
 %define ureinstdir %{baseinstdir}/ure
@@ -2140,8 +2140,8 @@ find $RPM_BUILD_ROOT/%{brinstdir} -type 
 %endif
 
 # move python bits into site-packages
-mkdir -p $RPM_BUILD_ROOT/%{python_py_sitearch}
-pushd $RPM_BUILD_ROOT/%{python_py_sitearch}
+mkdir -p $RPM_BUILD_ROOT/%{python_sitearch}
+pushd $RPM_BUILD_ROOT/%{python_sitearch}
 echo "import sys, os" > uno.py
 echo "sys.path.append('%{basisinstdir}/program')" >> uno.py
 echo "os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:%{oooinstdir}/program/fundamentalrc')" >> uno.py
@@ -4035,8 +4035,8 @@ update-desktop-database %{_datadir}/appl
 %dir %{basisinstdir}/share/registry/modules/org/openoffice/Office
 %dir %{basisinstdir}/share/registry/modules/org/openoffice/Office/Scripting
 %{basisinstdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
-%{python_py_sitearch}/uno.py*
-%{python_py_sitearch}/unohelper.py*
+%{python_sitearch}/uno.py*
+%{python_sitearch}/unohelper.py*
 %{_datadir}/openoffice.org/extensions/ScriptProviderForPython.zip
 
 %pre pyuno
@@ -4176,6 +4176,9 @@ fi
 %endif
 
 %changelog
+* Wed Dec 23 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-8.3
+- python bits should be site-arch
+
 * Tue Dec 22 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-8.2
 - Resolves: rhbz#545824 bustage in writer with emboldened fonts