From ec1c5eaa0e86bf9f34c15e86675834683fbcbbfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Thu, 13 May 2021 20:36:43 +0200 Subject: RPM: update all 'Obsoletes' and 'Provides' statement to avoid build warnings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: François Andriot --- redhat/main/tdebindings/tdebindings.spec | 140 +++++++++++++++---------------- 1 file changed, 70 insertions(+), 70 deletions(-) (limited to 'redhat/main/tdebindings') 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 -- cgit v1.2.3