rpms/openoffice.org/devel openoffice.org-2.2.0.ooo76424.nonatnum.bn_IN.18npool.patch, NONE, 1.1 openoffice.org.spec, 1.1169, 1.1170

Caolan McNamara (caolanm) fedora-extras-commits at redhat.com
Thu May 3 18:55:28 UTC 2007


Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.2.0.ooo76424.nonatnum.bn_IN.18npool.patch 
Log Message:
Resolves: rhbz#231924 Add the hunspell dictionaries requires

openoffice.org-2.2.0.ooo76424.nonatnum.bn_IN.18npool.patch:

--- NEW FILE openoffice.org-2.2.0.ooo76424.nonatnum.bn_IN.18npool.patch ---
Index: source/localedata/data/bn_IN.xml
===================================================================
RCS file: /cvs/l10n/i18npool/source/localedata/data/bn_IN.xml,v
retrieving revision 1.3
diff -u -r1.3 bn_IN.xml
--- openoffice.org.orig/i18npool/source/localedata/data/bn_IN.xml	20 Apr 2006 13:31:45 -0000	1.3
+++ openoffice.org/i18npool/source/localedata/data/bn_IN.xml	3 May 2007 08:02:57 -0000
@@ -85,47 +85,47 @@
       <FormatCode>[CURRENCY]#,##0.--;[RED]-[CURRENCY]#,##0.--</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey1" default="true" type="short" usage="DATE" formatindex="18">
-      <FormatCode>[NatNum1]D-M-YY</FormatCode>
+      <FormatCode>D-M-YY</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey9" default="false" type="medium" usage="DATE" formatindex="19">
-      <FormatCode>[NatNum1]NNNNDD MMMM GGGE</FormatCode>
+      <FormatCode>NNNNDD MMMM GGGE</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey8" default="false" type="medium" usage="DATE" formatindex="20">
-      <FormatCode>[NatNum1]DD-MM-YY</FormatCode>
+      <FormatCode>DD-MM-YY</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey7" default="true" type="medium" usage="DATE" formatindex="21">
-      <FormatCode>[NatNum1]DD-MM-YYYY</FormatCode>
+      <FormatCode>DD-MM-YYYY</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey10" default="false" type="long" usage="DATE" formatindex="22">
-      <FormatCode>[NatNum1]MMM D, YY</FormatCode>
+      <FormatCode>MMM D, YY</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey11" default="false" type="long" usage="DATE" formatindex="23">
-      <FormatCode>[NatNum1]MMM, D YYYY</FormatCode>
+      <FormatCode>MMM, D YYYY</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey16" default="false" type="long" usage="DATE" formatindex="24">
-      <FormatCode>[NatNum1]D. MMM. YYYY</FormatCode>
+      <FormatCode>D. MMM. YYYY</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey12" default="false" type="long" usage="DATE" formatindex="25">
-      <FormatCode>[NatNum1]MMMM D, YYYY</FormatCode>
+      <FormatCode>MMMM D, YYYY</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey17" default="false" type="long" usage="DATE" formatindex="26">
-      <FormatCode>[NatNum1]D. MMMM YYYY</FormatCode>
+      <FormatCode>D. MMMM YYYY</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey13" default="false" type="long" usage="DATE" formatindex="27">
-      <FormatCode>[NatNum1]NN, MMM D, YY</FormatCode>
+      <FormatCode>NN, MMM D, YY</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey2" default="false" type="medium" usage="DATE" formatindex="28">
-      <FormatCode>[NatNum1]NN DD-MMM YY</FormatCode>
+      <FormatCode>NN DD-MMM YY</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey14" default="false" type="long" usage="DATE" formatindex="29">
-      <FormatCode>[NatNum1]NN, MMMM D, YYYY</FormatCode>
+      <FormatCode>NN, MMMM D, YYYY</FormatCode>
       <DefaultName>29</DefaultName>
     </FormatElement>
     <FormatElement msgid="DateFormatskey15" default="true" type="long" usage="DATE" formatindex="30">
