rpms/openoffice.org/devel openoffice.org.spec,1.1571,1.1572

[Caolan McNamara (caolanm)]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Log Message:
Resolves: rhbz#454682 ok, so macro cannot be expanded like that


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1571
retrieving revision 1.1572
diff -u -r1.1571 -r1.1572
--- openoffice.org.spec	10 Jul 2008 13:38:09 -0000	1.1571
+++ openoffice.org.spec	10 Jul 2008 20:14:08 -0000	1.1572
@@ -1493,7 +1493,6 @@
 # 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 presenterscreenid %{expand:%%(grep identifier %{_builddir}/%{?buildsubdir}/sdext/unxlng*.pro/misc/PresenterScreen/description.xml | cut -d\\\" -f 2)}
 
 # revoke ScriptProviders and make into extensions
 pushd $RPM_BUILD_ROOT/%{basisinstdir}/program
@@ -2997,7 +2996,7 @@
 %pre presenter-screen
 if [ $1 -gt 1 ]; then
     # Upgrade => deregister old extension
-    unopkg remove --shared %{presenterscreenid} || :
+    unopkg remove --shared `grep identifier %{baseinstdir}/extensions/presenter-screen.oxt/description.xml | cut -d\\\" -f 2` || :
 fi
 
 %post presenter-screen
@@ -3007,7 +3006,7 @@
 %preun presenter-screen
 if [ $1 -eq 0 ]; then
     # not upgrading => deregister
-    unopkg remove --shared %{presenterscreenid} || :
+    unopkg remove --shared `grep identifier %{baseinstdir}/extensions/presenter-screen.oxt/description.xml | cut -d\\\" -f 2` || :
 fi
 
 %postun presenter-screen