rpms/openoffice.org/devel openoffice.org.spec,1.2029,1.2030

[Caolan McNamara]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Log Message:
regcomp isn't in default patch anymore, use explicit path


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2029
retrieving revision 1.2030
diff -u -p -r1.2029 -r1.2030
--- openoffice.org.spec	12 Oct 2009 13:19:32 -0000	1.2029
+++ openoffice.org.spec	12 Oct 2009 19:06:49 -0000	1.2030
@@ -1640,7 +1640,7 @@ autoconf
  --enable-minimizer --enable-presenter-console --enable-pdfimport \
  --enable-wiki-publisher --enable-vba --enable-report-builder \
  --with-system-jfreereport \
- --with-commons-logging-jar=/usr/share/java/commons-logging-1.0.4.jar \
+ --with-commons-logging-jar=/usr/share/java/commons-logging.jar \
  --with-vba-package-format="builtin" --with-system-libs \
  --with-system-headers --with-system-apache-commons \
  --with-system-mozilla --with-system-libtextcat --with-system-redland \
@@ -1693,11 +1693,6 @@ export MAXPROCESSLIMIT=65535
 #get core dumps
 ulimit -c unlimited
 
-mkdir -p solver/%{OFFICEUPD}/unxlng*/bin
-pushd solver/%{OFFICEUPD}/unxlng*/bin
-ln -s /usr/share/java/commons-logging-1.0.4.jar commons-logging-1.1.1.jar 
-popd
-
 #build OOo, on failure make a stab at debugging the crash if any, and
 #rebuild un-parallel
 cd instsetoo_native/util
@@ -1829,13 +1824,13 @@ chmod -x $RPM_BUILD_ROOT%{baseinstdir}/e
 
 # revoke ScriptProviders and make into extensions
 pushd $RPM_BUILD_ROOT/%{basisinstdir}/program
-regcomp -revoke -r services.rdb -br services.rdb -c "vnd.sun.star.expand:\$OOO_BASE_DIR/program/classes/ScriptProviderForBeanShell.jar"
+../ure-link/bin/regcomp -revoke -r services.rdb -br services.rdb -c "vnd.sun.star.expand:\$OOO_BASE_DIR/program/classes/ScriptProviderForBeanShell.jar"
 mkdir $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/ScriptProviderForBeanShell.zip
 mv classes/ScriptProviderForBeanShell.jar $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/ScriptProviderForBeanShell.zip
-regcomp -revoke -r services.rdb -br services.rdb -c "vnd.sun.star.expand:\$OOO_BASE_DIR/program/classes/ScriptProviderForJavaScript.jar"
+../ure-link/bin/regcomp -revoke -r services.rdb -br services.rdb -c "vnd.sun.star.expand:\$OOO_BASE_DIR/program/classes/ScriptProviderForJavaScript.jar"
 mkdir $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/ScriptProviderForJavaScript.zip
 mv classes/ScriptProviderForJavaScript.jar $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/ScriptProviderForJavaScript.zip
-regcomp -revoke -r services.rdb -br services.rdb -c vnd.openoffice.pymodule:pythonscript
+../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
 popd
@@ -1876,8 +1871,6 @@ pushd $RPM_BUILD_ROOT/%{sdkinstdir}
     rm -rf solenv/unx*
 #fix up checkdll
     sed -i -e "s#^checkdll=.*#checkdll=\"%{sdkinstdir}/bin/checkdll\"#g" solenv/bin/checkdll.sh
-#remove cruft
-#    find . -name CVS -exec rm -rf {} \;
 #fix permissions
     find examples -type f -exec chmod -x {} \;
 #make env