-      <FormatCode>[NatNum1]NNNNMMMM D, YYYY</FormatCode>
+      <FormatCode>NNNNMMMM D, YYYY</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey18" default="false" type="short" usage="DATE" formatindex="31">
-      <FormatCode>[NatNum1]MM-DD</FormatCode>
+      <FormatCode>MM-DD</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey19" default="false" type="medium" usage="DATE" formatindex="32">
       <FormatCode>YY-MM-DD</FormatCode>
@@ -136,46 +136,46 @@
       <DefaultName>ISO 8601</DefaultName>
     </FormatElement>
     <FormatElement msgid="DateFormatskey3" default="false" type="medium" usage="DATE" formatindex="34">
-      <FormatCode>[NatNum1]MM-YY</FormatCode>
+      <FormatCode>MM-YY</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey4" default="false" type="medium" usage="DATE" formatindex="35">
-      <FormatCode>[NatNum1]DD MMM</FormatCode>
+      <FormatCode>DD MMM</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey5" default="false" type="medium" usage="DATE" formatindex="36">
       <FormatCode>MMMM</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey6" default="false" type="medium" usage="DATE" formatindex="37">
-      <FormatCode>[NatNum1]QQ YY</FormatCode>
+      <FormatCode>QQ YY</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateFormatskey21" default="false" type="medium" usage="DATE" formatindex="38">
       <FormatCode>WW</FormatCode>
     </FormatElement>
     <FormatElement msgid="TimeFormatskey1" default="true" type="short" usage="TIME" formatindex="39">
-      <FormatCode>[NatNum1]HH:MM</FormatCode>
+      <FormatCode>HH:MM</FormatCode>
     </FormatElement>
     <FormatElement msgid="TimeFormatskey2" default="true" type="medium" usage="TIME" formatindex="40">
-      <FormatCode>[NatNum1]HH:MM:SS</FormatCode>
+      <FormatCode>HH:MM:SS</FormatCode>
     </FormatElement>
     <FormatElement msgid="TimeFormatskey3" default="false" type="short" usage="TIME" formatindex="41">
-      <FormatCode>[NatNum1]HH:MM AM/PM</FormatCode>
+      <FormatCode>HH:MM AM/PM</FormatCode>
     </FormatElement>
     <FormatElement msgid="TimeFormatskey4" default="false" type="medium" usage="TIME" formatindex="42">
-      <FormatCode>[NatNum1]HH:MM:SS AM/PM</FormatCode>
+      <FormatCode>HH:MM:SS AM/PM</FormatCode>
     </FormatElement>
     <FormatElement msgid="TimeFormatskey5" default="false" type="medium" usage="TIME" formatindex="43">
-      <FormatCode>[NatNum1][HH]:MM:SS</FormatCode>
+      <FormatCode>[HH]:MM:SS</FormatCode>
     </FormatElement>
     <FormatElement msgid="TimeFormatskey6" default="false" type="short" usage="TIME" formatindex="44">
-      <FormatCode>[NatNum1]MM:SS.00</FormatCode>
+      <FormatCode>MM:SS.00</FormatCode>
     </FormatElement>
     <FormatElement msgid="TimeFormatskey7" default="false" type="medium" usage="TIME" formatindex="45">
-      <FormatCode>[NatNum1][HH]:MM:SS.00</FormatCode>
+      <FormatCode>[HH]:MM:SS.00</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateTimeFormatskey1" default="true" type="medium" usage="DATE_TIME" formatindex="46">
-      <FormatCode>[NatNum1]MM-DD-YY HH:MM AM/PM</FormatCode>
+      <FormatCode>MM-DD-YY HH:MM AM/PM</FormatCode>
     </FormatElement>
     <FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME" formatindex="47">
-      <FormatCode>[NatNum1]MM-DD-YYYY HH:MM:SS</FormatCode>
+      <FormatCode>MM-DD-YYYY HH:MM:SS</FormatCode>
     </FormatElement>
   </LC_FORMAT>
   <LC_COLLATION ref="en_US" />


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1169
retrieving revision 1.1170
diff -u -r1.1169 -r1.1170
--- openoffice.org.spec	1 May 2007 12:41:20 -0000	1.1169
+++ openoffice.org.spec	3 May 2007 18:54:38 -0000	1.1170
@@ -131,6 +131,7 @@
 Patch72: openoffice.org-2.2.0.ooo75790.sc.pa-IN.translate.patch
 Patch73: openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch
 Patch74: openoffice.org-2.2.0.oooXXXXX.shell.reduceglobals.patch
