From 2835777e9ae7bde053e0da2f083ee020f26ea04a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Mon, 29 Jun 2015 20:17:57 +0200 Subject: RPM Packaging: massive update spec files --- redhat/applications/tdesvn/tdesvn-14.0.0.spec | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) (limited to 'redhat/applications/tdesvn') diff --git a/redhat/applications/tdesvn/tdesvn-14.0.0.spec b/redhat/applications/tdesvn/tdesvn-14.0.0.spec index 10292e44e..b2fc61788 100644 --- a/redhat/applications/tdesvn/tdesvn-14.0.0.spec +++ b/redhat/applications/tdesvn/tdesvn-14.0.0.spec @@ -1,5 +1,5 @@ # -# spec file for package tdesvn (version R14.0.0) +# spec file for package tdesvn (version R14) # # Copyright (c) 2014 Trinity Desktop Environment # @@ -17,7 +17,9 @@ # TDE variables %define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 +%endif %define tde_pkg tdesvn %define tde_prefix /opt/trinity %define tde_bindir %{tde_prefix}/bin @@ -53,7 +55,7 @@ Prefix: %{tde_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -Patch0: %{tde_pkg}-%{tde_version}.patch +Patch0: %{tde_pkg}-14.0.0.patch BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} @@ -91,11 +93,11 @@ BuildRequires: libidn-devel BuildRequires: gamin-devel %endif -Requires: %{name}-tdeio-plugins = %{version}-%{release} -Requires: trinity-libsvnqt = %{version}-%{release} +Requires: %{name}-tdeio-plugins = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-libsvnqt = %{?epoch:%{epoch}:}%{version}-%{release} -Obsoletes: trinity-kdesvn < %{version}-%{release} -Provides: trinity-kdesvn = %{version}-%{release} +Obsoletes: trinity-kdesvn < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kdesvn = %{?epoch:%{epoch}:}%{version}-%{release} %description @@ -173,7 +175,7 @@ written in C++. %package -n trinity-libsvnqt-devel Group: Development/Libraries -Requires: trinity-libsvnqt = %{version}-%{release} +Requires: trinity-libsvnqt = %{?epoch:%{epoch}:}%{version}-%{release} Requires: qt-devel Requires: subversion-devel Summary: Qt wrapper library for subversion (development files) [Trinity] @@ -194,10 +196,10 @@ Group: Development/Libraries Conflicts: trinity-kdesdk-tdeio-plugins Summary: subversion I/O slaves for Trinity -Obsoletes: trinity-kdesvn-kio-plugins < %{version}-%{release} -Provides: trinity-kdesvn-kio-plugins = %{version}-%{release} -Obsoletes: trinity-tdesvn-kio-plugins < %{version}-%{release} -Provides: trinity-tdesvn-kio-plugins = %{version}-%{release} +Obsoletes: trinity-kdesvn-kio-plugins < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-kdesvn-kio-plugins = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: trinity-tdesvn-kio-plugins < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: trinity-tdesvn-kio-plugins = %{?epoch:%{epoch}:}%{version}-%{release} %description tdeio-plugins This packages includes TDEIO slaves for svn, svn+file, svn+http, -- cgit v1.2.3