rpms/openoffice.org/devel openoffice.org.spec, 1.2116, 1.2117 sources, 1.385, 1.386

[Caolan McNamara]

Author: caolanm

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

Modified Files:
	openoffice.org.spec sources 
Log Message:
add hunspell-mai depend, and drop obsolete mimelnk foos


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2116
retrieving revision 1.2117
diff -u -p -r1.2116 -r1.2117
--- openoffice.org.spec	4 Jan 2010 07:08:38 -0000	1.2116
+++ openoffice.org.spec	4 Jan 2010 10:42:23 -0000	1.2117
@@ -1372,6 +1372,7 @@ Summary: Maithili language pack for Open
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: lohit-maithili-fonts
+Requires: hunspell-mai
 
 %description langpack-mai_IN
 Provides additional Maithili translations and resources for OpenOffice.org.
@@ -2317,7 +2318,6 @@ sed -i -e s/broffice.org$PRODUCTVERSIONS
 #relocate the rest of them
 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
@@ -3110,7 +3110,6 @@ fi
 %{oooinstdir}/share/registry/modules/org/openoffice/Setup/Setup-brand.xcu
 %{oooinstdir}/share/xdg/
 %{oooinstdir}/program/redirectrc
-%{_datadir}/mimelnk/application/openoffice.org-extension.desktop
 #launchers
 %{_bindir}/openoffice.org-1.9
 %{_bindir}/openoffice.org-2.0
@@ -3179,7 +3178,6 @@ update-desktop-database %{_datadir}/appl
 %{brinstdir}/program/fundamentalrc
 %{brinstdir}/program/redirectrc
 %{brinstdir}/basis-link
-%{_datadir}/mimelnk/application/broffice.org-extension.desktop
 %{_datadir}/mime-info/broffice.org.*
 %{_datadir}/icons/*/*/*/broffice*
 #launchers
@@ -3258,8 +3256,6 @@ fi
 %dir %{oooinstdir}/program
 %{oooinstdir}/program/sbase
 %{_datadir}/applications/openoffice.org-base.desktop
-#%{_datadir}/applications/openoffice.org-*-base.desktop
-%{_datadir}/mimelnk/application/openoffice.org-*database*
 %{_bindir}/oobase
 
 %post base
@@ -3275,7 +3271,6 @@ update-desktop-database %{_datadir}/appl
 %dir %{brinstdir}/program
 %{brinstdir}/program/sbase
 %{_datadir}/applications/broffice.org-base.desktop
-%{_datadir}/mimelnk/application/broffice.org-*database*
 %endif
 
 %post -n broffice.org-base
@@ -3547,9 +3542,6 @@ fi
 %{oooinstdir}/program/scalc
 %{oooinstdir}/program/scalc.bin
 %{_datadir}/applications/openoffice.org-calc.desktop
-#%{_datadir}/applications/openoffice.org-*-calc.desktop
-%{_datadir}/mimelnk/application/openoffice.org-ms-excel*
-%{_datadir}/mimelnk/application/openoffice.org-*spreadsheet*
 %{_bindir}/oocalc
 
 %post calc
@@ -3566,8 +3558,6 @@ update-desktop-database %{_datadir}/appl
 %{brinstdir}/program/scalc
 %{brinstdir}/program/scalc.bin
 %{_datadir}/applications/broffice.org-calc.desktop
-%{_datadir}/mimelnk/application/broffice.org-ms-excel*
-%{_datadir}/mimelnk/application/broffice.org-*spreadsheet*
 %endif
 
 %post -n broffice.org-calc
@@ -3615,8 +3605,6 @@ update-desktop-database %{_datadir}/appl
 %{oooinstdir}/program/sdraw
 %{oooinstdir}/program/sdraw.bin
 %{_datadir}/applications/openoffice.org-draw.desktop
-#%{_datadir}/applications/openoffice.org-*-draw.desktop
-%{_datadir}/mimelnk/application/openoffice.org-*drawing*
 %{_bindir}/oodraw
 
 %post draw
@@ -3633,7 +3621,6 @@ update-desktop-database %{_datadir}/appl
 %{brinstdir}/program/sdraw
 %{brinstdir}/program/sdraw.bin
 %{_datadir}/applications/broffice.org-draw.desktop
-%{_datadir}/mimelnk/application/broffice.org-*drawing*
 %endif
 
 %post -n broffice.org-draw
@@ -3727,12 +3714,6 @@ update-desktop-database %{_datadir}/appl
 %{oooinstdir}/program/swriter
 %{oooinstdir}/program/swriter.bin
 %{_datadir}/applications/openoffice.org-writer.desktop