+Patch75: openoffice.org-2.2.0.ooo76424.nonatnum.bn_IN.18npool.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -314,7 +315,7 @@
 Summary: Afrikaans language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-#Requires: hunspell-af
+Requires: hunspell-af
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org-langpack-af
 Obsoletes: openoffice.org2-langpack-af_ZA
@@ -337,7 +338,7 @@
 Summary: Bulgarian language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-#Requires: hunspell-bg
+Requires: hunspell-bg
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org-langpack-bg
 Obsoletes: openoffice.org2-langpack-bg_BG
@@ -361,7 +362,7 @@
 Summary: Catalan language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-#Requires: hunspell-ca
+Requires: hunspell-ca
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org-langpack-ca
 Obsoletes: openoffice.org2-langpack-ca_ES
@@ -373,7 +374,7 @@
 Summary: Czech language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-#Requires: hunspell-cs
+Requires: hunspell-cs
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org-langpack-cs
 Obsoletes: openoffice.org2-langpack-cs_CZ
@@ -385,7 +386,7 @@
 Summary: Welsh language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-#Requires: hunspell-cy
+Requires: hunspell-cy
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org-langpack-cy
 Obsoletes: openoffice.org2-langpack-cy_GB
@@ -398,7 +399,7 @@
 Summary: Danish language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-#Requires: hunspell-da
+Requires: hunspell-da
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org-langpack-da
 Obsoletes: openoffice.org2-langpack-da_DK
@@ -411,7 +412,7 @@
 Summary: German language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-#Requires: hunspell-de
+Requires: hunspell-de
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org2-langpack-de
 
@@ -423,7 +424,7 @@
 Summary: Greek language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-#Requires: hunspell-el
+Requires: hunspell-el
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org-langpack-el
 Obsoletes: openoffice.org2-langpack-el_GR
@@ -444,7 +445,7 @@
 Summary: Spanish language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-#Requires: hunspell-es
+Requires: hunspell-es
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org2-langpack-es
 
@@ -455,7 +456,7 @@
 Summary: Estonian language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-#Requires: hunspell-ee
+Requires: hunspell-ee
 Obsoletes: openoffice.org-langpack-et
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org2-langpack-et_EE
@@ -489,7 +490,7 @@
 Summary: French language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-#Requires: hunspell-fr
+Requires: hunspell-fr
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org2-langpack-fr
 
@@ -500,7 +501,7 @@
 Summary: Irish language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-#Requires: hunspell-ga
+Requires: hunspell-ga
 Obsoletes: openoffice.org2-langpack-ga_IE
 
 %description langpack-ga_IE
@@ -510,7 +511,7 @@
 Summary: Galician language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-#Requires: hunspell-gl
+Requires: hunspell-gl
 Obsoletes: openoffice.org-langpack-gl
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org2-langpack-gl_ES
@@ -544,7 +545,7 @@
 Summary: Hebrew language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-#Requires: hunspell-he
+Requires: hunspell-he
 Requires: fonts-hebrew
 Obsoletes: openoffice.org-langpack-he
 Obsoletes: openoffice.org-i18n
@@ -569,7 +570,7 @@
 Summary: Hungarian language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-#Requires: hunspell-hu
+Requires: hunspell-hu
 Obsoletes: openoffice.org-langpack-hu
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org2-langpack-hu_HU
@@ -581,7 +582,7 @@
 Summary: Croatian language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-#Requires: hunspell-hr
+Requires: hunspell-hr
 Obsoletes: openoffice.org-langpack-hr
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org2-langpack-hr_HR
@@ -593,7 +594,7 @@
 Summary: Italian language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-#Requires: hunspell-it
+Requires: hunspell-it
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org2-langpack-it
 
@@ -628,7 +629,7 @@
 Summary: Lithuanian language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-#Requires: hunspell-lt
