rpms/openoffice.org/devel openoffice.org-3.0.0.ooo88584.sdext.extraqual.patch, NONE, 1.1 openoffice.org.spec, 1.1496, 1.1497 openoffice.org-2.0.4.ooo69051.vcl.singlekeypress.patch, 1.3, NONE openoffice.org-2.0.4.rh217065.syncbackspace.patch, 1.1, NONE openoffice.org-3.0.0.ooo88319.setup_native.missing.patch, 1.1, NONE

Caolan McNamara (caolanm) fedora-extras-commits at redhat.com
Tue May 6 18:55:54 UTC 2008


Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.0.0.ooo88584.sdext.extraqual.patch 
Removed Files:
	openoffice.org-2.0.4.ooo69051.vcl.singlekeypress.patch 
	openoffice.org-2.0.4.rh217065.syncbackspace.patch 
	openoffice.org-3.0.0.ooo88319.setup_native.missing.patch 
Log Message:
extension explosion

openoffice.org-3.0.0.ooo88584.sdext.extraqual.patch:

--- NEW FILE openoffice.org-3.0.0.ooo88584.sdext.extraqual.patch ---
Index: source/presenter/PresenterConfigurationAccess.hxx
===================================================================
RCS file: /cvs/graphics/sdext/source/presenter/PresenterConfigurationAccess.hxx,v
retrieving revision 1.3
diff -u -r1.3 PresenterConfigurationAccess.hxx
--- openoffice.org.orig/sdext/source/presenter/PresenterConfigurationAccess.hxx	11 Apr 2008 11:21:15 -0000	1.3
+++ openoffice.org/sdext/source/presenter/PresenterConfigurationAccess.hxx	6 May 2008 06:55:03 -0000
@@ -126,7 +126,7 @@
         @param rList
             The list to be filled.
     */
