rpms/openoffice.org/F-9 openoffice.org-3.0.0.ooo86142.serbiannumbering.patch, NONE, 1.1 workspace.locdat30.patch, NONE, 1.1 .cvsignore, 1.154, 1.155 openoffice.org.spec, 1.1498, 1.1499 sources, 1.279, 1.280 workspace.cairotext01.patch, 1.7, 1.8

Caolan McNamara (caolanm) fedora-extras-commits at redhat.com
Mon Jul 7 13:21:17 UTC 2008 

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25294

Modified Files:
	.cvsignore openoffice.org.spec sources 
	workspace.cairotext01.patch 
Added Files:
	openoffice.org-3.0.0.ooo86142.serbiannumbering.patch 
	workspace.locdat30.patch 
Log Message:
Resolves: rhbz#452374 add openoffice.org-3.0.0.ooo86142.serbiannumbering.patch

openoffice.org-3.0.0.ooo86142.serbiannumbering.patch:

--- NEW FILE openoffice.org-3.0.0.ooo86142.serbiannumbering.patch ---
Index: i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
===================================================================
RCS file: /cvs/l10n/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx,v
retrieving revision 1.28
diff -u -r1.28 defaultnumberingprovider.cxx
--- openoffice.org.orig/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx	13 Nov 2007 14:32:47 -0000	1.28
+++ openoffice.org/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx	15 Feb 2008 05:14:16 -0000
@@ -166,6 +166,22 @@
     0x0449, 0x044B, 0x044D, 0x044E, 0x044F
 };
 
+// Serbian Cyrillic upper letters
+static sal_Unicode table_CyrillicUpperLetter_sr[] = { 
+    0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0402, 0x0415, 0x0416, 
+    0x0417, 0x0418, 0x0408, 0x041A, 0x041B, 0x0409, 0x041C, 0x041D, 
+    0x040A, 0x041E, 0x041F, 0x0420, 0x0421, 0x0422, 0x040B, 0x0423,
+    0x0424, 0x0425, 0x0426, 0x0427, 0x040F, 0x0428
+};
+
+// Serbian cyrillic lower letters
+static sal_Unicode table_CyrillicLowerLetter_sr[] = { 
+    0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0452, 0x0435, 0x0436,
+    0x0437, 0x0438, 0x0458, 0x043A, 0x043B, 0x0459, 0x043C, 0x043D, 
+    0x045A, 0x043E, 0x043F, 0x0440, 0x0441, 0x0442, 0x045B, 0x0443,
+    0x0444, 0x0445, 0x0446, 0x0447, 0x045F, 0x0448
+};
+
 static sal_Unicode table_Alphabet_fa[] = {
     0x0622, 0x0628, 0x067E, 0x062A, 0x062B, 0x062C, 0x0686, 0x062D,
     0x062E, 0x062F, 0x0630, 0x0631, 0x0632, 0x0698, 0x0633, 0x0634,
@@ -623,6 +639,32 @@
                       sizeof(table_CyrillicLowerLetter_ru[0]), number-1,
                       result); // 1=>a, 2=>b, ..., 27=>z, 28=>aa, 29=>bb, ...
               break;
+         case CHARS_CYRILLIC_UPPER_LETTER_SR:
+              lcl_formatChars2( table_CyrillicUpperLetter_sr,
+                      table_CyrillicLowerLetter_sr,
+                      sizeof(table_CyrillicLowerLetter_sr) /
+                      sizeof(table_CyrillicLowerLetter_sr[0]), number-1,
+                      result); // 1=>a, 2=>b, ..., 27=>z, 28=>Aa, 29=>Ab, ...
+              break;
+         case CHARS_CYRILLIC_LOWER_LETTER_SR:
+              lcl_formatChars( table_CyrillicLowerLetter_sr,
+                      sizeof(table_CyrillicLowerLetter_sr) /
+                      sizeof(table_CyrillicLowerLetter_sr[0]), number-1,
+                      result); // 1=>a, 2=>b, ..., 27=>z, 28=>aa, 29=>ab, ...
+              break;
+         case CHARS_CYRILLIC_UPPER_LETTER_N_SR:
+              lcl_formatChars3( table_CyrillicUpperLetter_sr,
+                      table_CyrillicLowerLetter_sr,
+                      sizeof(table_CyrillicLowerLetter_sr) /
+                      sizeof(table_CyrillicLowerLetter_sr[0]), number-1,
+                      result); // 1=>a, 2=>b, ..., 27=>z, 28=>Aa, 29=>Bb, ...
+              break;
+         case CHARS_CYRILLIC_LOWER_LETTER_N_SR:
+              lcl_formatChars1( table_CyrillicLowerLetter_sr,
+                      sizeof(table_CyrillicLowerLetter_sr) /
+                      sizeof(table_CyrillicLowerLetter_sr[0]), number-1,
+                      result); // 1=>a, 2=>b, ..., 27=>z, 28=>aa, 29=>bb, ...
+              break;
           case CHARS_PERSIAN:
               lcl_formatChars(table_Alphabet_fa, sizeof(table_Alphabet_fa) / sizeof(sal_Unicode), number - 1, result);
               break;
