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:39:07 +0200 |
commit | 8e3510f75a34c04dcf4503c15d4cfa85c92ed0e4 (patch) | |
tree | 5a7f6d1f1a87a7396df89dc61df946fc049f58ac /redhat/main/tdeartwork/tdeartwork.spec | |
parent | 2129c45a49b6487864915ecc1e22726cc5f62b71 (diff) | |
download | tde-packaging-8e3510f75a34c04dcf4503c15d4cfa85c92ed0e4.tar.gz tde-packaging-8e3510f75a34c04dcf4503c15d4cfa85c92ed0e4.zip |
RPM: update all 'Obsoletes' and 'Provides' statement to avoid build warnings
Signed-off-by: François Andriot <albator78@libertysurf.fr>
Diffstat (limited to 'redhat/main/tdeartwork/tdeartwork.spec')
-rw-r--r-- | redhat/main/tdeartwork/tdeartwork.spec | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/redhat/main/tdeartwork/tdeartwork.spec b/redhat/main/tdeartwork/tdeartwork.spec index 2a0eff9d4..0b7199279 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 |