-    static void PresenterConfigurationAccess::FillList(
+    static void FillList(
         const css::uno::Reference<css::container::XNameAccess>& rxContainer,
         const ::rtl::OUString& rsArgument,
         ::std::vector<rtl::OUString>& rList);


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1496
retrieving revision 1.1497
diff -u -r1.1496 -r1.1497
--- openoffice.org.spec	4 May 2008 17:18:27 -0000	1.1496
+++ openoffice.org.spec	6 May 2008 18:55:18 -0000	1.1497
@@ -66,7 +66,7 @@
 BuildRequires:	freetype-devel, gtk2-devel, desktop-file-utils, hyphen-devel
 BuildRequires:	evolution-data-server-devel, libtextcat-devel, nss-devel
 BuildRequires:	gstreamer-devel, gstreamer-plugins-base-devel, openssl-devel
-BuildRequires:	lpsolve-devel, xalan-j2, xerces-j2, hsqldb, bsh
+BuildRequires:	lpsolve-devel, xalan-j2, xerces-j2, hsqldb, bsh, mesa-libGL-devel
 
 Patch0:  openoffice.org-simple-crash_report.sh
 Patch1:  openoffice.org-multiliblauncher.sh
@@ -90,55 +90,53 @@
 Patch17: openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch
 Patch18: openoffice.org-2.0.2.rh188467.printingdefaults.patch
 Patch19: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
-Patch20: openoffice.org-2.0.4.ooo69051.vcl.singlekeypress.patch
-Patch21: pseudoworkspace.valgrind1.patch
-Patch22: openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch
-Patch23: openoffice.org-2.0.4.rh217065.syncbackspace.patch
-Patch24: openoffice.org.2.0.4.ooo80412.i18npool.extendgrapheme.patch
-Patch25: openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch
-Patch26: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.localize
-Patch27: openoffice.org-3.0.0.ooo87882.lingucomponent.systemdicts.patch
-Patch28: openoffice.org-2.1.0.rh217269.officecfg.nosequencecheck.patch
-Patch29: workspace.tl37.patch
-Patch30: openoffice.org-2.1.0.ooo73201.sw.a11yloadcrash.patch
-Patch31: openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch
-Patch32: openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch
-Patch33: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch
-Patch34: openoffice.org-2.2.0.ooo63159.sal.dtype.patch
-Patch35: openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch
-Patch36: openoffice.org-2.2.0.ooo76424.nonatnum.bn_IN.18npool.patch
-Patch37: openoffice.org-2.0.3.ooo80816.selinux.bridges.patch
-Patch38: openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch
-Patch39: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch
-Patch40: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.tar.gz
-Patch41: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
-Patch42: openoffice.org-2.3.0.ooo76649.httpencoding.patch
-Patch43: openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch
-Patch44: openoffice.org-2.3.1.ooo84676.ucb.davprotocol.patch
-Patch45: openoffice.org-2.3.1.ooo84621.sw.insertexcel.patch
-Patch46: openoffice.org-2.4.0.ooo85097.desktop.pagein.patch
-Patch47: openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch
-Patch48: openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch
-Patch49: openoffice.org-2.4.0.ooo85429.sw.a11ycrash.patch
-Patch50: openoffice.org-2.4.0.ooo85448.emptyrpath.patch
-Patch51: openoffice.org-2.4.0.ooo85854.sw.graphicsaveas.patch
-Patch52: openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch
-Patch53: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
-Patch54: openoffice.org-2.4.0.oooXXXXX.psprint.debugcups.patch
-Patch55: openoffice.org-2.3.0.ooo86866.embeddedobj.plusequalsoperator.patch
-Patch56: openoffice.org-2.4.0.ooo86924.sfx2.iconchanges.patch
-Patch57: openoffice.org-2.4.0.ooo87204.toolkit.64bitevent.patch
-Patch58: openoffice.org-2.4.0.ooo87490.sfx2.allprotocols.urlopen.patch
-Patch59: openoffice.org-3.0.0.ooo87604.fixupsystemhunspell.patch
-Patch60: openoffice.org-3.0.0.ooo85691.vcl.tooltipcolor.patch
-Patch61: openoffice.org-3.0.0.ooo87991.fpickersafe.patch
-Patch62: openoffice.org-3.0.0.ooo88260.decl-defi-mismatch.patch
-Patch63: openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch
-Patch64: openoffice.org-3.0.0.ooo88319.setup_native.missing.patch
-Patch65: openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch
-Patch66: openoffice.org-3.0.0.ooo6087.sc.sheetnames.patch
-Patch67: workspace.ucpgio1.patch
-Patch68: openoffice.org-3.0.0.ooo89002.vcl.symbolfonts.patch
+Patch20: pseudoworkspace.valgrind1.patch
+Patch21: openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch
+Patch22: openoffice.org.2.0.4.ooo80412.i18npool.extendgrapheme.patch
+Patch23: openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch
+Patch24: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.localize
+Patch25: openoffice.org-3.0.0.ooo87882.lingucomponent.systemdicts.patch
+Patch26: openoffice.org-2.1.0.rh217269.officecfg.nosequencecheck.patch
+Patch27: workspace.tl37.patch
+Patch28: openoffice.org-2.1.0.ooo73201.sw.a11yloadcrash.patch
+Patch29: openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch
+Patch30: openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch
+Patch31: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch
+Patch32: openoffice.org-2.2.0.ooo63159.sal.dtype.patch
+Patch33: openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch
+Patch34: openoffice.org-2.2.0.ooo76424.nonatnum.bn_IN.18npool.patch
+Patch35: openoffice.org-2.0.3.ooo80816.selinux.bridges.patch
+Patch36: openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch
+Patch37: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch
+Patch38: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.tar.gz
+Patch39: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
+Patch40: openoffice.org-2.3.0.ooo76649.httpencoding.patch
+Patch41: openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch
+Patch42: openoffice.org-2.3.1.ooo84676.ucb.davprotocol.patch
+Patch43: openoffice.org-2.3.1.ooo84621.sw.insertexcel.patch
+Patch44: openoffice.org-2.4.0.ooo85097.desktop.pagein.patch
+Patch45: openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch
+Patch46: openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch
+Patch47: openoffice.org-2.4.0.ooo85429.sw.a11ycrash.patch
+Patch48: openoffice.org-2.4.0.ooo85448.emptyrpath.patch
+Patch49: openoffice.org-2.4.0.ooo85854.sw.graphicsaveas.patch
+Patch50: openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch
+Patch51: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
+Patch52: openoffice.org-2.4.0.oooXXXXX.psprint.debugcups.patch
+Patch53: openoffice.org-2.3.0.ooo86866.embeddedobj.plusequalsoperator.patch
+Patch54: openoffice.org-2.4.0.ooo86924.sfx2.iconchanges.patch
+Patch55: openoffice.org-2.4.0.ooo87204.toolkit.64bitevent.patch
+Patch56: openoffice.org-2.4.0.ooo87490.sfx2.allprotocols.urlopen.patch
+Patch57: openoffice.org-3.0.0.ooo87604.fixupsystemhunspell.patch
+Patch58: openoffice.org-3.0.0.ooo85691.vcl.tooltipcolor.patch
+Patch59: openoffice.org-3.0.0.ooo87991.fpickersafe.patch
+Patch60: openoffice.org-3.0.0.ooo88260.decl-defi-mismatch.patch
+Patch61: openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch
+Patch62: openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch
+Patch63: openoffice.org-3.0.0.ooo6087.sc.sheetnames.patch
+Patch64: workspace.ucpgio1.patch
+Patch65: openoffice.org-3.0.0.ooo89002.vcl.symbolfonts.patch
+Patch66: openoffice.org-3.0.0.ooo88584.sdext.extraqual.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -254,6 +252,26 @@
 and page headers as well as group, page footers and calculation fields to
 accomplish complex database reports.
 
+%package presentation-minimizer
+Summary: Shrink %{name} presentations
+Group: Applications/Productivity
+Requires: %{name}-base-impress = %{epoch}:%{version}-%{release}
+
+%description presentation-minimizer
+The Presentation Minimizer is used to reduce the file size of the current
+presentation. Images will be compressed, and data that is no longer needed will
+be removed.
+
+%package presenter-screen
+Summary: Presenter Screen for %{name}-impress
+Group: Applications/Productivity
+Requires: %{name}-base-impress = %{epoch}:%{version}-%{release}
+
+%description presenter-screen
+The Presenter Screen is used to provides information on a second screen, that
+typically is not visible to the audience when delivering a presentation. e.g.
+slide notes.
+
 %package writer-core
 Summary: Word Processor libraries for %{name}
 Group: Applications/Productivity
@@ -363,6 +381,7 @@
 Obsoletes: openoffice.org2-impress
 Requires: %{name}-brand = %{epoch}:%{version}-%{release}
 Requires: %{name}-impress-core = %{epoch}:%{version}-%{release}
+Requires: %{name}-presenter-screen = %{epoch}:%{version}-%{release}
 
 %description impress
 The presentation application of %{name}.
@@ -372,6 +391,7 @@
 Group: Applications/Productivity
 Requires: broffice.org-brand = %{epoch}:%{version}-%{release}
 Requires: %{name}-impress-core = %{epoch}:%{version}-%{release}
+Requires: %{name}-presenter-screen = %{epoch}:%{version}-%{release}
 
 %description -n broffice.org-impress
 The presentation application of BrOffice.org
@@ -1198,55 +1218,53 @@
 %patch17 -p1 -b .ooo58606.sw.pre-edit.patch
 %patch18 -p1
 %patch19 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
-%patch20 -p1 -b .ooo69051.vcl.singlekeypress.patch
-%patch21 -p1 -b .pseudoworkspace.valgrind1.patch
-%patch22 -p1 -b .rhXXXXXX.padmin.nospadmin.patch
-%patch23 -p1 -b .rh217065.syncbackspace.patch
-%patch24 -p1 -b .ooo80412.i18npool.extendgrapheme.patch
-%patch25 -p1 -b .ooo65491.psprint.enablenups.patch
-cat %{PATCH26} >> svtools/source/dialogs/localize.sdf
-%patch27 -p1 -b .ooo87882.lingucomponent.systemdicts.patch
-%patch28 -p1 -b .rh217269.officecfg.nosequencecheck.patch
-%patch29 -p1 -b .tl37.patch
-%patch30 -p1 -b .ooo73201.sw.a11yloadcrash.patch
-%patch31 -p1 -b .ooo73863.vcl.imcommit.patch
-%patch32 -p1 -b .ooo74188.sw.cursorinsideglyph.patch
-%patch33 -p0 -b .ooo68717.gstreamer.video.patch
-%patch34 -p1 -b .ooo63159.sal.dtype.patch
-%patch35 -p1 -b .ooo76393.sal.dynamicsection.patch
-%patch36 -p1 -b .ooo76424.nonatnum.bn_IN.18npool.patch
-%patch37 -p1 -b .ooo80816.selinux.bridges.patch
-%patch38 -p1 -b .oooXXXXX.sw.titlepagedialog.patch
-%patch39 -p1 -b .ooo80257.sd.textonlystyle.patch
-tar xzf %{PATCH40}
-%patch41 -p1 -b .gccXXXXX.solenv.javaregistration.patch
-%patch42 -p1 -b .ooo76649.httpencoding.patc
-%patch43 -p1 -b .ooo83878.unopkg.enablelinking.patch
-%patch44 -p1 -b .ooo84676.ucb.davprotocol.patch
-%patch45 -p1 -b .ooo84621.sw.insertexcel.patch
-%patch46 -p1 -b .ooo85097.desktop.pagein.patch
-%patch47 -p1
-%patch48 -p1 -b .rh133741.alwaysgtk.vcl.patch
-%patch49 -p1 -b .ooo85429.sw.a11ycrash.patch
-%patch50 -p1 -b .ooo85448.emptyrpath.patch
-%patch51 -p1 -b .ooo85854.sw.graphicsaveas.patch
-%patch52 -p1 -b .ooo85921.sd.editmasterundermouse.patch
-%patch53 -p1 -b .ooo86080.unopkg.bodge.patch
-%patch54 -p1 -b .oooXXXXX.psprint.debugcups.patch
-%patch55 -p1 -b .ooo86866.embeddedobj.plusequalsoperator.patch
-%patch56 -p1 -b .ooo86924.sfx2.iconchanges.patch
-%patch57 -p1 -b .ooo87204.toolkit.64bitevent.patch
-%patch58 -p1 -b .ooo87490.sfx2.allprotocols.urlopen.patch
-%patch59 -p1 -b .ooo87604.fixupsystemhunspell.patch
-%patch60 -p1 -b .ooo85691.vcl.tooltipcolor.patch
-%patch61 -p1 -b .ooo87991.fpickersafe.patch
-%patch62 -p1 -b .ooo88260.decl-defi-mismatch.patch
-%patch63 -p1 -b .ooo88303.vcl.dynamicfontoptions.patch
-%patch64 -p1 -b .oo88319.setup_native.missing.patch
-%patch65 -p1 -b .ooo88341.sc.verticalboxes.patch
-%patch66 -p1 -b .ooo6087.sc.sheetnames.patch
-%patch67 -p1 -b .workspace.ucpgio1.patch
-%patch68 -p1 -b .ooo89002.vcl.symbolfonts.patch
+%patch20 -p1 -b .pseudoworkspace.valgrind1.patch
+%patch21 -p1 -b .rhXXXXXX.padmin.nospadmin.patch
+%patch22 -p1 -b .ooo80412.i18npool.extendgrapheme.patch
+%patch23 -p1 -b .ooo65491.psprint.enablenups.patch
+cat %{PATCH24} >> svtools/source/dialogs/localize.sdf
+%patch25 -p1 -b .ooo87882.lingucomponent.systemdicts.patch
+%patch26 -p1 -b .rh217269.officecfg.nosequencecheck.patch
+%patch27 -p1 -b .tl37.patch
+%patch28 -p1 -b .ooo73201.sw.a11yloadcrash.patch
+%patch29 -p1 -b .ooo73863.vcl.imcommit.patch
+%patch30 -p1 -b .ooo74188.sw.cursorinsideglyph.patch
+%patch31 -p0 -b .ooo68717.gstreamer.video.patch
+%patch32 -p1 -b .ooo63159.sal.dtype.patch
+%patch33 -p1 -b .ooo76393.sal.dynamicsection.patch
+%patch34 -p1 -b .ooo76424.nonatnum.bn_IN.18npool.patch
+%patch35 -p1 -b .ooo80816.selinux.bridges.patch
+%patch36 -p1 -b .oooXXXXX.sw.titlepagedialog.patch
+%patch37 -p1 -b .ooo80257.sd.textonlystyle.patch
+tar xzf %{PATCH38}
+%patch39 -p1 -b .gccXXXXX.solenv.javaregistration.patch
+%patch40 -p1 -b .ooo76649.httpencoding.patch
+%patch41 -p1 -b .ooo83878.unopkg.enablelinking.patch
+%patch42 -p1 -b .ooo84676.ucb.davprotocol.patch
+%patch43 -p1 -b .ooo84621.sw.insertexcel.patch
+%patch44 -p1 -b .ooo85097.desktop.pagein.patch
+%patch45 -p1
+%patch46 -p1 -b .rh133741.alwaysgtk.vcl.patch
+%patch47 -p1 -b .ooo85429.sw.a11ycrash.patch
+%patch48 -p1 -b .ooo85448.emptyrpath.patch
+%patch49 -p1 -b .ooo85854.sw.graphicsaveas.patch
+%patch50 -p1 -b .ooo85921.sd.editmasterundermouse.patch
+%patch51 -p1 -b .ooo86080.unopkg.bodge.patch
+%patch52 -p1 -b .oooXXXXX.psprint.debugcups.patch
+%patch53 -p1 -b .ooo86866.embeddedobj.plusequalsoperator.patch
+%patch54 -p1 -b .ooo86924.sfx2.iconchanges.patch
+%patch55 -p1 -b .ooo87204.toolkit.64bitevent.patch
+%patch56 -p1 -b .ooo87490.sfx2.allprotocols.urlopen.patch
+%patch57 -p1 -b .ooo87604.fixupsystemhunspell.patch
+%patch58 -p1 -b .ooo85691.vcl.tooltipcolor.patch
+%patch59 -p1 -b .ooo87991.fpickersafe.patch
+%patch60 -p1 -b .ooo88260.decl-defi-mismatch.patch
+%patch61 -p1 -b .ooo88303.vcl.dynamicfontoptions.patch
+%patch62 -p1 -b .ooo88341.sc.verticalboxes.patch
+%patch63 -p1 -b .ooo6087.sc.sheetnames.patch
+%patch64 -p1 -b .workspace.ucpgio1.patch
+%patch65 -p1 -b .ooo89002.vcl.symbolfonts.patch
+%patch66 -p1 -b .ooo88584.sdext.extraqual.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -1255,7 +1273,7 @@
 cd config_office
 autoconf
 export PATH=$PATH:/usr/sbin
-%configure --with-build-version="Ver: %{version}-%{release}" --with-unix-wrapper=%{name} --with-use-shell=bash --disable-ldap --disable-crashdump --disable-epm --disable-qadevooo --disable-fontooo --disable-mathmldtd --disable-pasf --disable-Xaw --disable-gnome-vfs --enable-gio --enable-gstreamer --enable-symbols --enable-lockdown --enable-evolution2 --enable-cairo --enable-vba --with-vba-package-format="builtin" --enable-dbus --with-system-libs --with-system-python --with-system-mozilla --with-system-boost --with-system-odbc-headers --with-system-sane-header --with-system-xrender-headers --with-system-hunspell --with-system-altlinuxhyph --with-system-libtextcat --with-system-vigra --without-myspell-dicts --without-system-mspack --without-fonts --without-nas --without-gpc --without-agg --without-ppds --without-afms --without-writer2latex %{stlflags} --with-lang="%{langpack_langs}" --with-poor-help-localizations="$POORHELPS" --disable-pdfimport
+%configure --with-build-version="Ver: %{version}-%{release}" --with-unix-wrapper=%{name} --with-use-shell=bash --disable-ldap --disable-crashdump --disable-epm --disable-qadevooo --disable-fontooo --disable-mathmldtd --disable-Xaw --disable-gnome-vfs --enable-gio --enable-gstreamer --enable-symbols --enable-lockdown --enable-evolution2 --enable-cairo --enable-vba --with-vba-package-format="builtin" --enable-dbus --with-system-libs --with-system-headers --with-system-mozilla --with-system-libtextcat --without-myspell-dicts --without-system-mspack --without-fonts --without-gpc --without-agg --without-ppds --without-afms --without-writer2latex %{stlflags} --with-lang="%{langpack_langs}" --with-poor-help-localizations="$POORHELPS" --disable-pdfimport --enable-presenter-screen --enable-opengl
 cd ..
 ./bootstrap
 source Linux*Env.Set.sh
@@ -1431,6 +1449,14 @@
 install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/openoffice.org/sun-report-builder.oxt
 unzip solver/%{OFFICEUPD}/unxlng*/bin/sun-report-builder.oxt -d $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/sun-report-builder.oxt
 
+# unpack presentation-minimizer extension
+install -d -m 755 $RPM_BUILD_ROOT%{baseinstdir}/extensions/sun-presentation-minimizer.oxt
+unzip solver/%{OFFICEUPD}/unxlng*/bin/minimizer/sun-presentation-minimizer.oxt -d $RPM_BUILD_ROOT%{baseinstdir}/extensions/sun-presentation-minimizer.oxt
+
+# 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
+
 #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/linux/bin
@@ -1511,6 +1537,9 @@
 #don't prompt user to agree to license
 mkdir -p $RPM_BUILD_ROOT/%{basisinstdir}/share/registry/modules/org/openoffice/Setup
 cp %{PATCH3} $RPM_BUILD_ROOT/%{basisinstdir}/share/registry/modules/org/openoffice/Setup
+#don't prompt user to register
+sed -i -e "s#>Patch.*# xsi:nil=\"true\"/>#g" $RPM_BUILD_ROOT/%{oooinstdir}/share/registry/data/org/openoffice/Office/Common.xcu
+sed -i -e "s#>Patch.*# xsi:nil=\"true\"/>#g" $RPM_BUILD_ROOT/%{brinstdir}/share/registry/data/org/openoffice/Office/Common.xcu
 #default autosave settings
 mkdir -p $RPM_BUILD_ROOT/%{basisinstdir}/share/registry/modules/org/openoffice/Office/Common
 cp %{PATCH4} $RPM_BUILD_ROOT/%{basisinstdir}/share/registry/modules/org/openoffice/Office/Common
@@ -2775,6 +2804,54 @@
     # clear disk cache
     unopkg list --shared > /dev/null 2>&1 || :
 
+%files presentation-minimizer
+%defattr(-,root,root,-)
+%{baseinstdir}/extensions/sun-presentation-minimizer.oxt
+
+%pre presentation-minimizer
+if [ $1 -gt 1 ]; then
+    # Upgrade => deregister old extension
+    unopkg remove --shared org.openoffice.legacy.sun-presentation-minimizer.oxt || :
+fi
+
+%post presentation-minimizer
+    # register extension
+    echo yes | unopkg add --shared --link %{baseinstdir}/extensions/sun-presentation-minimizer.oxt > /dev/null || :
+
+%preun presentation-minimizer
+if [ $1 -eq 0 ]; then
+    # not upgrading => deregister
+    unopkg remove --shared org.openoffice.legacy.sun-presentation-minimizer.oxt || :
+fi
+
+%postun presentation-minimizer
+    # clear disk cache
+    unopkg list --shared > /dev/null 2>&1 || :
+
+%files presenter-screen
+%defattr(-,root,root,-)
+%{baseinstdir}/extensions/presenter-screen.oxt
+
+%pre presenter-screen
+if [ $1 -gt 1 ]; then
+    # Upgrade => deregister old extension
+    unopkg remove --shared org.openoffice.PresenterScreen || :
+fi
+
+%post presenter-screen
+    # register extension
+    echo yes | unopkg add --shared --link %{baseinstdir}/extensions/presenter-screen.oxt > /dev/null || :
+
+%preun presenter-screen
+if [ $1 -eq 0 ]; then
+    # not upgrading => deregister
+    unopkg remove --shared org.openoffice.PresenterScreen || :
+fi
+
+%postun presenter-screen
+    # clear disk cache
+    unopkg list --shared > /dev/null 2>&1 || :
+
 %files calc-core
 %defattr(-,root,root,-)
 %dir %{basisinstdir}
@@ -3306,11 +3383,17 @@
 %{python_py_sitearch}/unohelper.py*
 
 %changelog
-* Sat May 03 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.11.1
+* Tue May 06 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.11.1
 - next version
 - drop integrated workspace.cmcfixes43.patch
 - drop integrated openoffice.org-3.0.0.ooo88375.filter.disablepdf.patch
+- drop integrated openoffice.org-3.0.0.ooo88319.setup_native.missing.patch
+- drop redundant openoffice.org-2.0.4.ooo69051.vcl.singlekeypress.patch
+- drop openoffice.org-2.0.4.rh217065.syncbackspace.patch as reported fixed
 - add openoffice.org-3.0.0.ooo89002.vcl.symbolfonts.patch
+- enable presentation-minimizer
+- enable presenter-screen
+- tidy configure line through --with-system-libs --with-system-headers
 
 * Wed Apr 30 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.10.1
 - next version


--- openoffice.org-2.0.4.ooo69051.vcl.singlekeypress.patch DELETED ---


--- openoffice.org-2.0.4.rh217065.syncbackspace.patch DELETED ---


--- openoffice.org-3.0.0.ooo88319.setup_native.missing.patch DELETED ---




More information about the fedora-extras-commits mailing list