rpms/openoffice.org/devel openoffice.org.spec,1.1648,1.1649

[Caolan McNamara]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Log Message:
next candidate


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1648
retrieving revision 1.1649
diff -u -r1.1648 -r1.1649
--- openoffice.org.spec	15 Sep 2008 16:35:22 -0000	1.1648
+++ openoffice.org.spec	15 Sep 2008 16:36:38 -0000	1.1649
@@ -920,6 +920,7 @@
 Summary: Southern Ndebele language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+Requires: hunspell-nr
 
 %description langpack-nr_ZA
 Provides additional Southern Ndebele translations and resources for 
@@ -1012,6 +1013,7 @@
 Summary: Swati language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+Requires: hunspell-ss
 
 %description langpack-ss_ZA
 Provides additional swati translations and resources for %{name}.
@@ -1020,6 +1022,7 @@
 Summary: Southern Sotho language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+Requires: hunspell-st
 
 %description langpack-st_ZA
 Provides additional Southern Sotho translations and resources for 
@@ -1065,6 +1068,7 @@
 Summary: Northern Sotho language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+Requires: hunspell-nso
 Obsoletes: openoffice.org2-langpack-nso_ZA
 
 %description langpack-nso_ZA
@@ -1085,6 +1089,7 @@
 Summary: Tsonga language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+Requires: hunspell-ts
 Obsoletes: openoffice.org2-langpack-ts_ZA
 Obsoletes: openoffice.org-langpack-ts
 
@@ -1106,6 +1111,7 @@
 Summary: Venda language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+Requires: hunspell-ve
 
 %description langpack-ve_ZA
 Provides additional venda translations and resources for %{name}.
@@ -1114,6 +1120,7 @@
 Summary: Xhosa language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+Requires: hunspell-xh
 
 %description langpack-xh_ZA
 Provides additional xhosa translations and resources for %{name}.
@@ -1405,6 +1412,7 @@
 source Linux*Env.Set.sh
 #figure out the icon version
 export `grep "^PRODUCTVERSIONSHORT =" sysui/desktop/productversion.mk | sed -e "s/ //g"`
+export `grep "PRODUCTVERSION[ ]*=[ ]*" sysui/desktop/productversion.mk | sed -e "s/ //g"`
 unset HAVE_LD_HASH_STYLE
 #don't duplicate english helpcontent about the place
 unset DEFAULT_TO_ENGLISH_FOR_PACKING
@@ -1889,6 +1897,8 @@
 for file in *.desktop; do
     # rhbz#156067 don't version the icons
     sed -i -e "s/$PRODUCTVERSIONSHORT//g" $file
+    # rhbz#156677 remove the version from Name=
+    sed -i -e "s/$PRODUCTVERSION //g" $file
 done
 echo "StartupNotify=true" >> base.desktop
 echo "StartupNotify=true" >> calc.desktop
@@ -1952,6 +1962,8 @@
 for file in *.desktop; do
     # rhbz#156067 don't version the icons
     sed -i -e "s/$PRODUCTVERSIONSHORT//g" $file
+    # rhbz#156677 remove the version from Name=
+    sed -i -e "s/$PRODUCTVERSION //g" $file
     # use broffice.org launcher
     sed -i -e "s/openoffice/broffice/g" $file
 done
@@ -3665,7 +3677,8 @@
 * Mon Sep 15 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-6.1
 - next candidate
 - use system jfreereport
-- Basque spellchecker
+- Basque, Ndebele, Swati, Southern Sotho, Northern Sotho, Tsonga,
+  Venda, Xhosa spellcheckers
 
 * Sun Sep 07 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-5.1
 - next candidate