rpms/openoffice.org/devel openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch, 1.5, 1.6 openoffice.org.spec, 1.1551, 1.1552 openoffice.org-2.2.1.ooo78198.sixtyfour.svx.patch, 1.2, NONE

[Caolan McNamara (caolanm)]

Author: caolanm

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

Modified Files:
	openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch 
	openoffice.org.spec 
Removed Files:
	openoffice.org-2.2.1.ooo78198.sixtyfour.svx.patch 
Log Message:
rats

openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch:

Index: openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch	2 Jul 2008 14:25:19 -0000	1.5
+++ openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch	3 Jul 2008 16:29:54 -0000	1.6
@@ -216,7 +216,6 @@
 retrieving revision 1.6.84.1
 diff -u -r1.6.84.1 unopkg_app.cxx
 --- openoffice.org.orig/desktop/source/pkgchk/unopkg/unopkg_app.cxx	10 Aug 2007 15:03:53 -0000	1.6.84.1
-+++ openoffice.org/desktop/source/pkgchk/unopkg/unopkg_app.cxx	22 Nov 2007 14:46:24 -0000
 @@ -86,6 +86,9 @@
  " -V, --version           version information\n"
  " -v, --verbose           verbose output to stdout\n"
@@ -268,6 +267,16 @@
                       !readArgument( &deploymentContext, info_context, &nPos ) &&
                       !isBootstrapVariable(&nPos))
              {
+@@ -346,7 +356,7 @@
+         
+         Reference< ::com::sun::star::ucb::XCommandEnvironment > xCmdEnv(
+             createCmdEnv( xComponentContext, logFile,
+-                          option_force, option_verbose, option_bundled) );
++                          option_force, option_link, option_verbose, option_bundled) );
+         
+         if (subcmd_add ||
+             subCommand.equalsAsciiL(
++++ openoffice.org/desktop/source/pkgchk/unopkg/unopkg_app.cxx	22 Nov 2007 14:46:24 -0000
 Index: source/pkgchk/unopkg/unopkg_cmdenv.cxx
 ===================================================================
 RCS file: /cvs/framework/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx,v


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1551
retrieving revision 1.1552
diff -u -r1.1551 -r1.1552
--- openoffice.org.spec	3 Jul 2008 13:32:07 -0000	1.1551
+++ openoffice.org.spec	3 Jul 2008 16:29:54 -0000	1.1552
@@ -2296,7 +2296,10 @@
 %{basisinstdir}/program/versionrc
 %{basisinstdir}/program/cairocanvas.uno.so
 %dir %{basisinstdir}/share
-%{basisinstdir}/share/Scripts
+%dir %{basisinstdir}/share/Scripts
+%{basisinstdir}/share/Scripts/beanshell
+%{basisinstdir}/share/Scripts/java
+%{basisinstdir}/share/Scripts/javascript
 %dir %{basisinstdir}/share/autocorr
 %if %{langpacks}
 %{basisinstdir}/share/autocorr/acor_en-*.dat


--- openoffice.org-2.2.1.ooo78198.sixtyfour.svx.patch DELETED ---