rpms/openoffice.org/devel openoffice.org.spec, 1.1337, 1.1338 openoffice.org-2.3.0.ooo77672.boost.use.end_p.patch, 1.2, NONE openoffice.org-2.3.0.ooo81323.svtools.sixtyfour.patch, 1.1, NONE openoffice.org-2.3.0.ooo83169.colordialog.crash.patch, 1.1, NONE openoffice.org.ooo82608.vcl.gtkbadfree.patch, 1.1, NONE

Caolan McNamara (caolanm) fedora-extras-commits at redhat.com
Wed Nov 14 07:19:48 UTC 2007


Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Removed Files:
	openoffice.org-2.3.0.ooo77672.boost.use.end_p.patch 
	openoffice.org-2.3.0.ooo81323.svtools.sixtyfour.patch 
	openoffice.org-2.3.0.ooo83169.colordialog.crash.patch 
	openoffice.org.ooo82608.vcl.gtkbadfree.patch 
Log Message:
additional extension things


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1337
retrieving revision 1.1338
diff -u -r1.1337 -r1.1338
--- openoffice.org.spec	13 Nov 2007 10:30:26 -0000	1.1337
+++ openoffice.org.spec	14 Nov 2007 07:19:12 -0000	1.1338
@@ -67,7 +67,7 @@
 Source6:        http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll
 BuildRequires:	tcsh, zip, findutils, autoconf, flex, bison, ant, icu, gcc-c++
 BuildRequires:  perl-Compress-Zlib, binutils, unixODBC-devel, xalan-j2, prelink
-BuildRequires:	gdb, %{java_devel}, zlib-devel, vigra-devel, hsqldb, libXt-dev
+BuildRequires:	gdb, %{java_devel}, zlib-devel, vigra-devel, hsqldb, libXt-devel
 BuildRequires:	freetype-devel, gtk2-devel, gnome-vfs2-devel, cups-devel, bsh
 BuildRequires:	libcurl-devel, boost-devel, python-devel, expat-devel
 BuildRequires:	libxml2-devel, neon-devel >= 0.27.0, libidn-devel, pam-devel
@@ -2240,6 +2240,7 @@
 %{_bindir}/openoffice.org
 %{_bindir}/ooffice
 %{_bindir}/ooviewdoc
+%{_bindir}/unopkg
 #gnome integration
 %{instdir}/program/gnome-set-default-application
 #icons and mime
@@ -2250,8 +2251,8 @@
 %if %{stlport_abi_lockin}
 %{instdir}/program/libstlport*.so
 %endif
-%dir %{_datadir}/mimelnk
-%dir %{_datadir}/mimelnk/application
+%{_datadir}/applications/openoffice.org-extension.desktop
+%{_datadir}/mime/packages/openoffice.org.xml
 %{_datadir}/mimelnk/application/*extension*
 #linkopt libs
 %if ! %{linkopt}
@@ -2382,10 +2383,7 @@
 %{instdir}/share/registry/schema/org/openoffice/Office/UI/DbReportWindowState.xcs
 %{instdir}/share/registry/schema/org/openoffice/Office/UI/ReportCommands.xcs
 %{_bindir}/oobase
-%dir %{_datadir}/applications
 %{_datadir}/applications/openoffice.org-*-base.desktop
-%dir %{_datadir}/mimelnk
-%dir %{_datadir}/mimelnk/application
 %{_datadir}/mimelnk/application/*database*
 
 %post base
@@ -2444,10 +2442,7 @@
 %dir %{instdir}/share/registry/schema/org/openoffice/Office/UI
 %{instdir}/share/registry/schema/org/openoffice/Office/UI/CalcCommands.xcs
 %{instdir}/share/registry/schema/org/openoffice/Office/UI/CalcWindowState.xcs
-%dir %{_datadir}/applications
 %{_datadir}/applications/openoffice.org-*-calc.desktop
-%dir %{_datadir}/mimelnk
-%dir %{_datadir}/mimelnk/application
 %{_datadir}/mimelnk/application/*spreadsheet*
 %{_bindir}/oocalc
 #vba
@@ -2495,10 +2490,7 @@
 %dir %{instdir}/share/registry/schema/org/openoffice/Office
 %dir %{instdir}/share/registry/schema/org/openoffice/Office/UI
 %{instdir}/share/registry/schema/org/openoffice/Office/UI/DrawWindowState.xcs
-%dir %{_datadir}/applications
 %{_datadir}/applications/openoffice.org-*-draw.desktop
-%dir %{_datadir}/mimelnk
-%dir %{_datadir}/mimelnk/application
 %{_datadir}/mimelnk/application/*drawing*
 %{_bindir}/oodraw
 
@@ -2578,10 +2570,7 @@
 %{instdir}/share/registry/schema/org/openoffice/Office/UI/WriterReportWindowState.xcs
 %{instdir}/share/registry/schema/org/openoffice/Office/UI/WriterWebWindowState.xcs
 %{instdir}/share/registry/schema/org/openoffice/Office/UI/WriterWindowState.xcs
-%dir %{_datadir}/applications
 %{_datadir}/applications/openoffice.org-*-writer.desktop
-%dir %{_datadir}/mimelnk
-%dir %{_datadir}/mimelnk/application
 %{_datadir}/mimelnk/application/*master*
 %{_datadir}/mimelnk/application/*text*
 %{_datadir}/mimelnk/application/*web*
@@ -2635,10 +2624,7 @@
 %dir %{instdir}/share/registry/schema/org/openoffice/Office/UI
 %{instdir}/share/registry/schema/org/openoffice/Office/UI/Effects.xcs
 %{instdir}/share/registry/schema/org/openoffice/Office/UI/ImpressWindowState.xcs
-%dir %{_datadir}/applications
 %{_datadir}/applications/openoffice.org-*-impress.desktop
-%dir %{_datadir}/mimelnk
-%dir %{_datadir}/mimelnk/application
 %{_datadir}/mimelnk/application/*presentation*
 %{_bindir}/ooimpress
 
@@ -2688,10 +2674,7 @@
 %dir %{instdir}/share/registry/schema/org/openoffice/Office
 %dir %{instdir}/share/registry/schema/org/openoffice/Office/UI
 %{instdir}/share/registry/schema/org/openoffice/Office/UI/MathCommands.xcs
-%dir %{_datadir}/applications
 %{_datadir}/applications/openoffice.org-*-math.desktop
-%dir %{_datadir}/mimelnk
-%dir %{_datadir}/mimelnk/application
 %{_datadir}/mimelnk/application/*formula*
 %{_bindir}/oomath
 


--- openoffice.org-2.3.0.ooo77672.boost.use.end_p.patch DELETED ---


--- openoffice.org-2.3.0.ooo81323.svtools.sixtyfour.patch DELETED ---


--- openoffice.org-2.3.0.ooo83169.colordialog.crash.patch DELETED ---


--- openoffice.org.ooo82608.vcl.gtkbadfree.patch DELETED ---




More information about the fedora-extras-commits mailing list