rpms/openoffice.org/devel .cvsignore, 1.198, 1.199 openoffice.org.spec, 1.1813, 1.1814 sources, 1.334, 1.335

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29249

Modified Files:
	.cvsignore openoffice.org.spec sources 
Log Message:
Resolves: rhbz#486062


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/.cvsignore,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -r1.198 -r1.199
--- .cvsignore	12 Feb 2009 14:37:55 -0000	1.198
+++ .cvsignore	19 Feb 2009 11:59:38 -0000	1.199
@@ -5,6 +5,6 @@
 redhat-templates.tar.gz
 redhat-registry.tar.gz
 redhat-langpacks.tar.gz
-OOO300_m15.tar.bz2
-OOO310_m1.tar.bz2
+openoffice.org-javafilter.desktop
 GSI_fi.sdf.gz
+OOO310_m1.tar.bz2


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1813
retrieving revision 1.1814
diff -u -r1.1813 -r1.1814
--- openoffice.org.spec	19 Feb 2009 11:43:01 -0000	1.1813
+++ openoffice.org.spec	19 Feb 2009 11:59:38 -0000	1.1814
@@ -50,7 +50,8 @@
 Source6:        redhat-registry.tar.gz
 Source7:        redhat-langpacks.tar.gz
 Source8:        redhat-agreement.xsl
-Source9:        http://www.puimula.org/htp/ooo/gsi/3.1/GSI_fi.sdf.gz
+Source9:        openoffice.org-javafilter.desktop
+Source10:       http://www.puimula.org/htp/ooo/gsi/3.1/GSI_fi.sdf.gz
 BuildRequires:	zip, findutils, autoconf, flex, bison, icu, gcc-c++
 BuildRequires:	binutils, java-devel, boost-devel, zlib-devel, vigra-devel
 BuildRequires:	python-devel, expat-devel, libxml2-devel, libxslt-devel, bc
@@ -535,8 +536,14 @@
 Obsoletes: openoffice.org2-javafilter < 1:3.0.0
 
 %description javafilter
-The javafilter module for %{name}, provides additional aportisdoc, pocket excel
-and pocket word import filters.
+The javafilter module for %{name}, provides additional AportisDoc, Pocket Excel
+and Pocket Word import filters.
+
+%post javafilter
+update-desktop-database %{_datadir}/applications &> /dev/null || :
+
+%postun javafilter
+update-desktop-database %{_datadir}/applications &> /dev/null || :
 
 %package testtools
 Summary: Testtools for %{name}
@@ -1654,7 +1661,7 @@
     build --dlv_switch -link --all
 fi
 deliver -link
-cp %{SOURCE9} .
+cp %{SOURCE10} .
 gzip -d GSI_fi.sdf.gz
 localize -m -x -l fi -f GSI_fi.sdf
 cd ../..
@@ -2190,6 +2197,9 @@
 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
 popd
+# rhbz#486062 create a .desktop file that registers OOo as a handler for the javafilter formats
+# iff it is installed
+cp -p %{SOURCE9} $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-javafilter.desktop
 pushd sysui/output/usr/share/
 #get rid of the gnome icons and other unneeded files
 rm -rf icons/gnome applications mime application-registry
@@ -3869,6 +3879,7 @@
 %{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Types/fcfg_palm_types.xcu
 %{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Types/fcfg_pocketexcel_types.xcu
 %{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Types/fcfg_pocketword_types.xcu
+%{_datadir}/applications/openoffice.org-javafilter.desktop
 
 %files testtools
 %defattr(-,root,root,-)
@@ -4075,10 +4086,13 @@
 * Wed Feb 18 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-1.3
 - rhbz#486062 add workspace.xmergeclean.patch to ensure functionality
 - add Danish thesaurus requires
-- add openoffice.org-3.1.0.ooo99407.filter-detectsmalldevicefilters.patch
-  to auto-detect AportisDoc and PocketWord documents
-- add openoffice.org-3.1.0.ooo99411.sysui.add.dbf-mimetype.patch
-  to register as handler for .dbf files
+- Resolves: rhbz#486062
+   + add openoffice.org-3.1.0.ooo99407.filter-detectsmalldevicefilters.patch
+     to auto-detect AportisDoc and PocketWord documents
+   + add openoffice.org-3.1.0.ooo99411.sysui.add.dbf-mimetype.patch
+     to register as handler for .dbf files
+   + add a openoffice.org-javafilter.desktop to the javafilter subrpm
+     to notify existance of handlers for optional importers
 
 * Tue Feb 17 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-1.2
 - fix rotated glyphs


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/sources,v
retrieving revision 1.334
retrieving revision 1.335
diff -u -r1.334 -r1.335
--- sources	16 Feb 2009 09:04:35 -0000	1.334
+++ sources	19 Feb 2009 11:59:38 -0000	1.335
@@ -7,3 +7,4 @@
 d4cd987dca2f091c888d95d5aef19f46  GSI_fi.sdf.gz
 89e188acf396e13982ce3d7bc7ec8636  OOO310_m1.tar.bz2
 87ee4ea18a5ee118f9d7fa567657744a  redhat-langpacks.tar.gz
+b9d9509527bae4a88caf6ecc5329ec7a  openoffice.org-javafilter.desktop