@@ -708,6 +750,10 @@
         {style::NumberingType::CHARS_CYRILLIC_LOWER_LETTER_RU,   S_CYR_A ", " S_CYR_B ", .., " S_CYR_A S_CYR_A ", " S_CYR_A S_CYR_B ", ... (ru)", LANG_ALL},
         {style::NumberingType::CHARS_CYRILLIC_UPPER_LETTER_N_RU, C_CYR_A ", " C_CYR_B ", .., " C_CYR_A S_CYR_A ", " C_CYR_B S_CYR_B ", ... (ru)", LANG_ALL},
         {style::NumberingType::CHARS_CYRILLIC_LOWER_LETTER_N_RU, S_CYR_A ", " S_CYR_B ", .., " S_CYR_A S_CYR_A ", " S_CYR_B S_CYR_B ", ... (ru)", LANG_ALL},
+        {style::NumberingType::CHARS_CYRILLIC_UPPER_LETTER_SR,   C_CYR_A ", " C_CYR_B ", .., " C_CYR_A S_CYR_A ", " C_CYR_A S_CYR_B ", ... (sr)", LANG_ALL},
+        {style::NumberingType::CHARS_CYRILLIC_LOWER_LETTER_SR,   S_CYR_A ", " S_CYR_B ", .., " S_CYR_A S_CYR_A ", " S_CYR_A S_CYR_B ", ... (sr)", LANG_ALL},
+        {style::NumberingType::CHARS_CYRILLIC_UPPER_LETTER_N_SR, C_CYR_A ", " C_CYR_B ", .., " C_CYR_A S_CYR_A ", " C_CYR_B S_CYR_B ", ... (sr)", LANG_ALL},
+        {style::NumberingType::CHARS_CYRILLIC_LOWER_LETTER_N_SR, S_CYR_A ", " S_CYR_B ", .., " S_CYR_A S_CYR_A ", " S_CYR_B S_CYR_B ", ... (sr)", LANG_ALL},
         {style::NumberingType::CHARS_PERSIAN,   NULL, LANG_CTL},
 };
 static const sal_Int32 nSupported_NumberingTypes = sizeof(aSupportedTypes) / sizeof(Supported_NumberingType);
Index: offapi/com/sun/star/style/NumberingType.idl
===================================================================
RCS file: /cvs/api/offapi/com/sun/star/style/NumberingType.idl,v
retrieving revision 1.17
diff -u -r1.17 NumberingType.idl
--- openoffice.org.orig/offapi/com/sun/star/style/NumberingType.idl	13 Nov 2007 14:30:30 -0000	1.17
+++ openoffice.org/offapi/com/sun/star/style/NumberingType.idl	15 Feb 2008 05:14:42 -0000
@@ -396,6 +396,66 @@
     const short CHARS_CYRILLIC_LOWER_LETTER_N_RU = 45;
 
     //-------------------------------------------------------------------------
