rpms/openoffice.org/devel openoffice.org.spec,1.1567,1.1568

[Caolan McNamara (caolanm)]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Log Message:
tum-te-tum


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1567
retrieving revision 1.1568
diff -u -r1.1567 -r1.1568
--- openoffice.org.spec	7 Jul 2008 17:57:04 -0000	1.1567
+++ openoffice.org.spec	8 Jul 2008 15:23:48 -0000	1.1568
@@ -491,6 +491,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.
 
 %package sdk-doc
 Summary: Software Development Kit documentation for %{name}
@@ -1388,8 +1389,6 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-#mine eyes burneth
-%define PLATFORM_ID %{expand:%%(LD_LIBRARY_PATH=`echo %{_builddir}/%{?buildsubdir}/solver/300/unxlng*.pro/lib`; if [ -e %{_builddir}/%{?buildsubdir}/sal/unxlng*.pro/bin/gen_makefile ]; then %{_builddir}/%{?buildsubdir}/sal/unxlng*.pro/bin/gen_makefile; else echo Linux_noarch; fi | sed -e "s/RTL_.*:=//g" | xargs | sed -e "s/ /_/g" | sed -r "s/[A-Z]+/\\L&/g")}
 source Linux*Env.Set.sh
 #figure out the icon version
 export LONGICON`grep "PRODUCTVERSION[ ]*=[ ]*" sysui/desktop/productversion.mk | sed -e "s/ //g"`
@@ -1493,6 +1492,7 @@
 # unpack presenter screen extension
 install -d -m 755 $RPM_BUILD_ROOT%{baseinstdir}/extensions/presenter-screen.oxt
 unzip solver/%{OFFICEUPD}/unxlng*/bin/presenter-screen.oxt -d $RPM_BUILD_ROOT%{baseinstdir}/extensions/presenter-screen.oxt
+%define presenter-screen-id %(grep identifier $RPM_BUILD_ROOT%{baseinstdir}/extensions/presenter-screen.oxt/description.xml | cut -d\" -f 2)
 
 # revoke ScriptProviders and make into extensions
 pushd $RPM_BUILD_ROOT/%{basisinstdir}/program
@@ -1608,9 +1608,11 @@
 pushd $RPM_BUILD_ROOT/%{basisinstdir}/share/template
 mkdir -p wizard
 for I in %{langpack_langs}; do
-	cp -afl $I/wizard/bitmap wizard/
-	rm -rf $I/wizard/bitmap
-	ln -sf ../../wizard/bitmap $I/wizard/bitmap
+	if [ -d $I/wizard/bitmap ]; then
+		cp -afl $I/wizard/bitmap wizard/
+		rm -rf $I/wizard/bitmap
+		ln -sf ../../wizard/bitmap $I/wizard/bitmap
+	fi
 
 	if [ -d $I/wizard/letter/$I ]; then
 		mv -f $I/wizard/letter/$I ${I}_wizard_letter_${I}
@@ -2991,7 +2993,7 @@
 %pre presenter-screen
 if [ $1 -gt 1 ]; then
     # Upgrade => deregister old extension
-    unopkg remove --shared com.sun.PresenterScreen-%{PLATFORM_ID} || :
+    unopkg remove --shared %{presenter-screen-id} || :
 fi
 
 %post presenter-screen
@@ -3001,7 +3003,7 @@
 %preun presenter-screen
 if [ $1 -eq 0 ]; then
     # not upgrading => deregister
-    unopkg remove --shared com.sun.PresenterScreen-%{PLATFORM_ID} || :
+    unopkg remove --shared %{presenter-screen-id} || :
 fi
 
 %postun presenter-screen