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

Caolan McNamara (caolanm) fedora-extras-commits at redhat.com
Thu Jul 10 13:39:06 UTC 2008


Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Log Message:
Resolves: rhbz#454682 expand macro


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1570
retrieving revision 1.1571
diff -u -r1.1570 -r1.1571
--- openoffice.org.spec	9 Jul 2008 21:55:58 -0000	1.1570
+++ openoffice.org.spec	10 Jul 2008 13:38:09 -0000	1.1571
@@ -1493,7 +1493,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 presenterscreenid %(grep identifier %{_builddir}/%{?buildsubdir}/sdext/unxlng*.pro/misc/PresenterScreen/description.xml | cut -d\\\" -f 2)
+%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
@@ -3584,7 +3584,7 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Wed Jul 09 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.23-2
+* Thu Jul 10 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.23-2
 - Resolves: rhbz#452385 add postgress-jdbc to default classpath
 - Resolves: rhbz#454682 expand macro to get correct name for
   inconsistent, unnecessarily complicated, redundant and nigh universially 




More information about the fedora-extras-commits mailing list