rpms/openoffice.org/devel workspace.native172.patch, NONE, 1.1 openoffice.org.spec, 1.1582, 1.1583

Caolan McNamara (caolanm) fedora-extras-commits at redhat.com
Thu Jul 17 13:28:46 UTC 2008 

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.native172.patch 
Log Message:
sdk foo

workspace.native172.patch:

--- NEW FILE workspace.native172.patch ---
Index: installation/scp2/source/ooo/profileitem_ooo.scp
diff -u installation/scp2/source/ooo/profileitem_ooo.scp:1.66 installation/scp2/source/ooo/profileitem_ooo.scp:1.66.30.1
--- installation/scp2/source/ooo/profileitem_ooo.scp:1.66	Wed Jul  2 02:45:57 2008
+++ installation/scp2/source/ooo/profileitem_ooo.scp	Wed Jul 16 06:16:02 2008
@@ -540,7 +540,7 @@
     ProfileID = gid_Profile_Fundamentalbasis_Ini;
     Section = "Bootstrap";
     Key = "URE_MORE_JAVA_TYPES";
-    Value = "$ORIGIN/classes/unoil.jar ${${$ORIGIN/" PROFILENAME(uno) ":PKG_UserUnoFile}:UNO_JAVA_CLASSPATH} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_SharedUnoFile}:UNO_JAVA_CLASSPATH}";
+    Value = "$ORIGIN/classes/unoil.jar $ORIGIN/classes/ScriptFramework.jar ${${$ORIGIN/" PROFILENAME(uno) ":PKG_UserUnoFile}:UNO_JAVA_CLASSPATH} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_SharedUnoFile}:UNO_JAVA_CLASSPATH}";
 End
 
 ProfileItem gid_Profileitem_Fundamentalbasis_Ure_Java_Jfw_Shared_Data


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1582
retrieving revision 1.1583
diff -u -r1.1582 -r1.1583
--- openoffice.org.spec	17 Jul 2008 07:41:39 -0000	1.1582
+++ openoffice.org.spec	17 Jul 2008 13:27:56 -0000	1.1583
@@ -113,11 +113,13 @@
 Patch41: openoffice.org-3.0.0.ooo90876.connectivity.evoab2.patch
 Patch42: openoffice.org-3.0.0.oooXXXXX.connectivity.mozprofilefinder.patch
 Patch43: openoffice.org-3.0.0.ooo86142.serbiannumbering.patch
+Patch44: workspace.native172.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
 %define ureinstdir %{baseinstdir}/ure
 %define basisinstdir %{baseinstdir}/basis3.0
+%define sdkinstdir %{baseinstdir}/basis3.0/sdk
 %define oooinstdir %{instdir}/openoffice.org3
 %define brinstdir %{instdir}/broffice.org3
 %define OFFICEUPD 300
@@ -232,7 +234,7 @@
 Summary: BeanShell support for %{name}
 Group: Development/Libraries
 Requires: bsh
-Requires: %{name}-base-core = %{epoch}:%{version}-%{release}
+Requires: %{name}-core = %{epoch}:%{version}-%{release}
 
 %description bsh
 Support BeanShell scripts in %{name}.
@@ -240,7 +242,7 @@
 %package rhino
 Summary: JavaScript support for %{name}
 Group: Development/Libraries
-Requires: %{name}-base-core = %{epoch}:%{version}-%{release}
+Requires: %{name}-core = %{epoch}:%{version}-%{release}
 
 %description rhino
 Support JavaScript scripts in %{name}.
@@ -488,7 +490,7 @@
 
 %description sdk
 The %{name} SDK is an add-on for the %{name} office suite. It provides the necessary tools for programming using the %{name} APIs and for creating extensions (UNO components) for %{name}.
-Run %{baseinstdir}/sdk/setsdkenv_unix.sh to set the build environment for building against the sdk.
+Run %{sdkinstdir}/setsdkenv_unix.sh to set the build environment for building against the sdk.
 
 %package sdk-doc
 Summary: Software Development Kit documentation for %{name}
@@ -1268,6 +1270,7 @@
 %patch41 -p1 -b .ooo90876.connectivity.evoab2.patch
 %patch42 -p1 -b .oooXXXXX.connectivity.mozprofilefinder.patch
 %patch43 -p1 -b .ooo86142.serbiannumbering.patch
+%patch44 -p1 -b .workspace.native172.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -1452,7 +1455,7 @@
 ln -s ../../../../../%{baseinstdir}/share/uno_packages/cache cache
 popd
 %endif
-export PKGFORMATSWITCH="-format rpm -simple $RPM_BUILD_ROOT/%{baseinstdir}/sdk"
+export PKGFORMATSWITCH="-format rpm -simple $RPM_BUILD_ROOT/%{instdir}"
 export WITH_LANG="en-US"
 dmake sdkoo
 cd ../../