+    /** Numbering in Serbian Cyrillic alphabet upper case letters
+
+    	@since OOo 2.4.0
+	 */
+     /*
+        CYRILLIC CAPITAL LETTER A , CYRILLIC CAPITAL LETTER BE ,
+            CYRILLIC CAPITAL LETTER VE , CYRILLIC CAPITAL LETTER GHE , ... ,
+        CYRILLIC CAPITAL LETTER A CYRILLIC SMALL LETTER A ,
+            CYRILLIC CAPITAL LETTER A CYRILLIC SMALL LETTER BE ,
+            CYRILLIC CAPITAL LETTER A CYRILLIC SMALL LETTER VE , ...
+        CYRILLIC CAPITAL LETTER A CYRILLIC SMALL LETTER A CYRILLIC SMALL LETTER A ,
+            CYRILLIC CAPITAL LETTER A CYRILLIC SMALL LETTER A CYRILLIC SMALL LETTER BE
+      */
+    const short CHARS_CYRILLIC_UPPER_LETTER_SR = 47;
+
+    //-------------------------------------------------------------------------
+    /** Numbering in Russian Serbian alphabet lower case letters
+
+    	@since OOo 2.4.0
+	 */
+     /*
+        CYRILLIC SMALL LETTER A , CYRILLIC SMALL LETTER BE ,
+            CYRILLIC SMALL LETTER VE , CYRILLIC SMALL LETTER GHE , ... ,
+        CYRILLIC SMALL LETTER A CYRILLIC SMALL LETTER A ,
+            CYRILLIC SMALL LETTER A CYRILLIC SMALL LETTER BE ,
+            CYRILLIC SMALL LETTER A CYRILLIC SMALL LETTER VE , ...
+        CYRILLIC SMALL LETTER A CYRILLIC SMALL LETTER A CYRILLIC SMALL LETTER A ,
+            CYRILLIC SMALL LETTER A CYRILLIC SMALL LETTER A CYRILLIC SMALL LETTER BE
+      */
+    const short CHARS_CYRILLIC_LOWER_LETTER_SR = 48;
+
+    //-------------------------------------------------------------------------
+    /** Numbering in Serbian Cyrillic alphabet upper case letters
+
+    	@since OOo 2.4.0
+	 */
+     /*
+        CYRILLIC CAPITAL LETTER A , CYRILLIC CAPITAL LETTER BE , ... ,
+        CYRILLIC CAPITAL LETTER A CYRILLIC SMALL LETTER A ,
+            CYRILLIC CAPITAL LETTER BE CYRILLIC SMALL LETTER BE ,
+            CYRILLIC CAPITAL LETTER VE CYRILLIC SMALL LETTER VE , ...
+        CYRILLIC CAPITAL LETTER A CYRILLIC SMALL LETTER A CYRILLIC SMALL LETTER A , ...
+      */
+    const short CHARS_CYRILLIC_UPPER_LETTER_N_SR = 49;
+
+    //-------------------------------------------------------------------------
+    /** Numbering in Serbian Cyrillic alphabet upper case letters
+
+    	@since OOo 2.4.0
+	 */
+     /*
+        CYRILLIC SMALL LETTER A , CYRILLIC SMALL LETTER BE , ... ,
+        CYRILLIC SMALL LETTER A CYRILLIC SMALL LETTER A ,
+            CYRILLIC SMALL LETTER BE CYRILLIC SMALL LETTER BE ,
+            CYRILLIC SMALL LETTER VE CYRILLIC SMALL LETTER VE , ...
+        CYRILLIC SMALL LETTER A CYRILLIC SMALL LETTER A CYRILLIC SMALL LETTER A , ...
+      */
+    const short CHARS_CYRILLIC_LOWER_LETTER_N_SR = 50;
+
+    //-------------------------------------------------------------------------
     /** Numbering in Persian alphabet letters (aa, be, pe, te, ...)
 
         @since OOo 2.4
Index: svx/source/dialog/numpages.src
===================================================================
RCS file: /cvs/graphics/svx/source/dialog/numpages.src,v
retrieving revision 1.62
diff -u -r1.62 numpages.src
--- openoffice.org.orig/svx/source/dialog/numpages.src	27 Jun 2007 17:23:30 -0000	1.62
+++ openoffice.org/svx/source/dialog/numpages.src	15 Feb 2008 05:16:13 -0000
@@ -216,6 +216,10 @@
             < "а, б, .., аа, аб, ... (Russian)" ;       43 /*CHARS_CYRILLIC_LOWER_LETTER_RU     */; > ;
             < "А, Б, .., Аа, Бб, ... (Russian)" ;       44 /*CHARS_CYRILLIC_UPPER_LETTER_N_RU   */; > ;
             < "а, б, .., аа, бб, ... (Russian)" ;       45 /*CHARS_CYRILLIC_LOWER_LETTER_N_RU   */; > ;
+            < "А, Б, .., Аа, Аб, ... (Serbian)" ;       47 /*CHARS_CYRILLIC_UPPER_LETTER_SR     */; > ;
+            < "а, б, .., аа, аб, ... (Serbian)" ;       48 /*CHARS_CYRILLIC_LOWER_LETTER_SR     */; > ;
+            < "А, Б, .., Аа, Бб, ... (Serbian)" ;       49 /*CHARS_CYRILLIC_UPPER_LETTER_N_SR   */; > ;
+            < "а, б, .., аа, бб, ... (Serbian)" ;       50 /*CHARS_CYRILLIC_LOWER_LETTER_N_SR   */; > ;
 
 		};
 	};
Index: sw/source/ui/misc/numberingtypelistbox.src
===================================================================
RCS file: /cvs/sw/sw/source/ui/misc/numberingtypelistbox.src,v
retrieving revision 1.19
diff -u -r1.19 numberingtypelistbox.src
--- openoffice.org.orig/sw/source/ui/misc/numberingtypelistbox.src	19 Apr 2007 13:21:04 -0000	1.19
+++ openoffice.org/sw/source/ui/misc/numberingtypelistbox.src	15 Feb 2008 05:16:22 -0000
@@ -61,6 +61,10 @@
             < "а, б, .., аа, аб, ... (Russian)" ;       43 /*CHARS_CYRILLIC_LOWER_LETTER_RU     */; > ;
             < "А, Б, .., Аа, Бб, ... (Russian)" ;       44 /*CHARS_CYRILLIC_UPPER_LETTER_N_RU   */; > ;
             < "а, б, .., аа, бб, ... (Russian)" ;       45 /*CHARS_CYRILLIC_LOWER_LETTER_N_RU   */; > ;
+            < "А, Б, .., Аа, Аб, ... (Serbian)" ;       47 /*CHARS_CYRILLIC_UPPER_LETTER_SR     */; > ;
+            < "а, б, .., аа, аб, ... (Serbian)" ;       48 /*CHARS_CYRILLIC_LOWER_LETTER_SR     */; > ;
+            < "А, Б, .., Аа, Бб, ... (Serbian)" ;       49 /*CHARS_CYRILLIC_UPPER_LETTER_N_SR   */; > ;
+            < "а, б, .., аа, бб, ... (Serbian)" ;       50 /*CHARS_CYRILLIC_LOWER_LETTER_N_SR   */; > ;
 		};
 	};
 };
