rpms/openoffice.org/devel openoffice.org.spec,1.662,1.663

[fedora-cvs-commits at redhat.com]

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6628

Modified Files:
	openoffice.org.spec 
Log Message:
rh#161530# try out the new soth african locales


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.662
retrieving revision 1.663
diff -u -r1.662 -r1.663
--- openoffice.org.spec	12 Apr 2006 09:57:54 -0000	1.662
+++ openoffice.org.spec	12 Apr 2006 14:17:35 -0000	1.663
@@ -20,6 +20,7 @@
 %define internaljavabits 1
 %define gnomeprintui 0
 %define obsoleteold 0
+%define new_sa_locales 0
 %endif
 %if %{build_fc6}
 %define forcegcc4 0
@@ -31,6 +32,7 @@
 %define internaljavabits 0
 %define gnomeprintui 1
 %define obsoleteold 1
+%define new_sa_locales 1
 %endif
 
 %if %{forcegcc4}
@@ -96,7 +98,12 @@
 %endif
 
 %if %{langpacks}
-%define langpack_langs af ar bg bn ca cs cy da de 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 pl pt pt-BR ru sk sl sr-CS sv ta-IN th tr zh-CN zh-TW zu
+%define langpack_common af ar bg bn ca cs cy da de 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 pl pt pt-BR ru sk sl sr-CS sv ta-IN th tr zh-CN zh-TW zu
+%if %{new_sa_locales}
+%define langpack_langs %{langpack_common} ns tn ts
+%else
+%define langpack_langs %{langpack_common}
+%endif
 %else
 %define langpack_langs en-US
 %endif
@@ -256,9 +263,11 @@
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org-kde
 Obsoletes: openoffice.org-langpack-eo
+Obsoletes: openoffice.org-langpack-kn_IN
+%if ! %{new_sa_locales}
 Obsoletes: openoffice.org-langpack-tn
 Obsoletes: openoffice.org-langpack-ts
-Obsoletes: openoffice.org-langpack-kn_IN
+%endif
 Obsoletes: openoffice.org2-core
 %endif
 
@@ -969,6 +978,44 @@
 %description langpack-th_TH
 Provides additional thai translations for %{name}
 
+%if %{new_sa_locales}
+%package langpack-nso_ZA
+Summary: Northern Sotho language pack for %{name}
+Group: Applications/Productivity
+Requires: %{name}-core = %{epoch}:%{version}-%{release}
+%if %{obsoleteold}
+Obsoletes: openoffice.org2-langpack-nso_ZA
+%endif
+
+%description langpack-nso_ZA
+Provides additional Northern Sotho translations for %{name}
+
+%package langpack-tn_ZA
+Summary: Tswana language pack for %{name}
+Group: Applications/Productivity
+Requires: %{name}-core = %{epoch}:%{version}-%{release}
+%if %{obsoleteold}
+Obsoletes: openoffice.org2-langpack-tn_ZA
+Obsoletes: openoffice.org-langpack-tn
+%endif
+
+%description langpack-tn_ZA
+Provides additional tswana translations for %{name}
+
+%package langpack-ts_ZA
+Summary: Tsonga language pack for %{name}
+Group: Applications/Productivity
+Requires: %{name}-core = %{epoch}:%{version}-%{release}
+%if %{obsoleteold}
+Obsoletes: openoffice.org2-langpack-ts_ZA
+Obsoletes: openoffice.org-langpack-ts
+%endif
+
+%description langpack-ts_ZA
+Provides additional tsonga translations for %{name}
+
+%endif
+
 %package langpack-tr_TR
 Summary: Turkish language pack for %{name}
 Group: Applications/Productivity
@@ -2448,6 +2495,68 @@
 %dir %{instdir}/share/registry/modules/org/openoffice/Setup
 %{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-zu.xcu
 
+%if %{new_sa_locales}
+%files langpack-tn_ZA
+%defattr(-,root,root)
+%dir %{instdir}
+%dir %{instdir}/help
+%{instdir}/help/tn
+%{instdir}/program/resource/*680tn.res
+%dir %{instdir}/share
+%{instdir}/share/readme/LICENSE_tn*
+%{instdir}/share/readme/README_tn*
+%dir %{instdir}/share/registry
+%dir %{instdir}/share/registry/res
+%{instdir}/share/registry/res/tn
+%dir %{instdir}/share/template
+%{instdir}/share/template/tn
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-tn.xcu
+
+%files langpack-ts_ZA
+%defattr(-,root,root)
+%dir %{instdir}
+%dir %{instdir}/help
+%{instdir}/help/ts
+%{instdir}/program/resource/*680ts.res
+%dir %{instdir}/share
+%{instdir}/share/readme/LICENSE_ts*
+%{instdir}/share/readme/README_ts*
+%dir %{instdir}/share/registry
+%dir %{instdir}/share/registry/res
+%{instdir}/share/registry/res/ts
+%dir %{instdir}/share/template
+%{instdir}/share/template/ts
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-ts.xcu
+
+%files langpack-nso_ZA
+%defattr(-,root,root)
+%dir %{instdir}
+%dir %{instdir}/help
+%{instdir}/help/ns
+%{instdir}/program/resource/*680ns.res
+%dir %{instdir}/share
+%{instdir}/share/readme/LICENSE_ns*
+%{instdir}/share/readme/README_ns*
+%dir %{instdir}/share/registry
+%dir %{instdir}/share/registry/res
+%{instdir}/share/registry/res/ns
+%dir %{instdir}/share/template
+%{instdir}/share/template/ns
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-ns.xcu
+%endif
+
 %endif
 
 %files core
@@ -3575,6 +3684,7 @@
 - rh#187939# not detecting changes to CUPS printers during execution
 - rh#188467# set printer font-handling defaults
 - ooo#59997# opensymbol font metrics changed
+- rh#161530# new South African locales exist in glibc now
 
 * Mon Apr 10 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-5.8
 - rh#188053# more a11y fixes