@@ -1482,10 +1485,10 @@
 
 # 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:\$UNO_JAVA_COMPONENT_PATH/ScriptProviderForBeanShell.jar"
+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:\$UNO_JAVA_COMPONENT_PATH/ScriptProviderForJavaScript.jar"
+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
@@ -1494,20 +1497,20 @@
 popd
 
 #add enough to the sdk to build the kde vcl plug out of tree
-cp -r solenv/ $RPM_BUILD_ROOT/%{baseinstdir}/sdk
-cp solver/%{OFFICEUPD}/unxlng*/bin/checkdll $RPM_BUILD_ROOT/%{baseinstdir}/sdk/bin
-cp -r solver/%{OFFICEUPD}/unxlng*/inc/comphelper/ $RPM_BUILD_ROOT/%{baseinstdir}/sdk/include
-cp -r solver/%{OFFICEUPD}/unxlng*/inc/i18npool/ $RPM_BUILD_ROOT/%{baseinstdir}/sdk/include
-cp -r solver/%{OFFICEUPD}/unxlng*/inc/psprint $RPM_BUILD_ROOT/%{baseinstdir}/sdk/include
-cp -r solver/%{OFFICEUPD}/unxlng*/inc/svtools $RPM_BUILD_ROOT/%{baseinstdir}/sdk/include
-cp -r solver/%{OFFICEUPD}/unxlng*/inc/tools/ $RPM_BUILD_ROOT/%{baseinstdir}/sdk/include
-cp -r solver/%{OFFICEUPD}/unxlng*/inc/vos $RPM_BUILD_ROOT/%{baseinstdir}/sdk/include
+cp -r solenv/ $RPM_BUILD_ROOT/%{sdkinstdir}
+cp solver/%{OFFICEUPD}/unxlng*/bin/checkdll $RPM_BUILD_ROOT/%{sdkinstdir}/bin
+cp -r solver/%{OFFICEUPD}/unxlng*/inc/comphelper/ $RPM_BUILD_ROOT/%{sdkinstdir}/include
+cp -r solver/%{OFFICEUPD}/unxlng*/inc/i18npool/ $RPM_BUILD_ROOT/%{sdkinstdir}/include
+cp -r solver/%{OFFICEUPD}/unxlng*/inc/psprint $RPM_BUILD_ROOT/%{sdkinstdir}/include
+cp -r solver/%{OFFICEUPD}/unxlng*/inc/svtools $RPM_BUILD_ROOT/%{sdkinstdir}/include
+cp -r solver/%{OFFICEUPD}/unxlng*/inc/tools/ $RPM_BUILD_ROOT/%{sdkinstdir}/include
+cp -r solver/%{OFFICEUPD}/unxlng*/inc/vos $RPM_BUILD_ROOT/%{sdkinstdir}/include
 
 #configure sdk
-pushd $RPM_BUILD_ROOT/%{baseinstdir}/sdk
+pushd $RPM_BUILD_ROOT/%{sdkinstdir}
     for file in setsdkenv_unix.csh setsdkenv_unix.sh ; do
         sed -e "s, at OO_SDK_NAME@,sdk," \
-            -e "s, at OO_SDK_HOME@,%{baseinstdir}/sdk," \
+            -e "s, at OO_SDK_HOME@,%{sdkinstdir}," \
             -e "s, at OFFICE_HOME@,%{basisinstdir}," \
             -e "s, at OO_SDK_URE_HOME@,%{ureinstdir}," \
             -e "s, at OO_SDK_MAKE_HOME@,/usr/bin," \
@@ -1524,12 +1527,12 @@
     mv solenv/unxlng*/bin/dmake solenv/bin
     rm -rf solenv/unx*
 #fix up checkdll
-    sed -i -e "s#^checkdll=.*#checkdll=\"%{baseinstdir}/sdk/bin/checkdll\"#g" solenv/bin/checkdll.sh
+    sed -i -e "s#^checkdll=.*#checkdll=\"%{sdkinstdir}/bin/checkdll\"#g" solenv/bin/checkdll.sh
 #make env
-    echo export PATH=\$PATH:%{baseinstdir}/sdk/solenv/bin > setdevelenv_unix.sh
-    echo export DMAKEROOT=%{baseinstdir}/sdk/solenv/inc/startup >> setdevelenv_unix.sh
+    echo export PATH=\$PATH:%{sdkinstdir}/solenv/bin > setdevelenv_unix.sh
+    echo export DMAKEROOT=%{sdkinstdir}/solenv/inc/startup >> setdevelenv_unix.sh
     echo export OS="LINUX" >> setdevelenv_unix.sh