Index: writerfilter/source/dmapper/DomainMapper_Impl.cxx
===================================================================
RCS file: /cvs/sw/writerfilter/source/dmapper/DomainMapper_Impl.cxx,v
retrieving revision 1.21
diff -u -r1.21 DomainMapper_Impl.cxx
--- openoffice.org.orig/writerfilter/source/dmapper/DomainMapper_Impl.cxx	29 Oct 2007 15:28:37 -0000	1.21
+++ openoffice.org/writerfilter/source/dmapper/DomainMapper_Impl.cxx	15 Feb 2008 05:16:48 -0000
@@ -1027,7 +1027,11 @@
     CHARS_CYRILLIC_UPPER_LETTER_RU
     CHARS_CYRILLIC_LOWER_LETTER_RU
     CHARS_CYRILLIC_UPPER_LETTER_N_RU
-    CHARS_CYRILLIC_LOWER_LETTER_N_RU*/
+    CHARS_CYRILLIC_LOWER_LETTER_N_RU
+    CHARS_CYRILLIC_UPPER_LETTER_SR
+    CHARS_CYRILLIC_LOWER_LETTER_SR
+    CHARS_CYRILLIC_UPPER_LETTER_N_SR
+    CHARS_CYRILLIC_LOWER_LETTER_N_SR*/
 
         };
         for( sal_uInt32 nNum = 0; nNum < sizeof(aNumberingPairs)/sizeof( NumberingPairs ); ++nNum)
Index: sh_RS.xml
===================================================================
RCS file: /cvs/l10n/i18npool/source/localedata/data/sh_RS.xml,v
retrieving revision 1.2
diff -u -r1.2 sh_RS.xml
--- openoffice.org.orig/i18npool/source/localedata/data/sh_RS.xml	13 Nov 2007 14:35:55 -0000	1.2
+++ openoffice.org/i18npool/source/localedata/data/sh_RS.xml	31 Mar 2008 17:33:14 -0000
@@ -210,72 +224,6 @@
       <quarter4Abbreviation>K4</quarter4Abbreviation>
     </ReservedWords>
   </LC_MISC>
-  <LC_NumberingLevel>
-    <NumberingLevel NumType="4" Prefix=" " Suffix=")"/>
-    <NumberingLevel NumType="4" Prefix=" " Suffix="."/>
-    <NumberingLevel NumType="4" Prefix="(" Suffix="."/>
-    <NumberingLevel NumType="2" Prefix=" " Suffix="."/>
-    <NumberingLevel NumType="0" Prefix=" " Suffix=")"/>
-    <NumberingLevel NumType="1" Prefix=" " Suffix=")"/>
-    <NumberingLevel NumType="1" Prefix="(" Suffix=")"/>
-    <NumberingLevel NumType="3" Prefix=" " Suffix="."/>
-  </LC_NumberingLevel>
-  <LC_OutLineNumberingLevel>
-    <OutlineStyle>
-      <OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0"/>
-      <OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="1" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0"/>
-      <OutLineNumberingLevel Prefix=" " NumType="1" Suffix=")" BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0"/>
-      <OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0"/>
-      <OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0"/>
-    </OutlineStyle>
-    <OutlineStyle>
-      <OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0"/>
-      <OutLineNumberingLevel Prefix=" " NumType="1" Suffix=")" BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0"/>
-      <OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0"/>
-      <OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0"/>
-      <OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0"/>
-    </OutlineStyle>
-    <OutlineStyle>
-      <OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0"/>
-      <OutLineNumberingLevel Prefix="(" NumType="1" Suffix=")" BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0"/>
-      <OutLineNumberingLevel Prefix=" " NumType="3" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0"/>
-      <OutLineNumberingLevel Prefix=" " NumType="0" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0"/>
-      <OutLineNumberingLevel Prefix=" " NumType="6" Suffix="." BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0"/>
-    </OutlineStyle>
-    <OutlineStyle>
-      <OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0"/>
-      <OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0"/>
-      <OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0"/>
-      <OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0"/>
-      <OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0"/>
-    </OutlineStyle>
-    <OutlineStyle>
-      <OutLineNumberingLevel Prefix=" " NumType="2" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0"/>
-      <OutLineNumberingLevel Prefix=" " NumType="0" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0"/>
-      <OutLineNumberingLevel Prefix=" " NumType="3" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0"/>
-      <OutLineNumberingLevel Prefix=" " NumType="1" Suffix=")" BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0"/>
-      <OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0"/>
-    </OutlineStyle>
-    <OutlineStyle>
-      <OutLineNumberingLevel Prefix=" " NumType="0" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0"/>
-      <OutLineNumberingLevel Prefix=" " NumType="2" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0"/>
-      <OutLineNumberingLevel Prefix=" " NumType="1" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0"/>
-      <OutLineNumberingLevel Prefix=" " NumType="3" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0"/>
-      <OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0"/>
-    </OutlineStyle>
-    <OutlineStyle>
-      <OutLineNumberingLevel Prefix=" " NumType="4" Suffix=" " BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0"/>
-      <OutLineNumberingLevel Prefix=" " NumType="4" Suffix=" " BulletChar="0020" BulletFontName="" ParentNumbering="1" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0"/>
-      <OutLineNumberingLevel Prefix=" " NumType="4" Suffix=" " BulletChar="0020" BulletFontName="" ParentNumbering="2" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0"/>
-      <OutLineNumberingLevel Prefix=" " NumType="4" Suffix=" " BulletChar="0020" BulletFontName="" ParentNumbering="3" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0"/>
-      <OutLineNumberingLevel Prefix=" " NumType="4" Suffix=" " BulletChar="0020" BulletFontName="" ParentNumbering="4" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0"/>
-    </OutlineStyle>
-    <OutlineStyle>
-      <OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="27A2" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0"/>
-      <OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="E006" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0"/>
-      <OutLineNumberingLevel Prefix=" " NumType="6" Suffix=")" BulletChar="E004" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0"/>
-      <OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0"/>
-      <OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0"/>
-    </OutlineStyle>
-  </LC_OutLineNumberingLevel>
+  <LC_NumberingLevel ref="sr_RS"/>
+  <LC_OutLineNumberingLevel ref="sr_RS"/>
 </Locale>