+Requires: hunspell-lt
 Obsoletes: openoffice.org-langpack-lt
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org2-langpack-lt_LT
@@ -640,7 +641,7 @@
 Summary: Malay language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-#Requires: hunspell-ms
+Requires: hunspell-ms
 Obsoletes: openoffice.org-langpack-ms
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org2-langpack-ms_MY
@@ -652,7 +653,7 @@
 Summary: Bokmal language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-#Requires: hunspell-nb
+Requires: hunspell-nb
 Obsoletes: openoffice.org-langpack-nb
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org2-langpack-nb_NO
@@ -664,7 +665,7 @@
 Summary: Dutch language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-#Requires: hunspell-nl
+Requires: hunspell-nl
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org2-langpack-nl
 
@@ -675,7 +676,7 @@
 Summary: Nynorsk language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-#Requires: hunspell-nn
+Requires: hunspell-nn
 Obsoletes: openoffice.org-langpack-nn
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org2-langpack-nn_NO
@@ -695,7 +696,7 @@
 Summary: Polish language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-#Requires: hunspell-pl
+Requires: hunspell-pl
 Obsoletes: openoffice.org-langpack-pl
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org2-langpack-pl_PL
@@ -707,7 +708,7 @@
 Summary: Portuguese language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-#Requires: hunspell-pt
+Requires: hunspell-pt
 Obsoletes: openoffice.org-langpack-pt
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org2-langpack-pt_PT
@@ -719,7 +720,7 @@
 Summary: Brazilian Portuguese language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-#Requires: hunspell-pt
+Requires: hunspell-pt
 Obsoletes: openoffice.org-langpack-pt-BR
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org2-langpack-pt_BR
@@ -731,7 +732,7 @@
 Summary: Russian language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-#Requires: hunspell-ru
+Requires: hunspell-ru
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org2-langpack-ru
 
@@ -742,7 +743,7 @@
 Summary: Slovak language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-#Requires: hunspell-sk
+Requires: hunspell-sk
 Obsoletes: openoffice.org-langpack-sk
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org2-langpack-sk_SK
@@ -754,7 +755,7 @@
 Summary: Slovenian language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-#Requires: hunspell-sl
+Requires: hunspell-sl
 Obsoletes: openoffice.org-langpack-sl
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org2-langpack-sl_SI
@@ -791,7 +792,7 @@
 Summary: Swedish language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-#Requires: hunspell-sv
+Requires: hunspell-sv
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org2-langpack-sv
 
@@ -813,7 +814,7 @@
 Summary: Thai language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-#Requires: hunspell-th
+Requires: hunspell-th
 Obsoletes: openoffice.org-langpack-th
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org2-langpack-th_TH
@@ -905,7 +906,7 @@
 Summary: Zulu language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-#Requires: hunspell-zu
+Requires: hunspell-zu
 Obsoletes: openoffice.org-langpack-zu
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org2-langpack-zu_ZA
@@ -1055,6 +1056,7 @@
 %patch72 -p1 -b .ooo75790.sc.pa-IN.translate.patch
 %patch73 -p1 -b .ooo76393.sal.dynamicsection.patch
 %patch74 -p1 -b .oooXXXXX.shell.reduceglobals.patch
+%patch75 -p1 -b .ooo76424.nonatnum.bn_IN.18npool.patch
 
 cp %{SOURCE1} extras/source/database/evolocal.odb
 
@@ -2632,11 +2634,12 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
-* Tue Apr 24 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.0-14.7-unreleased
-- remove gnome icons to that mist inheritance from bluecurve will give
-  the bluecurve panel icons
+* Tue Apr 24 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.0-14.7
 - Resolves: rhbz#203495 add some magic to allow native and OOo dialogs to
   interleave and keep parent child transient logic correct
+- remove gnome icons seeing as they are redundant
+- Resolves: rhbz#231924 Add the hunspell dictionaries requires
+- Resolves: rhbz#231924 add remove NatNum1 from bn_IN.xml
 
 * Tue Apr 17 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.0-14.6
 - merge openoffice.org-2.0.2.ooo59127.vcl.honourcairofont.patch




More information about the fedora-extras-commits mailing list