[libreoffice/f16] suck in more old rhel-6 obsoletes
Caolán McNamara
caolanm at fedoraproject.org
Mon Jan 16 14:02:22 UTC 2012
commit 7cef416cb50b0d8ec9bad5090df1b666cbb09798
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 16 14:02:17 2012 +0000
suck in more old rhel-6 obsoletes
libreoffice.spec | 141 +++++++++++++++++++++++++++++++++---------------------
1 files changed, 87 insertions(+), 54 deletions(-)
---
diff --git a/libreoffice.spec b/libreoffice.spec
index a672f21..e9bf6fc 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -110,6 +110,9 @@ Requires: %{name}-draw = %{epoch}:%{version}-%{release}
Requires: %{name}-math = %{epoch}:%{version}-%{release}
Requires: %{name}-base = %{epoch}:%{version}-%{release}
Requires: %{name}-emailmerge = %{epoch}:%{version}-%{release}
+%if %{defined rhel} && 0%{?rhel} < 7
+Obsoletes: openoffice.org < 1.9.0
+%endif
Patch1: openoffice.org-2.0.2.rh188467.printingdefaults.patch
Patch2: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
@@ -195,6 +198,11 @@ Obsoletes: openoffice.org-brand < 1:3.3.1, broffice.org-brand < 1:3.3.1
%if %{defined rhel} && 0%{?rhel} < 7
Provides: openoffice.org-core = 1:3.3.0
Provides: openoffice.org-brand = 1:3.3.0, broffice.org-brand = 1:3.3.0
+Obsoletes: openoffice.org-libs < 1.9.0
+Obsoletes: openoffice.org-i18n < 1.9.0
+Obsoletes: openoffice.org-kde < 1.9.0
+Obsoletes: openoffice.org-langpack-eo < 1:2.0.0
+Obsoletes: openoffice.org2-core < 1:3.0.0
%else
Obsoletes: openoffice.org-langpack-ms < 1:3.3.1, libreoffice-langpack-ms < 1:3.3.99.1
Obsoletes: openoffice.org-langpack-ur < 1:3.3.1, libreoffice-langpack-ur < 1:3.3.99.1
@@ -216,6 +224,7 @@ Requires(postun): %{name}-core
Obsoletes: openoffice.org-pyuno < 1:3.3.1
%if %{defined rhel} && 0%{?rhel} < 7
Provides: openoffice.org-pyuno = 1:3.3.0
+Obsoletes: openoffice.org2-pyuno < 1:3.0.0
%endif
%description pyuno
@@ -235,6 +244,7 @@ Obsoletes: openoffice.org-base < 1:3.3.1, broffice.org-base < 1:3.3.1
%if %{defined rhel} && 0%{?rhel} < 7
Provides: openoffice.org-base-core = 1:3.3.0
Provides: openoffice.org-base = 1:3.3.0, broffice.org-base = 1:3.3.0
+Obsoletes: openoffice.org2-base < 1:3.0.0
%endif
%description base
@@ -406,6 +416,7 @@ Obsoletes: openoffice.org-writer < 1:3.3.1, broffice.org-writer < 1:3.3.1
%if %{defined rhel} && 0%{?rhel} < 7
Provides: openoffice.org-writer-core = 1:3.3.0
Provides: openoffice.org-writer = 1:3.3.0, broffice.org-writer = 1:3.3.0
+Obsoletes: openoffice.org2-writer < 1:3.0.0
%endif
%description writer
@@ -419,6 +430,7 @@ Requires: %{name}-pyuno = %{epoch}:%{version}-%{release}
Obsoletes: openoffice.org-emailmerge < 1:3.3.1
%if %{defined rhel} && 0%{?rhel} < 7
Provides: openoffice.org-emailmerge = 1:3.3.0
+Obsoletes: openoffice.org2-emailmerge < 1:3.0.0
%endif
%description emailmerge
@@ -451,6 +463,7 @@ Obsoletes: openoffice.org-draw < 1:3.3.1, broffice.org-draw < 1:3.3.1
%if %{defined rhel} && 0%{?rhel} < 7
Provides: openoffice.org-draw-core = 1:3.3.0
Provides: openoffice.org-draw = 1:3.3.0, broffice.org-draw = 1:3.3.0
+Obsoletes: openoffice.org2-draw < 1:3.0.0
%endif
%description draw
@@ -467,6 +480,7 @@ Obsoletes: openoffice.org-impress < 1:3.3.1, broffice.org-impress < 1:3.3.1
%if %{defined rhel} && 0%{?rhel} < 7
Provides: openoffice.org-impress-core = 1:3.3.0
Provides: openoffice.org-impress = 1:3.3.0, broffice.org-impress = 1:3.3.0
+Obsoletes: openoffice.org2-impress < 1:3.0.0
%endif
%description impress
@@ -482,6 +496,7 @@ Obsoletes: openoffice.org-math < 1:3.3.1, broffice.org-math < 1:3.3.1
%if %{defined rhel} && 0%{?rhel} < 7
Provides: openoffice.org-math-core = 1:3.3.0
Provides: openoffice.org-math = 1:3.3.0, broffice.org-math = 1:3.3.0
+Obsoletes: openoffice.org2-math < 1:3.0.0
%endif
%description math
@@ -495,6 +510,7 @@ Requires: %{name}-core = %{epoch}:%{version}-%{release}
Obsoletes: openoffice.org-graphicfilter < 1:3.3.1
%if %{defined rhel} && 0%{?rhel} < 7
Provides: openoffice.org-graphicfilter = 1:3.3.0
+Obsoletes: openoffice.org2-graphicfilter < 1:3.0.0
%endif
%description graphicfilter
@@ -508,6 +524,7 @@ Requires: %{name}-core = %{epoch}:%{version}-%{release}
Obsoletes: openoffice.org-xsltfilter < 1:3.3.1
%if %{defined rhel} && 0%{?rhel} < 7
Provides: openoffice.org-xsltfilter = 1:3.3.0
+Obsoletes: openoffice.org2-xsltfilter < 1:3.0.0
%endif
%description xsltfilter
@@ -521,6 +538,7 @@ Requires: %{name}-core = %{epoch}:%{version}-%{release}
Obsoletes: openoffice.org-javafilter < 1:3.3.1
%if %{defined rhel} && 0%{?rhel} < 7
Provides: openoffice.org-javafilter = 1:3.3.0
+Obsoletes: openoffice.org2-javafilter < 1:3.0.0
%endif
%description javafilter
@@ -549,6 +567,7 @@ Requires: %{name}-rhino = %{epoch}:%{version}-%{release}
Obsoletes: openoffice.org-testtools < 1:3.3.1
%if %{defined rhel} && 0%{?rhel} < 7
Provides: openoffice.org-testtools = 1:3.3.0
+Obsoletes: openoffice.org2-testtools < 1:3.0.0
%endif
%description testtools
@@ -686,6 +705,8 @@ This package provides gdb pretty printers for package %{name}.
# Mm: mythes dependency
# n: language name, e.g., Czech
# Oo: Obsoletes: of openoffice.org-langpack
+# Vv: Very archaic Obsoletes: of openoffice.org-langpack
+# Zz: Archaic Obsoletes: of openoffice.org2-langpack
# p: Provides: of libreoffice-langpack
# r: comma-separated list of additional requires
# Ss: filelist
@@ -714,18 +735,26 @@ Requires: %{name}-core = %{epoch}:%{version}-%{release} \
%{-r:Requires: %{-r*}} \
%define obs openoffice.org-langpack \
%define obsv 1:3.3.1 \
+%define aobs openoffice.org2-langpack \
+%define aobsv 1:3.0.0 \
+%define vaobs openoffice.org2-langpack \
+%define vaobsv 1:2.0.3 \
%if %{defined rhel} && 0%{?rhel} < 7 \
%{-o: \
+Obsoletes: openoffice.org-i18n < 1.9.0 \
Obsoletes: %{obs}-%{-o*} < %{obsv} \
Provides: %{obs}-%{-o*} = 1:3.3.0 \
}%{!-o: \
%{-O: \
+Obsoletes: openoffice.org-i18n < 1.9.0 \
Obsoletes: %{obs}-%{lang} < %{obsv} \
Provides: %{obs}-%{lang} = 1:3.3.0 \
}} \
%else \
%{-o:Obsoletes: %{obs}-%{-o*} < %{obsv}}%{!-o:%{-O:Obsoletes: %{obs}-%{lang} < %{obsv}}} \
%endif \
+%{-z:Obsoletes: %{aobs}-%{-z*} < %{aobsv}}%{!-z:%{-Z:Obsoletes: %{aobs}-%{lang} < %{aobsv}}} \
+%{-v:Obsoletes: %{vaobs}-%{-v*} < %{vaobsv}}%{!-v:%{-V:Obsoletes: %{vaobs}-%{lang} < %{vaobsv}}} \
%{-p:Provides: %{name}-langpack-%{-p*}} \
\
%description %{pkgname} \
@@ -769,86 +798,90 @@ Rules for auto-correcting common %{langname} typing errors. \
%if %{langpacks}
-%langpack -l af -n Afrikaans -F -H -Y -A -o af_ZA -S
-%langpack -l ar -n Arabic -F -H -O -S
-%langpack -l as -n Assamese -F -H -Y -o as_IN -S
-%langpack -l bg -n Bulgarian -F -H -Y -M -A -o bg_BG -S
-%langpack -l bn -n Bengali -F -H -Y -O -S
-%langpack -l ca -n Catalan -F -H -Y -M -o ca_ES -S
-%langpack -l cs -n Czech -F -H -Y -M -A -o cs_CZ -S
-%langpack -l cy -n Welsh -F -H -Y -o cy_GB -S
-%langpack -l da -n Danish -F -H -Y -M -A -o da_DK -S
-%langpack -l de -n German -F -H -Y -M -A -O -S
+%langpack -l af -n Afrikaans -F -H -Y -A -o af_ZA -V -z af_ZA -S
+%langpack -l ar -n Arabic -F -H -O -Z -S
+%langpack -l as -n Assamese -F -H -Y -o as_IN -z as_IN -S
+%langpack -l bg -n Bulgarian -F -H -Y -M -A -o bg_BG -V -z bg_BG -S
+%langpack -l bn -n Bengali -F -H -Y -O -v bn_IN -Z -S
+%langpack -l ca -n Catalan -F -H -Y -M -o ca_ES -V -z ca_ES -S
+%langpack -l cs -n Czech -F -H -Y -M -A -o cs_CZ -V -z cs_CZ -S
+%langpack -l cy -n Welsh -F -H -Y -o cy_GB -V -z cy_GB -S
+%langpack -l da -n Danish -F -H -Y -M -A -o da_DK -V -z da_DK -S
+%langpack -l de -n German -F -H -Y -M -A -O -Z -S
%langpack -l dz -n Dzongkha -F -O -S
-%langpack -l el -n Greek -F -H -Y -M -o el_GR -S
+%langpack -l el -n Greek -F -H -Y -M -o el_GR -V -z el_GR -S
%langpack -l en -n English -M -O
-%langpack -l es -n Spanish -F -H -Y -M -A -O -S
-%langpack -l et -n Estonian -F -H -Y -o et_EE -S
-%langpack -l eu -n Basque -F -H -Y -A -o eu_ES -S
+%langpack -l es -n Spanish -F -H -Y -M -A -O -Z -S
+%langpack -l et -n Estonian -F -H -Y -o et_EE -V -z et_EE -S
+%langpack -l eu -n Basque -F -H -Y -A -o eu_ES -V -z eu_ES -S
%langpack -l fa -n Farsi -A -H -Y -S
+%if %{defined rhel} && 0%{?rhel} < 7 \
+%langpack -l fi -n Finnish -F -A -o fi_FI -V -z fi_FI -S
+%else
%langpack -l fi -n Finnish -F -r openoffice.org-voikko -A -o fi_FI -S
-%langpack -l fr -n French -F -H -Y -M -A -O -S
-%langpack -l ga -n Irish -F -H -Y -M -A -o ga_IE -S
-%langpack -l gl -n Galician -F -H -Y -o gl_ES -S
-%langpack -l gu -n Gujarati -F -H -Y -o gu_IN -S
-%langpack -l he -n Hebrew -F -H -o he_IL -S
-%langpack -l hi -n Hindi -F -H -Y -o hi_IN -S
-%langpack -l hr -n Croatian -F -H -Y -A -o hr_HR -S
-%langpack -l hu -n Hungarian -F -H -Y -M -A -o hu_HU -S
-%langpack -l it -n Italian -F -H -Y -M -A -O -S
-%langpack -l ja -n Japanese -F -A -o ja_JP -S
-%langpack -l kn -n Kannada -F -H -Y -o kn_IN -S
-%langpack -l ko -n Korean -F -H -A -o ko_KR -S
+%endif
+%langpack -l fr -n French -F -H -Y -M -A -O -Z -S
+%langpack -l ga -n Irish -F -H -Y -M -A -o ga_IE -z ga_IE -S
+%langpack -l gl -n Galician -F -H -Y -o gl_ES -V -z gl_ES -S
+%langpack -l gu -n Gujarati -F -H -Y -o gu_IN -z gu_IN -S
+%langpack -l he -n Hebrew -F -H -o he_IL -V -z he_IL -S
+%langpack -l hi -n Hindi -F -H -Y -o hi_IN -v hi_IN -z hi_IN -S
+%langpack -l hr -n Croatian -F -H -Y -A -o hr_HR -V -z hr_HR -S
+%langpack -l hu -n Hungarian -F -H -Y -M -A -o hu_HU -V -z hu_IN -S
+%langpack -l it -n Italian -F -H -Y -M -A -O -Z -S
+%langpack -l ja -n Japanese -F -A -o ja_JP -V -z ja_JP -S
+%langpack -l kn -n Kannada -F -H -Y -o kn_IN -z ka_IN -S
+%langpack -l ko -n Korean -F -H -A -o ko_KR -V -z ko_KR -S
%{baseinstdir}/share/registry/korea.xcd
-%langpack -l lt -n Lithuanian -F -H -Y -A -o lt_LT -S
+%langpack -l lt -n Lithuanian -F -H -Y -A -o lt_LT -V -z lt_LT -S
%langpack -l lv -n Latvian -F -H -Y -M -S
%langpack -l mai -n Maithili -F -o mai_IN -S
-%langpack -l ml -n Malayalam -F -H -Y -o ml_IN -S
-%langpack -l mr -n Marathi -F -H -Y -o mr_IN -S
+%langpack -l ml -n Malayalam -F -H -Y -o ml_IN -z ml_IN -S
+%langpack -l mr -n Marathi -F -H -Y -o mr_IN -z mr_IN -S
%if %{defined rhel} && 0%{?rhel} < 7
-%langpack -l ms -n Malay -F -H -o ms_MY -S
+%langpack -l ms -n Malay -F -H -o ms_MY -V -z ms_MY -S
%endif
-%langpack -l nb -n Bokmal -F -H -Y -M -o nb_NO -S
-%langpack -l nl -n Dutch -F -H -Y -M -A -O -S
-%langpack -l nn -n Nynorsk -F -H -Y -M -o nn_NO -S
+%langpack -l nb -n Bokmal -F -H -Y -M -o nb_NO -V -z nb_NO -S
+%langpack -l nl -n Dutch -F -H -Y -M -A -O -Z -S
+%langpack -l nn -n Nynorsk -F -H -Y -M -o nn_NO -V -z nn_NO -S
%define langpack_lang Southern Ndebele
%langpack -l nr -n %{langpack_lang} -F -H -o nr_ZA -S
%define langpack_lang Northern Sotho
-%langpack -l nso -n %{langpack_lang} -F -H -o nso_ZA -S
-%langpack -l or -n Oriya -F -H -Y -o or_IN -S
-%langpack -l pa -n Punjabi -F -H -Y -O -s pa-IN
-%langpack -l pl -n Polish -F -H -Y -M -A -o pl_PL -S
+%langpack -l nso -n %{langpack_lang} -F -H -o nso_ZA -z nso_ZA -S
+%langpack -l or -n Oriya -F -H -Y -o or_IN -z or_IN -S
+%langpack -l pa -n Punjabi -F -H -Y -O -v pa_IN -z pa_IN -s pa-IN
+%langpack -l pl -n Polish -F -H -Y -M -A -o pl_PL -V -z pl_PL -S
%define langpack_lang Brazilian Portuguese
-%langpack -l pt-BR -n %{langpack_lang} -f pt -h pt -y pt -m pt -a pt -o pt_BR -p pt_BR -S
-%langpack -l pt-PT -n Portuguese -f pt -h pt -y pt -m pt -a pt -o pt_PT -p pt_PT -s pt
+%langpack -l pt-BR -n %{langpack_lang} -f pt -h pt -y pt -m pt -a pt -o pt_BR -p pt_BR -V -Z -S
+%langpack -l pt-PT -n Portuguese -f pt -h pt -y pt -m pt -a pt -o pt_PT -p pt_PT -v pt -Z -s pt
%langpack -l ro -n Romanian -F -H -Y -M -O -S
-%langpack -l ru -n Russian -F -H -Y -M -A -O -S
+%langpack -l ru -n Russian -F -H -Y -M -A -O -Z -S
%langpack -l si -n Sinhalese -F -H -O -S
-%langpack -l sk -n Slovak -F -H -Y -M -A -o sk_SK -S
-%langpack -l sl -n Slovenian -F -H -Y -M -A -o sl_SI -S
-%langpack -l sr -n Serbian -F -H -Y -A -O -S
+%langpack -l sk -n Slovak -F -H -Y -M -A -o sk_SK -V -z sk_SK -S
+%langpack -l sl -n Slovenian -F -H -Y -M -A -o sl_SI -V -z sl_SI -S
+%langpack -l sr -n Serbian -F -H -Y -A -O -z sr_CR -S
%langpack -l ss -n Swati -F -H -o ss_ZA -S
%define langpack_lang Southern Sotho
%langpack -l st -n %{langpack_lang} -F -H -o st_ZA -S
-%langpack -l sv -n Swedish -F -H -Y -M -A -O -S
-%langpack -l ta -n Tamil -F -H -Y -o ta_IN -S
-%langpack -l te -n Telugu -F -H -Y -o te_IN -S
-%langpack -l th -n Thai -F -H -o th_TH -S
-%langpack -l tn -n Tswana -F -H -o tn_ZA -S
-%langpack -l tr -n Turkish -F -A -o tr_TR -S
-%langpack -l ts -n Tsonga -F -H -o ts_ZA -S
+%langpack -l sv -n Swedish -F -H -Y -M -A -O -Z -S
+%langpack -l ta -n Tamil -F -H -Y -o ta_IN -z ta_IN -S
+%langpack -l te -n Telugu -F -H -Y -o te_IN -z te_IN -S
+%langpack -l th -n Thai -F -H -o th_TH -V -z th_TH -S
+%langpack -l tn -n Tswana -F -H -o tn_ZA -V -z tn_ZA -S
+%langpack -l tr -n Turkish -F -A -o tr_TR -V -z tr_TR -S
+%langpack -l ts -n Tsonga -F -H -o ts_ZA -V -z ts_ZA -S
%langpack -l uk -n Ukrainian -F -H -Y -M -O -S
%if %{defined rhel} && 0%{?rhel} < 7
-%langpack -l ur -n Urdu -F -H -O -S
+%langpack -l ur -n Urdu -F -H -O -Z -S
%endif
%langpack -l ve -n Venda -F -H -o ve_ZA -S
%langpack -l xh -n Xhosa -F -H -o xh_ZA -S
%define langpack_lang Simplified Chinese
-%langpack -l zh-Hans -n %{langpack_lang} -f zh-cn -a zh -o zh_CN -p zh_CN -s zh-CN
+%langpack -l zh-Hans -n %{langpack_lang} -f zh-cn -a zh -o zh_CN -p zh_CN -V zh_CN -z zh_CN -s zh-CN
%define langpack_lang Traditional Chinese
-%langpack -l zh-Hant -n %{langpack_lang} -f zh-tw -a zh -o zh_TW -p zh_TW -s zh-TW
-%langpack -l zu -n Zulu -F -H -Y -o zu_ZA -S
+%langpack -l zh-Hant -n %{langpack_lang} -f zh-tw -a zh -o zh_TW -p zh_TW -V zh_TW -z zh_TW -s zh-TW
+%langpack -l zu -n Zulu -F -H -Y -o zu_ZA -V -z zu_ZA -S
%undefine langpack_lang
%endif
More information about the scm-commits
mailing list