Index: sr_RS.xml
===================================================================
RCS file: /cvs/l10n/i18npool/source/localedata/data/sr_RS.xml,v
retrieving revision 1.2
diff -u -r1.2 sr_RS.xml
--- openoffice.org.orig/i18npool/source/localedata/data/sr_RS.xml	13 Nov 2007 14:37:09 -0000	1.2
+++ openoffice.org/i18npool/source/localedata/data/sr_RS.xml	31 Mar 2008 17:33:19 -0000
@@ -350,35 +364,35 @@
     </ReservedWords>
   </LC_MISC>
   <LC_NumberingLevel>
-    <NumberingLevel NumType="4" Prefix=" " Suffix=")"/>
     <NumberingLevel NumType="4" Prefix=" " Suffix="."/>
-    <NumberingLevel NumType="4" Prefix="(" Suffix="."/>
-    <NumberingLevel NumType="2" Prefix=" " Suffix="."/>
+    <NumberingLevel NumType="4" Prefix=" " Suffix=")"/>
+    <NumberingLevel NumType="2" Prefix=" " Suffix=""/>
+    <NumberingLevel NumType="3" Prefix=" " Suffix=""/>
+    <NumberingLevel NumType="47" Prefix=" " Suffix=")"/>
+    <NumberingLevel NumType="48" Prefix=" " Suffix=")"/>
     <NumberingLevel NumType="0" Prefix=" " Suffix=")"/>
     <NumberingLevel NumType="1" Prefix=" " Suffix=")"/>
-    <NumberingLevel NumType="1" Prefix="(" Suffix=")"/>
-    <NumberingLevel NumType="3" Prefix=" " Suffix="."/>
   </LC_NumberingLevel>
   <LC_OutLineNumberingLevel>
     <OutlineStyle>
       <OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0"/>
       <OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="1" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0"/>
-      <OutLineNumberingLevel Prefix=" " NumType="1" Suffix=")" BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0"/>
+      <OutLineNumberingLevel Prefix=" " NumType="48" Suffix=")" BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0"/>
       <OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0"/>
       <OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0"/>
     </OutlineStyle>
     <OutlineStyle>
       <OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0"/>
-      <OutLineNumberingLevel Prefix=" " NumType="1" Suffix=")" BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0"/>
+      <OutLineNumberingLevel Prefix=" " NumType="48" Suffix=")" BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0"/>
       <OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0"/>
       <OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0"/>
       <OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0"/>
     </OutlineStyle>
     <OutlineStyle>
       <OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0"/>
-      <OutLineNumberingLevel Prefix="(" NumType="1" Suffix=")" BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0"/>
+      <OutLineNumberingLevel Prefix="(" NumType="48" Suffix=")" BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0"/>
       <OutLineNumberingLevel Prefix=" " NumType="3" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0"/>
-      <OutLineNumberingLevel Prefix=" " NumType="0" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0"/>
+      <OutLineNumberingLevel Prefix=" " NumType="47" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0"/>
       <OutLineNumberingLevel Prefix=" " NumType="6" Suffix="." BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0"/>
     </OutlineStyle>
     <OutlineStyle>
@@ -390,13 +404,13 @@
     </OutlineStyle>
     <OutlineStyle>
       <OutLineNumberingLevel Prefix=" " NumType="2" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0"/>
-      <OutLineNumberingLevel Prefix=" " NumType="0" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0"/>
+      <OutLineNumberingLevel Prefix=" " NumType="47" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0"/>
       <OutLineNumberingLevel Prefix=" " NumType="3" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0"/>
-      <OutLineNumberingLevel Prefix=" " NumType="1" Suffix=")" BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0"/>
+      <OutLineNumberingLevel Prefix=" " NumType="48" Suffix=")" BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0"/>
       <OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0"/>
     </OutlineStyle>
     <OutlineStyle>