-#%{_datadir}/applications/openoffice.org-*-writer.desktop
-%{_datadir}/mimelnk/application/openoffice.org-ms-word*
-%{_datadir}/mimelnk/application/openoffice.org-openxmlformats-officedocument-wordprocessingml*
-%{_datadir}/mimelnk/application/openoffice.org-*master*
-%{_datadir}/mimelnk/application/openoffice.org-*text*
-%{_datadir}/mimelnk/application/openoffice.org-*web*
 %{_bindir}/oowriter
 
 %post writer
@@ -3747,11 +3728,6 @@ update-desktop-database %{_datadir}/appl
 %{brinstdir}/program/swriter
 %{brinstdir}/program/swriter.bin
 %{_datadir}/applications/broffice.org-writer.desktop
-%{_datadir}/mimelnk/application/broffice.org-ms-word*
-%{_datadir}/mimelnk/application/broffice.org-openxmlformats-officedocument-wordprocessingml*
-%{_datadir}/mimelnk/application/broffice.org-*master*
-%{_datadir}/mimelnk/application/broffice.org-*text*
-%{_datadir}/mimelnk/application/broffice.org-*web*
 %endif
 
 %post -n broffice.org-writer
@@ -3809,9 +3785,6 @@ update-desktop-database %{_datadir}/appl
 %{oooinstdir}/program/simpress
 %{oooinstdir}/program/simpress.bin
 %{_datadir}/applications/openoffice.org-impress.desktop
-#%{_datadir}/applications/openoffice.org-*-impress.desktop
-%{_datadir}/mimelnk/application/openoffice.org-*presentation*
-%{_datadir}/mimelnk/application/openoffice.org-ms-powerpoint-template*.desktop
 %{_bindir}/ooimpress
 
 %post impress
@@ -3828,8 +3801,6 @@ update-desktop-database %{_datadir}/appl
 %{brinstdir}/program/simpress
 %{brinstdir}/program/simpress.bin
 %{_datadir}/applications/broffice.org-impress.desktop
-%{_datadir}/mimelnk/application/broffice.org-*presentation*
-%{_datadir}/mimelnk/application/broffice.org-ms-powerpoint-template*.desktop
 %endif
 
 %post -n broffice.org-impress
@@ -3886,8 +3857,6 @@ update-desktop-database %{_datadir}/appl
 %dir %{oooinstdir}/program
 %{oooinstdir}/program/smath
 %{_datadir}/applications/openoffice.org-math.desktop
-#%{_datadir}/applications/openoffice.org-*-math.desktop
-%{_datadir}/mimelnk/application/openoffice.org-*formula*
 %{_bindir}/oomath
 
 %post math
@@ -3903,7 +3872,6 @@ update-desktop-database %{_datadir}/appl
 %dir %{brinstdir}/program
 %{brinstdir}/program/smath
 %{_datadir}/applications/broffice.org-math.desktop
-%{_datadir}/mimelnk/application/broffice.org-*formula*
 %endif
 
 %post -n broffice.org-math
@@ -4188,7 +4156,7 @@ fi
 %endif
 
 %changelog
-* Mon Jan 04 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-8.6-UNBUILT
+* Mon Jan 04 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-8.6
 - Resolves: rhbz#551983 OpenOffice writer crashes when opening document
   with link in footnote (dtardon)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/sources,v
retrieving revision 1.385
retrieving revision 1.386
diff -u -p -r1.385 -r1.386
--- sources	17 Dec 2009 09:24:02 -0000	1.385
+++ sources	4 Jan 2010 10:42:24 -0000	1.386
@@ -4,7 +4,7 @@ b54bcc9fdb23389e961b281508d9110c  docume
 1b4d9a03ebb4c864015620153afb77c6  Tigert-templates.tar.gz
 f0cda31fe18bf9289629a321663031b8  redhat-templates.tar.gz
 ffa417a9556cdb16028c83718d758bc7  redhat-langpacks.tar.gz
+0c195c73f76d3e52da7588904bae8af0  openoffice.org-javafilter.desktop
 39a2c59cfae4019eda4a63f414c0aa54  redhat-registry.tar.gz
-6c28507e29056a3afb4baffdadab8499  openoffice.org-javafilter.desktop
 ef64057ee7e48ca472e80dd87f3dd426  acor_ga-IE.dat
 d86bdbcfc5b23bc0572f62770ec1ef74  OOO320_m8.tar.bz2