-    echo export SOLARENV=%{baseinstdir}/sdk/solenv >> setdevelenv_unix.sh
+    echo export SOLARENV=%{sdkinstdir}/solenv >> setdevelenv_unix.sh
     echo export SOLARVER="\`pwd\`/solver/%{OFFICEUPD}" >> setdevelenv_unix.sh
     echo export SOLARVERSION="\$SOLARVER" >> setdevelenv_unix.sh
     echo export INPATH="$INPATH" >> setdevelenv_unix.sh
@@ -1549,8 +1552,8 @@
     echo export CPU="$CPU" >> setdevelenv_unix.sh
     echo export MAKEDEPEND=makedepend >> setdevelenv_unix.sh
     echo export MKOUT="mkout.pl" >> setdevelenv_unix.sh
-    echo export SOLARINC=\"-I%{baseinstdir}/sdk/include/stl -I%{baseinstdir}/sdk/include\" >> setdevelenv_unix.sh
-    echo export SOLARLIB=\"-L%{baseinstdir}/program\" >> setdevelenv_unix.sh
+    echo export SOLARINC=\"-I%{sdkinstdir}/include/stl -I%{sdkinstdir}/include\" >> setdevelenv_unix.sh
+    echo export SOLARLIB=\"-L%{basisinstdir}/program\" >> setdevelenv_unix.sh
     echo export GXX_INCLUDE_PATH="$GXX_INCLUDE_PATH" >> setdevelenv_unix.sh
     echo export EXTERNAL_WARNINGS_NOT_ERRORS="TRUE" >> setdevelenv_unix.sh
     echo export GVER="VCL" >> setdevelenv_unix.sh
@@ -3477,33 +3480,33 @@
 
 %files sdk
 %defattr(-,root,root,-)
-%{baseinstdir}/sdk/
-%exclude %{baseinstdir}/sdk/setdevelenv_unix.sh
-%exclude %{baseinstdir}/sdk/docs/
-%exclude %{baseinstdir}/sdk/examples/
-%exclude %{baseinstdir}/sdk/include/tools
-%exclude %{baseinstdir}/sdk/include/comphelper
-%exclude %{baseinstdir}/sdk/include/i18npool
-%exclude %{baseinstdir}/sdk/include/vos
-%exclude %{baseinstdir}/sdk/include/psprint
-%exclude %{baseinstdir}/sdk/solenv
-%exclude %{baseinstdir}/sdk/bin/checkdll
+%{sdkinstdir}/
+%exclude %{sdkinstdir}/setdevelenv_unix.sh
+%exclude %{sdkinstdir}/docs/
+%exclude %{sdkinstdir}/examples/
+%exclude %{sdkinstdir}/include/tools
+%exclude %{sdkinstdir}/include/comphelper
+%exclude %{sdkinstdir}/include/i18npool
+%exclude %{sdkinstdir}/include/vos
+%exclude %{sdkinstdir}/include/psprint
+%exclude %{sdkinstdir}/solenv
+%exclude %{sdkinstdir}/bin/checkdll
 
 %files sdk-doc
 %defattr(-,root,root,-)
-%{baseinstdir}/sdk/docs/
-%{baseinstdir}/sdk/examples/
+%{sdkinstdir}/docs/
+%{sdkinstdir}/examples/
 
 %files devel
 %defattr(-,root,root,-)
-%{baseinstdir}/sdk/setdevelenv_unix.sh
-%{baseinstdir}/sdk/include/tools
-%{baseinstdir}/sdk/include/comphelper
-%{baseinstdir}/sdk/include/i18npool
-%{baseinstdir}/sdk/include/vos
-%{baseinstdir}/sdk/include/psprint
-%{baseinstdir}/sdk/solenv
-%{baseinstdir}/sdk/bin/checkdll
+%{sdkinstdir}/setdevelenv_unix.sh
+%{sdkinstdir}/include/tools
+%{sdkinstdir}/include/comphelper
+%{sdkinstdir}/include/i18npool
+%{sdkinstdir}/include/vos
+%{sdkinstdir}/include/psprint
+%{sdkinstdir}/solenv
+%{sdkinstdir}/bin/checkdll
 
 %files headless
 %defattr(-,root,root,-)
@@ -3557,10 +3560,11 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Wed Jul 16 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.25-1
+* Thu Jul 17 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.25-1
 - next version
 - drop integrated openoffice.org-2.4.0.ooo85448.emptyrpath.patch
 - drop inregrated openoffice.org-2.3.0.oooXXXXX.odk.3layer.patch
+- add workspace.native172.patch for ScriptFramework extention bustage
 
 * Fri Jul 11 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.24-1
 - next version

More information about the fedora-extras-commits mailing list