-      <OutLineNumberingLevel Prefix=" " NumType="0" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0"/>
+      <OutLineNumberingLevel Prefix=" " NumType="47" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0"/>
       <OutLineNumberingLevel Prefix=" " NumType="2" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0"/>
       <OutLineNumberingLevel Prefix=" " NumType="1" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0"/>
       <OutLineNumberingLevel Prefix=" " NumType="3" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0"/>

workspace.locdat30.patch:

--- NEW FILE workspace.locdat30.patch ---
Index: l10n/i18npool/source/localedata/data/sh_RS.xml
diff -u l10n/i18npool/source/localedata/data/sh_RS.xml:1.2 l10n/i18npool/source/localedata/data/sh_RS.xml:1.2.44.2
--- l10n/i18npool/source/localedata/data/sh_RS.xml:1.2	Tue Nov 13 06:35:55 2007
+++ l10n/i18npool/source/localedata/data/sh_RS.xml	Sun Jun 15 06:26:42 2008
@@ -34,9 +34,9 @@
     <TimePM>pop.</TimePM>
     <MeasurementSystem>metric</MeasurementSystem>
   </LC_CTYPE>
-  <LC_FORMAT ref="sr_RS" replaceFrom="[CURRENCY]" replaceTo="[$Din-881A]"/>
+  <LC_FORMAT ref="sr_RS" replaceFrom="[CURRENCY]" replaceTo="[$RSD-881A]"/>
   <LC_COLLATION>
-    <Collator default="true" unoid="alphanumeric" />
+    <Collator default="true" unoid="alphanumeric">&C<č<<<Č<ć<<<Ć&D<đ<<<Đ&Đ<dž<<<Dž<<<DŽ&L<lj<<<Lj<<<LJ&N<nj<<<Nj<<<NJ&S<š<<<Š&Z<ž<<<Ž</Collator>
     <CollationOptions>
       <TransliterationModules>IGNORE_CASE</TransliterationModules>
     </CollationOptions>
@@ -164,7 +164,7 @@
         <Era>
           <EraID>ad</EraID>
           <DefaultAbbrvName>n. e.</DefaultAbbrvName>
-          <DefaultFullName>nova era</DefaultFullName>
+          <DefaultFullName>nove ere</DefaultFullName>
         </Era>
       </Eras>
       <StartDayOfWeek>
@@ -174,18 +174,39 @@
     </Calendar>
   </LC_CALENDAR>
   <LC_CURRENCY>
-    <Currency default="false" usedInCompatibleFormatCodes="true">
+    <Currency default="true" usedInCompatibleFormatCodes="true">
+      <CurrencyID>RSD</CurrencyID>
+      <CurrencySymbol>RSD</CurrencySymbol>
+      <BankSymbol>RSD</BankSymbol>
+      <CurrencyName>Srpski dinar</CurrencyName>
+      <DecimalPlaces>2</DecimalPlaces>
+    </Currency>
+    <Currency default="false" usedInCompatibleFormatCodes="false">
+      <CurrencyID>RSD</CurrencyID>
+      <CurrencySymbol>din.</CurrencySymbol>
+      <BankSymbol>RSD</BankSymbol>
+      <CurrencyName>Srpski dinar</CurrencyName>
+      <DecimalPlaces>2</DecimalPlaces>
+    </Currency>
+    <Currency default="false" usedInCompatibleFormatCodes="false">
       <CurrencyID>CSD</CurrencyID>
-      <CurrencySymbol>Din</CurrencySymbol>
+      <CurrencySymbol>CSD</CurrencySymbol>
       <BankSymbol>CSD</BankSymbol>
-      <CurrencyName>Srpski Dinar</CurrencyName>
+      <CurrencyName>Srpski dinar</CurrencyName>
       <DecimalPlaces>2</DecimalPlaces>
     </Currency>
-    <Currency default="true" usedInCompatibleFormatCodes="false">
+    <Currency default="false" usedInCompatibleFormatCodes="false" legacyOnly="true">
       <CurrencyID>RSD</CurrencyID>
       <CurrencySymbol>Din</CurrencySymbol>
       <BankSymbol>RSD</BankSymbol>
-      <CurrencyName>Srpski Dinar</CurrencyName>
+      <CurrencyName>Srpski dinar</CurrencyName>
+      <DecimalPlaces>2</DecimalPlaces>
+    </Currency>
+    <Currency default="false" usedInCompatibleFormatCodes="false" legacyOnly="true">
+      <CurrencyID>CSD</CurrencyID>
+      <CurrencySymbol>Din</CurrencySymbol>
+      <BankSymbol>CSD</BankSymbol>
+      <CurrencyName>Srpski dinar</CurrencyName>
       <DecimalPlaces>2</DecimalPlaces>
     </Currency>
   </LC_CURRENCY>
Index: l10n/i18npool/source/localedata/data/sr_RS.xml
diff -u l10n/i18npool/source/localedata/data/sr_RS.xml:1.2 l10n/i18npool/source/localedata/data/sr_RS.xml:1.2.44.1
--- l10n/i18npool/source/localedata/data/sr_RS.xml:1.2	Tue Nov 13 06:37:09 2007
+++ l10n/i18npool/source/localedata/data/sr_RS.xml	Sun Jun 15 06:26:43 2008
@@ -34,7 +34,7 @@
     <TimePM>поп.</TimePM>
     <MeasurementSystem>metric</MeasurementSystem>
   </LC_CTYPE>
