rpms/openoffice.org/devel openoffice.org.spec,1.2136,1.2137

Caolan McNamara caolanm at fedoraproject.org
Wed Feb 3 10:44:43 UTC 2010


Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Log Message:
improve pyuno multilib


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2136
retrieving revision 1.2137
diff -u -p -r1.2136 -r1.2137
--- openoffice.org.spec	2 Feb 2010 15:42:56 -0000	1.2136
+++ openoffice.org.spec	3 Feb 2010 10:44:43 -0000	1.2137
@@ -1,6 +1,6 @@
 %define oootag OOO320
 %define ooomilestone 12
-%define rh_rpm_release 1
+%define rh_rpm_release 2
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -1897,7 +1897,8 @@ mkdir $RPM_BUILD_ROOT%{_datadir}/openoff
 mv classes/ScriptProviderForJavaScript.jar $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/ScriptProviderForJavaScript.zip
 ../ure-link/bin/regcomp -revoke -r services.rdb -br services.rdb -c vnd.openoffice.pymodule:pythonscript
 mkdir $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/ScriptProviderForPython.zip
-mv pythonscript.py* $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/ScriptProviderForPython.zip
+mv pythonscript.py $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/ScriptProviderForPython.zip
+rm -rf pythonscript.py?
 popd
 
 # remove force-agrement to extensions licences
@@ -4177,6 +4178,9 @@ fi
 %endif
 
 %changelog
+* Wed Feb 03 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-12.2
+- improve pyuno multilib
+
 * Tue Feb 02 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-12.1
 - latest milestone
 - Resolves: rhbz#560996/rhbz#560353 qstartfixes (caolanm)



More information about the scm-commits mailing list