rpms/openoffice.org/devel openoffice.org.spec, 1.1440.2.6, 1.1440.2.7

[Caolan McNamara (caolanm)]

Author: caolanm

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

Modified Files:
      Tag: openoffice_org-2_4_0-9_1_999_fc9
	openoffice.org.spec 
Log Message:
SRC680 -> DEV300


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1440.2.6
retrieving revision 1.1440.2.7
diff -u -r1.1440.2.6 -r1.1440.2.7
--- openoffice.org.spec	9 Mar 2008 18:12:22 -0000	1.1440.2.6
+++ openoffice.org.spec	9 Mar 2008 18:23:44 -0000	1.1440.2.7
@@ -143,6 +143,7 @@
 Patch69: openoffice.org-3.0.0.ooo86588.sw.buildfix.patch
 
 %define instdir %{_libdir}/openoffice.org
+%define OFFICEUPD 300
 
 %description
 OpenOffice.org is an Open Source, community-developed, multi-platform
@@ -1232,13 +1233,13 @@
 
 #add enough to the sdk to build the kde vcl plug out of tree
 cp -r solenv/ $RPM_BUILD_ROOT/%{instdir}/sdk
-cp solver/680/unxlng*/bin/checkdll $RPM_BUILD_ROOT/%{instdir}/sdk/linux/bin
-cp -r solver/680/unxlng*/inc/comphelper/ $RPM_BUILD_ROOT/%{instdir}/sdk/include
-cp -r solver/680/unxlng*/inc/i18npool/ $RPM_BUILD_ROOT/%{instdir}/sdk/include
-cp -r solver/680/unxlng*/inc/psprint $RPM_BUILD_ROOT/%{instdir}/sdk/include
-cp -r solver/680/unxlng*/inc/svtools $RPM_BUILD_ROOT/%{instdir}/sdk/include
-cp -r solver/680/unxlng*/inc/tools/ $RPM_BUILD_ROOT/%{instdir}/sdk/include
-cp -r solver/680/unxlng*/inc/vos $RPM_BUILD_ROOT/%{instdir}/sdk/include
+cp solver/%{OFFICEUPD}/unxlng*/bin/checkdll $RPM_BUILD_ROOT/%{instdir}/sdk/linux/bin
+cp -r solver/%{OFFICEUPD}/unxlng*/inc/comphelper/ $RPM_BUILD_ROOT/%{instdir}/sdk/include
+cp -r solver/%{OFFICEUPD}/unxlng*/inc/i18npool/ $RPM_BUILD_ROOT/%{instdir}/sdk/include
+cp -r solver/%{OFFICEUPD}/unxlng*/inc/psprint $RPM_BUILD_ROOT/%{instdir}/sdk/include
+cp -r solver/%{OFFICEUPD}/unxlng*/inc/svtools $RPM_BUILD_ROOT/%{instdir}/sdk/include
+cp -r solver/%{OFFICEUPD}/unxlng*/inc/tools/ $RPM_BUILD_ROOT/%{instdir}/sdk/include
+cp -r solver/%{OFFICEUPD}/unxlng*/inc/vos $RPM_BUILD_ROOT/%{instdir}/sdk/include
 
 #configure sdk
 pushd $RPM_BUILD_ROOT/%{instdir}/sdk
@@ -1267,7 +1268,7 @@
     echo export DMAKEROOT=%{instdir}/sdk/solenv/inc/startup >> setdevelenv_unix.sh
     echo export OS="LINUX" >> setdevelenv_unix.sh
     echo export SOLARENV=%{instdir}/sdk/solenv >> setdevelenv_unix.sh
-    echo export SOLARVER="\`pwd\`/solver/680" >> 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
     echo export OUTPATH="$OUTPATH" >> setdevelenv_unix.sh
@@ -1314,7 +1315,7 @@
 rm -rf $RPM_BUILD_ROOT/%{instdir}/share/uno_packages/cache/* || :
 
 #add the debugging libsalalloc_malloc.so.3 library
-cp -f solver/680/unxlng*.pro/lib/libsalalloc_malloc.so.3 $RPM_BUILD_ROOT/%{instdir}/program
+cp -f solver/%{OFFICEUPD}/unxlng*.pro/lib/libsalalloc_malloc.so.3 $RPM_BUILD_ROOT/%{instdir}/program
 
 #We don't need to carry around all the letter templates for all the languages 
 #in each langpack! In addition, all the bitmaps are the same!