-  <LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$ДИН-8C1A]">
+  <LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$РСД-8C1A]">
     <FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER" formatindex="0">
       <FormatCode>Standard</FormatCode>
     </FormatElement>
@@ -303,7 +303,7 @@
         <Era>
           <EraID>ad</EraID>
           <DefaultAbbrvName>н. е.</DefaultAbbrvName>
-          <DefaultFullName>нова ера</DefaultFullName>
+          <DefaultFullName>нове ере</DefaultFullName>
         </Era>
       </Eras>
       <StartDayOfWeek>
@@ -313,18 +313,39 @@
     </Calendar>
   </LC_CALENDAR>
   <LC_CURRENCY>
-    <Currency default="false" usedInCompatibleFormatCodes="true">
+    <Currency default="true" usedInCompatibleFormatCodes="true">
+      <CurrencyID>RSD</CurrencyID>
+      <CurrencySymbol>РСД</CurrencySymbol>
+      <BankSymbol>RSD</BankSymbol>
+      <CurrencyName>Српски динар</CurrencyName>
+      <DecimalPlaces>2</DecimalPlaces>
+    </Currency>
+    <Currency default="false" usedInCompatibleFormatCodes="false">
+      <CurrencyID>RSD</CurrencyID>
+      <CurrencySymbol>дин.</CurrencySymbol>
+      <BankSymbol>RSD</BankSymbol>
+      <CurrencyName>Српски динар</CurrencyName>
+      <DecimalPlaces>2</DecimalPlaces>
+    </Currency>
+    <Currency default="false" usedInCompatibleFormatCodes="false">
       <CurrencyID>CSD</CurrencyID>
-      <CurrencySymbol>ДИН</CurrencySymbol>
+      <CurrencySymbol>ЦСД</CurrencySymbol>
       <BankSymbol>CSD</BankSymbol>
-      <CurrencyName>Српски Динар</CurrencyName>
+      <CurrencyName>Српски динар</CurrencyName>
       <DecimalPlaces>2</DecimalPlaces>
     </Currency>
-    <Currency default="true" usedInCompatibleFormatCodes="false">
+    <Currency default="false" usedInCompatibleFormatCodes="false" legacyOnly="true">
       <CurrencyID>RSD</CurrencyID>
       <CurrencySymbol>ДИН</CurrencySymbol>
       <BankSymbol>RSD</BankSymbol>
-      <CurrencyName>Српски Динар</CurrencyName>
+      <CurrencyName>Српски динар</CurrencyName>
+      <DecimalPlaces>2</DecimalPlaces>
+    </Currency>
+    <Currency default="false" usedInCompatibleFormatCodes="false" legacyOnly="true">
+      <CurrencyID>CSD</CurrencyID>
+      <CurrencySymbol>ДИН</CurrencySymbol>
+      <BankSymbol>CSD</BankSymbol>
+      <CurrencyName>Српски динар</CurrencyName>
       <DecimalPlaces>2</DecimalPlaces>
     </Currency>
   </LC_CURRENCY>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-9/.cvsignore,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- .cvsignore	30 May 2008 14:20:03 -0000	1.154
+++ .cvsignore	7 Jul 2008 13:20:29 -0000	1.155
@@ -5,3 +5,5 @@
 unowinreg.dll
 bengali.sdf
 OOH680_m17.tar.bz2
+serbian_sr.sdf
+serbian_sh.sdf


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-9/openoffice.org.spec,v
retrieving revision 1.1498
retrieving revision 1.1499
diff -u -r1.1498 -r1.1499
--- openoffice.org.spec	15 Jun 2008 20:23:37 -0000	1.1498
+++ openoffice.org.spec	7 Jul 2008 13:20:29 -0000	1.1499
@@ -1,6 +1,6 @@
 %define oootag OOH680
 %define ooomilestone 17
-%define rh_rpm_release 4
+%define rh_rpm_release 5
 
 # undef to get english only and no-langpacks for a faster smoketest build
 %define langpacks 1
@@ -31,7 +31,7 @@
 %endif
 
 %if %{langpacks}
-%define langpack_langs af ar bg bn ca cs cy da de dz el en-US es et eu fi fr ga gl gu-IN pa-IN he hi-IN hu hr it ja ko lt ms nb nl nn nr pl pt pt-BR ru sk sl sr ss st sv ta-IN th tr ve xh zh-CN zh-TW zu ns tn ts as-IN mr-IN ml-IN or-IN te-IN ur-IN kn
+%define langpack_langs af ar bg bn ca cs cy da de dz el en-US es et eu fi fr ga gl gu-IN pa-IN he hi-IN hu hr it ja ko lt ms nb nl nn nr pl pt pt-BR ru sh sk sl sr ss st sv ta-IN th tr ve xh zh-CN zh-TW zu ns tn ts as-IN mr-IN ml-IN or-IN te-IN ur-IN kn
 %else
 %define langpack_langs en-US
 %endif
