rpms/openoffice.org/devel openoffice.org.spec, 1.1614, 1.1615 workspace.cmcfixes48.patch, 1.2, 1.3

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24259

Modified Files:
	openoffice.org.spec workspace.cmcfixes48.patch 
Log Message:
Resolves: rhbz#458681 python requires


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1614
retrieving revision 1.1615
diff -u -r1.1614 -r1.1615
--- openoffice.org.spec	10 Aug 2008 17:52:43 -0000	1.1614
+++ openoffice.org.spec	11 Aug 2008 15:39:57 -0000	1.1615
@@ -1,6 +1,6 @@
 %define oootag OOO300
 %define ooomilestone 2
-%define rh_rpm_release 1
+%define rh_rpm_release 2
 
 # undef to get english only and no-langpacks for a faster smoketest build
 %define langpacks 1
@@ -1756,7 +1756,6 @@
 echo "sys.path.append('%{basisinstdir}/program')" >> uno.py
 echo "os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:%{oooinstdir}/program/fundamentalrc')" >> uno.py
 cat $RPM_BUILD_ROOT/%{basisinstdir}/program/uno.py >> uno.py
-chmod a+x $RPM_BUILD_ROOT/%{basisinstdir}/program/*.py
 rm -f $RPM_BUILD_ROOT/%{basisinstdir}/program/uno.py*
 mv -f $RPM_BUILD_ROOT/%{basisinstdir}/program/unohelper.py* .
 popd
@@ -3602,6 +3601,9 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Mon Aug 11 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-2.2
+- Resolves: rhbz#458681 python requires
+
 * Sat Aug 09 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-2.1
 - next milestone
 - Resolves: rhbz#457938 openoffice.org-3.0.0.ooo92522.sd.brokentemplates.patch

workspace.cmcfixes48.patch:

Index: workspace.cmcfixes48.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.cmcfixes48.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- workspace.cmcfixes48.patch	1 Aug 2008 23:48:29 -0000	1.2
+++ workspace.cmcfixes48.patch	11 Aug 2008 15:39:57 -0000	1.3
@@ -2263,3 +2263,16 @@
  
  		sal_Int16				m_nBorder;				// TRUE when border should be shown
  
+Index: source/pyprov/mailmerge.py
+===================================================================
+RCS file: /cvs/framework/scripting/source/pyprov/mailmerge.py,v
+retrieving revision 1.8
+diff -u -r1.8 mailmerge.py
+--- openoffice.org.orig/scripting/source/pyprov/mailmerge.py	6 Dec 2007 10:57:39 -0000	1.8
++++ openoffice.org/scripting/source/pyprov/mailmerge.py	11 Aug 2008 15:37:51 -0000
+@@ -1,5 +1,3 @@
+-#!/bin/python
+-
+ # Caolan McNamara caolanm at redhat.com
+ # a simple email mailmerge component
+