rpms/openoffice.org/devel openoffice.org.spec,1.1332,1.1333

[Caolan McNamara (caolanm)]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Log Message:
get extensions to just do the right thing(tm) from nautilus


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1332
retrieving revision 1.1333
diff -u -r1.1332 -r1.1333
--- openoffice.org.spec	9 Nov 2007 11:00:52 -0000	1.1332
+++ openoffice.org.spec	10 Nov 2007 14:38:51 -0000	1.1333
@@ -1,6 +1,6 @@
 %define oootag OOG680
 %define ooomilestone 6
-%define rh_rpm_release 7
+%define rh_rpm_release 8
 
 # undef to get english only and no-langpacks for a faster smoketest build
 %define langpacks 1
@@ -176,7 +176,11 @@
 Requires: hunspell-en
 Requires: bsh, java >= 1.5.0
 Requires: hsqldb, xalan-j2, xerces-j2
-PreReq: desktop-file-utils >= 0.9, gtk2 >= 2.9.4
+PreReq: gtk2 >= 2.9.4
+Requires(post): shared-mime-info
+Requires(post): desktop-file-utils
+Requires(postun): shared-mime-info
+Requires(postun): desktop-file-utils
 Obsoletes: openoffice.org
 Obsoletes: openoffice.org-libs
 Obsoletes: openoffice.org-i18n
@@ -1482,6 +1486,10 @@
 echo exec %{instdir}/program/soffice -base \"\$@\" >> $RPM_BUILD_ROOT/%{_bindir}/oobase
 chmod a+x $RPM_BUILD_ROOT/%{_bindir}/oobase
 
+echo \#\!/bin/sh > $RPM_BUILD_ROOT/%{_bindir}/unopkg
+echo exec %{instdir}/program/unopkg \"\$@\" >> $RPM_BUILD_ROOT/%{_bindir}/unopkg
+chmod a+x $RPM_BUILD_ROOT/%{_bindir}/unopkg
+
 pushd $RPM_BUILD_ROOT/%{instdir}/share/xdg/
 chmod u+w *.desktop
 # rhbz#156677 use GenericNames
@@ -1517,6 +1525,7 @@
 cp -p writer.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-writer.desktop
 cp -p math.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-math.desktop
 cp -p draw.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-draw.desktop
+cp -p extension.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-extension.desktop
 popd
 pushd sysui/output/usr/share/
 #get rid of the gnome icons and other unneeded files
@@ -1542,6 +1551,9 @@
 cp -r icons $RPM_BUILD_ROOT/%{_datadir}
 cp -r mime-info $RPM_BUILD_ROOT/%{_datadir}
 cp -r mimelnk $RPM_BUILD_ROOT/%{_datadir}
+#add our mime-types, e.g. for .oxt extensions
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/mime/packages
+cp -p ../../../unxlng*.pro/misc/openoffice.org/openoffice.org.xml $RPM_BUILD_ROOT/%{_datadir}/mime/packages
 popd
 
 rm -rf $RPM_BUILD_ROOT/%{instdir}/readmes
@@ -2302,6 +2314,7 @@
 
 %post core
 update-desktop-database -q %{_datadir}/applications
+update-mime-database %{_datadir}/mime > /dev/null
 for theme in hicolor locolor; do
   if [ -x /usr/bin/gtk-update-icon-cache ]; then
     if test -d "%{_datadir}/icons/$theme"; then
@@ -2315,6 +2328,7 @@
 
 %postun core
 update-desktop-database -q %{_datadir}/applications
+update-mime-database %{_datadir}/mime > /dev/null
 for theme in hicolor locolor; do
   if [ -x /usr/bin/gtk-update-icon-cache ]; then
     if test -d "%{_datadir}/icons/$theme"; then
@@ -2799,6 +2813,9 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Sat Nov 10 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-6.8
+- tweak mime information and desktop files to support .oxt extensions
+
 * Fri Nov 09 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-6.7
 - rebuild for hunspell