@@ -56,6 +56,8 @@
 Source4:	http://people.redhat.com/caolanm/templates/redhat-templates.tar.gz
 Source5:        http://www.openoffice.org/nonav/issues/showattachment.cgi/50963/bengali.sdf
 Source6:        http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll
+Source7:        serbian_sr.sdf
+Source8:        serbian_sh.sdf
 BuildRequires:	zip, findutils, autoconf, flex, bison, ant, icu, gcc-c++, gdb
 BuildRequires:	binutils, %{java_devel}, boost-devel, zlib-devel, vigra-devel
 BuildRequires:	python-devel, expat-devel, libxml2-devel, libxslt-devel, bc
@@ -161,6 +163,8 @@
 Patch88: openoffice.org-3.0.0.ooo90306.sw.wrongprotection.patch
 Patch89: openoffice.org-3.0.0.ooo48400.svx.fixspelling.patch
 Patch90: openoffice.org-3.0.0.ooo90697.sd.a11ycrash.patch
+Patch91: workspace.locdat30.patch
+Patch92: openoffice.org-3.0.0.ooo86142.serbiannumbering.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1136,6 +1140,8 @@
 %patch88 -p1 -b .ooo90306.sw.wrongprotection.patch
 %patch89 -p1 -b .ooo48400.svx.fixspelling.patch
 %patch90 -p1 -b .ooo90697.sd.a11ycrash.patch
+%patch91 -p1 -b .workspace.locdat30.patch
+%patch92 -p1 -b .ooo86142.serbiannumbering.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -1201,6 +1207,8 @@
 fi
 deliver -link
 localize -m -x -l bn -f %{SOURCE5}
+localize -m -x -l sr -f %{SOURCE7}
+localize -m -x -l sh -f %{SOURCE8}
 cd ../..
 
 #build OOo, on failure make a stab at debugging the crash if any, and
@@ -1464,7 +1472,7 @@
 xh	help	noacor		western		ve	nohelp	noacor		western \
 st	help	noacor		western		ss	nohelp	noacor		western \
 nr	help	noacor		western		ns	help	noacor		western	\
-dz      help    noacor  	ctl
+dz      help    noacor  	ctl		sh	nohelp	noacor		western \
 )
 
 i=0
@@ -1492,6 +1500,9 @@
    i=$[i+1]
 done
 
+#rhbz#452379 clump serbian translations together
+cat sh.filelist >> sr.filelist
+
 #add in some templates
 tar xzf %{SOURCE2} -C $RPM_BUILD_ROOT/%{instdir}/share
 tar xzf %{SOURCE3} -C $RPM_BUILD_ROOT/%{instdir}/share
@@ -2924,6 +2935,12 @@
 
 
 %changelog
+* Mon Jul 07 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.1-17.5-UNRELEASED
+- Resolves: rhbz#452376 backport workspace.locdat30.patch for Serbian
+- Resolves: rhbz#452376 update Serbian translations
+- Resolves: rhbz#452379 extend Serbian translations
+- Resolves: rhbz#452374 add openoffice.org-3.0.0.ooo86142.serbiannumbering.patch
+
 * Fri Jun 13 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.1-17.4
 - Resolves: rhbz#451485 fix vertical glyphs
 - Resolves: rhbz#450661 openoffice.org-3.0.0.ooo90306.sw.wrongprotection.patch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-9/sources,v
retrieving revision 1.279
retrieving revision 1.280
diff -u -r1.279 -r1.280
--- sources	1 Jun 2008 10:44:36 -0000	1.279
+++ sources	7 Jul 2008 13:20:29 -0000	1.280
@@ -5,3 +5,5 @@
 f0cda31fe18bf9289629a321663031b8  redhat-templates.tar.gz
 0c0e868b34329d90a7c9a92f1704775c  bengali.sdf
 e43083af0b559ea47a88889c4e620800  OOH680_m17.tar.bz2
+0edb73ddd2b97670bee7e6bcc0a326fe  serbian_sr.sdf
+9df1425588986b36072bfbc40651f83d  serbian_sh.sdf

workspace.cairotext01.patch:

Index: workspace.cairotext01.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-9/workspace.cairotext01.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- workspace.cairotext01.patch	3 Jun 2008 15:52:16 -0000	1.7
+++ workspace.cairotext01.patch	7 Jul 2008 13:20:29 -0000	1.8
@@ -379,7 +379,7 @@
 +    Display* pDisplay = GetXDisplay();
 +
 +    cairo_surface_t *surface = rCairo.xlib_surface_create_with_xrender_format (pDisplay,
-+        hDrawable_, DefaultScreenOfDisplay(pDisplay), pVisualFormat, SAL_MAX_INT16, SAL_MAX_INT16);
++        hDrawable_, ScreenOfDisplay(pDisplay, m_nScreen), pVisualFormat, SAL_MAX_INT16, SAL_MAX_INT16);
 +
 +    /*
 +     * It might be ideal to cache surface and cairo context between calls and

More information about the fedora-extras-commits mailing list