diff options
| author | François Andriot <albator78@libertysurf.fr> | 2021-05-13 20:36:43 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2021-05-13 22:40:29 +0200 |
| commit | ec1c5eaa0e86bf9f34c15e86675834683fbcbbfb (patch) | |
| tree | be508994d0f2dc1c9c4a8165249f65f51ae84f50 | |
| parent | 53213b648bf2965b5a0b272163acd5f3c7703b09 (diff) | |
| download | tde-packaging-ec1c5eaa0e86bf9f34c15e86675834683fbcbbfb.tar.gz tde-packaging-ec1c5eaa0e86bf9f34c15e86675834683fbcbbfb.zip | |
RPM: update all 'Obsoletes' and 'Provides' statement to avoid build warnings
Signed-off-by: François Andriot <albator78@libertysurf.fr>
45 files changed, 1219 insertions, 1219 deletions
diff --git a/redhat/applications/filelight/filelight.spec b/redhat/applications/filelight/filelight.spec index 17278340f..da445b80a 100644 --- a/redhat/applications/filelight/filelight.spec +++ b/redhat/applications/filelight/filelight.spec @@ -94,8 +94,8 @@ BuildRequires: update-desktop-files BuildRequires: brp-check-trinity %endif -Obsoletes: filelight-l10n < %{version}-%{release} -Provides: filelight-l10n = %{version}-%{release} +Obsoletes: filelight-l10n < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: filelight-l10n = %{?epoch:%{epoch}:}%{version}-%{release} %description Filelight creates a complex, but data-rich graphical representation of the files and diff --git a/redhat/applications/k3b-i18n/k3b-i18n.spec b/redhat/applications/k3b-i18n/k3b-i18n.spec index 63c94619f..0d3fe2c20 100644 --- a/redhat/applications/k3b-i18n/k3b-i18n.spec +++ b/redhat/applications/k3b-i18n/k3b-i18n.spec @@ -94,8 +94,8 @@ Group: Applications/Archiving Requires: trinity-k3b Summary: Danish (da) translations for K3B [Trinity] -Obsoletes: trinity-k3b-i18n-da < %{version}-%{release} -Provides: trinity-k3b-i18n-da = %{version}-%{release} +Obsoletes: trinity-k3b-i18n-da < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-k3b-i18n-da = %{?epoch:%{epoch}:}%{version}-%{release} %description Danish This package contains the Danish translations for K3B. @@ -112,8 +112,8 @@ Group: Applications/Archiving Requires: trinity-k3b Summary: German (de) translations for K3B [Trinity] -Obsoletes: trinity-k3b-i18n-de < %{version}-%{release} -Provides: trinity-k3b-i18n-de = %{version}-%{release} +Obsoletes: trinity-k3b-i18n-de < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-k3b-i18n-de = %{?epoch:%{epoch}:}%{version}-%{release} %description German This package contains the German translations for K3B. @@ -130,8 +130,8 @@ Group: Applications/Archiving Requires: trinity-k3b >= %{version} Summary: Greek (el) translations for K3B [Trinity] -Obsoletes: trinity-k3b-i18n-el < %{version}-%{release} -Provides: trinity-k3b-i18n-el = %{version}-%{release} +Obsoletes: trinity-k3b-i18n-el < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-k3b-i18n-el = %{?epoch:%{epoch}:}%{version}-%{release} %description Greek This package contains the greek translations for K3B. @@ -148,8 +148,8 @@ Group: Applications/Archiving Requires: trinity-k3b Summary: Spanish (es) translations for K3B [Trinity] -Obsoletes: trinity-k3b-i18n-es < %{version}-%{release} -Provides: trinity-k3b-i18n-es = %{version}-%{release} +Obsoletes: trinity-k3b-i18n-es < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-k3b-i18n-es = %{?epoch:%{epoch}:}%{version}-%{release} %description Spanish This package contains the Spanish translations for K3B. @@ -166,8 +166,8 @@ Group: Applications/Archiving Requires: trinity-k3b Summary: Estonian (et) translations for K3B [Trinity] -Obsoletes: trinity-k3b-i18n-et < %{version}-%{release} -Provides: trinity-k3b-i18n-et = %{version}-%{release} +Obsoletes: trinity-k3b-i18n-et < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-k3b-i18n-et = %{?epoch:%{epoch}:}%{version}-%{release} %description Estonian This package contains the Estonian translations for K3B. @@ -184,8 +184,8 @@ Group: Applications/Archiving Requires: trinity-k3b Summary: French (fr) translations for K3B [Trinity] -Obsoletes: trinity-k3b-i18n-fr < %{version}-%{release} -Provides: trinity-k3b-i18n-fr = %{version}-%{release} +Obsoletes: trinity-k3b-i18n-fr < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-k3b-i18n-fr = %{?epoch:%{epoch}:}%{version}-%{release} %description French This package contains the French translations for K3B. @@ -202,8 +202,8 @@ Group: Applications/Archiving Requires: trinity-k3b Summary: Italian (it) translations for K3B [Trinity] -Obsoletes: trinity-k3b-i18n-it < %{version}-%{release} -Provides: trinity-k3b-i18n-it = %{version}-%{release} +Obsoletes: trinity-k3b-i18n-it < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-k3b-i18n-it = %{?epoch:%{epoch}:}%{version}-%{release} %description Italian This package contains the Italian translations for K3B. @@ -220,8 +220,8 @@ Group: Applications/Archiving Requires: trinity-k3b Summary: Dutch (nl) translations for K3B [Trinity] -Obsoletes: trinity-k3b-i18n-nl < %{version}-%{release} -Provides: trinity-k3b-i18n-nl = %{version}-%{release} +Obsoletes: trinity-k3b-i18n-nl < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-k3b-i18n-nl = %{?epoch:%{epoch}:}%{version}-%{release} %description Dutch This package contains the Dutch translations for K3B. @@ -238,8 +238,8 @@ Group: Applications/Archiving Requires: trinity-k3b Summary: Polish (pl) translations for K3B [Trinity] -Obsoletes: trinity-k3b-i18n-pl < %{version}-%{release} -Provides: trinity-k3b-i18n-pl = %{version}-%{release} +Obsoletes: trinity-k3b-i18n-pl < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-k3b-i18n-pl = %{?epoch:%{epoch}:}%{version}-%{release} %description Polish This package contains the Polish translations for K3B. @@ -256,8 +256,8 @@ Group: Applications/Archiving Requires: trinity-k3b Summary: Portuguese (pt) translations for K3B [Trinity] -Obsoletes: trinity-k3b-i18n-pt < %{version}-%{release} -Provides: trinity-k3b-i18n-pt = %{version}-%{release} +Obsoletes: trinity-k3b-i18n-pt < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-k3b-i18n-pt = %{?epoch:%{epoch}:}%{version}-%{release} %description Portuguese This package contains the Portuguese translations for K3B. @@ -274,10 +274,10 @@ Group: Applications/Archiving Requires: trinity-k3b Summary: Brazilian Portuguese (pt_BR) translations for K3B [Trinity] -Obsoletes: trinity-k3b-i18n-pt_BR < %{version}-%{release} -Provides: trinity-k3b-i18n-pt_BR = %{version}-%{release} -Obsoletes: trinity-k3b-i18n-ptbr < %{version}-%{release} -Provides: trinity-k3b-i18n-ptbr = %{version}-%{release} +Obsoletes: trinity-k3b-i18n-pt_BR < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-k3b-i18n-pt_BR = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-k3b-i18n-ptbr < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-k3b-i18n-ptbr = %{?epoch:%{epoch}:}%{version}-%{release} %description Brazil This package contains the Brazilian Portuguese translations for K3B. @@ -294,8 +294,8 @@ Group: Applications/Archiving Requires: trinity-k3b Summary: Russian (ru) translations for K3B [Trinity] -Obsoletes: trinity-k3b-i18n-ru < %{version}-%{release} -Provides: trinity-k3b-i18n-ru = %{version}-%{release} +Obsoletes: trinity-k3b-i18n-ru < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-k3b-i18n-ru = %{?epoch:%{epoch}:}%{version}-%{release} %description Russian This package contains the Russian translations for K3B. @@ -312,8 +312,8 @@ Group: Applications/Archiving Requires: trinity-k3b Summary: Swedish (sv) translations for K3B [Trinity] -Obsoletes: trinity-k3b-i18n-sv < %{version}-%{release} -Provides: trinity-k3b-i18n-sv = %{version}-%{release} +Obsoletes: trinity-k3b-i18n-sv < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-k3b-i18n-sv = %{?epoch:%{epoch}:}%{version}-%{release} %description Swedish This package contains the Swedish translations for K3B. @@ -330,8 +330,8 @@ Group: Applications/Archiving Requires: trinity-k3b Summary: Ukrainian (uk) translations for K3B [Trinity] -Obsoletes: trinity-k3b-i18n-uk < %{version}-%{release} -Provides: trinity-k3b-i18n-uk = %{version}-%{release} +Obsoletes: trinity-k3b-i18n-uk < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-k3b-i18n-uk = %{?epoch:%{epoch}:}%{version}-%{release} %description Ukrainian This package contains the Ukrainian translations for K3B. diff --git a/redhat/applications/kile/kile.spec b/redhat/applications/kile/kile.spec index 75d27dd5c..31b8d0947 100644 --- a/redhat/applications/kile/kile.spec +++ b/redhat/applications/kile/kile.spec @@ -76,51 +76,51 @@ BuildRequires: update-desktop-files BuildRequires: brp-check-trinity %endif -Obsoletes: %{name}-i18n-ar -Obsoletes: %{name}-i18n-bg -Obsoletes: %{name}-i18n-br -Obsoletes: %{name}-i18n-ca -Obsoletes: %{name}-i18n-cs -Obsoletes: %{name}-i18n-cy -Obsoletes: %{name}-i18n-da -Obsoletes: %{name}-i18n-de -Obsoletes: %{name}-i18n-el -Obsoletes: %{name}-i18n-engb -Obsoletes: %{name}-i18n-es -Obsoletes: %{name}-i18n-et -Obsoletes: %{name}-i18n-eu -Obsoletes: %{name}-i18n-fi -Obsoletes: %{name}-i18n-fr -Obsoletes: %{name}-i18n-ga -Obsoletes: %{name}-i18n-gl -Obsoletes: %{name}-i18n-hi -Obsoletes: %{name}-i18n-hu -Obsoletes: %{name}-i18n-is -Obsoletes: %{name}-i18n-it -Obsoletes: %{name}-i18n-ja -Obsoletes: %{name}-i18n-lt -Obsoletes: %{name}-i18n-ms -Obsoletes: %{name}-i18n-mt -Obsoletes: %{name}-i18n-nb -Obsoletes: %{name}-i18n-nds -Obsoletes: %{name}-i18n-nl -Obsoletes: %{name}-i18n-nn -Obsoletes: %{name}-i18n-pa -Obsoletes: %{name}-i18n-pl -Obsoletes: %{name}-i18n-pt -Obsoletes: %{name}-i18n-ptbr -Obsoletes: %{name}-i18n-ro -Obsoletes: %{name}-i18n-ru -Obsoletes: %{name}-i18n-rw -Obsoletes: %{name}-i18n-sk -Obsoletes: %{name}-i18n-sr -Obsoletes: %{name}-i18n-srlatin -Obsoletes: %{name}-i18n-sv -Obsoletes: %{name}-i18n-ta -Obsoletes: %{name}-i18n-th -Obsoletes: %{name}-i18n-tr -Obsoletes: %{name}-i18n-uk -Obsoletes: %{name}-i18n-zhcn +Obsoletes: %{name}-i18n-ar < %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: %{name}-i18n-bg < %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: %{name}-i18n-br < %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: %{name}-i18n-ca < %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: %{name}-i18n-cs < %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: %{name}-i18n-cy < %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: %{name}-i18n-da < %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: %{name}-i18n-de < %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: %{name}-i18n-el < %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: %{name}-i18n-engb < %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: %{name}-i18n-es < %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: %{name}-i18n-et < %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: %{name}-i18n-eu < %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: %{name}-i18n-fi < %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: %{name}-i18n-fr < %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: %{name}-i18n-ga < %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: %{name}-i18n-gl < %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: %{name}-i18n-hi < %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: %{name}-i18n-hu < %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: %{name}-i18n-is < %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: %{name}-i18n-it < %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: %{name}-i18n-ja < %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: %{name}-i18n-lt < %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: %{name}-i18n-ms < %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: %{name}-i18n-mt < %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: %{name}-i18n-nb < %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: %{name}-i18n-nds < %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: %{name}-i18n-nl < %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: %{name}-i18n-nn < %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: %{name}-i18n-pa < %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: %{name}-i18n-pl < %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: %{name}-i18n-pt < %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: %{name}-i18n-ptbr < %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: %{name}-i18n-ro < %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: %{name}-i18n-ru < %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: %{name}-i18n-rw < %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: %{name}-i18n-sk < %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: %{name}-i18n-sr < %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: %{name}-i18n-srlatin < %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: %{name}-i18n-sv < %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: %{name}-i18n-ta < %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: %{name}-i18n-th < %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: %{name}-i18n-tr < %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: %{name}-i18n-uk < %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: %{name}-i18n-zhcn < %{?epoch:%{epoch}:}%{version}-%{release} %description diff --git a/redhat/applications/knetworkmanager8/knetworkmanager8.spec b/redhat/applications/knetworkmanager8/knetworkmanager8.spec index 334a82076..923d189f4 100644 --- a/redhat/applications/knetworkmanager8/knetworkmanager8.spec +++ b/redhat/applications/knetworkmanager8/knetworkmanager8.spec @@ -89,8 +89,8 @@ BuildRequires: NetworkManager-glib-devel # HAL support BuildRequires: hal-devel -Obsoletes: trinity-knetworkmanager < %{version}-%{release} -Provides: trinity-knetworkmanager = %{version}-%{release} +Obsoletes: trinity-knetworkmanager < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-knetworkmanager = %{?epoch:%{epoch}:}%{version}-%{release} %description KNetworkManager is a system tray applet for controlling network @@ -119,10 +119,10 @@ connections on systems that use the NetworkManager daemon. %package devel Summary: Common data shared among the MySQL GUI Suites Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} -Obsoletes: trinity-knetworkmanager-devel < %{version}-%{release} -Provides: trinity-knetworkmanager-devel = %{version}-%{release} +Obsoletes: trinity-knetworkmanager-devel < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-knetworkmanager-devel = %{?epoch:%{epoch}:}%{version}-%{release} %description devel Development headers for knetworkmanager diff --git a/redhat/applications/koffice-i18n/koffice-i18n.spec b/redhat/applications/koffice-i18n/koffice-i18n.spec index 5c4f1785a..f71f0fe38 100644 --- a/redhat/applications/koffice-i18n/koffice-i18n.spec +++ b/redhat/applications/koffice-i18n/koffice-i18n.spec @@ -95,49 +95,49 @@ BuildRequires: brp-check-trinity %package Bulgarian Summary: Bulgarian(bg) language support for Koffice [Trinity] Group: User Interface/Desktops -Provides: %{name}-bg = %{version}-%{release} +Provides: %{name}-bg = %{?epoch:%{epoch}:}%{version}-%{release} %description Bulgarian %{summary}. %package Bengali Summary: Bengali(bn) language support for Koffice [Trinity] Group: User Interface/Desktops -Provides: %{name}-bn = %{version}-%{release} +Provides: %{name}-bn = %{?epoch:%{epoch}:}%{version}-%{release} %description Bengali %{summary}. %package Tibetan Summary: Tibetan(bo) language support for Koffice [Trinity] Group: User Interface/Desktops -Provides: %{name}-bo = %{version}-%{release} +Provides: %{name}-bo = %{?epoch:%{epoch}:}%{version}-%{release} %description Tibetan %{summary}. %package Breton Summary: Breton(br) language support for Koffice [Trinity] Group: User Interface/Desktops -Provides: %{name}-br = %{version}-%{release} +Provides: %{name}-br = %{?epoch:%{epoch}:}%{version}-%{release} %description Breton %{summary}. %package Bosnian Summary: Bosnian(bs) language support for Koffice [Trinity] Group: User Interface/Desktops -Provides: %{name}-bs = %{version}-%{release} +Provides: %{name}-bs = %{?epoch:%{epoch}:}%{version}-%{release} %description Bosnian %{summary}. %package Catalan Summary: Catalan(ca) language support for Koffice [Trinity] Group: User Interface/Desktops -Provides: %{name}-ca = %{version}-%{release} +Provides: %{name}-ca = %{?epoch:%{epoch}:}%{version}-%{release} %description Catalan %{summary}. %package Czech Summary: Czech(cs) language support for Koffice [Trinity] Group: User Interface/Desktops -Provides: %{name}-cs = %{version}-%{release} +Provides: %{name}-cs = %{?epoch:%{epoch}:}%{version}-%{release} %description Czech %{summary}. @@ -150,421 +150,421 @@ Group: User Interface/Desktops %package Welsh Summary: Welsh(cy) language support for Koffice [Trinity] Group: User Interface/Desktops -Provides: %{name}-cy = %{version}-%{release} +Provides: %{name}-cy = %{?epoch:%{epoch}:}%{version}-%{release} %description Welsh %{summary}. %package Danish Summary: Danish(da) language support for Koffice [Trinity] Group: User Interface/Desktops -Provides: %{name}-da = %{version}-%{release} +Provides: %{name}-da = %{?epoch:%{epoch}:}%{version}-%{release} %description Danish %{summary}. %package German Summary: German(de) language support for Koffice [Trinity] Group: User Interface/Desktops -Provides: %{name}-de = %{version}-%{release} +Provides: %{name}-de = %{?epoch:%{epoch}:}%{version}-%{release} %description German %{summary}. %package Greek Summary: Greek(el) language support for Koffice [Trinity] Group: User Interface/Desktops -Provides: %{name}-el = %{version}-%{release} +Provides: %{name}-el = %{?epoch:%{epoch}:}%{version}-%{release} %description Greek %{summary}. %package British Summary: British(en_GB) English support for TDE Group: User Interface/Desktops -Provides: %{name}-en_GB = %{version}-%{release} +Provides: %{name}-en_GB = %{?epoch:%{epoch}:}%{version}-%{release} %description British %{summary}. %package Esperanto Summary: Esperanto(eo) support for TDE Group: User Interface/Desktops -Provides: %{name}-eo = %{version}-%{release} +Provides: %{name}-eo = %{?epoch:%{epoch}:}%{version}-%{release} %description Esperanto %{summary}. %package Spanish Summary: Spanish(es) language support for Koffice [Trinity] Group: User Interface/Desktops -Provides: %{name}-es = %{version}-%{release} +Provides: %{name}-es = %{?epoch:%{epoch}:}%{version}-%{release} %description Spanish %{summary}. %package Estonian Summary: Estonian(et) language support for Koffice [Trinity] Group: User Interface/Desktops -Provides: %{name}-et = %{version}-%{release} +Provides: %{name}-et = %{?epoch:%{epoch}:}%{version}-%{release} %description Estonian %{summary}. %package Basque Summary: Basque(eu) language support for Koffice [Trinity] Group: User Interface/Desktops -Provides: %{name}-eu = %{version}-%{release} +Provides: %{name}-eu = %{?epoch:%{epoch}:}%{version}-%{release} %description Basque %{summary}. %package Finnish Summary: Finnish(fi) language support for Koffice [Trinity] Group: User Interface/Desktops -Provides: %{name}-fi = %{version}-%{release} +Provides: %{name}-fi = %{?epoch:%{epoch}:}%{version}-%{release} %description Finnish %{summary}. %package Faroese Summary: Faroese(fo) language support for Koffice [Trinity] Group: User Interface/Desktops -Provides: %{name}-fo = %{version}-%{release} +Provides: %{name}-fo = %{?epoch:%{epoch}:}%{version}-%{release} %description Faroese %{summary}. %package French Summary: French(fr) language support for Koffice [Trinity] Group: User Interface/Desktops -Provides: %{name}-fr = %{version}-%{release} +Provides: %{name}-fr = %{?epoch:%{epoch}:}%{version}-%{release} %description French %{summary}. %package Frisian Summary: Frisian(fy) language support for Koffice [Trinity] Group: User Interface/Desktops -Provides: %{name}-fy = %{version}-%{release} +Provides: %{name}-fy = %{?epoch:%{epoch}:}%{version}-%{release} %description Frisian %{summary}. %package Irish Summary: Irish(ga) language support for Koffice [Trinity] Group: User Interface/Desktops -Obsoletes: kde-i18n-Gaeilge < %{version} -Provides: %{name}-ga = %{version}-%{release} +Obsoletes: kde-i18n-Gaeilge < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: %{name}-ga = %{?epoch:%{epoch}:}%{version}-%{release} %description Irish %{summary}. %package Galician Summary: Galician(gl) language support for Koffice [Trinity] Group: User Interface/Desktops -Provides: %{name}-gl = %{version}-%{release} +Provides: %{name}-gl = %{?epoch:%{epoch}:}%{version}-%{release} %description Galician %{summary}. %package Hebrew Summary: Hebrew(he) language support for Koffice [Trinity] Group: User Interface/Desktops -Provides: %{name}-he = %{version}-%{release} +Provides: %{name}-he = %{?epoch:%{epoch}:}%{version}-%{release} %description Hebrew %{summary}. %package Hindi Summary: Hindi(hi) language support for Koffice [Trinity] Group: User Interface/Desktops -Provides: %{name}-hi = %{version}-%{release} +Provides: %{name}-hi = %{?epoch:%{epoch}:}%{version}-%{release} %description Hindi %{summary}. %package Croatian Summary: Croatian(hr) language support for Koffice [Trinity] Group: User Interface/Desktops -Provides: %{name}-hr = %{version}-%{release} +Provides: %{name}-hr = %{?epoch:%{epoch}:}%{version}-%{release} %description Croatian %{summary}. %package Hungarian Summary: Hungarian(hu) language support for Koffice [Trinity] Group: User Interface/Desktops -Provides: %{name}-hu = %{version}-%{release} +Provides: %{name}-hu = %{?epoch:%{epoch}:}%{version}-%{release} %description Hungarian %{summary}. %package Indonesian Summary: Indonesian(id) language support for Koffice [Trinity] Group: User Interface/Desktops -Provides: %{name}-id = %{version}-%{release} +Provides: %{name}-id = %{?epoch:%{epoch}:}%{version}-%{release} %description Indonesian %{summary}. %package Icelandic Summary: Icelandic(is) language support for Koffice [Trinity] Group: User Interface/Desktops -Provides: %{name}-is = %{version}-%{release} +Provides: %{name}-is = %{?epoch:%{epoch}:}%{version}-%{release} %description Icelandic %{summary}. %package Italian Summary: Italian(it) language support for Koffice [Trinity] Group: User Interface/Desktops -Provides: %{name}-it = %{version}-%{release} +Provides: %{name}-it = %{?epoch:%{epoch}:}%{version}-%{release} %description Italian %{summary}. %package Japanese Summary: Japanese(ja) language support for Koffice [Trinity] Group: User Interface/Desktops -Provides: %{name}-ja = %{version}-%{release} +Provides: %{name}-ja = %{?epoch:%{epoch}:}%{version}-%{release} %description Japanese %{summary}. %package Khmer Summary: Khmer(km) language support for Koffice [Trinity] Group: User Interface/Desktops -Provides: %{name}-km = %{version}-%{release} +Provides: %{name}-km = %{?epoch:%{epoch}:}%{version}-%{release} %description Khmer %{summary}. %package Korean Summary: Korean(ko) language support for Koffice [Trinity] Group: User Interface/Desktops -Provides: %{name}-ko = %{version}-%{release} +Provides: %{name}-ko = %{?epoch:%{epoch}:}%{version}-%{release} %description Korean %{summary}. %package Kurdish Summary: Kurdish(ku) language support for Koffice [Trinity] Group: User Interface/Desktops -Provides: %{name}-ku = %{version}-%{release} +Provides: %{name}-ku = %{?epoch:%{epoch}:}%{version}-%{release} %description Kurdish %{summary}. %package Lao Summary: Lao(lo) language support for Koffice [Trinity] Group: User Interface/Desktops -Provides: %{name}-lo = %{version}-%{release} +Provides: %{name}-lo = %{?epoch:%{epoch}:}%{version}-%{release} %description Lao %{summary}. %package Lithuanian Summary: Lithuanian(lt) language support for Koffice [Trinity] Group: User Interface/Desktops -Provides: %{name}-lt = %{version}-%{release} +Provides: %{name}-lt = %{?epoch:%{epoch}:}%{version}-%{release} %description Lithuanian %{summary}. %package Latvian Summary: Latvian(lv) language support for Koffice [Trinity] Group: User Interface/Desktops -Provides: %{name}-lv = %{version}-%{release} +Provides: %{name}-lv = %{?epoch:%{epoch}:}%{version}-%{release} %description Latvian %{summary}. %package Maori Summary: Maori(mi) language support for Koffice [Trinity] Group: User Interface/Desktops -Provides: %{name}-mi = %{version}-%{release} +Provides: %{name}-mi = %{?epoch:%{epoch}:}%{version}-%{release} %description Maori %{summary}. %package Macedonian Summary: Macedonian(mk) language support for Koffice [Trinity] Group: User Interface/Desktops -Provides: %{name}-mk = %{version}-%{release} +Provides: %{name}-mk = %{?epoch:%{epoch}:}%{version}-%{release} %description Macedonian %{summary}. %package Malay Summary: Malay(ms) language support for Koffice [Trinity] Group: User Interface/Desktops -Provides: %{name}-ms = %{version}-%{release} +Provides: %{name}-ms = %{?epoch:%{epoch}:}%{version}-%{release} %description Malay %{summary}. %package Maltese Summary: Maltese(mt) language support for Koffice [Trinity] Group: User Interface/Desktops -Provides: %{name}-mt = %{version}-%{release} +Provides: %{name}-mt = %{?epoch:%{epoch}:}%{version}-%{release} %description Maltese %{summary}. %package LowSaxon Summary: Low Saxon (nds) language support for Koffice [Trinity] Group: User Interface/Desktops -Provides: %{name}-nds = %{version}-%{release} +Provides: %{name}-nds = %{?epoch:%{epoch}:}%{version}-%{release} %description LowSaxon %{summary}. %package Nepali Summary: Nepali(ne) language support for Koffice [Trinity] Group: User Interface/Desktops -Provides: %{name}-ne = %{version}-%{release} +Provides: %{name}-ne = %{?epoch:%{epoch}:}%{version}-%{release} %description Nepali %{summary}. %package Dutch Summary: Dutch(nl) language support for Koffice [Trinity] Group: User Interface/Desktops -Provides: %{name}-nl = %{version}-%{release} +Provides: %{name}-nl = %{?epoch:%{epoch}:}%{version}-%{release} %description Dutch %{summary}. %package Norwegian Summary: Norwegian(no) (Bokmaal) language support for Koffice [Trinity] Group: User Interface/Desktops -Provides: %{name}-no = %{version}-%{release} +Provides: %{name}-no = %{?epoch:%{epoch}:}%{version}-%{release} %description Norwegian %{summary}. %package Norwegian-Nynorsk Summary: Norwegian(nn) (Nynorsk) language support for Koffice [Trinity] Group: User Interface/Desktops -Provides: %{name}-nn = %{version}-%{release} +Provides: %{name}-nn = %{?epoch:%{epoch}:}%{version}-%{release} %description Norwegian-Nynorsk %{summary}. %package Occitan Summary: Occitan(oc) language support for Koffice [Trinity] Group: User Interface/Desktops -Provides: %{name}-oc = %{version}-%{release} +Provides: %{name}-oc = %{?epoch:%{epoch}:}%{version}-%{release} %description Occitan %{summary}. %package Polish Summary: Polish(pl) language support for Koffice [Trinity] Group: User Interface/Desktops -Provides: %{name}-pl = %{version}-%{release} +Provides: %{name}-pl = %{?epoch:%{epoch}:}%{version}-%{release} %description Polish %{summary}. %package Portuguese Summary: Portuguese(pt) language support for Koffice [Trinity] Group: User Interface/Desktops -Provides: %{name}-pt = %{version}-%{release} +Provides: %{name}-pt = %{?epoch:%{epoch}:}%{version}-%{release} %description Portuguese %{summary}. %package Punjabi Summary: Punjabi(pa) language support for Koffice [Trinity] Group: User Interface/Desktops -Provides: %{name}-pa = %{version}-%{release} +Provides: %{name}-pa = %{?epoch:%{epoch}:}%{version}-%{release} %description Punjabi %{summary}. %package Brazil Summary: Brazil(pt_BR) Portuguese language support for Koffice [Trinity] Group: User Interface/Desktops -Provides: %{name}-pt_BR = %{version}-%{release} +Provides: %{name}-pt_BR = %{?epoch:%{epoch}:}%{version}-%{release} %description Brazil %{summary}. %package Romanian Summary: Romanian(ro) language support for Koffice [Trinity] Group: User Interface/Desktops -Provides: %{name}-ro = %{version}-%{release} +Provides: %{name}-ro = %{?epoch:%{epoch}:}%{version}-%{release} %description Romanian %{summary}. %package Russian Summary: Russian(ru) language support for Koffice [Trinity] Group: User Interface/Desktops -Provides: %{name}-ru = %{version}-%{release} +Provides: %{name}-ru = %{?epoch:%{epoch}:}%{version}-%{release} %description Russian %{summary}. %package Slovak Summary: Slovak(sk) language support for Koffice [Trinity] Group: User Interface/Desktops -Provides: %{name}-sk = %{version}-%{release} +Provides: %{name}-sk = %{?epoch:%{epoch}:}%{version}-%{release} %description Slovak %{summary}. %package Slovenian Summary: Slovenian(sl) language support for Koffice [Trinity] Group: User Interface/Desktops -Provides: %{name}-sl = %{version}-%{release} +Provides: %{name}-sl = %{?epoch:%{epoch}:}%{version}-%{release} %description Slovenian %{summary}. %package Serbian Summary: Serbian(sr) language support for Koffice [Trinity] Group: User Interface/Desktops -Provides: %{name}-sr = %{version}-%{release} +Provides: %{name}-sr = %{?epoch:%{epoch}:}%{version}-%{release} %description Serbian %{summary}. %package Swedish Summary: Swedish(sv) language support for Koffice [Trinity] Group: User Interface/Desktops -Provides: %{name}-sv = %{version}-%{release} +Provides: %{name}-sv = %{?epoch:%{epoch}:}%{version}-%{release} %description Swedish %{summary}. %package Tamil Summary: Tamil(ta) language support for Koffice [Trinity] Group: User Interface/Desktops -Provides: %{name}-ta = %{version}-%{release} +Provides: %{name}-ta = %{?epoch:%{epoch}:}%{version}-%{release} %description Tamil %{summary}. %package Tajik Summary: Tajik(tg) language support for Koffice [Trinity] Group: User Interface/Desktops -Provides: %{name}-tg = %{version}-%{release} +Provides: %{name}-tg = %{?epoch:%{epoch}:}%{version}-%{release} %description Tajik %{summary}. %package Thai Summary: Thai(th) language support for Koffice [Trinity] Group: User Interface/Desktops -Provides: %{name}-th = %{version}-%{release} +Provides: %{name}-th = %{?epoch:%{epoch}:}%{version}-%{release} %description Thai %{summary}. %package Turkish Summary: Turkish(tr) language support for Koffice [Trinity] Group: User Interface/Desktops -Provides: %{name}-tr = %{version}-%{release} +Provides: %{name}-tr = %{?epoch:%{epoch}:}%{version}-%{release} %description Turkish %{summary}. %package Ukrainian Summary: Ukrainian(uk) language support for Koffice [Trinity] Group: User Interface/Desktops -Provides: %{name}-uk = %{version}-%{release} +Provides: %{name}-uk = %{?epoch:%{epoch}:}%{version}-%{release} %description Ukrainian %{summary}. %package Venda Summary: Venda(ven) language support for Koffice [Trinity] Group: User Interface/Desktops -Provides: %{name}-ven = %{version}-%{release} +Provides: %{name}-ven = %{?epoch:%{epoch}:}%{version}-%{release} %description Venda %{summary}. %package Vietnamese Summary: Vietnamese(vi) language support for Koffice [Trinity] Group: User Interface/Desktops -Provides: %{name}-vi = %{version}-%{release} +Provides: %{name}-vi = %{?epoch:%{epoch}:}%{version}-%{release} %description Vietnamese %{summary}. %package Walloon Summary: Walloon(wa) language support for Koffice [Trinity] Group: User Interface/Desktops -Provides: %{name}-wa = %{version}-%{release} +Provides: %{name}-wa = %{?epoch:%{epoch}:}%{version}-%{release} %description Walloon %{summary}. %package Xhosa Summary: Xhosa(xh) (a Bantu language) language support for Koffice [Trinity] Group: User Interface/Desktops -Provides: %{name}-xh = %{version}-%{release} +Provides: %{name}-xh = %{?epoch:%{epoch}:}%{version}-%{release} %description Xhosa %{summary}. %package Chinese Summary: Chinese(zh_CN) (Simplified Chinese) language support for Koffice [Trinity] Group: User Interface/Desktops -Provides: %{name}-zh_CN = %{version}-%{release} +Provides: %{name}-zh_CN = %{?epoch:%{epoch}:}%{version}-%{release} %description Chinese %{summary}. %package Chinese-Big5 Summary: Chinese(zh_TW) (Big5) language support for Koffice [Trinity] Group: User Interface/Desktops -Provides: %{name}-tz_TW = %{version}-%{release} +Provides: %{name}-tz_TW = %{?epoch:%{epoch}:}%{version}-%{release} %description Chinese-Big5 %{summary}. diff --git a/redhat/applications/koffice/koffice.spec b/redhat/applications/koffice/koffice.spec index ea5fcde82..b3c4c2da2 100644 --- a/redhat/applications/koffice/koffice.spec +++ b/redhat/applications/koffice/koffice.spec @@ -222,12 +222,12 @@ BuildRequires: postgresql-devel BuildRequires: libpqxx-devel %endif %endif -Obsoletes: trinity-libpqxx +Obsoletes: trinity-libpqxx < %{?epoch:%{epoch}:}%{version}-%{release} # WPD support # For chalk and filters BuildRequires: libwpd-devel -Obsoletes: trinity-libwpd +Obsoletes: trinity-libwpd < %{?epoch:%{epoch}:}%{version}-%{release} # WV2 support %if 0%{?mgaversion} || 0%{?mdkversion} @@ -533,7 +533,7 @@ Requires: %{name}-core = %{?epoch:%{epoch}:}%{version}-%{release} Summary: A flowcharting application Group: Applications/Productivity Requires: %{name}-core = %{?epoch:%{epoch}:}%{version}-%{release} -Obsoletes: kivio < %{version}-%{release} +Obsoletes: kivio < %{?epoch:%{epoch}:}%{version}-%{release} %description kivio %{summary}. @@ -614,7 +614,7 @@ Group: Applications/Productivity Requires: %{name}-core = %{?epoch:%{epoch}:}%{version}-%{release} %if 0%{?with_postgresql} == 0 -Obsoletes: %{name}-kexi-driver-pgsql +Obsoletes: %{name}-kexi-driver-pgsql < %{?epoch:%{epoch}:}%{version}-%{release} %endif %description kexi diff --git a/redhat/applications/tde-guidance/tde-guidance.spec b/redhat/applications/tde-guidance/tde-guidance.spec index 824cdf775..74fdb60fd 100644 --- a/redhat/applications/tde-guidance/tde-guidance.spec +++ b/redhat/applications/tde-guidance/tde-guidance.spec @@ -165,7 +165,7 @@ Requires: %{name}-backends = %{?epoch:%{epoch}:}%{version}-%{release} # POWERMANAGER support (requires HAL) #define with_powermanager 1 -Obsoletes: trinity-tde-guidance-powermanager +Obsoletes: trinity-tde-guidance-powermanager < %{?epoch:%{epoch}:}%{version}-%{release} Obsoletes: trinity-guidance < %{?epoch:%{epoch}:}%{version}-%{release} Provides: trinity-guidance = %{?epoch:%{epoch}:}%{version}-%{release} diff --git a/redhat/applications/tde-style-ia-ora/tde-style-ia-ora.spec b/redhat/applications/tde-style-ia-ora/tde-style-ia-ora.spec index 817a2a691..eee02ddbb 100644 --- a/redhat/applications/tde-style-ia-ora/tde-style-ia-ora.spec +++ b/redhat/applications/tde-style-ia-ora/tde-style-ia-ora.spec @@ -76,8 +76,8 @@ BuildRequires: openssl-devel Requires: trinity-twin -Obsoletes: trinity-style-ia-ora < %{version}-%{release} -Provides: trinity-style-ia-ora = %{version}-%{release} +Obsoletes: trinity-style-ia-ora < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-style-ia-ora = %{?epoch:%{epoch}:}%{version}-%{release} %description Mandriva theme for Trinity diff --git a/redhat/applications/tde-style-lipstik/tde-style-lipstik.spec b/redhat/applications/tde-style-lipstik/tde-style-lipstik.spec index 351ac9910..80223ce84 100644 --- a/redhat/applications/tde-style-lipstik/tde-style-lipstik.spec +++ b/redhat/applications/tde-style-lipstik/tde-style-lipstik.spec @@ -56,10 +56,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -Obsoletes: trinity-kde-style-lipstik < %{version}-%{release} -Provides: trinity-kde-style-lipstik = %{version}-%{release} -Obsoletes: trinity-style-lipstik < %{version}-%{release} -Provides: trinity-style-lipstik = %{version}-%{release} +Obsoletes: trinity-kde-style-lipstik < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kde-style-lipstik = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-style-lipstik < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-style-lipstik = %{?epoch:%{epoch}:}%{version}-%{release} BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} diff --git a/redhat/applications/tde-style-qtcurve/tde-style-qtcurve.spec b/redhat/applications/tde-style-qtcurve/tde-style-qtcurve.spec index 9445cca9f..d58d8fb5c 100644 --- a/redhat/applications/tde-style-qtcurve/tde-style-qtcurve.spec +++ b/redhat/applications/tde-style-qtcurve/tde-style-qtcurve.spec @@ -93,10 +93,10 @@ BuildRequires: gamin-devel BuildRequires: openssl-devel -Obsoletes: trinity-kde-style-qtcurve < %{version}-%{release} -Provides: trinity-kde-style-qtcurve = %{version}-%{release} -Obsoletes: trinity-style-qtcurve < %{version}-%{release} -Provides: trinity-style-qtcurve = %{version}-%{release} +Obsoletes: trinity-kde-style-qtcurve < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kde-style-qtcurve = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-style-qtcurve < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-style-qtcurve = %{?epoch:%{epoch}:}%{version}-%{release} %description diff --git a/redhat/applications/tdeio-ftps/tdeio-ftps.spec b/redhat/applications/tdeio-ftps/tdeio-ftps.spec index b570d90f1..b89d22983 100644 --- a/redhat/applications/tdeio-ftps/tdeio-ftps.spec +++ b/redhat/applications/tdeio-ftps/tdeio-ftps.spec @@ -85,8 +85,8 @@ BuildRequires: update-desktop-files BuildRequires: brp-check-trinity %endif -Obsoletes: trinity-kio-ftps < %{version}-%{release} -Provides: trinity-kio-ftps < %{version}-%{release} +Obsoletes: trinity-kio-ftps < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kio-ftps = %{?epoch:%{epoch}:}%{version}-%{release} %description diff --git a/redhat/applications/tdeio-gopher/tdeio-gopher.spec b/redhat/applications/tdeio-gopher/tdeio-gopher.spec index 3e6ce1a81..d4c862df3 100644 --- a/redhat/applications/tdeio-gopher/tdeio-gopher.spec +++ b/redhat/applications/tdeio-gopher/tdeio-gopher.spec @@ -85,8 +85,8 @@ BuildRequires: update-desktop-files BuildRequires: brp-check-trinity %endif -Obsoletes: trinity-kio-gopher < %{version}-%{release} -Provides: trinity-kio-gopher < %{version}-%{release} +Obsoletes: trinity-kio-gopher < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kio-gopher = %{?epoch:%{epoch}:}%{version}-%{release} %description diff --git a/redhat/applications/tdeio-locate/tdeio-locate.spec b/redhat/applications/tdeio-locate/tdeio-locate.spec index dda8398b4..8ee35756e 100644 --- a/redhat/applications/tdeio-locate/tdeio-locate.spec +++ b/redhat/applications/tdeio-locate/tdeio-locate.spec @@ -92,8 +92,8 @@ BuildRequires: gamin-devel # OPENSSL support BuildRequires: openssl-devel -Obsoletes: trinity-kio-locate < %{version}-%{release} -Provides: trinity-kio-locate = %{version}-%{release} +Obsoletes: trinity-kio-locate < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kio-locate = %{?epoch:%{epoch}:}%{version}-%{release} %description diff --git a/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper.spec b/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper.spec index 59df206ef..149e5a882 100644 --- a/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper.spec +++ b/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper.spec @@ -62,8 +62,8 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils -Obsoletes: trinity-kio-umountwrapper < %{version}-%{release} -Provides: trinity-kio-umountwrapper = %{version}-%{release} +Obsoletes: trinity-kio-umountwrapper < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kio-umountwrapper = %{?epoch:%{epoch}:}%{version}-%{release} BuildRequires: cmake >= 2.8 BuildRequires: gcc-c++ diff --git a/redhat/applications/tdenetworkmanager/tdenetworkmanager.spec b/redhat/applications/tdenetworkmanager/tdenetworkmanager.spec index bcc1b342f..5673869bf 100644 --- a/redhat/applications/tdenetworkmanager/tdenetworkmanager.spec +++ b/redhat/applications/tdenetworkmanager/tdenetworkmanager.spec @@ -77,8 +77,8 @@ BuildRequires: update-desktop-files BuildRequires: brp-check-trinity %endif -Obsoletes: trinity-knetworkmanager < %{version}-%{release} -Provides: trinity-knetworkmanager = %{version}-%{release} +Obsoletes: trinity-knetworkmanager < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-knetworkmanager = %{?epoch:%{epoch}:}%{version}-%{release} # NETWORKMANAGER support %if 0%{?rhel} || 0%{?fedora} @@ -179,7 +179,7 @@ fi %package devel Summary: Common data shared among the MySQL GUI Suites Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %description devel Development headers for tdenetworkmanager diff --git a/redhat/applications/tdepowersave/tdepowersave.spec b/redhat/applications/tdepowersave/tdepowersave.spec index 6c0be077d..db0ae8d73 100644 --- a/redhat/applications/tdepowersave/tdepowersave.spec +++ b/redhat/applications/tdepowersave/tdepowersave.spec @@ -125,8 +125,8 @@ BuildRequires: gamin-devel BuildRequires: openssl-devel -Obsoletes: trinity-kpowersave < %{version}-%{release} -Provides: trinity-kpowersave = %{version}-%{release} +Obsoletes: trinity-kpowersave < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kpowersave = %{?epoch:%{epoch}:}%{version}-%{release} %description diff --git a/redhat/applications/tderadio/tderadio.spec b/redhat/applications/tderadio/tderadio.spec index 57216d054..47ef2c7ca 100644 --- a/redhat/applications/tderadio/tderadio.spec +++ b/redhat/applications/tderadio/tderadio.spec @@ -108,8 +108,8 @@ BuildRequires: lame-devel %endif %endif -Obsoletes: trinity-kradio < %{version}-%{release} -Provides: trinity-kradio = %{version}-%{release} +Obsoletes: trinity-kradio < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kradio = %{?epoch:%{epoch}:}%{version}-%{release} %description diff --git a/redhat/applications/tdesudo/tdesudo.spec b/redhat/applications/tdesudo/tdesudo.spec index fbc0ac704..16d2e8bc8 100644 --- a/redhat/applications/tdesudo/tdesudo.spec +++ b/redhat/applications/tdesudo/tdesudo.spec @@ -84,8 +84,8 @@ BuildRequires: update-desktop-files BuildRequires: brp-check-trinity %endif -Obsoletes: trinity-kdesudo < %{version}-%{release} -Provides: trinity-kdesudo = %{version}-%{release} +Obsoletes: trinity-kdesudo < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kdesudo = %{?epoch:%{epoch}:}%{version}-%{release} Requires: sudo diff --git a/redhat/applications/tdmtheme/tdmtheme.spec b/redhat/applications/tdmtheme/tdmtheme.spec index 2237a7b61..85a6c65ab 100644 --- a/redhat/applications/tdmtheme/tdmtheme.spec +++ b/redhat/applications/tdmtheme/tdmtheme.spec @@ -85,8 +85,8 @@ BuildRequires: update-desktop-files BuildRequires: brp-check-trinity %endif -Obsoletes: trinity-kdmtheme < %{version}-%{release} -Provides: trinity-kdmtheme = %{version}-%{release} +Obsoletes: trinity-kdmtheme < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kdmtheme = %{?epoch:%{epoch}:}%{version}-%{release} %description diff --git a/redhat/applications/twin-style-crystal/twin-style-crystal.spec b/redhat/applications/twin-style-crystal/twin-style-crystal.spec index 2f5611335..82d5534e4 100644 --- a/redhat/applications/twin-style-crystal/twin-style-crystal.spec +++ b/redhat/applications/twin-style-crystal/twin-style-crystal.spec @@ -76,8 +76,8 @@ BuildRequires: update-desktop-files BuildRequires: brp-check-trinity %endif -Obsoletes: trinity-kwin-style-crystal < %{version}-%{release} -Provides: trinity-kwin-style-crystal = %{version}-%{release} +Obsoletes: trinity-kwin-style-crystal < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kwin-style-crystal = %{?epoch:%{epoch}:}%{version}-%{release} %description diff --git a/redhat/dependencies/arts/arts.spec b/redhat/dependencies/arts/arts.spec index 5642d945a..062fb1415 100644 --- a/redhat/dependencies/arts/arts.spec +++ b/redhat/dependencies/arts/arts.spec @@ -129,7 +129,7 @@ Requires: libtqt4 >= %{tde_epoch}:4.2.0 Requires: audiofile %if "%{?tde_prefix}" == "/usr" -Obsoletes: arts +Obsoletes: arts < %{?epoch:%{epoch}:}%{version}-%{release} %endif %description @@ -170,7 +170,7 @@ Group: Development/Libraries Summary: ARTS (analog realtime synthesizer) - the TDE sound system (Development files) Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %if "%{?tde_prefix}" == "/usr" -Obsoletes: arts-devel +Obsoletes: arts-devel < %{?epoch:%{epoch}:}%{version}-%{release} %endif Requires: alsa-lib-devel diff --git a/redhat/dependencies/libart-lgpl/libart-lgpl.spec b/redhat/dependencies/libart-lgpl/libart-lgpl.spec index c1423577a..924074c91 100644 --- a/redhat/dependencies/libart-lgpl/libart-lgpl.spec +++ b/redhat/dependencies/libart-lgpl/libart-lgpl.spec @@ -68,11 +68,11 @@ especially suitable for embedded applications. %package -n %{libart}_lgpl_2-2 Summary: Library of functions for 2D graphics - runtime files Group: System/Libraries -Obsoletes: libart_lgpl < %{version}-%{release} -Provides: libart_lgpl = %{version}-%{release} -Obsoletes: %{_lib}art_lgpl2 < %{version}-%{release} -Provides: %{_lib}art_lgpl2 = %{version}-%{release} -Provides: libart_lgpl_2-2 = %{version}-%{release} +Obsoletes: libart_lgpl < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: libart_lgpl = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: %{_lib}art_lgpl2 < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: %{_lib}art_lgpl2 = %{?epoch:%{epoch}:}%{version}-%{release} +Provides: libart_lgpl_2-2 = %{?epoch:%{epoch}:}%{version}-%{release} %description -n %{libart}_lgpl_2-2 A library of functions for 2D graphics supporting a superset of the diff --git a/redhat/dependencies/libcarddav/libcarddav.spec b/redhat/dependencies/libcarddav/libcarddav.spec index ec6fc38e1..9a58cc122 100644 --- a/redhat/dependencies/libcarddav/libcarddav.spec +++ b/redhat/dependencies/libcarddav/libcarddav.spec @@ -118,8 +118,8 @@ Requires: %{libcarddav}0 = %{?epoch:%{epoch}:}%{version}-%{release} %{?libcurl_devel:Requires: %{libcurl_devel}} Requires: glib2-devel -Obsoletes: trinity-libcarddav-devel < %{version}-%{release} -Provides: trinity-libcarddav-devel = %{version}-%{release} +Obsoletes: trinity-libcarddav-devel < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-libcarddav-devel = %{?epoch:%{epoch}:}%{version}-%{release} Provides: libcarddav-devel = %{?epoch:%{epoch}:}%{version}-%{release} %description -n %{libcarddav}-devel diff --git a/redhat/dependencies/python-tqt/python-tqt.spec b/redhat/dependencies/python-tqt/python-tqt.spec index 001d64264..5d8aa43d0 100644 --- a/redhat/dependencies/python-tqt/python-tqt.spec +++ b/redhat/dependencies/python-tqt/python-tqt.spec @@ -59,8 +59,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -Obsoletes: trinity-PyQt -Obsoletes: trinity-python-qt3 +Obsoletes: trinity-PyQt < %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-python-qt3 < %{?epoch:%{epoch}:}%{version}-%{release} BuildRequires: tqt3-apps-devel >= 3.5.0 BuildRequires: libtqt4-devel >= %{?epoch:%{epoch}:}4.2.0 diff --git a/redhat/extras/trinity-desktop/trinity-desktop.spec b/redhat/extras/trinity-desktop/trinity-desktop.spec index 8e2871fb8..6a09c0fa7 100644 --- a/redhat/extras/trinity-desktop/trinity-desktop.spec +++ b/redhat/extras/trinity-desktop/trinity-desktop.spec @@ -235,7 +235,7 @@ Requires: trinity-tdenetworkmanager %endif # Power management -Obsoletes: trinity-tde-guidance-powermanager +Obsoletes: trinity-tde-guidance-powermanager < %{?epoch:%{epoch}:}%{version}-%{release} # Decoration-related stuff (not installed by default) #Requires: trinity-kgtk-qt3 diff --git a/redhat/libraries/python-trinity/python-trinity.spec b/redhat/libraries/python-trinity/python-trinity.spec index 587ad51c3..cde093dd8 100644 --- a/redhat/libraries/python-trinity/python-trinity.spec +++ b/redhat/libraries/python-trinity/python-trinity.spec @@ -103,8 +103,8 @@ Summary: Trinity bindings for Python - Development files and scripts Group: Development/Libraries/Python Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} -Obsoletes: python-trinity-devel < %{version}-%{release} -Provides: python-trinity-devel = %{version}-%{release} +Obsoletes: python-trinity-devel < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: python-trinity-devel = %{?epoch:%{epoch}:}%{version}-%{release} %description devel Development .sip files with definitions of PyTDE classes. They diff --git a/redhat/main/tde-i18n/tde-i18n.spec b/redhat/main/tde-i18n/tde-i18n.spec index ac595b096..29bb1ecfd 100644 --- a/redhat/main/tde-i18n/tde-i18n.spec +++ b/redhat/main/tde-i18n/tde-i18n.spec @@ -81,9 +81,9 @@ This package contains %{summary}. %package Afrikaans Summary: Afrikaans(af) language support for TDE Group: User Interface/Desktops -Provides: %{name}-af = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Afrikaans < %{version}-%{release} -Provides: trinity-kde-i18n-Afrikaans = %{version}-%{release} +Provides: %{name}-af = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kde-i18n-Afrikaans < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kde-i18n-Afrikaans = %{?epoch:%{epoch}:}%{version}-%{release} %description Afrikaans This package contains %{summary}. @@ -97,9 +97,9 @@ This package contains %{summary}. %package Arabic Summary: Arabic(ar) language support for TDE Group: User Interface/Desktops -Provides: %{name}-ar = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Arabic < %{version}-%{release} -Provides: trinity-kde-i18n-Arabic = %{version}-%{release} +Provides: %{name}-ar = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kde-i18n-Arabic < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kde-i18n-Arabic = %{?epoch:%{epoch}:}%{version}-%{release} %description Arabic This package contains %{summary}. @@ -113,9 +113,9 @@ This package contains %{summary}. %package Azerbaijani Summary: Azerbaijani(az) language support for TDE Group: User Interface/Desktops -Provides: %{name}-az = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Arabic < %{version}-%{release} -Provides: trinity-kde-i18n-Arabic = %{version}-%{release} +Provides: %{name}-az = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kde-i18n-Arabic < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kde-i18n-Arabic = %{?epoch:%{epoch}:}%{version}-%{release} %description Azerbaijani This package contains %{summary}. @@ -129,9 +129,9 @@ This package contains %{summary}. %package Belarusian Summary: Belarusian(be) language support for TDE Group: User Interface/Desktops -Provides: %{name}-be = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Belarusian < %{version}-%{release} -Provides: trinity-kde-i18n-Belarusian = %{version}-%{release} +Provides: %{name}-be = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kde-i18n-Belarusian < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kde-i18n-Belarusian = %{?epoch:%{epoch}:}%{version}-%{release} %description Belarusian This package contains %{summary}. @@ -145,9 +145,9 @@ This package contains %{summary}. %package Bulgarian Summary: Bulgarian(bg) language support for TDE Group: User Interface/Desktops -Provides: %{name}-bg = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Bulgarian < %{version}-%{release} -Provides: trinity-kde-i18n-Bulgarian = %{version}-%{release} +Provides: %{name}-bg = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kde-i18n-Bulgarian < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kde-i18n-Bulgarian = %{?epoch:%{epoch}:}%{version}-%{release} %description Bulgarian This package contains %{summary}. @@ -161,9 +161,9 @@ This package contains %{summary}. %package Bengali Summary: Bengali(bn) language support for TDE Group: User Interface/Desktops -Provides: %{name}-bn = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Bengali < %{version}-%{release} -Provides: trinity-kde-i18n-Bengali = %{version}-%{release} +Provides: %{name}-bn = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kde-i18n-Bengali < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kde-i18n-Bengali = %{?epoch:%{epoch}:}%{version}-%{release} %description Bengali This package contains %{summary}. @@ -177,9 +177,9 @@ This package contains %{summary}. %package Tibetan Summary: Tibetan(bo) language support for TDE Group: User Interface/Desktops -Provides: %{name}-bo = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Tibetan < %{version}-%{release} -Provides: trinity-kde-i18n-Tibetan = %{version}-%{release} +Provides: %{name}-bo = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kde-i18n-Tibetan < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kde-i18n-Tibetan = %{?epoch:%{epoch}:}%{version}-%{release} %description Tibetan This package contains %{summary}. @@ -193,9 +193,9 @@ This package contains %{summary}. %package Breton Summary: Breton(br) language support for TDE Group: User Interface/Desktops -Provides: %{name}-br = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Breton < %{version}-%{release} -Provides: trinity-kde-i18n-Breton = %{version}-%{release} +Provides: %{name}-br = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kde-i18n-Breton < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kde-i18n-Breton = %{?epoch:%{epoch}:}%{version}-%{release} %description Breton This package contains %{summary}. @@ -209,9 +209,9 @@ This package contains %{summary}. %package Bosnian Summary: Bosnian(bs) language support for TDE Group: User Interface/Desktops -Provides: %{name}-bs = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Bosnian < %{version}-%{release} -Provides: trinity-kde-i18n-Bosnian = %{version}-%{release} +Provides: %{name}-bs = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kde-i18n-Bosnian < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kde-i18n-Bosnian = %{?epoch:%{epoch}:}%{version}-%{release} %description Bosnian This package contains %{summary}. @@ -225,9 +225,9 @@ This package contains %{summary}. %package Catalan Summary: Catalan(ca) language support for TDE Group: User Interface/Desktops -Provides: %{name}-ca = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Catalan < %{version}-%{release} -Provides: trinity-kde-i18n-Catalan = %{version}-%{release} +Provides: %{name}-ca = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kde-i18n-Catalan < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kde-i18n-Catalan = %{?epoch:%{epoch}:}%{version}-%{release} %description Catalan This package contains %{summary}. @@ -242,9 +242,9 @@ This package contains %{summary}. %package Czech Summary: Czech(cs) language support for TDE Group: User Interface/Desktops -Provides: %{name}-cs = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Czech < %{version}-%{release} -Provides: trinity-kde-i18n-Czech = %{version}-%{release} +Provides: %{name}-cs = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kde-i18n-Czech < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kde-i18n-Czech = %{?epoch:%{epoch}:}%{version}-%{release} %description Czech This package contains %{summary}. @@ -259,9 +259,9 @@ This package contains %{summary}. %package Kashubian Summary: Kashubian(csb) language support for TDE Group: User Interface/Desktops -Provides: %{name}-csb = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Kashubian < %{version}-%{release} -Provides: trinity-kde-i18n-Kashubian = %{version}-%{release} +Provides: %{name}-csb = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kde-i18n-Kashubian < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kde-i18n-Kashubian = %{?epoch:%{epoch}:}%{version}-%{release} %description Kashubian This package contains %{summary}. @@ -275,8 +275,8 @@ This package contains %{summary}. %package Cymraeg Summary: Cymraeg language support for TDE Group: User Interface/Desktops -Obsoletes: trinity-kde-i18n-Cymraeg < %{version}-%{release} -Provides: trinity-kde-i18n-Cymraeg = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Cymraeg < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kde-i18n-Cymraeg = %{?epoch:%{epoch}:}%{version}-%{release} %description Cymraeg This package contains %{summary}. @@ -286,9 +286,9 @@ This package contains %{summary}. %package Welsh Summary: Welsh(cy) language support for TDE Group: User Interface/Desktops -Provides: %{name}-cy = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Welsh < %{version}-%{release} -Provides: trinity-kde-i18n-Welsh = %{version}-%{release} +Provides: %{name}-cy = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kde-i18n-Welsh < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kde-i18n-Welsh = %{?epoch:%{epoch}:}%{version}-%{release} %description Welsh This package contains %{summary}. @@ -302,9 +302,9 @@ This package contains %{summary}. %package Danish Summary: Danish(da) language support for TDE Group: User Interface/Desktops -Provides: %{name}-da = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Danish < %{version}-%{release} -Provides: trinity-kde-i18n-Danish = %{version}-%{release} +Provides: %{name}-da = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kde-i18n-Danish < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kde-i18n-Danish = %{?epoch:%{epoch}:}%{version}-%{release} %description Danish This package contains %{summary}. @@ -319,9 +319,9 @@ This package contains %{summary}. %package German Summary: German(de) language support for TDE Group: User Interface/Desktops -Provides: %{name}-de = %{version}-%{release} -Obsoletes: trinity-kde-i18n-German < %{version}-%{release} -Provides: trinity-kde-i18n-German = %{version}-%{release} +Provides: %{name}-de = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kde-i18n-German < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kde-i18n-German = %{?epoch:%{epoch}:}%{version}-%{release} %description German This package contains %{summary}. @@ -336,9 +336,9 @@ This package contains %{summary}. %package Greek Summary: Greek(el) language support for TDE Group: User Interface/Desktops -Provides: %{name}-el = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Greek < %{version}-%{release} -Provides: trinity-kde-i18n-Greek = %{version}-%{release} +Provides: %{name}-el = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kde-i18n-Greek < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kde-i18n-Greek = %{?epoch:%{epoch}:}%{version}-%{release} %description Greek This package contains %{summary}. @@ -352,9 +352,9 @@ This package contains %{summary}. %package British Summary: British(en_GB) English support for TDE Group: User Interface/Desktops -Provides: %{name}-en_GB = %{version}-%{release} -Obsoletes: trinity-kde-i18n-British < %{version}-%{release} -Provides: trinity-kde-i18n-British = %{version}-%{release} +Provides: %{name}-en_GB = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kde-i18n-British < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kde-i18n-British = %{?epoch:%{epoch}:}%{version}-%{release} %description British This package contains %{summary}. @@ -369,9 +369,9 @@ This package contains %{summary}. %package Esperanto Summary: Esperanto(eo) support for TDE Group: User Interface/Desktops -Provides: %{name}-eo = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Esperanto < %{version}-%{release} -Provides: trinity-kde-i18n-Esperanto = %{version}-%{release} +Provides: %{name}-eo = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kde-i18n-Esperanto < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kde-i18n-Esperanto = %{?epoch:%{epoch}:}%{version}-%{release} %description Esperanto This package contains %{summary}. @@ -385,9 +385,9 @@ This package contains %{summary}. %package Spanish Summary: Spanish(es) language support for TDE Group: User Interface/Desktops -Provides: %{name}-es = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Spanish < %{version}-%{release} -Provides: trinity-kde-i18n-Spanish = %{version}-%{release} +Provides: %{name}-es = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kde-i18n-Spanish < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kde-i18n-Spanish = %{?epoch:%{epoch}:}%{version}-%{release} %description Spanish This package contains %{summary}. @@ -402,9 +402,9 @@ This package contains %{summary}. %package Estonian Summary: Estonian(et) language support for TDE Group: User Interface/Desktops -Provides: %{name}-et = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Estonian < %{version}-%{release} -Provides: trinity-kde-i18n-Estonian = %{version}-%{release} +Provides: %{name}-et = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kde-i18n-Estonian < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kde-i18n-Estonian = %{?epoch:%{epoch}:}%{version}-%{release} %description Estonian This package contains %{summary}. @@ -419,9 +419,9 @@ This package contains %{summary}. %package Basque Summary: Basque(eu) language support for TDE Group: User Interface/Desktops -Provides: %{name}-eu = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Basque < %{version}-%{release} -Provides: trinity-kde-i18n-Basque = %{version}-%{release} +Provides: %{name}-eu = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kde-i18n-Basque < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kde-i18n-Basque = %{?epoch:%{epoch}:}%{version}-%{release} %description Basque This package contains %{summary}. @@ -436,9 +436,9 @@ This package contains %{summary}. %package Farsi Summary: Farsi(fa) language support for TDE Group: User Interface/Desktops -Provides: %{name}-fa = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Farsi < %{version}-%{release} -Provides: trinity-kde-i18n-Farsi = %{version}-%{release} +Provides: %{name}-fa = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kde-i18n-Farsi < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kde-i18n-Farsi = %{?epoch:%{epoch}:}%{version}-%{release} %description Farsi This package contains %{summary}. @@ -452,9 +452,9 @@ This package contains %{summary}. %package Finnish Summary: Finnish(fi) language support for TDE Group: User Interface/Desktops -Provides: %{name}-fi = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Finnish < %{version}-%{release} -Provides: trinity-kde-i18n-Finnish = %{version}-%{release} +Provides: %{name}-fi = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kde-i18n-Finnish < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kde-i18n-Finnish = %{?epoch:%{epoch}:}%{version}-%{release} %description Finnish This package contains %{summary}. @@ -469,9 +469,9 @@ This package contains %{summary}. %package Faroese Summary: Faroese(fo) language support for TDE Group: User Interface/Desktops -Provides: %{name}-fo = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Faroese < %{version}-%{release} -Provides: trinity-kde-i18n-Faroese = %{version}-%{release} +Provides: %{name}-fo = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kde-i18n-Faroese < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kde-i18n-Faroese = %{?epoch:%{epoch}:}%{version}-%{release} %description Faroese This package contains %{summary}. @@ -485,9 +485,9 @@ This package contains %{summary}. %package French Summary: French(fr) language support for TDE Group: User Interface/Desktops -Provides: %{name}-fr = %{version}-%{release} -Obsoletes: trinity-kde-i18n-French < %{version}-%{release} -Provides: trinity-kde-i18n-French = %{version}-%{release} +Provides: %{name}-fr = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kde-i18n-French < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kde-i18n-French = %{?epoch:%{epoch}:}%{version}-%{release} %description French This package contains %{summary}. @@ -502,9 +502,9 @@ This package contains %{summary}. %package Frisian Summary: Frisian(fy) language support for TDE Group: User Interface/Desktops -Provides: %{name}-fy = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Frisian < %{version}-%{release} -Provides: trinity-kde-i18n-Frisian = %{version}-%{release} +Provides: %{name}-fy = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kde-i18n-Frisian < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kde-i18n-Frisian = %{?epoch:%{epoch}:}%{version}-%{release} %description Frisian This package contains %{summary}. @@ -518,9 +518,9 @@ This package contains %{summary}. %package Irish Summary: Irish(ga) language support for TDE Group: User Interface/Desktops -Provides: %{name}-ga = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Irish < %{version}-%{release} -Provides: trinity-kde-i18n-Irish = %{version}-%{release} +Provides: %{name}-ga = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kde-i18n-Irish < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kde-i18n-Irish = %{?epoch:%{epoch}:}%{version}-%{release} %description Irish This package contains %{summary}. @@ -534,9 +534,9 @@ This package contains %{summary}. %package Galician Summary: Galician(gl) language support for TDE Group: User Interface/Desktops -Provides: %{name}-gl = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Galician < %{version}-%{release} -Provides: trinity-kde-i18n-Galician = %{version}-%{release} +Provides: %{name}-gl = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kde-i18n-Galician < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kde-i18n-Galician = %{?epoch:%{epoch}:}%{version}-%{release} %description Galician This package contains %{summary}. @@ -550,9 +550,9 @@ This package contains %{summary}. %package Hebrew Summary: Hebrew(he) language support for TDE Group: User Interface/Desktops -Provides: %{name}-he = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Hebrew < %{version}-%{release} -Provides: trinity-kde-i18n-Hebrew = %{version}-%{release} +Provides: %{name}-he = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kde-i18n-Hebrew < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kde-i18n-Hebrew = %{?epoch:%{epoch}:}%{version}-%{release} %description Hebrew This package contains %{summary}. @@ -567,9 +567,9 @@ This package contains %{summary}. %package Hindi Summary: Hindi(hi) language support for TDE Group: User Interface/Desktops -Provides: %{name}-hi = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Hindi < %{version}-%{release} -Provides: trinity-kde-i18n-Hindi = %{version}-%{release} +Provides: %{name}-hi = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kde-i18n-Hindi < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kde-i18n-Hindi = %{?epoch:%{epoch}:}%{version}-%{release} %description Hindi This package contains %{summary}. @@ -583,9 +583,9 @@ This package contains %{summary}. %package Croatian Summary: Croatian(hr) language support for TDE Group: User Interface/Desktops -Provides: %{name}-hr = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Croatian < %{version}-%{release} -Provides: trinity-kde-i18n-Croatian = %{version}-%{release} +Provides: %{name}-hr = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kde-i18n-Croatian < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kde-i18n-Croatian = %{?epoch:%{epoch}:}%{version}-%{release} %description Croatian This package contains %{summary}. @@ -600,9 +600,9 @@ This package contains %{summary}. %package Hungarian Summary: Hungarian(hu) language support for TDE Group: User Interface/Desktops -Provides: %{name}-hu = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Hungarian < %{version}-%{release} -Provides: trinity-kde-i18n-Hungarian = %{version}-%{release} +Provides: %{name}-hu = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kde-i18n-Hungarian < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kde-i18n-Hungarian = %{?epoch:%{epoch}:}%{version}-%{release} %description Hungarian This package contains %{summary}. @@ -617,9 +617,9 @@ This package contains %{summary}. %package Indonesian Summary: Indonesian(id) language support for TDE Group: User Interface/Desktops -Provides: %{name}-id = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Indonesian < %{version}-%{release} -Provides: trinity-kde-i18n-Indonesian = %{version}-%{release} +Provides: %{name}-id = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kde-i18n-Indonesian < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kde-i18n-Indonesian = %{?epoch:%{epoch}:}%{version}-%{release} %description Indonesian This package contains %{summary}. @@ -633,9 +633,9 @@ This package contains %{summary}. %package Icelandic Summary: Icelandic(is) language support for TDE Group: User Interface/Desktops -Provides: %{name}-is = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Icelandic < %{version}-%{release} -Provides: trinity-kde-i18n-Icelandic = %{version}-%{release} +Provides: %{name}-is = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kde-i18n-Icelandic < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kde-i18n-Icelandic = %{?epoch:%{epoch}:}%{version}-%{release} %description Icelandic This package contains %{summary}. @@ -649,9 +649,9 @@ This package contains %{summary}. %package Italian Summary: Italian(it) language support for TDE Group: User Interface/Desktops -Provides: %{name}-it = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Italian < %{version}-%{release} -Provides: trinity-kde-i18n-Italian = %{version}-%{release} +Provides: %{name}-it = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kde-i18n-Italian < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kde-i18n-Italian = %{?epoch:%{epoch}:}%{version}-%{release} %description Italian This package contains %{summary}. @@ -666,9 +666,9 @@ This package contains %{summary}. %package Japanese Summary: Japanese(ja) language support for TDE Group: User Interface/Desktops -Provides: %{name}-ja = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Japanese < %{version}-%{release} -Provides: trinity-kde-i18n-Japanese = %{version}-%{release} +Provides: %{name}-ja = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kde-i18n-Japanese < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kde-i18n-Japanese = %{?epoch:%{epoch}:}%{version}-%{release} %description Japanese This package contains %{summary}. @@ -683,9 +683,9 @@ This package contains %{summary}. %package Kazakh Summary: Kazakh(kk) language support for TDE Group: User Interface/Desktops -Provides: %{name}-kk = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Kazakh < %{version}-%{release} -Provides: trinity-kde-i18n-Kazakh = %{version}-%{release} +Provides: %{name}-kk = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kde-i18n-Kazakh < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kde-i18n-Kazakh = %{?epoch:%{epoch}:}%{version}-%{release} %description Kazakh This package contains %{summary}. @@ -699,9 +699,9 @@ This package contains %{summary}. %package Khmer Summary: Khmer(km) language support for TDE Group: User Interface/Desktops -Provides: %{name}-ko = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Khmer < %{version}-%{release} -Provides: trinity-kde-i18n-Khmer = %{version}-%{release} +Provides: %{name}-ko = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kde-i18n-Khmer < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kde-i18n-Khmer = %{?epoch:%{epoch}:}%{version}-%{release} %description Khmer This package contains %{summary}. @@ -715,9 +715,9 @@ This package contains %{summary}. %package Korean Summary: Korean(ko) language support for TDE Group: User Interface/Desktops -Provides: %{name}-ko = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Korean < %{version}-%{release} -Provides: trinity-kde-i18n-Korean = %{version}-%{release} +Provides: %{name}-ko = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kde-i18n-Korean < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kde-i18n-Korean = %{?epoch:%{epoch}:}%{version}-%{release} %description Korean This package contains %{summary}. @@ -732,9 +732,9 @@ This package contains %{summary}. %package Kurdish Summary: Kurdish(ku) language support for TDE Group: User Interface/Desktops -Provides: %{name}-ku = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Kurdish < %{version}-%{release} -Provides: trinity-kde-i18n-Kurdish = %{version}-%{release} +Provides: %{name}-ku = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kde-i18n-Kurdish < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kde-i18n-Kurdish = %{?epoch:%{epoch}:}%{version}-%{release} %description Kurdish This package contains %{summary}. @@ -748,9 +748,9 @@ This package contains %{summary}. %package Lao Summary: Lao(lo) language support for TDE Group: User Interface/Desktops -Provides: %{name}-lo = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Lao < %{version}-%{release} -Provides: trinity-kde-i18n-Lao = %{version}-%{release} +Provides: %{name}-lo = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kde-i18n-Lao < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kde-i18n-Lao = %{?epoch:%{epoch}:}%{version}-%{release} %description Lao This package contains %{summary}. @@ -764,9 +764,9 @@ This package contains %{summary}. %package Lithuanian Summary: Lithuanian(lt) language support for TDE Group: User Interface/Desktops -Provides: %{name}-lt = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Lithuanian < %{version}-%{release} -Provides: trinity-kde-i18n-Lithuanian = %{version}-%{release} +Provides: %{name}-lt = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kde-i18n-Lithuanian < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kde-i18n-Lithuanian = %{?epoch:%{epoch}:}%{version}-%{release} %description Lithuanian This package contains %{summary}. @@ -780,9 +780,9 @@ This package contains %{summary}. %package Latvian Summary: Latvian(lv) language support for TDE Group: User Interface/Desktops -Provides: %{name}-lv = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Latvian < %{version}-%{release} -Provides: trinity-kde-i18n-Latvian = %{version}-%{release} +Provides: %{name}-lv = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kde-i18n-Latvian < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kde-i18n-Latvian = %{?epoch:%{epoch}:}%{version}-%{release} %description Latvian This package contains %{summary}. @@ -796,9 +796,9 @@ This package contains %{summary}. %package Maori Summary: Maori(mi) language support for TDE Group: User Interface/Desktops -Provides: %{name}-mi = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Maori < %{version}-%{release} -Provides: trinity-kde-i18n-Maori = %{version}-%{release} +Provides: %{name}-mi = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kde-i18n-Maori < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kde-i18n-Maori = %{?epoch:%{epoch}:}%{version}-%{release} %description Maori This package contains %{summary}. @@ -812,9 +812,9 @@ This package contains %{summary}. %package Macedonian Summary: Macedonian(mk) language support for TDE Group: User Interface/Desktops -Provides: %{name}-mk = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Macedonian < %{version}-%{release} -Provides: trinity-kde-i18n-Macedonian = %{version}-%{release} +Provides: %{name}-mk = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kde-i18n-Macedonian < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kde-i18n-Macedonian = %{?epoch:%{epoch}:}%{version}-%{release} %description Macedonian This package contains %{summary}. @@ -828,9 +828,9 @@ This package contains %{summary}. %package Mongolian Summary: Mongolian(mn) language support for TDE Group: User Interface/Desktops -Provides: %{name}-mn = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Mongolian < %{version}-%{release} -Provides: trinity-kde-i18n-Mongolian = %{version}-%{release} +Provides: %{name}-mn = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kde-i18n-Mongolian < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kde-i18n-Mongolian = %{?epoch:%{epoch}:}%{version}-%{release} %description Mongolian This package contains %{summary}. @@ -844,9 +844,9 @@ This package contains %{summary}. %package Malay Summary: Malay(ms) language support for TDE Group: User Interface/Desktops -Provides: %{name}-ms = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Malay < %{version}-%{release} -Provides: trinity-kde-i18n-Malay = %{version}-%{release} +Provides: %{name}-ms = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kde-i18n-Malay < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kde-i18n-Malay = %{?epoch:%{epoch}:}%{version}-%{release} %description Malay This package contains %{summary}. @@ -860,9 +860,9 @@ This package contains %{summary}. %package Maltese Summary: Maltese(mt) language support for TDE Group: User Interface/Desktops -Provides: %{name}-mt = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Maltese < %{version}-%{release} -Provides: trinity-kde-i18n-Maltese = %{version}-%{release} +Provides: %{name}-mt = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kde-i18n-Maltese < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kde-i18n-Maltese = %{?epoch:%{epoch}:}%{version}-%{release} %description Maltese This package contains %{summary}. @@ -876,9 +876,9 @@ This package contains %{summary}. %package Low-Saxon Summary: Low Saxon(nds) language support for TDE Group: User Interface/Desktops -Provides: %{name}-nds = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Low-Saxon < %{version}-%{release} -Provides: trinity-kde-i18n-Low-Saxon = %{version}-%{release} +Provides: %{name}-nds = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kde-i18n-Low-Saxon < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kde-i18n-Low-Saxon = %{?epoch:%{epoch}:}%{version}-%{release} %description Low-Saxon This package contains %{summary}. @@ -892,9 +892,9 @@ This package contains %{summary}. %package Dutch Summary: Dutch(nl) language support for TDE Group: User Interface/Desktops -Provides: %{name}-nl = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Dutch < %{version}-%{release} -Provides: trinity-kde-i18n-Dutch = %{version}-%{release} +Provides: %{name}-nl = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kde-i18n-Dutch < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kde-i18n-Dutch = %{?epoch:%{epoch}:}%{version}-%{release} %description Dutch This package contains %{summary}. @@ -909,9 +909,9 @@ This package contains %{summary}. %package Norwegian Summary: Norwegian(no) (Bokmaal) language support for TDE Group: User Interface/Desktops -Provides: %{name}-no = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Norwegian < %{version}-%{release} -Provides: trinity-kde-i18n-Norwegian = %{version}-%{release} +Provides: %{name}-no = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kde-i18n-Norwegian < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kde-i18n-Norwegian = %{?epoch:%{epoch}:}%{version}-%{release} %description Norwegian This package contains %{summary}. @@ -925,9 +925,9 @@ This package contains %{summary}. %package Norwegian-Nynorsk Summary: Norwegian(nn) (Nynorsk) language support for TDE Group: User Interface/Desktops -Provides: %{name}-nn = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Norwegian-Nynorsk < %{version}-%{release} -Provides: trinity-kde-i18n-Norwegian-Nynorsk = %{version}-%{release} +Provides: %{name}-nn = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kde-i18n-Norwegian-Nynorsk < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kde-i18n-Norwegian-Nynorsk = %{?epoch:%{epoch}:}%{version}-%{release} %description Norwegian-Nynorsk This package contains %{summary}. @@ -941,9 +941,9 @@ This package contains %{summary}. %package Occitan Summary: Occitan(oc) language support for TDE Group: User Interface/Desktops -Provides: %{name}-oc = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Occitan < %{version}-%{release} -Provides: trinity-kde-i18n-Occitan = %{version}-%{release} +Provides: %{name}-oc = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kde-i18n-Occitan < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kde-i18n-Occitan = %{?epoch:%{epoch}:}%{version}-%{release} %description Occitan This package contains %{summary}. @@ -957,9 +957,9 @@ This package contains %{summary}. %package Polish Summary: Polish(pl) language support for TDE Group: User Interface/Desktops -Provides: %{name}-pl = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Polish < %{version}-%{release} -Provides: trinity-kde-i18n-Polish = %{version}-%{release} +Provides: %{name}-pl = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kde-i18n-Polish < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kde-i18n-Polish = %{?epoch:%{epoch}:}%{version}-%{release} %description Polish This package contains %{summary}. @@ -974,9 +974,9 @@ This package contains %{summary}. %package Portuguese Summary: Portuguese(pt) language support for TDE Group: User Interface/Desktops -Provides: %{name}-pt = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Portuguese < %{version}-%{release} -Provides: trinity-kde-i18n-Portuguese = %{version}-%{release} +Provides: %{name}-pt = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kde-i18n-Portuguese < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kde-i18n-Portuguese = %{?epoch:%{epoch}:}%{version}-%{release} %description Portuguese This package contains %{summary}. @@ -991,9 +991,9 @@ This package contains %{summary}. %package Punjabi Summary: Punjabi(pa) language support for TDE Group: User Interface/Desktops -Provides: %{name}-pa = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Punjabi < %{version}-%{release} -Provides: trinity-kde-i18n-Punjabi = %{version}-%{release} +Provides: %{name}-pa = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kde-i18n-Punjabi < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kde-i18n-Punjabi = %{?epoch:%{epoch}:}%{version}-%{release} %description Punjabi This package contains %{summary}. @@ -1007,9 +1007,9 @@ This package contains %{summary}. %package Brazil Summary: Brazil(pt_BR) Portuguese language support for TDE Group: User Interface/Desktops -Provides: %{name}-pt_BR = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Brazil < %{version}-%{release} -Provides: trinity-kde-i18n-Brazil = %{version}-%{release} +Provides: %{name}-pt_BR = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kde-i18n-Brazil < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kde-i18n-Brazil = %{?epoch:%{epoch}:}%{version}-%{release} %description Brazil This package contains %{summary}. @@ -1024,9 +1024,9 @@ This package contains %{summary}. %package Romanian Summary: Romanian(ro) language support for TDE Group: User Interface/Desktops -Provides: %{name}-ro = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Romanian < %{version}-%{release} -Provides: trinity-kde-i18n-Romanian = %{version}-%{release} +Provides: %{name}-ro = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kde-i18n-Romanian < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kde-i18n-Romanian = %{?epoch:%{epoch}:}%{version}-%{release} %description Romanian This package contains %{summary}. @@ -1041,9 +1041,9 @@ This package contains %{summary}. %package Russian Summary: Russian(ru) language support for TDE Group: User Interface/Desktops -Provides: %{name}-ru = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Russian < %{version}-%{release} -Provides: trinity-kde-i18n-Russian = %{version}-%{release} +Provides: %{name}-ru = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kde-i18n-Russian < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kde-i18n-Russian = %{?epoch:%{epoch}:}%{version}-%{release} %description Russian This package contains %{summary}. @@ -1058,9 +1058,9 @@ This package contains %{summary}. %package Kinyarwanda Summary: Kinyarwanda(rw) language support for TDE Group: User Interface/Desktops -Provides: %{name}-rw = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Kinyarwanda < %{version}-%{release} -Provides: trinity-kde-i18n-Kinyarwanda = %{version}-%{release} +Provides: %{name}-rw = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kde-i18n-Kinyarwanda < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kde-i18n-Kinyarwanda = %{?epoch:%{epoch}:}%{version}-%{release} %description Kinyarwanda This package contains %{summary}. @@ -1074,9 +1074,9 @@ This package contains %{summary}. %package Northern-Sami Summary: Northern-Sami(se) language support for TDE Group: User Interface/Desktops -Provides: %{name}-se = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Northern-Sami < %{version}-%{release} -Provides: trinity-kde-i18n-Northern-Sami = %{version}-%{release} +Provides: %{name}-se = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kde-i18n-Northern-Sami < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kde-i18n-Northern-Sami = %{?epoch:%{epoch}:}%{version}-%{release} %description Northern-Sami This package contains %{summary}. @@ -1090,9 +1090,9 @@ This package contains %{summary}. %package Slovak Summary: Slovak(sk) language support for TDE Group: User Interface/Desktops -Provides: %{name}-sk = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Slovak < %{version}-%{release} -Provides: trinity-kde-i18n-Slovak = %{version}-%{release} +Provides: %{name}-sk = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kde-i18n-Slovak < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kde-i18n-Slovak = %{?epoch:%{epoch}:}%{version}-%{release} %description Slovak This package contains %{summary}. @@ -1107,9 +1107,9 @@ This package contains %{summary}. %package Slovenian Summary: Slovenian(sl) language support for TDE Group: User Interface/Desktops -Provides: %{name}-sl = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Slovenian < %{version}-%{release} -Provides: trinity-kde-i18n-Slovenian = %{version}-%{release} +Provides: %{name}-sl = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kde-i18n-Slovenian < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kde-i18n-Slovenian = %{?epoch:%{epoch}:}%{version}-%{release} %description Slovenian This package contains %{summary}. @@ -1124,9 +1124,9 @@ This package contains %{summary}. %package Serbian Summary: Serbian(sr) language support for TDE Group: User Interface/Desktops -Provides: %{name}-sr = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Serbian < %{version}-%{release} -Provides: trinity-kde-i18n-Serbian = %{version}-%{release} +Provides: %{name}-sr = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kde-i18n-Serbian < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kde-i18n-Serbian = %{?epoch:%{epoch}:}%{version}-%{release} %description Serbian This package contains %{summary}. @@ -1141,8 +1141,8 @@ This package contains %{summary}. %package Serbian-Latin Summary: Serbian-Latin(sr@Latn) language support for TDE Group: User Interface/Desktops -Obsoletes: trinity-kde-i18n-Serbian-Latin < %{version}-%{release} -Provides: trinity-kde-i18n-Serbian-Latin = %{version}-%{release} +Obsoletes: trinity-kde-i18n-Serbian-Latin < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kde-i18n-Serbian-Latin = %{?epoch:%{epoch}:}%{version}-%{release} %description Serbian-Latin This package contains %{summary}. @@ -1156,9 +1156,9 @@ This package contains %{summary}. %package South-Sudan Summary: South-Sudan(ss) language support for TDE Group: User Interface/Desktops -Provides: %{name}-ss = %{version}-%{release} -Obsoletes: trinity-kde-i18n-South-Sudan < %{version}-%{release} -Provides: trinity-kde-i18n-South-Sudan = %{version}-%{release} +Provides: %{name}-ss = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kde-i18n-South-Sudan < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kde-i18n-South-Sudan = %{?epoch:%{epoch}:}%{version}-%{release} %description South-Sudan This package contains %{summary}. @@ -1172,9 +1172,9 @@ This package contains %{summary}. %package Swedish Summary: Swedish(sv) language support for TDE Group: User Interface/Desktops -Provides: %{name}-sv = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Swedish < %{version}-%{release} -Provides: trinity-kde-i18n-Swedish = %{version}-%{release} +Provides: %{name}-sv = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kde-i18n-Swedish < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kde-i18n-Swedish = %{?epoch:%{epoch}:}%{version}-%{release} %description Swedish This package contains %{summary}. @@ -1189,9 +1189,9 @@ This package contains %{summary}. %package Tamil Summary: Tamil(ta) language support for TDE Group: User Interface/Desktops -Provides: %{name}-ta = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Tamil < %{version}-%{release} -Provides: trinity-kde-i18n-Tamil = %{version}-%{release} +Provides: %{name}-ta = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kde-i18n-Tamil < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kde-i18n-Tamil = %{?epoch:%{epoch}:}%{version}-%{release} %description Tamil This package contains %{summary}. @@ -1205,9 +1205,9 @@ This package contains %{summary}. %package Telugu Summary: Telugu(te) language support for TDE Group: User Interface/Desktops -Provides: %{name}-te = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Telugu < %{version}-%{release} -Provides: trinity-kde-i18n-Telugu = %{version}-%{release} +Provides: %{name}-te = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kde-i18n-Telugu < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kde-i18n-Telugu = %{?epoch:%{epoch}:}%{version}-%{release} %description Telugu This package contains %{summary}. @@ -1221,9 +1221,9 @@ This package contains %{summary}. %package Tajik Summary: Tajik(tg) language support for TDE Group: User Interface/Desktops -Provides: %{name}-tg = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Tajik < %{version}-%{release} -Provides: trinity-kde-i18n-Tajik = %{version}-%{release} +Provides: %{name}-tg = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kde-i18n-Tajik < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kde-i18n-Tajik = %{?epoch:%{epoch}:}%{version}-%{release} %description Tajik This package contains %{summary}. @@ -1237,9 +1237,9 @@ This package contains %{summary}. %package Thai Summary: Thai(th) language support for TDE Group: User Interface/Desktops -Provides: %{name}-th = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Thai < %{version}-%{release} -Provides: trinity-kde-i18n-Thai = %{version}-%{release} +Provides: %{name}-th = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kde-i18n-Thai < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kde-i18n-Thai = %{?epoch:%{epoch}:}%{version}-%{release} %description Thai This package contains %{summary}. @@ -1253,9 +1253,9 @@ This package contains %{summary}. %package Turkish Summary: Turkish(tr) language support for TDE Group: User Interface/Desktops -Provides: %{name}-tr = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Turkish < %{version}-%{release} -Provides: trinity-kde-i18n-Turkish = %{version}-%{release} +Provides: %{name}-tr = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kde-i18n-Turkish < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kde-i18n-Turkish = %{?epoch:%{epoch}:}%{version}-%{release} %description Turkish This package contains %{summary}. @@ -1270,9 +1270,9 @@ This package contains %{summary}. %package Ukrainian Summary: Ukrainian(uk) language support for TDE Group: User Interface/Desktops -Provides: %{name}-uk = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Ukrainian < %{version}-%{release} -Provides: trinity-kde-i18n-Ukrainian = %{version}-%{release} +Provides: %{name}-uk = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kde-i18n-Ukrainian < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kde-i18n-Ukrainian = %{?epoch:%{epoch}:}%{version}-%{release} %description Ukrainian This package contains %{summary}. @@ -1287,9 +1287,9 @@ This package contains %{summary}. %package Uzbek Summary: Uzbek(uz) language support for TDE Group: User Interface/Desktops -Provides: %{name}-uz = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Uzbek < %{version}-%{release} -Provides: trinity-kde-i18n-Uzbek = %{version}-%{release} +Provides: %{name}-uz = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kde-i18n-Uzbek < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kde-i18n-Uzbek = %{?epoch:%{epoch}:}%{version}-%{release} %description Uzbek This package contains %{summary}. @@ -1303,9 +1303,9 @@ This package contains %{summary}. %package Uzbek-Cyrillic Summary: Uzbek(uz@cyrillic) language support for TDE Group: User Interface/Desktops -Provides: %{name}-uz@cyrillic = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Uzbek-Cyrillic < %{version}-%{release} -Provides: trinity-kde-i18n-Uzbek-Cyrillic = %{version}-%{release} +Provides: %{name}-uz@cyrillic = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kde-i18n-Uzbek-Cyrillic < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kde-i18n-Uzbek-Cyrillic = %{?epoch:%{epoch}:}%{version}-%{release} %description Uzbek-Cyrillic This package contains %{summary}. @@ -1319,9 +1319,9 @@ This package contains %{summary}. %package Venda Summary: Venda(ven) language support for TDE Group: User Interface/Desktops -Provides: %{name}-ven = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Venda < %{version}-%{release} -Provides: trinity-kde-i18n-Venda = %{version}-%{release} +Provides: %{name}-ven = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kde-i18n-Venda < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kde-i18n-Venda = %{?epoch:%{epoch}:}%{version}-%{release} %description Venda This package contains %{summary}. @@ -1335,9 +1335,9 @@ This package contains %{summary}. %package Vietnamese Summary: Vietnamese(vi) language support for TDE Group: User Interface/Desktops -Provides: %{name}-vi = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Vietnamese < %{version}-%{release} -Provides: trinity-kde-i18n-Vietnamese = %{version}-%{release} +Provides: %{name}-vi = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kde-i18n-Vietnamese < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kde-i18n-Vietnamese = %{?epoch:%{epoch}:}%{version}-%{release} %description Vietnamese This package contains %{summary}. @@ -1351,9 +1351,9 @@ This package contains %{summary}. %package Walloon Summary: Walloon(wa) language support for TDE Group: User Interface/Desktops -Provides: %{name}-wa = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Walloon < %{version}-%{release} -Provides: trinity-kde-i18n-Walloon = %{version}-%{release} +Provides: %{name}-wa = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kde-i18n-Walloon < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kde-i18n-Walloon = %{?epoch:%{epoch}:}%{version}-%{release} %description Walloon This package contains %{summary}. @@ -1367,9 +1367,9 @@ This package contains %{summary}. %package Xhosa Summary: Xhosa(xh) (a Bantu language) support for TDE Group: User Interface/Desktops -Provides: %{name}-xh = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Xhosa < %{version}-%{release} -Provides: trinity-kde-i18n-Xhosa = %{version}-%{release} +Provides: %{name}-xh = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kde-i18n-Xhosa < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kde-i18n-Xhosa = %{?epoch:%{epoch}:}%{version}-%{release} %description Xhosa This package contains %{summary}. @@ -1383,9 +1383,9 @@ This package contains %{summary}. %package Chinese Summary: Chinese(zh_CN) (Simplified Chinese) language support for TDE Group: User Interface/Desktops -Provides: %{name}-zh_CN = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Chinese < %{version}-%{release} -Provides: trinity-kde-i18n-Chinese = %{version}-%{release} +Provides: %{name}-zh_CN = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kde-i18n-Chinese < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kde-i18n-Chinese = %{?epoch:%{epoch}:}%{version}-%{release} %description Chinese This package contains %{summary}. @@ -1400,9 +1400,9 @@ This package contains %{summary}. %package Chinese-Big5 Summary: Chinese(zh_TW) (Big5) language support for TDE Group: User Interface/Desktops -Provides: %{name}-tz_TW = %{version}-%{release} -Obsoletes: trinity-kde-i18n-Chinese-Big5 < %{version}-%{release} -Provides: trinity-kde-i18n-Chinese-Big5 = %{version}-%{release} +Provides: %{name}-tz_TW = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kde-i18n-Chinese-Big5 < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kde-i18n-Chinese-Big5 = %{?epoch:%{epoch}:}%{version}-%{release} %description Chinese-Big5 This package contains %{summary}. diff --git a/redhat/main/tdeaccessibility/tdeaccessibility.spec b/redhat/main/tdeaccessibility/tdeaccessibility.spec index a2faba458..e7250a59e 100644 --- a/redhat/main/tdeaccessibility/tdeaccessibility.spec +++ b/redhat/main/tdeaccessibility/tdeaccessibility.spec @@ -121,19 +121,19 @@ BuildRequires: %{_lib}xau%{?mgaversion:6}-devel BuildRequires: libXau-devel %endif -Obsoletes: trinity-kdeaccessibility < %{version}-%{release} -Provides: trinity-kdeaccessibility = %{version}-%{release} -Obsoletes: trinity-kdeaccessibility-libs < %{version}-%{release} -Provides: trinity-kdeaccessibility-libs = %{version}-%{release} - -Requires: trinity-tde-icons-mono = %{version}-%{release} -Requires: trinity-kbstate = %{version}-%{release} -Requires: trinity-kmag = %{version}-%{release} -Requires: trinity-kmousetool = %{version}-%{release} -Requires: trinity-kmouth = %{version}-%{release} -Requires: trinity-ksayit = %{version}-%{release} -Requires: trinity-kttsd = %{version}-%{release} -Requires: trinity-kttsd-contrib-plugins = %{version}-%{release} +Obsoletes: trinity-kdeaccessibility < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kdeaccessibility = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kdeaccessibility-libs < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kdeaccessibility-libs = %{?epoch:%{epoch}:}%{version}-%{release} + +Requires: trinity-tde-icons-mono = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kbstate = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kmag = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kmousetool = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kmouth = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-ksayit = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kttsd = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kttsd-contrib-plugins = %{?epoch:%{epoch}:}%{version}-%{release} %description Included with this package are: @@ -150,8 +150,8 @@ Included with this package are: Summary: A monochromatic icons theme for TDE Group: System/GUI/Other -Obsoletes: trinity-kde-icons-mono < %{version}-%{release} -Provides: trinity-kde-icons-mono = %{version}-%{release} +Obsoletes: trinity-kde-icons-mono < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kde-icons-mono = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-tde-icons-mono A monochromatic icon theme for TDE, designed for accessibility purposes. @@ -374,7 +374,7 @@ Homepage: http://accessibility.kde.org/developer/kttsd %package -n trinity-kttsd-contrib-plugins Summary: The TDE Text-to-Speech system Group: System/GUI/Other -Requires: trinity-kttsd = %{version}-%{release} +Requires: trinity-kttsd = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-kttsd-contrib-plugins kttsd synthetizer plugins that depends on non-free software : @@ -400,13 +400,13 @@ This package is part of Trinity, as a component of the TDE accessibility module. %package devel Summary: Development files for tdeaccessibility Group: Development/Libraries/X11 -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} Requires: trinity-tdelibs-devel >= %{version} Requires: libjpeg-devel Requires: libpng-devel -Obsoletes: trinity-kdeaccessibility-devel < %{version}-%{release} -Provides: trinity-kdeaccessibility-devel = %{version}-%{release} +Obsoletes: trinity-kdeaccessibility-devel < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kdeaccessibility-devel = %{?epoch:%{epoch}:}%{version}-%{release} %description devel This package contains the development file for TDE accessibility diff --git a/redhat/main/tdeaddons/tdeaddons.spec b/redhat/main/tdeaddons/tdeaddons.spec index aeb681a7d..e9f622a3b 100644 --- a/redhat/main/tdeaddons/tdeaddons.spec +++ b/redhat/main/tdeaddons/tdeaddons.spec @@ -52,10 +52,10 @@ License: GPLv2+ #Vendor: Trinity Project #Packager: Francois Andriot <francois.andriot@free.fr> -Obsoletes: trinity-kdeaddons < %{version}-%{release} -Provides: trinity-kdeaddons = %{version}-%{release} -Obsoletes: trinity-kdeaddons-extras < %{version}-%{release} -Provides: trinity-kdeaddons-extras = %{version}-%{release} +Obsoletes: trinity-kdeaddons < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kdeaddons = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kdeaddons-extras < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kdeaddons-extras = %{?epoch:%{epoch}:}%{version}-%{release} Prefix: %{tde_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -145,15 +145,15 @@ BuildRequires: db4-devel %global python python %endif -Requires: trinity-atlantikdesigner = %{version}-%{release} -Requires: trinity-kaddressbook-plugins = %{version}-%{release} -Requires: trinity-kate-plugins = %{version}-%{release} -Requires: trinity-tdeaddons-tdefile-plugins = %{version}-%{release} -Requires: trinity-kicker-applets = %{version}-%{release} -Requires: trinity-knewsticker-scripts = %{version}-%{release} -Requires: trinity-konq-plugins = %{version}-%{release} -Requires: trinity-ksig = %{version}-%{release} -Requires: trinity-noatun-plugins = %{version}-%{release} +Requires: trinity-atlantikdesigner = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kaddressbook-plugins = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kate-plugins = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-tdeaddons-tdefile-plugins = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kicker-applets = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-knewsticker-scripts = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-konq-plugins = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-ksig = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-noatun-plugins = %{?epoch:%{epoch}:}%{version}-%{release} %description @@ -303,8 +303,8 @@ a tab bar, a Python browser and even more. Summary: Trinity file dialog plugins for text files and folders Group: Applications/Utilities -Obsoletes: trinity-tdeaddons-kfile-plugins < %{version}-%{release} -Provides: trinity-tdeaddons-kfile-plugins = %{version}-%{release} +Obsoletes: trinity-tdeaddons-kfile-plugins < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-tdeaddons-kfile-plugins = %{?epoch:%{epoch}:}%{version}-%{release} %description tdefile-plugins This is a collection of plugins for the TDE file dialog. These plugins diff --git a/redhat/main/tdeadmin/tdeadmin.spec b/redhat/main/tdeadmin/tdeadmin.spec index 1b328f37d..8a84b4662 100644 --- a/redhat/main/tdeadmin/tdeadmin.spec +++ b/redhat/main/tdeadmin/tdeadmin.spec @@ -66,8 +66,8 @@ Source5: kpackagerc Source6: ksysvrc Source7: kuserrc -Obsoletes: trinity-kdeadmin < %{version}-%{release} -Provides: trinity-kdeadmin = %{version}-%{release} +Obsoletes: trinity-kdeadmin < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kdeadmin = %{?epoch:%{epoch}:}%{version}-%{release} BuildRequires: trinity-arts-devel >= %{tde_epoch}:1.5.10 BuildRequires: trinity-tdelibs-devel >= %{tde_version} @@ -110,17 +110,17 @@ BuildRequires: pam-devel BuildRequires: lilo %endif -Requires: trinity-kcron = %{version}-%{release} -Requires: trinity-kdat = %{version}-%{release} -Requires: %{name}-kfile-plugins = %{version}-%{release} -Requires: trinity-knetworkconf = %{version}-%{release} -Requires: trinity-kpackage = %{version}-%{release} -Requires: trinity-ksysv = %{version}-%{release} -Requires: trinity-kuser = %{version}-%{release} +Requires: trinity-kcron = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kdat = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-kfile-plugins = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-knetworkconf = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kpackage = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-ksysv = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kuser = %{?epoch:%{epoch}:}%{version}-%{release} %if 0%{?with_lilo} -Requires: trinity-lilo-config = %{version}-%{release} +Requires: trinity-lilo-config = %{?epoch:%{epoch}:}%{version}-%{release} %else -Obsoletes: trinity-lilo-config +Obsoletes: trinity-lilo-config < %{?epoch:%{epoch}:}%{version}-%{release} %endif # CONSOLEHELPER (usermode) support diff --git a/redhat/main/tdeartwork/tdeartwork.spec b/redhat/main/tdeartwork/tdeartwork.spec index 25585bc0d..b0dab58db 100644 --- a/redhat/main/tdeartwork/tdeartwork.spec +++ b/redhat/main/tdeartwork/tdeartwork.spec @@ -59,8 +59,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz -Obsoletes: trinity-kdeartwork < %{version}-%{release} -Provides: trinity-kdeartwork = %{version}-%{release} +Obsoletes: trinity-kdeartwork < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kdeartwork = %{?epoch:%{epoch}:}%{version}-%{release} BuildRequires: trinity-arts-devel >= %{tde_epoch}:1.5.10 BuildRequires: trinity-tdelibs-devel >= %{tde_version} @@ -174,19 +174,19 @@ BuildRequires: openssl-devel # Metapackage -Requires: %{name}-emoticons = %{version}-%{release} -Requires: %{name}-misc = %{version}-%{release} -Requires: %{name}-style = %{version}-%{release} -Requires: %{name}-theme-icon = %{version}-%{release} -Requires: %{name}-theme-window = %{version}-%{release} -Requires: trinity-tdewallpapers = %{version}-%{release} -Requires: trinity-tdescreensaver = %{version}-%{release} +Requires: %{name}-emoticons = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-misc = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-style = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-theme-icon = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-theme-window = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-tdewallpapers = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-tdescreensaver = %{?epoch:%{epoch}:}%{version}-%{release} %if 0%{?with_xscreensaver} -Requires: trinity-tdescreensaver-xsavers = %{version}-%{release} -Requires: trinity-tdescreensaver-xsavers-extra = %{version}-%{release} +Requires: trinity-tdescreensaver-xsavers = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-tdescreensaver-xsavers-extra = %{?epoch:%{epoch}:}%{version}-%{release} %if 0%{?with_webcollage} -Requires: trinity-tdescreensaver-xsavers-webcollage = %{version}-%{release} +Requires: trinity-tdescreensaver-xsavers-webcollage = %{?epoch:%{epoch}:}%{version}-%{release} %endif %endif @@ -265,8 +265,8 @@ This package is part of Trinity, and a component of the TDE artwork module. Summary: Icon themes released with Trinity Group: System/GUI/Other -Obsoletes: trinity-kdeartwork-icons < %{version}-%{release} -Provides: trinity-kdeartwork-icons = %{version}-%{release} +Obsoletes: trinity-kdeartwork-icons < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kdeartwork-icons = %{?epoch:%{epoch}:}%{version}-%{release} %description theme-icon This package contains additional icon themes for Trinity. Icon themes can be @@ -308,8 +308,8 @@ This package is part of Trinity, and a component of the TDE artwork module. %package -n trinity-tdewallpapers Summary: Wallpapers released with Trinity Group: System/GUI/Other -Obsoletes: trinity-kdewallpapers < %{version}-%{release} -Provides: trinity-kdewallpapers = %{version}-%{release} +Obsoletes: trinity-kdewallpapers < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kdewallpapers = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-tdewallpapers This package contains additional wallpapers for Trinity. Wallpapers can be @@ -327,8 +327,8 @@ This package is part of Trinity, and a component of the TDE artwork module. Summary: Additional screen savers released with Trinity Group: System/GUI/Other -Obsoletes: trinity-kscreensaver < %{version}-%{release} -Provides: trinity-kscreensaver = %{version}-%{release} +Obsoletes: trinity-kscreensaver < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kscreensaver = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-tdescreensaver This package contains the screen savers for Trinity. They can be tested and @@ -401,8 +401,8 @@ Group: System/GUI/Other Requires: trinity-tdebase-bin >= %{tde_version} Requires: xscreensaver -Obsoletes: trinity-kscreensaver-xsavers < %{version}-%{release} -Provides: trinity-kscreensaver-xsavers = %{version}-%{release} +Obsoletes: trinity-kscreensaver-xsavers < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kscreensaver-xsavers = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-tdescreensaver-xsavers This package allows a smooth integration of the standard xscreensavers @@ -524,11 +524,11 @@ This package is part of Trinity, and a component of the TDE artwork module. %package -n trinity-tdescreensaver-xsavers-webcollage Summary: Webcollage screensaver Trinity hook Group: System/GUI/Other -Requires: trinity-tdescreensaver-xsavers-extra = %{version}-%{release} +Requires: trinity-tdescreensaver-xsavers-extra = %{?epoch:%{epoch}:}%{version}-%{release} Requires: netpbm -Obsoletes: trinity-kscreensaver-xsavers-webcollage < %{version}-%{release} -Provides: trinity-kscreensaver-xsavers-webcollage = %{version}-%{release} +Obsoletes: trinity-kscreensaver-xsavers-webcollage < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kscreensaver-xsavers-webcollage = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-tdescreensaver-xsavers-webcollage This package give access to the webcollage screensaver through the Trinity @@ -555,10 +555,10 @@ This package is part of Trinity, and a component of the TDE artwork module. %package -n trinity-tdescreensaver-xsavers-extra Summary: Trinity hooks for standard xscreensavers Group: System/GUI/Other -Requires: trinity-tdescreensaver-xsavers = %{version}-%{release} +Requires: trinity-tdescreensaver-xsavers = %{?epoch:%{epoch}:}%{version}-%{release} -Obsoletes: trinity-kscreensaver-xsavers-extra < %{version}-%{release} -Provides: trinity-kscreensaver-xsavers-extra = %{version}-%{release} +Obsoletes: trinity-kscreensaver-xsavers-extra < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kscreensaver-xsavers-extra = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-tdescreensaver-xsavers-extra This package allows a smooth integration of the universe xscreensavers diff --git a/redhat/main/tdebase/tdebase.spec b/redhat/main/tdebase/tdebase.spec index 838ab322c..9992b18d0 100644 --- a/redhat/main/tdebase/tdebase.spec +++ b/redhat/main/tdebase/tdebase.spec @@ -94,14 +94,14 @@ Source8: tdm%{?dist}.te Source9: mgabutton.svg %endif -Obsoletes: trinity-kdebase < %{version}-%{release} -Provides: trinity-kdebase = %{version}-%{release} -Obsoletes: trinity-kdebase-libs < %{version}-%{release} -Provides: trinity-kdebase-libs = %{version}-%{release} -Obsoletes: trinity-kdebase-extras < %{version}-%{release} -Provides: trinity-kdebase-extras = %{version}-%{release} -Obsoletes: tdebase < %{version}-%{release} -Provides: tdebase = %{version}-%{release} +Obsoletes: trinity-kdebase < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kdebase = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kdebase-libs < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kdebase-libs = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kdebase-extras < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kdebase-extras = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: tdebase < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: tdebase = %{?epoch:%{epoch}:}%{version}-%{release} # for set_permissions macro %if 0%{?suse_version} @@ -813,38 +813,38 @@ BuildRequires: selinux-policy-devel %endif # tdebase is a metapackage that installs all sub-packages -Requires: %{name}-runtime-data-common = %{version}-%{release} -Requires: %{name}-data = %{version}-%{release} -Requires: %{name}-bin = %{version}-%{release} -Requires: %{name}-tdeio-plugins = %{version}-%{release} -Requires: %{name}-tdeio-pim-plugins = %{version}-%{release} -Requires: trinity-kappfinder = %{version}-%{release} -Requires: trinity-kate = %{version}-%{release} -Requires: trinity-kwrite = %{version}-%{release} -Requires: trinity-kcontrol = %{version}-%{release} -Requires: trinity-tdepasswd = %{version}-%{release} -Requires: trinity-tdeprint = %{version}-%{release} -Requires: trinity-kdesktop = %{version}-%{release} -Requires: trinity-tdm = %{version}-%{release} -Requires: trinity-kfind = %{version}-%{release} -Requires: trinity-khelpcenter = %{version}-%{release} -Requires: trinity-kicker = %{version}-%{release} -Requires: trinity-klipper = %{version}-%{release} -Requires: trinity-kmenuedit = %{version}-%{release} -Requires: trinity-konqueror = %{version}-%{release} -Requires: trinity-konqueror-nsplugins = %{version}-%{release} -Requires: trinity-konsole = %{version}-%{release} -Requires: trinity-kpager = %{version}-%{release} -Requires: trinity-kpersonalizer = %{version}-%{release} -Requires: trinity-ksmserver = %{version}-%{release} -Requires: trinity-ksplash = %{version}-%{release} -Requires: trinity-ksysguard = %{version}-%{release} -Requires: trinity-ksysguardd = %{version}-%{release} -Requires: trinity-ktip = %{version}-%{release} -Requires: trinity-twin = %{version}-%{release} -Requires: trinity-libkonq = %{version}-%{release} -Requires: %{name}-libtqt3-integration = %{version}-%{release} -Requires: %{name}-tdeio-smb-plugin = %{version}-%{release} +Requires: %{name}-runtime-data-common = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-data = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-bin = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-tdeio-plugins = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-tdeio-pim-plugins = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kappfinder = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kate = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kwrite = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kcontrol = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-tdepasswd = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-tdeprint = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kdesktop = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-tdm = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kfind = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-khelpcenter = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kicker = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-klipper = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kmenuedit = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-konqueror = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-konqueror-nsplugins = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-konsole = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kpager = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kpersonalizer = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-ksmserver = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-ksplash = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-ksysguard = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-ksysguardd = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-ktip = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-twin = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-libkonq = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-libtqt3-integration = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-tdeio-smb-plugin = %{?epoch:%{epoch}:}%{version}-%{release} Requires: trinity-arts >= %{tde_epoch}:1.5.10 Requires: trinity-tdelibs >= %{tde_version} @@ -883,26 +883,26 @@ web browser, X terminal emulator, and many other programs and components. %package devel Summary: %{summary} - Development files Group: Development/Libraries/Other -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} Requires: trinity-arts-devel >= %{tde_epoch}:1.5.10 Requires: trinity-tdelibs-devel >= %{tde_version} -Requires: %{name}-bin-devel = %{version}-%{release} -Requires: trinity-kate-devel = %{version}-%{release} -Requires: trinity-kcontrol-devel = %{version}-%{release} -Requires: trinity-kdesktop-devel = %{version}-%{release} -Requires: trinity-kicker-devel = %{version}-%{release} -Requires: trinity-konqueror-devel = %{version}-%{release} -Requires: trinity-ksplash-devel = %{version}-%{release} -Requires: trinity-ksysguard-devel = %{version}-%{release} -Requires: trinity-libkonq-devel = %{version}-%{release} -Requires: trinity-tdm-devel = %{version}-%{release} -Requires: trinity-twin-devel = %{version}-%{release} - -Provides: trinity-kdebase-devel = %{version}-%{release} -Obsoletes: trinity-kdebase-devel < %{version}-%{release} -Provides: tdebase-devel = %{version}-%{release} -Obsoletes: tdebase-devel < %{version}-%{release} +Requires: %{name}-bin-devel = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kate-devel = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kcontrol-devel = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kdesktop-devel = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kicker-devel = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-konqueror-devel = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-ksplash-devel = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-ksysguard-devel = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-libkonq-devel = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-tdm-devel = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-twin-devel = %{?epoch:%{epoch}:}%{version}-%{release} + +Provides: trinity-kdebase-devel = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kdebase-devel < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: tdebase-devel = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: tdebase-devel < %{?epoch:%{epoch}:}%{version}-%{release} %description devel This is a meta-package that installs all tdebase development packages. @@ -921,12 +921,12 @@ Kate plugins or TWin styles. Summary: PIM TDEIOslaves from %{name} Group: System/GUI/Other -Provides: trinity-kdebase-pim-ioslaves = %{version}-%{release} -Obsoletes: trinity-kdebase-pim-ioslaves < %{version}-%{release} -Provides: tdebase-kio-pim-plugins = %{version}-%{release} -Obsoletes: tdebase-kio-pim-plugins < %{version}-%{release} -Provides: trinity-tdebase-kio-pim-plugins = %{version}-%{release} -Obsoletes: trinity-tdebase-kio-pim-plugins < %{version}-%{release} +Provides: trinity-kdebase-pim-ioslaves = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kdebase-pim-ioslaves < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: tdebase-kio-pim-plugins = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: tdebase-kio-pim-plugins < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-tdebase-kio-pim-plugins = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-tdebase-kio-pim-plugins < %{?epoch:%{epoch}:}%{version}-%{release} %description tdeio-pim-plugins Protocol handlers (TDEIOslaves) for personal information management, including: @@ -960,8 +960,8 @@ Protocol handlers (TDEIOslaves) for personal information management, including: Summary: Shared common files for Trinity and KDE4 Group: System/GUI/Other -Provides: tdebase-runtime-data-common = %{version}-%{release} -Obsoletes: tdebase-runtime-data-common < %{version}-%{release} +Provides: tdebase-runtime-data-common = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: tdebase-runtime-data-common < %{?epoch:%{epoch}:}%{version}-%{release} %description runtime-data-common Shared common files for both Trinity and KDE4 @@ -987,7 +987,7 @@ Such as the desktop right-click-"Create New" list %package -n trinity-kappfinder Summary: Non-TDE application finder for TDE Group: System/GUI/Other -Requires: %{name}-data = %{version}-%{release} +Requires: %{name}-data = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-kappfinder kappfinder searches your workstation for many common applications and @@ -1019,9 +1019,9 @@ This package contains the kateinterface library. %package -n trinity-kate Summary: Advanced text editor for TDE Group: System/GUI/Other -Requires: %{name}-data = %{version}-%{release} -Requires: trinity-kwrite = %{version}-%{release} -Requires: trinity-libkateinterfaces = %{version}-%{release} +Requires: %{name}-data = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kwrite = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-libkateinterfaces = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-kate Kate is a multi document editor, based on a rewritten version of the kwrite @@ -1064,7 +1064,7 @@ Some random features: %package -n trinity-kate-devel Summary: Development files for kate Group: Development/Libraries/Other -Requires: trinity-kate = %{version}-%{release} +Requires: trinity-kate = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-kate-devel This package contains the development files fare Kate. @@ -1082,8 +1082,8 @@ This package contains the development files fare Kate. %package -n trinity-kwrite Summary: Advanced text editor for TDE Group: System/GUI/Other -Requires: %{name}-data = %{version}-%{release} -Requires: trinity-libkateinterfaces = %{version}-%{release} +Requires: %{name}-data = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-libkateinterfaces = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-kwrite Kwrite is an advanced text editor for TDE. @@ -1107,7 +1107,7 @@ Kwrite is an advanced text editor for TDE. %package -n trinity-kcontrol Summary: Control center for TDE Group: System/GUI/Other -Requires: %{name}-data = %{version}-%{release} +Requires: %{name}-data = %{?epoch:%{epoch}:}%{version}-%{release} # Requires 'usb.ids' Requires: usbutils @@ -1412,7 +1412,7 @@ plugdev group. %package -n trinity-kcontrol-devel Summary: Development files for kcontrol Group: Development/Libraries/Other -Requires: trinity-kcontrol = %{version}-%{release} +Requires: trinity-kcontrol = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-kcontrol-devel %{summary}. @@ -1427,7 +1427,7 @@ Requires: trinity-kcontrol = %{version}-%{release} %package bin Summary: Core binaries for the TDE base module Group: System/GUI/Other -Requires: %{name}-data = %{version}-%{release} +Requires: %{name}-data = %{?epoch:%{epoch}:}%{version}-%{release} Requires: pam %if 0%{?rhel} >= 7 Requires: xorg-x11-server-Xorg @@ -1435,8 +1435,8 @@ Requires: xorg-x11-drv-evdev Requires: dejavu-sans-fonts %endif -Provides: tdebase-bin = %{version}-%{release} -Obsoletes: tdebase-bin < %{version}-%{release} +Provides: tdebase-bin = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: tdebase-bin < %{?epoch:%{epoch}:}%{version}-%{release} %description bin This package contains miscellaneous programs needed by other @@ -1562,11 +1562,11 @@ TDE applications, particularly those in the TDE base module. %package bin-devel Summary: Development files for core binaries for the TDE base module Group: Development/Libraries/Other -Requires: %{name}-bin = %{version}-%{release} +Requires: %{name}-bin = %{?epoch:%{epoch}:}%{version}-%{release} %{?xtst_devel:Requires: %{xtst_devel}} -Obsoletes: tdebase-bin-devel < %{version}-%{release} -Provides: tdebase-bin-devel = %{version}-%{release} +Obsoletes: tdebase-bin-devel < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: tdebase-bin-devel = %{?epoch:%{epoch}:}%{version}-%{release} %description bin-devel This package contains the development files for core binaries for @@ -1582,10 +1582,10 @@ the TDE base module %package data Summary: Shared data files for the TDE base module Group: System/GUI/Other -Requires: %{name}-runtime-data-common = %{version}-%{release} +Requires: %{name}-runtime-data-common = %{?epoch:%{epoch}:}%{version}-%{release} -Obsoletes: tdebase-data < %{version}-%{release} -Provides: tdebase-data = %{version}-%{release} +Obsoletes: tdebase-data < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: tdebase-data = %{?epoch:%{epoch}:}%{version}-%{release} %description data This package contains the architecture-independent shared data files @@ -1880,7 +1880,7 @@ fi %package tdeio-plugins Summary: Core I/O slaves for TDE Group: System/GUI/Other -Requires: trinity-kdesktop = %{version}-%{release} +Requires: trinity-kdesktop = %{?epoch:%{epoch}:}%{version}-%{release} Requires: cyrus-sasl Requires: psmisc %if 0%{?with_hal} @@ -1892,10 +1892,10 @@ Requires: cryptsetup Requires: cryptsetup-luks %endif -Obsoletes: tdebase-kio-plugins < %{version}-%{release} -Provides: tdebase-kio-plugins = %{version}-%{release} -Obsoletes: trinity-tdebase-kio-plugins < %{version}-%{release} -Provides: trinity-tdebase-kio-plugins = %{version}-%{release} +Obsoletes: tdebase-kio-plugins < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: tdebase-kio-plugins = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-tdebase-kio-plugins < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-tdebase-kio-plugins = %{?epoch:%{epoch}:}%{version}-%{release} %description tdeio-plugins This package includes the base tdeioslaves. They include, amongst many @@ -2060,8 +2060,8 @@ group. Summary: Password changer for TDE Group: System/GUI/Other -Obsoletes: trinity-kdepasswd < %{version}-%{release} -Provides: trinity-kdepasswd = %{version}-%{release} +Obsoletes: trinity-kdepasswd < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kdepasswd = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-tdepasswd This is a simple application which allows users to change their @@ -2111,7 +2111,7 @@ system passwords. %package -n trinity-tdeprint Summary: Print system for TDE Group: System/GUI/Other -Requires: %{name}-data = %{version}-%{release} +Requires: %{name}-data = %{?epoch:%{epoch}:}%{version}-%{release} Requires: psutils %description -n trinity-tdeprint @@ -2173,9 +2173,9 @@ Installation of smbclient will make you able to use smb shared printers. %package -n trinity-kdesktop Summary: Miscellaneous binaries and files for the TDE desktop Group: System/GUI/Other -Requires: %{name}-bin = %{version}-%{release} -Requires: %{name}-data = %{version}-%{release} -Requires: trinity-libkonq = %{version}-%{release} +Requires: %{name}-bin = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-data = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-libkonq = %{?epoch:%{epoch}:}%{version}-%{release} Requires: eject %if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} Requires: xdg-utils @@ -2211,7 +2211,7 @@ the TDE desktop. %package -n trinity-kdesktop-devel Summary: Development files for kdesktop Group: Development/Libraries/Other -Requires: trinity-kdesktop = %{version}-%{release} +Requires: trinity-kdesktop = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-kdesktop-devel This package contains the development files for kdesktop. @@ -2227,8 +2227,8 @@ This package contains the development files for kdesktop. %package -n trinity-tdm Summary: X Display manager for TDE Group: System/GUI/Other -Requires: %{name}-bin = %{version}-%{release} -Requires: %{name}-data = %{version}-%{release} +Requires: %{name}-bin = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-data = %{?epoch:%{epoch}:}%{version}-%{release} Requires: pam Requires: logrotate @@ -2428,7 +2428,7 @@ fi %package -n trinity-tdm-devel Summary: Development files for tdm Group: Development/Libraries/Other -Requires: trinity-tdm = %{version}-%{release} +Requires: trinity-tdm = %{?epoch:%{epoch}:}%{version}-%{release} %{?xtst_devel:Requires: %{xtst_devel}} %description -n trinity-tdm-devel @@ -2443,7 +2443,7 @@ This package contains the development files for TDM. %package -n trinity-kfind Summary: File-find utility for TDE Group: System/GUI/Other -Requires: %{name}-data = %{version}-%{release} +Requires: %{name}-data = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-kfind kfind can be used to find files and directories on your @@ -2466,7 +2466,7 @@ workstations. %package -n trinity-khelpcenter Summary: Help center for TDE Group: System/GUI/Other -Requires: %{name}-data = %{version}-%{release} +Requires: %{name}-data = %{?epoch:%{epoch}:}%{version}-%{release} Requires: htdig %description -n trinity-khelpcenter @@ -2499,7 +2499,7 @@ documentation. %package -n trinity-kicker Summary: Desktop panel for TDE Group: System/GUI/Other -Requires: %{name}-data = %{version}-%{release} +Requires: %{name}-data = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-kicker Kicker provides the TDE panel on you desktop. It can be used as a @@ -2615,7 +2615,7 @@ functionality. %package -n trinity-kicker-devel Summary: Development files for kicker Group: Development/Libraries/Other -Requires: trinity-kicker = %{version}-%{release} +Requires: trinity-kicker = %{?epoch:%{epoch}:}%{version}-%{release} %{?xtst_devel:Requires: %{xtst_devel}} %description -n trinity-kicker-devel @@ -2641,7 +2641,7 @@ This package contains the development files for kicker. %package -n trinity-klipper Summary: Clipboard utility for Trinity Group: System/GUI/Other -Requires: %{name}-data = %{version}-%{release} +Requires: %{name}-data = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-klipper klipper provides standard clipboard functions (cut and paste, history @@ -2674,7 +2674,7 @@ web browser if the clipboard contains a URL. %package -n trinity-kmenuedit Summary: Menu editor for TDE Group: System/GUI/Other -Requires: %{name}-data = %{version}-%{release} +Requires: %{name}-data = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-kmenuedit The TDE menu editor allows you to make customisations to the TDE menu @@ -2703,12 +2703,12 @@ structure. %package -n trinity-konqueror Summary: TDE's advanced file manager, web browser and document viewer Group: System/GUI/Other -Requires: %{name}-data = %{version}-%{release} -Requires: trinity-kcontrol = %{version}-%{release} -Requires: %{name}-tdeio-plugins = %{version}-%{release} -Requires: trinity-kdesktop = %{version}-%{release} -Requires: trinity-kfind = %{version}-%{release} -Requires: trinity-libkonq = %{version}-%{release} +Requires: %{name}-data = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kcontrol = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-tdeio-plugins = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kdesktop = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kfind = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-libkonq = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-konqueror Konqueror is the file manager for the Trinity Desktop Environment. @@ -2851,7 +2851,7 @@ fi %package -n trinity-konqueror-devel Summary: Development files for konqueror Group: Development/Libraries/Other -Requires: trinity-konqueror = %{version}-%{release} +Requires: trinity-konqueror = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-konqueror-devel This package contains the development files for konqueror. @@ -2868,7 +2868,7 @@ This package contains the development files for konqueror. %package -n trinity-konqueror-nsplugins Summary: Netscape plugin support for Konqueror Group: System/GUI/Other -Requires: trinity-konqueror = %{version}-%{release} +Requires: trinity-konqueror = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-konqueror-nsplugins This package includes support for Netscape plugins in Konqueror. @@ -2889,7 +2889,7 @@ This package includes support for Netscape plugins in Konqueror. %package -n trinity-konsole Summary: X terminal emulator for TDE Group: System/GUI/Other -Requires: %{name}-data = %{version}-%{release} +Requires: %{name}-data = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-konsole Konsole is an X terminal emulation which provides a command-line interface @@ -2942,7 +2942,7 @@ Using Konsole, a user can open: %package -n trinity-kpager Summary: Desktop pager for TDE Group: System/GUI/Other -Requires: %{name}-data = %{version}-%{release} +Requires: %{name}-data = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-kpager This package contains TDE's desktop pager, which displays your virtual @@ -2962,7 +2962,7 @@ applications. It is used to switch between applications or desktops. %package -n trinity-kpersonalizer Summary: Installation personalizer for TDE Group: System/GUI/Other -Requires: %{name}-data = %{version}-%{release} +Requires: %{name}-data = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-kpersonalizer TDE Personalizer is the application that configures the TDE desktop for you. @@ -2983,8 +2983,8 @@ automatically started. KPersonalizer can also be called later. %package -n trinity-ksmserver Summary: Session manager for TDE Group: System/GUI/Other -Requires: %{name}-data = %{version}-%{release} -Requires: trinity-twin = %{version}-%{release} +Requires: %{name}-data = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-twin = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-ksmserver This package contains the TDE session manager. It is responsible for @@ -3038,7 +3038,7 @@ update-alternatives --remove default-xsession.desktop /usr/share/xsessions/tde.d %package -n trinity-ksplash Summary: The TDE splash screen Group: System/GUI/Other -Requires: %{name}-data = %{version}-%{release} +Requires: %{name}-data = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-ksplash This package includes the TDE Splash screen, which is seen when @@ -3074,7 +3074,7 @@ a TDE session is launched. %package -n trinity-ksplash-devel Summary: Development files for ksplash Group: Development/Libraries/Other -Requires: trinity-ksplash = %{version}-%{release} +Requires: trinity-ksplash = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-ksplash-devel This package contains the development files for ksplash. @@ -3090,8 +3090,8 @@ This package contains the development files for ksplash. %package -n trinity-ksysguard Summary: System guard for TDE Group: System/GUI/Other -Requires: %{name}-data = %{version}-%{release} -Requires: trinity-ksysguardd = %{version}-%{release} +Requires: %{name}-data = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-ksysguardd = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-ksysguard TDE System Guard allows you to monitor various statistics about your @@ -3116,7 +3116,7 @@ computer. %package -n trinity-ksysguard-devel Summary: Development files for ksysguard Group: Development/Libraries/Other -Requires: trinity-ksysguard = %{version}-%{release} +Requires: trinity-ksysguard = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-ksysguard-devel This package contains the development files for ksysguard. @@ -3132,7 +3132,7 @@ This package contains the development files for ksysguard. %package -n trinity-ksysguardd Summary: System guard daemon for TDE Group: System/GUI/Other -Requires: %{name}-data = %{version}-%{release} +Requires: %{name}-data = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-ksysguardd TDE System Guard Daemon is the daemon part of ksysguard. The daemon can @@ -3149,7 +3149,7 @@ to monitor it through the daemon running there. %package -n trinity-ktip Summary: Useful tips for TDE Group: System/GUI/Other -Requires: %{name}-data = %{version}-%{release} +Requires: %{name}-data = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-ktip ktip provides many useful tips on using TDE when you log in. @@ -3168,7 +3168,7 @@ ktip provides many useful tips on using TDE when you log in. %package -n trinity-twin Summary: The TDE window manager Group: System/GUI/Other -Requires: %{name}-data = %{version}-%{release} +Requires: %{name}-data = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-twin This package contains the default X window manager for TDE. @@ -3221,7 +3221,7 @@ This package contains the default X window manager for TDE. %package -n trinity-twin-devel Summary: Development files for twin Group: Development/Libraries/Other -Requires: trinity-twin = %{version}-%{release} +Requires: trinity-twin = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-twin-devel This package contains the development files for twin. @@ -3273,8 +3273,8 @@ Konqueror and the kdesktop package. Summary: Integration library between TQt3 and TDE Group: System/GUI/Other -Obsoletes: tdebase-libtqt3-integration < %{version}-%{release} -Provides: tdebase-libtqt3-integration = %{version}-%{release} +Obsoletes: tdebase-libtqt3-integration < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: tdebase-libtqt3-integration = %{?epoch:%{epoch}:}%{version}-%{release} %description libtqt3-integration These libraries allow you to use TDE dialogs in native TQt3 applications. @@ -3291,7 +3291,7 @@ These libraries allow you to use TDE dialogs in native TQt3 applications. %package -n trinity-libkonq-devel Summary: Development files for Konqueror's core libraries Group: Development/Libraries/Other -Requires: trinity-libkonq = %{version}-%{release} +Requires: trinity-libkonq = %{?epoch:%{epoch}:}%{version}-%{release} %{?xtst_devel:Requires: %{xtst_devel}} %description -n trinity-libkonq-devel diff --git a/redhat/main/tdebindings/tdebindings.spec b/redhat/main/tdebindings/tdebindings.spec index d68e30b61..883f47711 100644 --- a/redhat/main/tdebindings/tdebindings.spec +++ b/redhat/main/tdebindings/tdebindings.spec @@ -278,24 +278,24 @@ BuildRequires: perl-devel BuildRequires: libtqscintilla-devel >= %{?tde_epoch:%{tde_epoch}:}1.7.1 %define _enable_qscintilla --enable-qscintilla -Obsoletes: trinity-kdebindings < %{version}-%{release} -Provides: trinity-kdebindings = %{version}-%{release} +Obsoletes: trinity-kdebindings < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kdebindings = %{?epoch:%{epoch}:}%{version}-%{release} # Metapackage requires %if "%{?_with_java}" != "" -Requires: trinity-tdebindings-java = %{version}-%{release} -%endif -Requires: trinity-libsmoketqt = %{version}-%{release} -Requires: trinity-libsmoketde = %{version}-%{release} -Requires: perl-dcop = %{version}-%{release} -Requires: python-dcop = %{version}-%{release} -Requires: trinity-libkjsembed1 = %{version}-%{release} -Requires: trinity-kjscmd = %{version}-%{release} +Requires: trinity-tdebindings-java = %{?epoch:%{epoch}:}%{version}-%{release} +%endif +Requires: trinity-libsmoketqt = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-libsmoketde = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: perl-dcop = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: python-dcop = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-libkjsembed1 = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kjscmd = %{?epoch:%{epoch}:}%{version}-%{release} %if "%{?_with_java}" != "" -Requires: trinity-juic = %{version}-%{release} +Requires: trinity-juic = %{?epoch:%{epoch}:}%{version}-%{release} %endif -Requires: trinity-libkorundum0-ruby = %{version}-%{release} -Requires: trinity-libqt0-ruby = %{version}-%{release} +Requires: trinity-libkorundum0-ruby = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-libqt0-ruby = %{?epoch:%{epoch}:}%{version}-%{release} %description @@ -309,12 +309,12 @@ TDE/DCOP bindings to non-C++ languages %package java Summary: TDE Java bindings metapackage [Trinity] Group: System/Libraries -Requires: trinity-libdcop3-java = %{version}-%{release} -Requires: trinity-libdcop3-jni = %{version}-%{release} -Requires: trinity-libqt3-java = %{version}-%{release} -Requires: trinity-libtqt3-jni = %{version}-%{release} -Requires: trinity-libtrinity-java = %{version}-%{release} -Requires: trinity-libtrinity-jni = %{version}-%{release} +Requires: trinity-libdcop3-java = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-libdcop3-jni = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-libqt3-java = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-libtqt3-jni = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-libtrinity-java = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-libtrinity-jni = %{?epoch:%{epoch}:}%{version}-%{release} %description java A metapackage depending on all TDE, Qt and DCOP bindings libraries @@ -332,7 +332,7 @@ This package is part of the official TDE bindings module. Summary: DCOP bindings for Java [Trinity] Group: System/Libraries -Requires: trinity-libdcop3-jni = %{version}-%{release} +Requires: trinity-libdcop3-jni = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-libdcop3-java This package contains the Java classes necessary to run Java programs @@ -352,7 +352,7 @@ This package is part of the official TDE bindings module. %package -n trinity-libdcop3-java-devel Summary: DCOP bindings for Java (dcopidl2java program) [Trinity] Group: Development/Languages/Java -Requires: trinity-libdcop3-java = %{version}-%{release} +Requires: trinity-libdcop3-java = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-libdcop3-java-devel This package contains the dcopidl2java program which generates Java @@ -394,9 +394,9 @@ This package is part of the official TDE bindings module. %package -n trinity-libqt3-java Summary: Java bindings for Qt [Trinity] Group: System/Libraries -Requires: trinity-libdcop3-jni = %{version}-%{release} -Requires: trinity-libtqt3-jni = %{version}-%{release} -Requires: trinity-juic = %{version}-%{release} +Requires: trinity-libdcop3-jni = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-libtqt3-jni = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-juic = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-libqt3-java This package contains the Java classes necessary to run Java programs @@ -421,8 +421,8 @@ This package is part of the official TDE bindings module. Summary: Java bindings for TQt ( Native libraries ) [Trinity] Group: System/Libraries -Obsoletes: trinity-libqt3-jni < %{version}-%{release} -Provides: trinity-libqt3-jni = %{version}-%{release} +Obsoletes: trinity-libqt3-jni < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-libqt3-jni = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-libtqt3-jni This package contains the shared libraries necessary to run Java @@ -446,10 +446,10 @@ This package is part of the official TDE bindings module. %package -n trinity-libtqt3-jni-devel Summary: Development files fo Java bindings for TQt ( Native libraries ) [Trinity] Group: Development/Languages/Java -Requires: trinity-libtqt3-jni = %{version}-%{release} +Requires: trinity-libtqt3-jni = %{?epoch:%{epoch}:}%{version}-%{release} -Obsoletes: trinity-libqt3-jni-devel < %{version}-%{release} -Provides: trinity-libqt3-jni-devel = %{version}-%{release} +Obsoletes: trinity-libqt3-jni-devel < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-libqt3-jni-devel = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-libtqt3-jni-devel This package contains the development files for trinity-libtqt3-jni. @@ -469,7 +469,7 @@ This package is part of the official TDE bindings module. Summary: Tdelibs bindings for Java [Trinity] Group: System/Libraries -Requires: trinity-libtrinity-jni = %{version}-%{release} +Requires: trinity-libtrinity-jni = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-libtrinity-java This package contains the Java classes necessary to run Java programs @@ -513,7 +513,7 @@ This package is part of the official TDE bindings module. %package -n trinity-libtrinity-jni-devel Summary: Development files for tdelibs bindings for java ( Native libraries ) [Trinity] Group: Development/Languages/Java -Requires: trinity-libtrinity-jni = %{version}-%{release} +Requires: trinity-libtrinity-jni = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-libtrinity-jni-devel This package contains the development files for trinity-libtrinity-jni. @@ -531,8 +531,8 @@ This package is part of the official TDE bindings module. Summary: SMOKE Binding Library to Qt Group: System/Libraries -Obsoletes: trinity-libsmokeqt1 < %{version}-%{release} -Provides: trinity-libsmokeqt1 = %{version}-%{release} +Obsoletes: trinity-libsmokeqt1 < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-libsmokeqt1 = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-libsmoketqt The "Scripting Meta Object Kompiler Engine" library is used by @@ -550,10 +550,10 @@ This package is part of the official TDE bindings module. %package -n trinity-libsmoketqt-devel Summary: SMOKE Binding Library to TQt - Development Files Group: Development/Languages/Other -Requires: trinity-libsmoketqt = %{version}-%{release} +Requires: trinity-libsmoketqt = %{?epoch:%{epoch}:}%{version}-%{release} -Obsoletes: trinity-libsmokeqt-devel < %{version}-%{release} -Provides: trinity-libsmokeqt-devel = %{version}-%{release} +Obsoletes: trinity-libsmokeqt-devel < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-libsmokeqt-devel = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-libsmoketqt-devel The "Scripting Meta Object Kompiler Engine" library is used by @@ -578,8 +578,8 @@ This package is part of the official TDE bindings module. Summary: SMOKE Binding Library to TDE Group: System/Libraries -Obsoletes: trinity-libsmokekde1 < %{version}-%{release} -Provides: trinity-libsmokekde1 = %{version}-%{release} +Obsoletes: trinity-libsmokekde1 < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-libsmokekde1 = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-libsmoketde The "Scripting Meta Object Kompiler Engine" library is used by @@ -597,10 +597,10 @@ This package is part of the official TDE bindings module. %package -n trinity-libsmoketde-devel Summary: SMOKE Binding Library to TDE - Development Files Group: Development/Languages/Other -Requires: trinity-libsmoketde = %{version}-%{release} +Requires: trinity-libsmoketde = %{?epoch:%{epoch}:}%{version}-%{release} -Obsoletes: trinity-libsmokekde-devel < %{version}-%{release} -Provides: trinity-libsmokekde-devel = %{version}-%{release} +Obsoletes: trinity-libsmokekde-devel < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-libsmokekde-devel = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-libsmoketde-devel The "Scripting Meta Object Kompiler Engine" library is used by @@ -629,11 +629,11 @@ Requires: perl-base Requires: perl %endif -Obsoletes: trinity-kdebindings-dcopperl < %{version}-%{release} -Provides: trinity-kdebindings-dcopperl = %{version}-%{release} +Obsoletes: trinity-kdebindings-dcopperl < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kdebindings-dcopperl = %{?epoch:%{epoch}:}%{version}-%{release} -Obsoletes: trinity-perl-dcop < %{version}-%{release} -Provides: trinity-perl-dcop = %{version}-%{release} +Obsoletes: trinity-perl-dcop < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-perl-dcop = %{?epoch:%{epoch}:}%{version}-%{release} %description -n perl-dcop Perl bindings to the DCOP interprocess communication protocol used by TDE @@ -653,8 +653,8 @@ Summary: DCOP bindings for Python Group: System/Libraries Requires: %{python} -Obsoletes: trinity-python-dcop < %{version}-%{release} -Provides: trinity-python-dcop = %{version}-%{release} +Obsoletes: trinity-python-dcop < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-python-dcop = %{?epoch:%{epoch}:}%{version}-%{release} %description -n python-dcop This package contains the shared libraries necessary to run and @@ -717,7 +717,7 @@ This package is part of the official TDE bindings module. %package -n trinity-libkjsembed-devel Summary: Embedded JavaScript library (Development files) Group: Development/Libraries/Other -Requires: trinity-libkjsembed1 = %{version}-%{release} +Requires: trinity-libkjsembed1 = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-libkjsembed-devel This package contains the header files and symbolic links necessary @@ -764,7 +764,7 @@ This package is part of the official TDE bindings module. %package -n trinity-juic Summary: The Qt Java UI Compiler Group: Development/Languages/Java -Requires: trinity-libqt3-java = %{version}-%{release} +Requires: trinity-libqt3-java = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-juic This package contains the juic program, which is used to convert @@ -786,7 +786,7 @@ This package is part of the official TDE bindings module. %package -n trinity-libkorundum0-ruby Summary: TDE bindings for Ruby [Trinity] Group: System/Libraries -Requires: trinity-libqt0-ruby = %{version}-%{release} +Requires: trinity-libqt0-ruby = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-libkorundum0-ruby This package contains the files necessary for running and developing @@ -902,8 +902,8 @@ This package contains the xparts library for GTK. Summary: Xparts library for TDE Group: Development/Languages/Other -Obsoletes: trinity-libkdexparts1 < %{version}-%{release} -Provides: trinity-libkdexparts1 = %{version}-%{release} +Obsoletes: trinity-libkdexparts1 < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-libkdexparts1 = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-libtdexparts This package contains the xparts library for TDE. @@ -919,9 +919,9 @@ This package contains the xparts library for TDE. Summary: Xparts development files Group: Development/Languages/Other %if 0%{?with_gtk1} -Requires: trinity-libgtkxparts1 = %{version}-%{release} +Requires: trinity-libgtkxparts1 = %{?epoch:%{epoch}:}%{version}-%{release} %endif -Requires: trinity-libtdexparts = %{version}-%{release} +Requires: trinity-libtdexparts = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-libxparts-devel This package contains the development files for Xparts library. @@ -941,12 +941,12 @@ Summary: Extra xparts for TDE [Trinity] Group: Development/Languages/Other # Metapckage requires -Requires: trinity-xpart-notepad = %{version}-%{release} +Requires: trinity-xpart-notepad = %{?epoch:%{epoch}:}%{version}-%{release} %if 0%{?with_gtk1} -Requires: trinity-libgtkxparts1 = %{version}-%{release} +Requires: trinity-libgtkxparts1 = %{?epoch:%{epoch}:}%{version}-%{release} %endif -Requires: trinity-libtdexparts = %{version}-%{release} -Requires: trinity-libdcop-c = %{version}-%{release} +Requires: trinity-libtdexparts = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-libdcop-c = %{?epoch:%{epoch}:}%{version}-%{release} %description xparts-extras This package contains extra xparts-based modules for Trinity @@ -975,7 +975,7 @@ This package contains the DCOP bindings for C. %package -n trinity-libdcop-c-devel Summary: DCOP bindings for C, development files [Trinity] Group: Development/Languages/C and C++ -Requires: trinity-libdcop-c = %{version}-%{release} +Requires: trinity-libdcop-c = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-libdcop-c-devel This package contains the development files for DCOP bindings for C. @@ -993,23 +993,23 @@ Summary: Development files for %{name} Group: Development/Languages/Other Requires: trinity-tdelibs-devel >= %{tde_version} -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} -Obsoletes: trinity-kdebindings-devel < %{version}-%{release} -Provides: trinity-kdebindings-devel = %{version}-%{release} +Obsoletes: trinity-kdebindings-devel < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kdebindings-devel = %{?epoch:%{epoch}:}%{version}-%{release} # Metapackage -Requires: trinity-libsmoketqt-devel = %{version}-%{release} +Requires: trinity-libsmoketqt-devel = %{?epoch:%{epoch}:}%{version}-%{release} %if "%{?_with_java}" != "" -Requires: trinity-libdcop3-java-devel = %{version}-%{release} +Requires: trinity-libdcop3-java-devel = %{?epoch:%{epoch}:}%{version}-%{release} %endif -Requires: trinity-libsmoketde-devel = %{version}-%{release} -Requires: trinity-libkjsembed-devel = %{version}-%{release} -Requires: trinity-libxparts-devel = %{version}-%{release} -Requires: trinity-libdcop-c-devel = %{version}-%{release} +Requires: trinity-libsmoketde-devel = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-libkjsembed-devel = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-libxparts-devel = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-libdcop-c-devel = %{?epoch:%{epoch}:}%{version}-%{release} %if "%{?_with_java}" != "" -Requires: trinity-libtqt3-jni-devel = %{version}-%{release} -Requires: trinity-libtrinity-jni-devel = %{version}-%{release} +Requires: trinity-libtqt3-jni-devel = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-libtrinity-jni-devel = %{?epoch:%{epoch}:}%{version}-%{release} %endif %description devel diff --git a/redhat/main/tdeedu/tdeedu.spec b/redhat/main/tdeedu/tdeedu.spec index 5bc1dfcc9..7423d0c91 100644 --- a/redhat/main/tdeedu/tdeedu.spec +++ b/redhat/main/tdeedu/tdeedu.spec @@ -140,41 +140,41 @@ BuildRequires: ocaml %define with_v4l 1 %endif -Obsoletes: trinity-kdeedu < %{version}-%{release} -Provides: trinity-kdeedu = %{version}-%{release} -Obsoletes: trinity-kdeedu-libs < %{version}-%{release} -Provides: trinity-kdeedu-libs = %{version}-%{release} +Obsoletes: trinity-kdeedu < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kdeedu = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kdeedu-libs < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kdeedu-libs = %{?epoch:%{epoch}:}%{version}-%{release} # Meta-package -Requires: %{name}-data = %{version}-%{release} -Requires: trinity-blinken = %{version}-%{release} -Requires: trinity-kalzium = %{version}-%{release} -Requires: trinity-kalzium-data = %{version}-%{release} -Requires: trinity-kanagram = %{version}-%{release} -Requires: trinity-kbruch = %{version}-%{release} -Requires: trinity-keduca = %{version}-%{release} -Requires: trinity-kgeography = %{version}-%{release} -Requires: trinity-kgeography-data = %{version}-%{release} -Requires: trinity-khangman = %{version}-%{release} +Requires: %{name}-data = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-blinken = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kalzium = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kalzium-data = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kanagram = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kbruch = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-keduca = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kgeography = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kgeography-data = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-khangman = %{?epoch:%{epoch}:}%{version}-%{release} %if 0%{?with_kig} -Requires: trinity-kig = %{version}-%{release} +Requires: trinity-kig = %{?epoch:%{epoch}:}%{version}-%{release} %endif -Requires: trinity-kiten = %{version}-%{release} -Requires: trinity-klatin = %{version}-%{release} -Requires: trinity-klettres = %{version}-%{release} -Requires: trinity-klettres-data = %{version}-%{release} -Requires: trinity-kmplot = %{version}-%{release} -Requires: trinity-kpercentage = %{version}-%{release} -Requires: trinity-kstars = %{version}-%{release} -Requires: trinity-kstars-data = %{version}-%{release} -Requires: trinity-ktouch = %{version}-%{release} -Requires: trinity-kturtle = %{version}-%{release} -Requires: trinity-kverbos = %{version}-%{release} -Requires: trinity-kvoctrain = %{version}-%{release} -Requires: trinity-kwordquiz = %{version}-%{release} -Requires: trinity-libtdeedu3 = %{version}-%{release} -Requires: trinity-libkiten1 = %{version}-%{release} -Requires: trinity-indi = %{version}-%{release} +Requires: trinity-kiten = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-klatin = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-klettres = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-klettres-data = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kmplot = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kpercentage = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kstars = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kstars-data = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-ktouch = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kturtle = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kverbos = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kvoctrain = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kwordquiz = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-libtdeedu3 = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-libkiten1 = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-indi = %{?epoch:%{epoch}:}%{version}-%{release} %description @@ -231,7 +231,7 @@ This package is part of Trinity, as a component of the TDE education module. %package -n trinity-blinken Summary: Trinity version of the Simon Says electronic memory game Group: System/GUI/Other -Requires: trinity-tdeedu-data = %{version}-%{release} +Requires: trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-blinken Blinken is based on an electronic game released in 1978, which @@ -261,8 +261,8 @@ This package is part of Trinity, as a component of the TDE education module. %package -n trinity-kalzium Summary: Chemistry teaching tool for Trinity Group: System/GUI/Other -Requires: trinity-kalzium-data = %{version}-%{release} -Requires: trinity-tdeedu-data = %{version}-%{release} +Requires: trinity-kalzium-data = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-kalzium Kalzium is a program which shows you the Periodic System of Elements @@ -318,7 +318,7 @@ This package is part of Trinity, as a component of the TDE education module. %package -n trinity-kanagram Summary: Letter order game for Trinity Group: System/GUI/Other -Requires: trinity-tdeedu-data = %{version}-%{release} +Requires: trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-kanagram KAnagram is a game that is based on the word/letter puzzles that the @@ -351,7 +351,7 @@ This package is part of Trinity, as a component of the TDE education module. %package -n trinity-kbruch Summary: Fraction calculation teaching tool for Trinity Group: System/GUI/Other -Requires: trinity-tdeedu-data = %{version}-%{release} +Requires: trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-kbruch KBruch is a small program to practice calculating with fractions. @@ -377,7 +377,7 @@ This package is part of Trinity, as a component of the TDE education module. %package -n trinity-keduca Summary: Interactive form-based tests for Trinity Group: System/GUI/Other -Requires: trinity-tdeedu-data = %{version}-%{release} +Requires: trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-keduca KEduca is a flash-card application which allows you to make @@ -408,8 +408,8 @@ This package is part of Trinity, as a component of the TDE education module. %package -n trinity-kgeography Summary: Geography learning tool for Trinity Group: System/GUI/Other -Requires: trinity-kgeography-data = %{version}-%{release} -Requires: trinity-tdeedu-data = %{version}-%{release} +Requires: trinity-kgeography-data = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-kgeography KGeography contains maps allowing you to learn various countries or @@ -456,7 +456,7 @@ This package is part of Trinity, as a component of the TDE education module. Summary: The classical hangman game for Trinity Group: System/GUI/Other #Requires: dustin-dustismo-sans-fonts -Requires: trinity-tdeedu-data = %{version}-%{release} +Requires: trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-khangman KHangMan is a game based on the well known hangman game. It is aimed @@ -488,7 +488,7 @@ This package is part of Trinity, as a component of the TDE education module. %package -n trinity-kig Summary: Interactive geometry program for TDE Group: System/GUI/Other -Requires: trinity-tdeedu-data = %{version}-%{release} +Requires: trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-kig Kig is an application for interactive geometry. It is intended to @@ -550,7 +550,7 @@ This package is part of Trinity, as a component of the TDE education module. %package -n trinity-kiten Summary: Japanese reference/study tool for Trinity Group: System/GUI/Other -Requires: trinity-tdeedu-data = %{version}-%{release} +Requires: trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release} #Requires: ttf-kochi-gothic | ttf-kochi-mincho %description -n trinity-kiten @@ -577,7 +577,7 @@ This package is part of Trinity, as a component of the TDE education module. %package -n trinity-klatin Summary: Application to help revise/teach Latin Group: System/GUI/Other -Requires: trinity-tdeedu-data = %{version}-%{release} +Requires: trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-klatin KLatin is a program to help revise Latin. There are three "sections" @@ -612,8 +612,8 @@ This package is part of Trinity, as a component of the TDE education module. %package -n trinity-klettres Summary: Foreign alphabet tutor for Trinity Group: System/GUI/Other -Requires: trinity-klettres-data = %{version}-%{release} -Requires: trinity-tdeedu-data = %{version}-%{release} +Requires: trinity-klettres-data = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-klettres KLettres is an application specially designed to help the user to @@ -661,7 +661,7 @@ This package is part of Trinity, as a component of the TDE education module. %package -n trinity-kmplot Summary: Mathematical function plotter for Trinity Group: System/GUI/Other -Requires: trinity-tdeedu-data = %{version}-%{release} +Requires: trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-kmplot KmPlot is a mathematical function plotter for TDE. It has a powerful @@ -699,7 +699,7 @@ This package is part of Trinity, as a component of the TDE education module. %package -n trinity-kpercentage Summary: Percentage calculation teaching tool for Trinity Group: System/GUI/Other -Requires: trinity-tdeedu-data = %{version}-%{release} +Requires: trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-kpercentage KPercentage is a small math application that will help pupils to @@ -726,9 +726,9 @@ This package is part of Trinity, as a component of the TDE education module. %package -n trinity-kstars Summary: Desktop planetarium for Trinity Group: System/GUI/Other -Requires: trinity-tdeedu-data = %{version}-%{release} -Requires: trinity-kstars-data = %{version}-%{release} -Requires: trinity-indi = %{version}-%{release} +Requires: trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kstars-data = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-indi = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-kstars KStars is a graphical desktop planetarium for TDE. It depicts an @@ -780,7 +780,7 @@ This package is part of Trinity, as a component of the TDE education module. %package -n trinity-ktouch Summary: Touch typing tutor for Trinity Group: System/GUI/Other -Requires: trinity-tdeedu-data = %{version}-%{release} +Requires: trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-ktouch KTouch is a program for learning touch typing - it helps you learn to @@ -810,7 +810,7 @@ This package is part of Trinity, as a component of the TDE education module. %package -n trinity-kturtle Summary: Educational Logo programming environment Group: System/GUI/Other -Requires: trinity-tdeedu-data = %{version}-%{release} +Requires: trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-kturtle KTurtle is an educational programming environment using the Logo @@ -848,7 +848,7 @@ This package is part of Trinity, as a component of the TDE education module. %package -n trinity-kverbos Summary: Spanish verb form study application for Trinity Group: System/GUI/Other -Requires: trinity-tdeedu-data = %{version}-%{release} +Requires: trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-kverbos Kverbos allows the user to learn the forms of Spanish verbs. The @@ -880,7 +880,7 @@ Summary: Vocabulary trainer for Trinity Group: System/GUI/Other Requires: perl Requires: perl-libwww-perl -Requires: trinity-tdeedu-data = %{version}-%{release} +Requires: trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-kvoctrain KVocTrain is a little utility to help you train your vocabulary when @@ -922,7 +922,7 @@ This package is part of Trinity, as a component of the TDE education module. %package -n trinity-kwordquiz Summary: Flashcard and vocabulary learning program for Trinity Group: System/GUI/Other -Requires: trinity-tdeedu-data = %{version}-%{release} +Requires: trinity-tdeedu-data = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-kwordquiz KWordQuiz is a flashcard-based tool that helps you to master new @@ -976,7 +976,7 @@ This package is part of Trinity, as a component of the TDE education module. %package -n trinity-libtdeedu-devel Summary: Development files for Trinity educational library Group: Development/Libraries/Other -Requires: trinity-libtdeedu3 = %{version}-%{release} +Requires: trinity-libtdeedu3 = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-libtdeedu-devel The TDE-based library libtdeedu is used with educational @@ -1035,7 +1035,7 @@ This package is part of Trinity, as a component of the TDE education module. %package -n trinity-libkiten-devel Summary: Development files for Kiten library Group: Development/Libraries/Other -Requires: trinity-libkiten1 = %{version}-%{release} +Requires: trinity-libkiten1 = %{?epoch:%{epoch}:}%{version}-%{release} Requires: trinity-tdelibs-devel >= %{version} %description -n trinity-libkiten-devel @@ -1105,12 +1105,12 @@ This package is part of Trinity, as a component of the TDE education module. %package devel Summary: Development files for %{name} Group: Development/Libraries/Other -Requires: %{name} = %{version}-%{release} -Requires: trinity-libtdeedu-devel = %{version}-%{release} -Requires: trinity-libkiten-devel = %{version}-%{release} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-libtdeedu-devel = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-libkiten-devel = %{?epoch:%{epoch}:}%{version}-%{release} -Obsoletes: trinity-kdeedu-devel < %{version}-%{release} -Provides: trinity-kdeedu-devel = %{version}-%{release} +Obsoletes: trinity-kdeedu-devel < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kdeedu-devel = %{?epoch:%{epoch}:}%{version}-%{release} %description devel This package contains the development files for tdeedu. diff --git a/redhat/main/tdegames/tdegames.spec b/redhat/main/tdegames/tdegames.spec index 4902e47f6..8deae8f67 100644 --- a/redhat/main/tdegames/tdegames.spec +++ b/redhat/main/tdegames/tdegames.spec @@ -118,46 +118,46 @@ BuildRequires: brp-check-trinity # GLIB2 support BuildRequires: glib2-devel -Obsoletes: trinity-kdegames < %{version}-%{release} -Provides: trinity-kdegames = %{version}-%{release} -Obsoletes: trinity-kdegames-libs < %{version}-%{release} -Provides: trinity-kdegames-libs = %{version}-%{release} - -Requires: trinity-libtdegames1 = %{version}-%{release} -Requires: trinity-tdegames-card-data = %{version}-%{release} -Requires: trinity-atlantik = %{version}-%{release} -Requires: trinity-kasteroids = %{version}-%{release} -Requires: trinity-katomic = %{version}-%{release} -Requires: trinity-kbackgammon = %{version}-%{release} -Requires: trinity-kbattleship = %{version}-%{release} -Requires: trinity-kblackbox = %{version}-%{release} -Requires: trinity-kbounce = %{version}-%{release} -Requires: trinity-kenolaba = %{version}-%{release} -Requires: trinity-kfouleggs = %{version}-%{release} -Requires: trinity-kgoldrunner = %{version}-%{release} -Requires: trinity-kjumpingcube = %{version}-%{release} -Requires: trinity-klickety = %{version}-%{release} -Requires: trinity-klines = %{version}-%{release} -Requires: trinity-kmahjongg = %{version}-%{release} -Requires: trinity-kmines = %{version}-%{release} -Requires: trinity-knetwalk = %{version}-%{release} -Requires: trinity-kolf = %{version}-%{release} -Requires: trinity-konquest = %{version}-%{release} -Requires: trinity-kpat = %{version}-%{release} -Requires: trinity-kpoker = %{version}-%{release} -Requires: trinity-kreversi = %{version}-%{release} -Requires: trinity-ksame = %{version}-%{release} -Requires: trinity-kshisen = %{version}-%{release} -Requires: trinity-ksirtet = %{version}-%{release} -Requires: trinity-ksmiletris = %{version}-%{release} -Requires: trinity-ksnake = %{version}-%{release} -Requires: trinity-ksokoban = %{version}-%{release} -Requires: trinity-kspaceduel = %{version}-%{release} -Requires: trinity-ktron = %{version}-%{release} -Requires: trinity-ktuberling = %{version}-%{release} -Requires: trinity-twin4 = %{version}-%{release} -Requires: trinity-lskat = %{version}-%{release} -Requires: trinity-tdefifteen = %{version}-%{release} +Obsoletes: trinity-kdegames < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kdegames = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kdegames-libs < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kdegames-libs = %{?epoch:%{epoch}:}%{version}-%{release} + +Requires: trinity-libtdegames1 = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-tdegames-card-data = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-atlantik = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kasteroids = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-katomic = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kbackgammon = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kbattleship = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kblackbox = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kbounce = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kenolaba = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kfouleggs = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kgoldrunner = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kjumpingcube = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-klickety = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-klines = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kmahjongg = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kmines = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-knetwalk = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kolf = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-konquest = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kpat = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kpoker = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kreversi = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-ksame = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kshisen = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-ksirtet = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-ksmiletris = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-ksnake = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-ksokoban = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kspaceduel = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-ktron = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-ktuberling = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-twin4 = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-lskat = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-tdefifteen = %{?epoch:%{epoch}:}%{version}-%{release} %description @@ -174,14 +174,14 @@ ksnake, ksirtet, katomic, kjumpingcube, ktuberling. Summary: Development files for %{name} Group: Amusements/Games/Other -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} Requires: trinity-tdelibs-devel >= %{tde_version} -Requires: trinity-libtdegames-devel = %{version}-%{release} -Requires: trinity-atlantik-devel = %{version}-%{release} -Requires: trinity-kolf-devel = %{version}-%{release} +Requires: trinity-libtdegames-devel = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-atlantik-devel = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kolf-devel = %{?epoch:%{epoch}:}%{version}-%{release} -Obsoletes: trinity-kdegames-devel < %{version}-%{release} -Provides: trinity-kdegames-devel = %{version}-%{release} +Obsoletes: trinity-kdegames-devel < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kdegames-devel = %{?epoch:%{epoch}:}%{version}-%{release} %description devel Install %{name}-devel if you wish to develop or compile games for the @@ -220,7 +220,7 @@ This package is part of TDE, and a component of the TDE games module. %package -n trinity-libtdegames-devel Summary: Trinity games library headers Group: Development/Libraries/Other -Requires: trinity-libtdegames1 = %{version}-%{release} +Requires: trinity-libtdegames1 = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-libtdegames-devel This package is necessary if you want to develop your own games using @@ -285,7 +285,7 @@ This package is part of Trinity, and a component of the TDE games module. %package -n trinity-atlantik-devel Summary: Development files for Atlantik Group: Development/Libraries/Other -Requires: trinity-atlantik = %{version}-%{release} +Requires: trinity-atlantik = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-atlantik-devel This package contains header files for compiling programs against the @@ -734,7 +734,7 @@ This package is part of Trinity, and a component of the TDE games module. %package -n trinity-kolf-devel Summary: Development files for Kolf Group: Development/Libraries/Other -Requires: trinity-kolf = %{version}-%{release} +Requires: trinity-kolf = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-kolf-devel This package contains headers and development libraries for compiling diff --git a/redhat/main/tdegraphics/tdegraphics.spec b/redhat/main/tdegraphics/tdegraphics.spec index acdde3ba8..f061739c0 100644 --- a/redhat/main/tdegraphics/tdegraphics.spec +++ b/redhat/main/tdegraphics/tdegraphics.spec @@ -237,39 +237,39 @@ BuildRequires: openssl-devel %if 0%{?build_kmrml} #Requires: gift %else -Obsoletes: trinity-kmrml < %{version}-%{release} +Obsoletes: trinity-kmrml < %{?epoch:%{epoch}:}%{version}-%{release} %endif -Obsoletes: trinity-kdegraphics < %{version}-%{release} -Provides: trinity-kdegraphics = %{version}-%{release} -Obsoletes: trinity-kdegraphics-libs < %{version}-%{release} -Provides: trinity-kdegraphics-libs = %{version}-%{release} -Obsoletes: trinity-kdegraphics-extras < %{version}-%{release} -Provides: trinity-kdegraphics-extras = %{version}-%{release} - - -%{?build_kamera:Requires: trinity-kamera = %{version}-%{release}} -Requires: trinity-kcoloredit = %{version}-%{release} -Requires: %{name}-kfile-plugins = %{version}-%{release} -Requires: trinity-kdvi = %{version}-%{release} -Requires: trinity-kfax = %{version}-%{release} -Requires: trinity-kfaxview = %{version}-%{release} -Requires: trinity-kgamma = %{version}-%{release} -Requires: trinity-kghostview = %{version}-%{release} -Requires: trinity-kiconedit = %{version}-%{release} -%{?build_kmrml:Requires: trinity-kmrml = %{version}-%{release}} -Requires: trinity-kolourpaint = %{version}-%{release} -Requires: trinity-kooka = %{version}-%{release} -Requires: trinity-kpdf = %{version}-%{release} -Requires: trinity-kpovmodeler = %{version}-%{release} -Requires: trinity-kruler = %{version}-%{release} -Requires: trinity-ksnapshot = %{version}-%{release} -Requires: trinity-ksvg = %{version}-%{release} -Requires: trinity-kview = %{version}-%{release} -Requires: trinity-kviewshell = %{version}-%{release} -Requires: trinity-libkscan = %{version}-%{release} +Obsoletes: trinity-kdegraphics < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kdegraphics = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kdegraphics-libs < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kdegraphics-libs = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kdegraphics-extras < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kdegraphics-extras = %{?epoch:%{epoch}:}%{version}-%{release} + + +%{?build_kamera:Requires: trinity-kamera = %{?epoch:%{epoch}:}%{version}-%{release}} +Requires: trinity-kcoloredit = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-kfile-plugins = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kdvi = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kfax = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kfaxview = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kgamma = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kghostview = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kiconedit = %{?epoch:%{epoch}:}%{version}-%{release} +%{?build_kmrml:Requires: trinity-kmrml = %{?epoch:%{epoch}:}%{version}-%{release}} +Requires: trinity-kolourpaint = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kooka = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kpdf = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kpovmodeler = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kruler = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-ksnapshot = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-ksvg = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kview = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kviewshell = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-libkscan = %{?epoch:%{epoch}:}%{version}-%{release} %if 0%{?with_pdf} -Requires: trinity-libpoppler-tqt = %{version}-%{release} +Requires: trinity-libpoppler-tqt = %{?epoch:%{epoch}:}%{version}-%{release} %endif %description @@ -540,8 +540,8 @@ online. Summary: An icon editor for Trinity Group: Productivity/Graphics/Viewers -Obsoletes: trinity-kiconedit < %{version}-%{release} -Provides: trinity-kiconedit = %{version}-%{release} +Obsoletes: trinity-kiconedit < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kiconedit = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-tdeiconedit TDEIconedit allows you easily to create and edit icons. @@ -894,7 +894,7 @@ It provides an easy-to-use library, which allows you to access your scanner %package -n trinity-libkscan-devel Summary: Development files for the Trinity scanner library Group: Development/Libraries/Other -Requires: trinity-libkscan = %{version}-%{release} +Requires: trinity-libkscan = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-libkscan-devel This package contains development files for Trinity's scanner library. @@ -910,10 +910,10 @@ This package contains development files for Trinity's scanner library. %package -n trinity-libpoppler-tqt Summary: TQt support for Poppler Group: Productivity/Graphics/Viewers -Obsoletes: poppler-tqt < %{version}-%{release} -Provides: poppler-tqt = %{version}-%{release} -Obsoletes: %{name}-libpoppler-tqt < %{version}-%{release} -Provides: %{name}-libpoppler-tqt = %{version}-%{release} +Obsoletes: poppler-tqt < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: poppler-tqt = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: %{name}-libpoppler-tqt < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: %{name}-libpoppler-tqt = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-libpoppler-tqt TQt support library for Poppler. @@ -930,11 +930,11 @@ This library is used by the Trinity graphics file plugins for PDF support. %package -n trinity-libpoppler-tqt-devel Summary: Development files for TQt support for Poppler Group: Development/Libraries/Other -Requires: trinity-libpoppler-tqt = %{version}-%{release} -Obsoletes: poppler-tqt-devel < %{version}-%{release} -Provides: poppler-tqt-devel = %{version}-%{release} -Obsoletes: %{name}-libpoppler-tqt-devel < %{version}-%{release} -Provides: %{name}-libpoppler-tqt-devel = %{version}-%{release} +Requires: trinity-libpoppler-tqt = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: poppler-tqt-devel < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: poppler-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: %{name}-libpoppler-tqt-devel < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: %{name}-libpoppler-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-libpoppler-tqt-devel Development files of TQt support library for Poppler. @@ -956,13 +956,13 @@ This package contains the development files needed to compile applications again Summary: Development files for tdegraphics Group: Development/Libraries/Other -Obsoletes: trinity-kdegraphics-devel < %{version}-%{release} -Provides: trinity-kdegraphics-devel = %{version}-%{release} +Obsoletes: trinity-kdegraphics-devel < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kdegraphics-devel = %{?epoch:%{epoch}:}%{version}-%{release} -Requires: %{name} = %{version}-%{release} -Requires: trinity-libkscan-devel = %{version}-%{release} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-libkscan-devel = %{?epoch:%{epoch}:}%{version}-%{release} %if 0%{?with_pdf} -Requires: trinity-libpoppler-tqt-devel = %{version}-%{release} +Requires: trinity-libpoppler-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release} %endif %description devel diff --git a/redhat/main/tdelibs/tdelibs.spec b/redhat/main/tdelibs/tdelibs.spec index 334993823..d7beb44fb 100644 --- a/redhat/main/tdelibs/tdelibs.spec +++ b/redhat/main/tdelibs/tdelibs.spec @@ -60,12 +60,12 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz Source1: %{name}-rpmlintrc -Obsoletes: tdelibs < %{version}-%{release} -Provides: tdelibs = %{version}-%{release} -Obsoletes: trinity-kdelibs < %{version}-%{release} -Provides: trinity-kdelibs = %{version}-%{release} -Obsoletes: trinity-kdelibs-apidocs < %{version}-%{release} -Provides: trinity-kdelibs-apidocs = %{version}-%{release} +Obsoletes: tdelibs < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: tdelibs = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kdelibs < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kdelibs = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kdelibs-apidocs < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kdelibs-apidocs = %{?epoch:%{epoch}:}%{version}-%{release} # for set_permissions macro %if 0%{?suse_version} @@ -580,12 +580,12 @@ fi %package devel Summary: TDE Libraries (Development files) Group: Development/Libraries/X11 -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} -Obsoletes: tdelibs-devel < %{version}-%{release} -Provides: tdelibs-devel = %{version}-%{release} -Obsoletes: trinity-kdelibs-devel < %{version}-%{release} -Provides: trinity-kdelibs-devel = %{version}-%{release} +Obsoletes: tdelibs-devel < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: tdelibs-devel = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kdelibs-devel < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kdelibs-devel = %{?epoch:%{epoch}:}%{version}-%{release} Requires: libtqt3-mt-devel >= 3.5.0 Requires: libtqt4-devel = %{tde_epoch}:4.2.0 diff --git a/redhat/main/tdemultimedia/tdemultimedia.spec b/redhat/main/tdemultimedia/tdemultimedia.spec index 10b9673fd..e566b7d4d 100644 --- a/redhat/main/tdemultimedia/tdemultimedia.spec +++ b/redhat/main/tdemultimedia/tdemultimedia.spec @@ -59,14 +59,14 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz Source1: %{name}-rpmlintrc -Obsoletes: trinity-kdemultimedia < %{version}-%{release} -Provides: trinity-kdemultimedia = %{version}-%{release} -Obsoletes: trinity-kdemultimedia-libs < %{version}-%{release} -Provides: trinity-kdemultimedia-libs = %{version}-%{release} -Obsoletes: trinity-kdemultimedia-extras < %{version}-%{release} -Provides: trinity-kdemultimedia-extras = %{version}-%{release} -Obsoletes: trinity-kdemultimedia-extras-libs < %{version}-%{release} -Provides: trinity-kdemultimedia-extras-libs = %{version}-%{release} +Obsoletes: trinity-kdemultimedia < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kdemultimedia = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kdemultimedia-libs < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kdemultimedia-libs = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kdemultimedia-extras < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kdemultimedia-extras = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kdemultimedia-extras-libs < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kdemultimedia-extras-libs = %{?epoch:%{epoch}:}%{version}-%{release} BuildRequires: trinity-arts-devel >= %{tde_epoch}:1.5.10 BuildRequires: trinity-tdelibs-devel >= %{tde_version} @@ -224,24 +224,24 @@ BuildRequires: lame-devel %endif -Requires: trinity-artsbuilder = %{version}-%{release} -Requires: trinity-juk = %{version}-%{release} -Requires: trinity-kaboodle = %{version}-%{release} -Requires: trinity-kaudiocreator = %{version}-%{release} -Requires: %{name}-kfile-plugins = %{version}-%{release} -Requires: %{name}-kappfinder-data = %{version}-%{release} -Requires: %{name}-tdeio-plugins = %{version}-%{release} -Requires: trinity-tdemid = %{version}-%{release} -Requires: trinity-kmix = %{version}-%{release} -Requires: trinity-krec = %{version}-%{release} -Requires: trinity-kscd = %{version}-%{release} -%{?with_akode:Requires: trinity-libarts-akode = %{version}-%{release}} -Requires: trinity-libarts-audiofile = %{version}-%{release} -%{?with_mpeg:Requires: trinity-libarts-mpeglib = %{version}-%{release}} -%{?with_xine:Requires: trinity-libarts-xine = %{version}-%{release}} -Requires: trinity-libkcddb = %{version}-%{release} -%{?with_mpeg:Requires: trinity-mpeglib = %{version}-%{release}} -Requires: trinity-noatun = %{version}-%{release} +Requires: trinity-artsbuilder = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-juk = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kaboodle = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kaudiocreator = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-kfile-plugins = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-kappfinder-data = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-tdeio-plugins = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-tdemid = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kmix = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-krec = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kscd = %{?epoch:%{epoch}:}%{version}-%{release} +%{?with_akode:Requires: trinity-libarts-akode = %{?epoch:%{epoch}:}%{version}-%{release}} +Requires: trinity-libarts-audiofile = %{?epoch:%{epoch}:}%{version}-%{release} +%{?with_mpeg:Requires: trinity-libarts-mpeglib = %{?epoch:%{epoch}:}%{version}-%{release}} +%{?with_xine:Requires: trinity-libarts-xine = %{?epoch:%{epoch}:}%{version}-%{release}} +Requires: trinity-libkcddb = %{?epoch:%{epoch}:}%{version}-%{release} +%{?with_mpeg:Requires: trinity-mpeglib = %{?epoch:%{epoch}:}%{version}-%{release}} +Requires: trinity-noatun = %{?epoch:%{epoch}:}%{version}-%{release} %description @@ -467,7 +467,7 @@ Summary: Light, embedded media player for Trinity Group: System/GUI/Other %if 0%{?with_xine} -Requires: trinity-libarts-xine = %{version}-%{release} +Requires: trinity-libarts-xine = %{?epoch:%{epoch}:}%{version}-%{release} %endif %description -n trinity-kaboodle @@ -492,7 +492,7 @@ for TDE. It uses the aRts framework for playing media files. Summary: CD ripper and audio encoder frontend for Trinity Group: Productivity/Multimedia/CD/Grabbers -Requires: %{name}-tdeio-plugins = %{version}-%{release} +Requires: %{name}-tdeio-plugins = %{?epoch:%{epoch}:}%{version}-%{release} Requires: vorbis-tools Requires: flac @@ -586,8 +586,8 @@ Summary: Enables the browsing of audio CDs under Konqueror Group: Productivity/Multimedia/Sound/Utilities Requires: trinity-tdebase-tdeio-plugins >= %{tde_version} -Obsoletes: trinity-tdemultimedia-kio-plugins < %{version}-%{release} -Provides: trinity-tdemultimedia-kio-plugins = %{version}-%{release} +Obsoletes: trinity-tdemultimedia-kio-plugins < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-tdemultimedia-kio-plugins = %{?epoch:%{epoch}:}%{version}-%{release} %description tdeio-plugins This package allow audio CDs to be browsed like a file system using @@ -623,8 +623,8 @@ Konqueror and the audiocd:/ URL. Summary: MIDI/karaoke player for Trinity Group: Productivity/Multimedia/Sound/Midi -Obsoletes: trinity-kmid < %{version}-%{release} -Provides: trinity-kmid = %{version}-%{release} +Obsoletes: trinity-kmid < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kmid = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-tdemid This package provides a MIDI and karaoke player for TDE. @@ -862,7 +862,7 @@ databases, for TDE applications. Summary: MP3 and MPEG-1 audio and video library Group: Productivity/Multimedia/Other %if 0%{?with_mpeg} -Requires: trinity-libarts-mpeglib = %{version}-%{release} +Requires: trinity-libarts-mpeglib = %{?epoch:%{epoch}:}%{version}-%{release} %endif %description -n trinity-mpeglib @@ -974,11 +974,11 @@ formats supported by your installation of aRts (including aRts plugins). %package devel Summary: Development files for %{name}, aRts and noatun plugins Group: Development/Libraries/Other -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} Requires: trinity-tdelibs-devel >= %{tde_version} -Obsoletes: trinity-kdemultimedia-devel < %{version}-%{release} -Provides: trinity-kdemultimedia-devel = %{version}-%{release} +Obsoletes: trinity-kdemultimedia-devel < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kdemultimedia-devel = %{?epoch:%{epoch}:}%{version}-%{release} %description devel {summary}. diff --git a/redhat/main/tdenetwork/tdenetwork.spec b/redhat/main/tdenetwork/tdenetwork.spec index 81c47c13b..027da4a7f 100644 --- a/redhat/main/tdenetwork/tdenetwork.spec +++ b/redhat/main/tdenetwork/tdenetwork.spec @@ -266,32 +266,32 @@ BuildRequires: speex-devel %define build_kopete_motionaway 1 %endif -Obsoletes: trinity-kdenetwork < %{version}-%{release} -Provides: trinity-kdenetwork = %{version}-%{release} -Obsoletes: trinity-kdenetwork-libs < %{version}-%{release} -Provides: trinity-kdenetwork-libs = %{version}-%{release} -Obsoletes: trinity-kdenetwork-extras < %{version}-%{release} -Provides: trinity-kdenetwork-extras = %{version}-%{release} -Obsoletes: tdenetwork < %{version}-%{release} -Provides: tdenetwork = %{version}-%{release} - -Requires: trinity-dcoprss = %{version}-%{release} -Requires: %{name}-filesharing = %{version}-%{release} -Requires: trinity-kdict = %{version}-%{release} -Requires: %{name}-tdefile-plugins = %{version}-%{release} -Requires: trinity-kget = %{version}-%{release} -Requires: trinity-knewsticker = %{version}-%{release} -Requires: trinity-kopete = %{version}-%{release} -Requires: trinity-kopete-nowlistening = %{version}-%{release} -Requires: trinity-kpf = %{version}-%{release} -Requires: trinity-kppp = %{version}-%{release} -Requires: trinity-krdc = %{version}-%{release} -Requires: trinity-krfb = %{version}-%{release} -Requires: trinity-ksirc = %{version}-%{release} -Requires: trinity-ktalkd = %{version}-%{release} -Requires: trinity-kwifimanager = %{version}-%{release} -Requires: trinity-librss = %{version}-%{release} -Requires: trinity-lisa = %{version}-%{release} +Obsoletes: trinity-kdenetwork < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kdenetwork = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kdenetwork-libs < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kdenetwork-libs = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kdenetwork-extras < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kdenetwork-extras = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: tdenetwork < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: tdenetwork = %{?epoch:%{epoch}:}%{version}-%{release} + +Requires: trinity-dcoprss = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-filesharing = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kdict = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-tdefile-plugins = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kget = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-knewsticker = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kopete = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kopete-nowlistening = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kpf = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kppp = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-krdc = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-krfb = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-ksirc = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-ktalkd = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kwifimanager = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-librss = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-lisa = %{?epoch:%{epoch}:}%{version}-%{release} %description This metapackage includes a collection of network and networking related @@ -346,17 +346,17 @@ DCOP is the TDE interprocess communication protocol. %package devel Summary: Development files for the Trinity network module Group: Development/Libraries/Other -Requires: %{name} = %{version}-%{release} -Requires: trinity-kdict = %{version}-%{release} -Requires: trinity-kopete = %{version}-%{release} -Requires: trinity-ksirc = %{version}-%{release} -Requires: trinity-librss = %{version}-%{release} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kdict = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kopete = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-ksirc = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-librss = %{?epoch:%{epoch}:}%{version}-%{release} Requires: trinity-tdelibs-devel >= %{tde_version} -Obsoletes: trinity-kdenetwork-devel < %{version}-%{release} -Provides: trinity-kdenetwork-devel = %{version}-%{release} -Obsoletes: tdenetwork-devel < %{version}-%{release} -Provides: tdenetwork-devel = %{version}-%{release} +Obsoletes: trinity-kdenetwork-devel < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kdenetwork-devel = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: tdenetwork-devel < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: tdenetwork-devel = %{?epoch:%{epoch}:}%{version}-%{release} %description devel This is the development package which contains the headers for the TDE RSS @@ -387,8 +387,8 @@ development-related files for the TDE network module. Summary: Network filesharing configuration module for Trinity Group: Applications/Internet -Obsoletes: tdenetwork-filesharing < %{version}-%{release} -Provides: tdenetwork-filesharing = %{version}-%{release} +Obsoletes: tdenetwork-filesharing < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: tdenetwork-filesharing = %{?epoch:%{epoch}:}%{version}-%{release} %description filesharing This package provides a Trinity Control Center module to configure @@ -441,10 +441,10 @@ basic as well as advanced queries. Summary: Torrent metainfo plugin for Trinity Group: Applications/Internet -Obsoletes: tdenetwork-kfile-plugins < %{version}-%{release} -Provides: tdenetwork-kfile-plugins = %{version}-%{release} -Obsoletes: trinity-tdenetwork-kfile-plugins < %{version}-%{release} -Provides: trinity-tdenetwork-kfile-plugins = %{version}-%{release} +Obsoletes: tdenetwork-kfile-plugins < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: tdenetwork-kfile-plugins = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-tdenetwork-kfile-plugins < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-tdenetwork-kfile-plugins = %{?epoch:%{epoch}:}%{version}-%{release} %description tdefile-plugins This package provides a metainformation plugin for bittorrent files. @@ -730,7 +730,7 @@ Support for more IM protocols can be added through a plugin system. %package -n trinity-kopete-nowlistening Summary: Nowlistening (xmms) plugin for Kopete Group: Applications/Internet -Requires: trinity-kopete = %{version}-%{release} +Requires: trinity-kopete = %{?epoch:%{epoch}:}%{version}-%{release} Requires: trinity-filesystem >= %{tde_version} %description -n trinity-kopete-nowlistening diff --git a/redhat/main/tdepim/tdepim.spec b/redhat/main/tdepim/tdepim.spec index eb4c9e2d8..dd1e5ed05 100644 --- a/redhat/main/tdepim/tdepim.spec +++ b/redhat/main/tdepim/tdepim.spec @@ -190,43 +190,43 @@ BuildRequires: xscreensaver-gl BuildRequires: libacl-devel -Requires: trinity-libtdepim = %{version}-%{release} -Requires: %{name}-kfile-plugins = %{version}-%{release} -Requires: %{name}-tdeio-plugins = %{version}-%{release} -Requires: %{name}-tderesources = %{version}-%{release} -Requires: %{name}-wizards = %{version}-%{release} -Requires: trinity-akregator = %{version}-%{release} -Requires: trinity-kaddressbook = %{version}-%{release} -Requires: trinity-kalarm = %{version}-%{release} -Requires: trinity-kandy = %{version}-%{release} -Requires: trinity-karm = %{version}-%{release} -Requires: trinity-kleopatra = %{version}-%{release} -Requires: trinity-kmail = %{version}-%{release} -Requires: trinity-kmailcvt = %{version}-%{release} -Requires: trinity-kmobile = %{version}-%{release} -Requires: trinity-knode = %{version}-%{release} -Requires: trinity-knotes = %{version}-%{release} -Requires: trinity-kode = %{version}-%{release} -Requires: trinity-konsolekalendar = %{version}-%{release} -Requires: trinity-kontact = %{version}-%{release} -Requires: trinity-korganizer = %{version}-%{release} -Requires: trinity-korn = %{version}-%{release} -Requires: trinity-ktnef = %{version}-%{release} -Requires: trinity-libindex = %{version}-%{release} -Requires: trinity-libkcal = %{version}-%{release} -Requires: trinity-libkgantt = %{version}-%{release} -Requires: trinity-libkleopatra = %{version}-%{release} -Requires: trinity-libkmime = %{version}-%{release} -Requires: trinity-libkpimexchange = %{version}-%{release} -Requires: trinity-libkpimidentities = %{version}-%{release} -Requires: trinity-libksieve = %{version}-%{release} -Requires: trinity-libktnef = %{version}-%{release} -Requires: trinity-libmimelib = %{version}-%{release} - -Obsoletes: trinity-kdepim < %{version}-%{release} -Provides: trinity-kdepim = %{version}-%{release} -Obsoletes: tdepim < %{version}-%{release} -Provides: tdepim = %{version}-%{release} +Requires: trinity-libtdepim = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-kfile-plugins = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-tdeio-plugins = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-tderesources = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-wizards = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-akregator = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kaddressbook = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kalarm = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kandy = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-karm = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kleopatra = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kmail = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kmailcvt = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kmobile = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-knode = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-knotes = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kode = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-konsolekalendar = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kontact = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-korganizer = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-korn = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-ktnef = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-libindex = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-libkcal = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-libkgantt = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-libkleopatra = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-libkmime = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-libkpimexchange = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-libkpimidentities = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-libksieve = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-libktnef = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-libmimelib = %{?epoch:%{epoch}:}%{version}-%{release} + +Obsoletes: trinity-kdepim < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kdepim = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: tdepim < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: tdepim = %{?epoch:%{epoch}:}%{version}-%{release} %description This metapackage includes a collection of Personal Information Management @@ -241,35 +241,35 @@ This metapackage includes a collection of Personal Information Management Summary: Development files for %{name} Group: Development/Libraries/Other -Obsoletes: tdepim-cmake < %{version}-%{release} - -Obsoletes: trinity-kdepim-devel < %{version}-%{release} -Provides: trinity-kdepim-devel = %{version}-%{release} -Obsoletes: tdepim-devel < %{version}-%{release} -Provides: tdepim-devel = %{version}-%{release} - -Requires: %{name} = %{version}-%{release} -Requires: trinity-akregator-devel = %{version}-%{release} -Requires: trinity-libtdepim-devel = %{version}-%{release} -Requires: trinity-kaddressbook-devel = %{version}-%{release} -Requires: trinity-karm-devel = %{version}-%{release} -Requires: trinity-kmail-devel = %{version}-%{release} -Requires: trinity-knode-devel = %{version}-%{release} -Requires: trinity-knotes-devel = %{version}-%{release} -Requires: trinity-kode-devel = %{version}-%{release} -Requires: trinity-kontact-devel = %{version}-%{release} -Requires: trinity-korganizer-devel = %{version}-%{release} -Requires: trinity-libindex-devel = %{version}-%{release} -Requires: trinity-libkcal-devel = %{version}-%{release} -Requires: trinity-libkgantt-devel = %{version}-%{release} -Requires: trinity-libkleopatra-devel = %{version}-%{release} -Requires: trinity-libkmime-devel = %{version}-%{release} -Requires: trinity-libkpimexchange-devel = %{version}-%{release} -Requires: trinity-libkpimidentities-devel = %{version}-%{release} -Requires: trinity-libksieve-devel = %{version}-%{release} -Requires: trinity-libktnef-devel = %{version}-%{release} -Requires: trinity-libmimelib-devel = %{version}-%{release} -Requires: %{name}-tderesources-devel = %{version}-%{release} +Obsoletes: tdepim-cmake < %{?epoch:%{epoch}:}%{version}-%{release} + +Obsoletes: trinity-kdepim-devel < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kdepim-devel = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: tdepim-devel < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: tdepim-devel = %{?epoch:%{epoch}:}%{version}-%{release} + +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-akregator-devel = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-libtdepim-devel = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kaddressbook-devel = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-karm-devel = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kmail-devel = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-knode-devel = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-knotes-devel = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kode-devel = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kontact-devel = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-korganizer-devel = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-libindex-devel = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-libkcal-devel = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-libkgantt-devel = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-libkleopatra-devel = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-libkmime-devel = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-libkpimexchange-devel = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-libkpimidentities-devel = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-libksieve-devel = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-libktnef-devel = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-libmimelib-devel = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-tderesources-devel = %{?epoch:%{epoch}:}%{version}-%{release} %description devel This metapackage includes all development files for TDE PIM. @@ -284,8 +284,8 @@ It also contains the CMAKE macros. %package -n trinity-akregator Summary: RSS feed aggregator for TDE Group: Applications/Internet -Requires: trinity-libtdepim = %{version}-%{release} -Requires: trinity-libkcal = %{version}-%{release} +Requires: trinity-libtdepim = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-libkcal = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-akregator aKregator is a fast, lightweight, and intuitive feed reader program @@ -321,7 +321,7 @@ thousands of internet feeds in a quick, efficient, and familiar way. %package -n trinity-akregator-devel Summary: Development files for trinity-akregator Group: Development/Libraries/Other -Requires: trinity-akregator = %{version}-%{release} +Requires: trinity-akregator = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-akregator-devel %{summary} @@ -338,7 +338,7 @@ Requires: trinity-akregator = %{version}-%{release} Summary: TDE addressbook application Group: Applications/Communications Requires: trinity-tdebase-tdeio-pim-plugins -Requires: %{name}-tderesources = %{version}-%{release} +Requires: %{name}-tderesources = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-kaddressbook KAddressBook is the main address book application for TDE; it enables you @@ -391,7 +391,7 @@ LDAP servers, and SQL databases. %package -n trinity-kaddressbook-devel Summary: Development files for trinity-kaddressbook Group: Development/Libraries/Other -Requires: trinity-kaddressbook = %{version}-%{release} +Requires: trinity-kaddressbook = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-kaddressbook-devel %{summary} @@ -408,7 +408,7 @@ Requires: trinity-kaddressbook = %{version}-%{release} %package -n trinity-kalarm Summary: Trinity alarm message, command and email scheduler Group: Applications/Communications -Requires: trinity-libkpimidentities = %{version}-%{release} +Requires: trinity-libkpimidentities = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-kalarm KAlarm provides a graphical interface to schedule personal timed events - @@ -510,7 +510,7 @@ Group: Development/Libraries/Other Summary: TDE File dialog plugins for palm and vcf files Group: Environment/Libraries -Obsoletes: tdepim-kfile-plugins < %{version}-%{release} +Obsoletes: tdepim-kfile-plugins < %{?epoch:%{epoch}:}%{version}-%{release} %description kfile-plugins File dialog plugins for palm and vcf files. @@ -530,9 +530,9 @@ File dialog plugins for palm and vcf files. Summary: Trinity PIM I/O Slaves Group: Environment/Libraries -Obsoletes: tdepim-kio-plugins < %{version}-%{release} -Obsoletes: trinity-tdepim-kio-plugins < %{version}-%{release} -Provides: trinity-tdepim-kio-plugins = %{version}-%{release} +Obsoletes: tdepim-kio-plugins < %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-tdepim-kio-plugins < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-tdepim-kio-plugins = %{?epoch:%{epoch}:}%{version}-%{release} %description tdeio-plugins This package includes the pim kioslaves. This includes imap4, sieve, @@ -567,15 +567,15 @@ and mbox. %package tderesources Summary: Trinity pim resource plugins Group: Environment/Libraries -#Requires: trinity-kaddressbook = %{version}-%{release} -#Requires: trinity-korganizer = %{version}-%{release} -#Requires: trinity-knotes = %{version}-%{release} +#Requires: trinity-kaddressbook = %{?epoch:%{epoch}:}%{version}-%{release} +#Requires: trinity-korganizer = %{?epoch:%{epoch}:}%{version}-%{release} +#Requires: trinity-knotes = %{?epoch:%{epoch}:}%{version}-%{release} Requires: libcaldav Requires: libcarddav -Obsoletes: tdepim-kresources < %{version}-%{release} -Obsoletes: trinity-tdepim-kresources < %{version}-%{release} -Provides: trinity-tdepim-kresources = %{version}-%{release} +Obsoletes: tdepim-kresources < %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-tdepim-kresources < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-tdepim-kresources = %{?epoch:%{epoch}:}%{version}-%{release} %description tderesources This package includes several plugins needed to interface with groupware @@ -685,13 +685,13 @@ tracking feature plans. %package tderesources-devel Summary: Development files for tderesources Group: Development/Libraries/Other -Requires: %{name}-tderesources = %{version}-%{release} +Requires: %{name}-tderesources = %{?epoch:%{epoch}:}%{version}-%{release} Requires: libcaldav Requires: libcarddav -Obsoletes: tdepim-tderesources-devel < %{version}-%{release} -Obsoletes: trinity-tdepim-kresources-devel < %{version}-%{release} -Provides: trinity-tdepim-kresources-devel = %{version}-%{release} +Obsoletes: tdepim-tderesources-devel < %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-tdepim-kresources-devel < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-tdepim-kresources-devel = %{?epoch:%{epoch}:}%{version}-%{release} %description tderesources-devel %{summary} @@ -754,7 +754,7 @@ Provides: trinity-tdepim-kresources-devel = %{version}-%{release} Summary: Trinity server configuration wizards Group: Applications/Communications -Obsoletes: tdepim-wizards < %{version}-%{release} +Obsoletes: tdepim-wizards < %{?epoch:%{epoch}:}%{version}-%{release} %description wizards This package contains TDE-based wizards for configuring eGroupware, @@ -862,7 +862,7 @@ keybox and for retrieving certificates from LDAP servers. %package -n trinity-kmail Summary: Trinity Email client Group: Applications/Communications -Requires: %{name}-tdeio-plugins = %{version}-%{release} +Requires: %{name}-tdeio-plugins = %{?epoch:%{epoch}:}%{version}-%{release} Requires: trinity-tdebase-tdeio-pim-plugins >= %{tde_version} # GPG support @@ -882,8 +882,8 @@ Requires: pinentry %endif Requires: procmail -Requires: trinity-kaddressbook = %{version}-%{release} -Requires: trinity-kleopatra = %{version}-%{release} +Requires: trinity-kaddressbook = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kleopatra = %{?epoch:%{epoch}:}%{version}-%{release} Requires: trinity-tdebase-tdeio-pim-plugins >= %{tde_version} Provides: imap-client, mail-reader @@ -975,7 +975,7 @@ Group: Development/Libraries/Other %package -n trinity-kmailcvt Summary: Trinity KMail mail folder converter Group: Applications/Communications -Requires: trinity-kmail = %{version}-%{release} +Requires: trinity-kmail = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-kmailcvt Converts mail folders to KMail format. Formats supported for import @@ -1022,7 +1022,7 @@ signatures. %package -n trinity-knode-devel Summary: Development files for trinity-knode Group: Development/Libraries/Other -Requires: trinity-knode = %{version}-%{release} +Requires: trinity-knode = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-knode-devel %{summary} @@ -1037,7 +1037,7 @@ Requires: trinity-knode = %{version}-%{release} %package -n trinity-knotes Summary: Trinity sticky notes Group: Applications/Utilities -Requires: trinity-tdepim-tderesources = %{version}-%{release} +Requires: trinity-tdepim-tderesources = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-knotes KNotes is a program that lets you write sticky notes. The notes are saved @@ -1066,8 +1066,8 @@ program. The program supports printing and mailing your notes. %package -n trinity-knotes-devel Summary: Development files for knots Group: Development/Libraries/Other -Requires: trinity-knotes = %{version}-%{release} -Requires: %{name}-tderesources-devel = %{version}-%{release} +Requires: trinity-knotes = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-tderesources-devel = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-knotes-devel %{summary} @@ -1101,7 +1101,7 @@ described by RelaxNG schemes. %package -n trinity-kode-devel Summary: Development files for trinity-kode Group: Development/Libraries/Other -Requires: trinity-kode = %{version}-%{release} +Requires: trinity-kode = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-kode-devel %{summary} @@ -1134,12 +1134,12 @@ frontend to manage your calendars. %package -n trinity-kontact Summary: Trinity pim application Group: Applications/Communications -Requires: trinity-kmail = %{version}-%{release} -Requires: trinity-korganizer = %{version}-%{release} -Requires: trinity-kaddressbook = %{version}-%{release} -Requires: trinity-knode = %{version}-%{release} -Requires: trinity-knotes = %{version}-%{release} -Requires: trinity-akregator = %{version}-%{release} +Requires: trinity-kmail = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-korganizer = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kaddressbook = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-knode = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-knotes = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-akregator = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-kontact Kontact is the integrated solution to your personal information management @@ -1192,7 +1192,7 @@ scheduling, address book and other PIM functionality. %package -n trinity-kontact-devel Summary: Development files for kontact Group: Development/Libraries/Other -Requires: trinity-kontact = %{version}-%{release} +Requires: trinity-kontact = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-kontact-devel %{summary} @@ -1210,9 +1210,9 @@ Requires: trinity-kontact = %{version}-%{release} %package -n trinity-korganizer Summary: Trinity personal organizer Group: Applications/Productivity -Requires: trinity-libkpimidentities = %{version}-%{release} -Requires: trinity-libkpimexchange = %{version}-%{release} -Requires: %{name}-tderesources = %{version}-%{release} +Requires: trinity-libkpimidentities = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-libkpimexchange = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-tderesources = %{?epoch:%{epoch}:}%{version}-%{release} Requires: perl %description -n trinity-korganizer @@ -1270,7 +1270,7 @@ installed. %package -n trinity-korganizer-devel Summary: Development files for korganizer Group: Development/Libraries/Other -Requires: trinity-korganizer = %{version}-%{release} +Requires: trinity-korganizer = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-korganizer-devel %{summary} @@ -1295,7 +1295,7 @@ Requires: trinity-korganizer = %{version}-%{release} %package -n trinity-korn Summary: Trinity mail checker Group: Applications/Communications -Requires: %{name}-tdeio-plugins = %{version}-%{release} +Requires: %{name}-tdeio-plugins = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-korn Korn is a TDE mail checker that can display a small summary in the Kicker @@ -1359,7 +1359,7 @@ This is the runtime package for programs that use the libindex library. %package -n trinity-libindex-devel Summary: Trinity indexing library [development] Group: Development/Libraries/Other -Requires: trinity-libindex = %{version}-%{release} +Requires: trinity-libindex = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-libindex-devel This library provides text indexing and is currently used by KMail @@ -1380,8 +1380,8 @@ library. %package -n trinity-libkcal Summary: Trinity calendaring library Group: Environment/Libraries -#Requires: %{name}-tderesources = %{version}-%{release} -Requires: trinity-libkmime = %{version}-%{release} +#Requires: %{name}-tderesources = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-libkmime = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-libkcal This library provides a C++ API for handling the vCalendar and iCalendar @@ -1416,9 +1416,9 @@ This is the runtime package for programs that use the libkcal-trinity library. %package -n trinity-libkcal-devel Summary: Trinity calendaring library [development] Group: Development/Libraries/Other -Requires: trinity-libkcal = %{version}-%{release} -Requires: trinity-libtdepim-devel = %{version}-%{release} -Requires: trinity-libktnef-devel = %{version}-%{release} +Requires: trinity-libkcal = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-libtdepim-devel = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-libktnef-devel = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-libkcal-devel This library provides a C++ API for handling the vCalendar and iCalendar @@ -1443,11 +1443,11 @@ library. %package -n trinity-libtdepim Summary: Trinity PIM library Group: Environment/Libraries -Requires: trinity-libkcal = %{version}-%{release} -Requires: trinity-libktnef = %{version}-%{release} +Requires: trinity-libkcal = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-libktnef = %{?epoch:%{epoch}:}%{version}-%{release} -Obsoletes: libtdepim < %{version}-%{release} -Provides: libtdepim = %{version}-%{release} +Obsoletes: libtdepim < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: libtdepim = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-libtdepim This is the runtime package for programs that use the trinity-libtdepim library. @@ -1471,11 +1471,11 @@ This is the runtime package for programs that use the trinity-libtdepim library. %package -n trinity-libtdepim-devel Summary: Trinity PIM library [development] Group: Development/Libraries/Other -Requires: trinity-libtdepim = %{version}-%{release} +Requires: trinity-libtdepim = %{?epoch:%{epoch}:}%{version}-%{release} Requires: trinity-tdelibs-devel >= %{version} -Obsoletes: libtdepim-devel < %{version}-%{release} -Provides: libtdepim-devel = %{version}-%{release} +Obsoletes: libtdepim-devel < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: libtdepim-devel = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-libtdepim-devel This is the development package which contains the headers for the libtdepim-trinity @@ -1505,8 +1505,8 @@ This is the runtime package for programs that use the libkgantt-trinity library. %package -n trinity-libkgantt-devel Summary: Trinity gantt charting library [development] Group: Development/Libraries/Other -Requires: trinity-libkgantt = %{version}-%{release} -Requires: trinity-libtdepim-devel = %{version}-%{release} +Requires: trinity-libkgantt = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-libtdepim-devel = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-libkgantt-devel This is the development package which contains the headers for the libkgantt-trinity @@ -1553,8 +1553,8 @@ This is the runtime package for programs that use the libkleopatra-trinity libra %package -n trinity-libkleopatra-devel Summary: Trinity GnuPG interface libraries [development] Group: Development/Libraries/Other -Requires: trinity-libkleopatra = %{version}-%{release} -Requires: trinity-libtdepim-devel = %{version}-%{release} +Requires: trinity-libkleopatra = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-libtdepim-devel = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-libkleopatra-devel This library is used by several TDE applications to interface to the @@ -1597,7 +1597,7 @@ an object tree. %package -n trinity-libkmime-devel Summary: Development files for libkmime Group: Development/Libraries/Other -Requires: trinity-libkmime = %{version}-%{release} +Requires: trinity-libkmime = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-libkmime-devel %{summary} @@ -1628,9 +1628,9 @@ library. %package -n trinity-libkpimexchange-devel Summary: Trinity PIM Exchange library [development] Group: Development/Libraries/Other -Requires: trinity-libkpimexchange = %{version}-%{release} -Requires: trinity-libkcal-devel = %{version}-%{release} -Requires: trinity-libtdepim-devel = %{version}-%{release} +Requires: trinity-libkpimexchange = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-libkcal-devel = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-libtdepim-devel = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-libkpimexchange-devel This is the development package which contains the headers for the @@ -1666,7 +1666,7 @@ library. %package -n trinity-libkpimidentities-devel Summary: Development files for libkpimidentities Group: Development/Libraries/Other -Requires: trinity-libkpimidentities = %{version}-%{release} +Requires: trinity-libkpimidentities = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-libkpimidentities-devel %{summary} @@ -1695,8 +1695,8 @@ This is the runtime package for programs that use the libksieve-trinity library. %package -n trinity-libksieve-devel Summary: Trinity mail/news message filtering library [development] Group: Development/Libraries/Other -Requires: trinity-libksieve = %{version}-%{release} -Requires: trinity-libtdepim-devel = %{version}-%{release} +Requires: trinity-libksieve = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-libtdepim-devel = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-libksieve-devel This is the development package which contains the headers for the libksieve-trinity @@ -1731,8 +1731,8 @@ This is the runtime library for packages using the ktnef-trinity library. %package -n trinity-libktnef-devel Summary: KTNEF handler library [development] Group: Development/Libraries/Other -Requires: trinity-libktnef = %{version}-%{release} -Requires: trinity-libtdepim-devel = %{version}-%{release} +Requires: trinity-libktnef = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-libtdepim-devel = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-libktnef-devel This library handles mail attachments using the TNEF format. These @@ -1769,7 +1769,7 @@ This is the runtime package for programs that use the libmimelib-trinity library %package -n trinity-libmimelib-devel Summary: Trinity mime library [development] Group: Development/Libraries/Other -Requires: trinity-libmimelib = %{version}-%{release} +Requires: trinity-libmimelib = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-libmimelib-devel This library is used by several TDE applications to handle mime types. diff --git a/redhat/main/tdesdk/tdesdk.spec b/redhat/main/tdesdk/tdesdk.spec index 882740b2f..97612f4f9 100644 --- a/redhat/main/tdesdk/tdesdk.spec +++ b/redhat/main/tdesdk/tdesdk.spec @@ -156,29 +156,29 @@ BuildRequires: libtool-ltdl-devel %define build_kioslave 1 %endif -Obsoletes: trinity-kdesdk < %{version}-%{release} -Provides: trinity-kdesdk = %{version}-%{release} -Obsoletes: trinity-kdesdk-libs < %{version}-%{release} -Provides: trinity-kdesdk-libs = %{version}-%{release} - -Requires: trinity-cervisia = %{version}-%{release} -Requires: trinity-kapptemplate = %{version}-%{release} -Requires: trinity-kbabel = %{version}-%{release} -Requires: trinity-kbugbuster = %{version}-%{release} -Requires: trinity-tdecachegrind = %{version}-%{release} -Requires: trinity-tdecachegrind-converters = %{version}-%{release} -Requires: %{name}-kfile-plugins = %{version}-%{release} -Requires: %{name}-misc = %{version}-%{release} -Requires: %{name}-scripts = %{version}-%{release} -Requires: trinity-kmtrace = %{version}-%{release} -Requires: trinity-kompare = %{version}-%{release} -Requires: trinity-kspy = %{version}-%{release} -Requires: trinity-kuiviewer = %{version}-%{release} -Requires: trinity-libcvsservice0 = %{version}-%{release} -Requires: trinity-poxml = %{version}-%{release} -Requires: trinity-umbrello = %{version}-%{release} -%{?build_kioslave:Requires: %{name}-tdeio-plugins = %{version}-%{release}} -Requires: trinity-tdeunittest = %{version}-%{release} +Obsoletes: trinity-kdesdk < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kdesdk = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kdesdk-libs < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kdesdk-libs = %{?epoch:%{epoch}:}%{version}-%{release} + +Requires: trinity-cervisia = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kapptemplate = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kbabel = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kbugbuster = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-tdecachegrind = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-tdecachegrind-converters = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-kfile-plugins = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-misc = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-scripts = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kmtrace = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kompare = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kspy = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kuiviewer = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-libcvsservice0 = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-poxml = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-umbrello = %{?epoch:%{epoch}:}%{version}-%{release} +%{?build_kioslave:Requires: %{name}-tdeio-plugins = %{?epoch:%{epoch}:}%{version}-%{release}} +Requires: trinity-tdeunittest = %{?epoch:%{epoch}:}%{version}-%{release} %description @@ -384,7 +384,7 @@ This package is part of Trinity, and a component of the TDE SDK module. %package -n trinity-kbabel-devel Summary: PO-file editing suite for Trinity (development files) Group: Development/Libraries/Other -Requires: trinity-kbabel = %{version}-%{release} +Requires: trinity-kbabel = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-kbabel-devel This is a suite of programs for editing gettext message files (PO-files). @@ -796,7 +796,7 @@ This package is part of Trinity, and a component of the TDE SDK module. %package -n trinity-libcvsservice-devel Summary: Development files for CVS DCOP service Group: Development/Libraries/Other -Requires: trinity-libcvsservice0 = %{version}-%{release} +Requires: trinity-libcvsservice0 = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-libcvsservice-devel The library libcvsservice provides a DCOP service for accessing and @@ -885,8 +885,8 @@ Summary: Subversion ioslave for Trinity Group: Development/Languages/Other Requires: subversion -Obsoletes: trinity-tdesdk-kio-plugins < %{version}-%{release} -Provides: trinity-tdesdk-kio-plugins = %{version}-%{release} +Obsoletes: trinity-tdesdk-kio-plugins < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-tdesdk-kio-plugins = %{?epoch:%{epoch}:}%{version}-%{release} %description tdeio-plugins This package provides easy access to remote SVN repositories from within @@ -949,8 +949,8 @@ fi Summary: Unit testing library for Trinity Group: Development/Languages/Other -Obsoletes: trinity-kunittest < %{version}-%{release} -Provides: trinity-kunittest = %{version}-%{release} +Obsoletes: trinity-kunittest < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kunittest = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-tdeunittest tdeunittest is a small library that facilitates the writing of tests for @@ -976,17 +976,17 @@ This package is part of Trinity, and a component of the TDE SDK module. Summary: Development files for %{name} Group: Development/Libraries/Other -Requires: %{name} = %{version}-%{release} -Requires: trinity-kbabel-devel = %{version}-%{release} -Requires: %{name}-misc = %{version}-%{release} -Requires: trinity-kspy = %{version}-%{release} -Requires: trinity-kmtrace = %{version}-%{release} -Requires: trinity-tdeunittest = %{version}-%{release} -Requires: trinity-libcvsservice-devel = %{version}-%{release} -Requires: trinity-kompare = %{version}-%{release} - -Obsoletes: trinity-kdesdk-devel < %{version}-%{release} -Provides: trinity-kdesdk-devel = %{version}-%{release} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kbabel-devel = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-misc = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kspy = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kmtrace = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-tdeunittest = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-libcvsservice-devel = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kompare = %{?epoch:%{epoch}:}%{version}-%{release} + +Obsoletes: trinity-kdesdk-devel < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kdesdk-devel = %{?epoch:%{epoch}:}%{version}-%{release} %description devel This package contains the development files for tdesdk. diff --git a/redhat/main/tdetoys/tdetoys.spec b/redhat/main/tdetoys/tdetoys.spec index 92646b807..e4edbf952 100644 --- a/redhat/main/tdetoys/tdetoys.spec +++ b/redhat/main/tdetoys/tdetoys.spec @@ -101,19 +101,19 @@ BuildRequires: pcre-devel BuildRequires: openssl-devel -Obsoletes: trinity-kdetoys < %{version}-%{release} -Provides: trinity-kdetoys = %{version}-%{release} +Obsoletes: trinity-kdetoys < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kdetoys = %{?epoch:%{epoch}:}%{version}-%{release} # Metapackage -Requires: trinity-amor = %{version}-%{release} -Requires: trinity-eyesapplet = %{version}-%{release} -Requires: trinity-fifteenapplet = %{version}-%{release} -Requires: trinity-kmoon = %{version}-%{release} -Requires: trinity-kodo = %{version}-%{release} -Requires: trinity-kteatime = %{version}-%{release} -Requires: trinity-ktux = %{version}-%{release} -Requires: trinity-kweather = %{version}-%{release} -Requires: trinity-kworldclock = %{version}-%{release} +Requires: trinity-amor = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-eyesapplet = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-fifteenapplet = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kmoon = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kodo = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kteatime = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-ktux = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kweather = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kworldclock = %{?epoch:%{epoch}:}%{version}-%{release} %description diff --git a/redhat/main/tdeutils/tdeutils.spec b/redhat/main/tdeutils/tdeutils.spec index 2428e00f7..5b56731c1 100644 --- a/redhat/main/tdeutils/tdeutils.spec +++ b/redhat/main/tdeutils/tdeutils.spec @@ -63,12 +63,12 @@ Source2: klaptop_acpi_helper.console Source3: kcmlaptoprc Source4: %{name}-rpmlintrc -Obsoletes: trinity-kdeutils < %{version}-%{release} -Provides: trinity-kdeutils = %{version}-%{release} -Obsoletes: trinity-kdeutils-extras < %{version}-%{release} -Provides: trinity-kdeutils-extras = %{version}-%{release} -Obsoletes: tdeutils < %{version}-%{release} -Provides: tdeutils = %{version}-%{release} +Obsoletes: trinity-kdeutils < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kdeutils = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kdeutils-extras < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kdeutils-extras = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: tdeutils < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: tdeutils = %{?epoch:%{epoch}:}%{version}-%{release} BuildRequires: trinity-filesystem >= %{tde_version} BuildRequires: trinity-tdelibs-devel >= %{tde_version} @@ -175,27 +175,27 @@ BuildRequires: openssl-devel %define build_tdefilereplace 1 %endif -Requires: trinity-ark = %{version}-%{release} -Requires: trinity-kcalc = %{version}-%{release} -Requires: trinity-kcharselect = %{version}-%{release} -Requires: trinity-tdelirc = %{version}-%{release} -Requires: trinity-tdessh = %{version}-%{release} -Requires: trinity-kdf = %{version}-%{release} -Requires: trinity-kedit = %{version}-%{release} -Requires: trinity-kfloppy = %{version}-%{release} -Requires: trinity-kgpg = %{version}-%{release} -Requires: trinity-khexedit = %{version}-%{release} -Requires: trinity-kjots = %{version}-%{release} -%{?build_klaptopdaemon:Requires: trinity-klaptopdaemon = %{version}-%{release}} -Requires: trinity-kmilo = %{version}-%{release} -Requires: trinity-kmilo-legacy = %{version}-%{release} -Requires: trinity-kregexpeditor = %{version}-%{release} -Requires: trinity-ksim = %{version}-%{release} -Requires: trinity-ktimer = %{version}-%{release} -Requires: trinity-tdewalletmanager = %{version}-%{release} -Requires: trinity-superkaramba = %{version}-%{release} +Requires: trinity-ark = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kcalc = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kcharselect = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-tdelirc = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-tdessh = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kdf = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kedit = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kfloppy = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kgpg = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-khexedit = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kjots = %{?epoch:%{epoch}:}%{version}-%{release} +%{?build_klaptopdaemon:Requires: trinity-klaptopdaemon = %{?epoch:%{epoch}:}%{version}-%{release}} +Requires: trinity-kmilo = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kmilo-legacy = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kregexpeditor = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-ksim = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-ktimer = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-tdewalletmanager = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-superkaramba = %{?epoch:%{epoch}:}%{version}-%{release} %if 0%{?build_tdefilereplace} -Requires: trinity-tdefilereplace = %{version}-%{release} +Requires: trinity-tdefilereplace = %{?epoch:%{epoch}:}%{version}-%{release} %endif %description @@ -324,8 +324,8 @@ Summary: Infrared control for Trinity Group: Applications/Utilities Requires: trinity-filesystem -Obsoletes: trinity-kdelirc < %{version}-%{release} -Provides: trinity-kdelirc = %{version}-%{release} +Obsoletes: trinity-kdelirc < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kdelirc = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-tdelirc This is a frontend for the LIRC suite to use infrared devices with TDE. @@ -369,8 +369,8 @@ Requires: openssh Requires: openssh-clients %endif -Obsoletes: trinity-kdessh < %{version}-%{release} -Provides: trinity-kdessh = %{version}-%{release} +Obsoletes: trinity-kdessh < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kdessh = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-tdessh This package contains TDE's frontend for ssh. @@ -620,7 +620,7 @@ with special keys. %package -n trinity-kmilo-legacy Summary: Non-standard plugins for KMilo Group: Applications/Utilities -Requires: trinity-kmilo = %{version}-%{release} +Requires: trinity-kmilo = %{?epoch:%{epoch}:}%{version}-%{release} Requires: trinity-kcontrol %description -n trinity-kmilo-legacy @@ -725,8 +725,8 @@ command execution. Summary: Wallet manager for Trinity Group: Applications/Utilities -Obsoletes: trinity-kwalletmanager < %{version}-%{release} -Provides: trinity-kwalletmanager = %{version}-%{release} +Obsoletes: trinity-kwalletmanager < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kwalletmanager = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-tdewalletmanager This program keeps various wallets for any kind of data that the user can @@ -785,8 +785,8 @@ Here are just some examples of the things that can be done: Summary: Batch search-and-replace component for TDE Group: Applications/Utilities -Obsoletes: trinity-kfilereplace < %{version}-%{release} -Provides: trinity-kfilereplace = %{version}-%{release} +Obsoletes: trinity-kfilereplace < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kfilereplace = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-tdefilereplace TDEFileReplace is an embedded component for TDE that acts as a batch @@ -818,13 +818,13 @@ This package is part of Trinity, as a component of the TDE utilities module. %package devel Summary: Development files for %{name} Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} Requires: trinity-tdelibs-devel -Obsoletes: trinity-kdeutils-devel < %{version}-%{release} -Provides: trinity-kdeutils-devel = %{version}-%{release} -Obsoletes: tdeutils-devel < %{version}-%{release} -Provides: tdeutils-devel = %{version}-%{release} +Obsoletes: trinity-kdeutils-devel < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kdeutils-devel = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: tdeutils-devel < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: tdeutils-devel = %{?epoch:%{epoch}:}%{version}-%{release} %description devel This package contains the development files for tdeutils. diff --git a/redhat/main/tdevelop/tdevelop.spec b/redhat/main/tdevelop/tdevelop.spec index dfcbcace6..21f4d0c8d 100644 --- a/redhat/main/tdevelop/tdevelop.spec +++ b/redhat/main/tdevelop/tdevelop.spec @@ -60,7 +60,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz Source1: %{name}-rpmlintrc -Requires: %{name}-libs = %{version}-%{release} +Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release} BuildRequires: tqt3-apps-devel >= 3.5.0 BuildRequires: trinity-arts-devel >= %{tde_epoch}:1.5.10 @@ -68,8 +68,8 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: trinity-tdesdk-devel >= %{tde_version} -Obsoletes: trinity-kdevelop < %{version}-%{release} -Provides: trinity-kdevelop = %{version}-%{release} +Obsoletes: trinity-kdevelop < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kdevelop = %{?epoch:%{epoch}:}%{version}-%{release} # SUSE desktop files utility %if 0%{?suse_version} @@ -536,10 +536,10 @@ individual needs. %package devel Summary: Development files for %{name} Group: Development/Libraries/Other -Requires: %{name}-libs = %{version}-%{release} +Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release} -Obsoletes: trinity-kdevelop-devel < %{version}-%{release} -Provides: trinity-kdevelop-devel = %{version}-%{release} +Obsoletes: trinity-kdevelop-devel < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kdevelop-devel = %{?epoch:%{epoch}:}%{version}-%{release} %description devel This package contains the development files for tdevelop. @@ -557,10 +557,10 @@ Summary: %{name} runtime libraries Group: System Environment/Libraries Requires: trinity-tdelibs >= %{tde_version} # include to be paranoid, installing libs-only is still mostly untested -- Rex -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} -Obsoletes: trinity-kdevelop-libs < %{version}-%{release} -Provides: trinity-kdevelop-libs = %{version}-%{release} +Obsoletes: trinity-kdevelop-libs < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kdevelop-libs = %{?epoch:%{epoch}:}%{version}-%{release} %description libs This package contains the libraries needed for the tdevelop programs. diff --git a/redhat/main/tdewebdev/tdewebdev.spec b/redhat/main/tdewebdev/tdewebdev.spec index 42b2d70b5..c23f766dd 100644 --- a/redhat/main/tdewebdev/tdewebdev.spec +++ b/redhat/main/tdewebdev/tdewebdev.spec @@ -100,17 +100,17 @@ BuildRequires: libxml2-devel %define build_tdefilereplace 1 %endif -Obsoletes: trinity-kdewebdev-libs < %{version}-%{release} -Provides: trinity-kdewebdev-libs = %{version}-%{release} -Obsoletes: trinity-kdewebdev < %{version}-%{release} -Provides: trinity-kdewebdev = %{version}-%{release} - -Requires: trinity-quanta = %{version}-%{release} -Requires: trinity-quanta-data = %{version}-%{release} -Requires: trinity-kimagemapeditor = %{version}-%{release} -Requires: trinity-klinkstatus = %{version}-%{release} -Requires: trinity-kommander = %{version}-%{release} -%{?build_kxsldbg:Requires: trinity-kxsldbg = %{version}-%{release}} +Obsoletes: trinity-kdewebdev-libs < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kdewebdev-libs = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-kdewebdev < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kdewebdev = %{?epoch:%{epoch}:}%{version}-%{release} + +Requires: trinity-quanta = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-quanta-data = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kimagemapeditor = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-klinkstatus = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kommander = %{?epoch:%{epoch}:}%{version}-%{release} +%{?build_kxsldbg:Requires: trinity-kxsldbg = %{?epoch:%{epoch}:}%{version}-%{release}} %description Web development applications, including: @@ -129,11 +129,11 @@ Web development applications, including: Summary: web development environment for TDE [Trinity] Group: Applications/Development Requires: trinity-tdefilereplace -Requires: trinity-klinkstatus = %{version}-%{release} -Requires: trinity-kommander = %{version}-%{release} -Requires: trinity-quanta-data = %{version}-%{release} -#Requires: trinity-kimagemapeditor = %{version}-%{release} -#Requires: trinity-kxsldbg = %{version}-%{release} +Requires: trinity-klinkstatus = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kommander = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-quanta-data = %{?epoch:%{epoch}:}%{version}-%{release} +#Requires: trinity-kimagemapeditor = %{?epoch:%{epoch}:}%{version}-%{release} +#Requires: trinity-kxsldbg = %{?epoch:%{epoch}:}%{version}-%{release} Requires: tidy %description -n trinity-quanta @@ -299,7 +299,7 @@ This package is part of TDE, as a component of the TDE web development module. %package -n trinity-kommander-devel Summary: development files for Kommander [Trinity] Group: Development/Libraries -Requires: trinity-kommander = %{version}-%{release} +Requires: trinity-kommander = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-kommander-devel This package contains the headers and other development files for @@ -377,8 +377,8 @@ This package is part of TDE, as a component of the TDE web development module. Summary: Batch search-and-replace component for TDE Group: Applications/Utilities -Obsoletes: trinity-kfilereplace < %{version}-%{release} -Provides: trinity-kfilereplace = %{version}-%{release} +Obsoletes: trinity-kfilereplace < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kfilereplace = %{?epoch:%{epoch}:}%{version}-%{release} %description -n trinity-tdefilereplace TDEFileReplace is an embedded component for TDE that acts as a batch @@ -410,12 +410,12 @@ This package is part of Trinity, as a component of the TDE utilities module. Group: Development/Libraries Summary: Header files and documentation for %{name} -Obsoletes: trinity-kdewebdev-devel < %{version}-%{release} -Provides: trinity-kdewebdev-devel = %{version}-%{release} +Obsoletes: trinity-kdewebdev-devel < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kdewebdev-devel = %{?epoch:%{epoch}:}%{version}-%{release} Requires: trinity-tdelibs-devel >= %{tde_version} -Requires: %{name} = %{version}-%{release} -Requires: trinity-kommander-devel = %{version}-%{release} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kommander-devel = %{?epoch:%{epoch}:}%{version}-%{release} %description devel %{summary}. |