RPM Packaging: massive update spec files

1 files changed, 37 insertions, 36 deletions

diff --git a/redhat/applications/koffice/koffice-14.0.0.spec b/redhat/applications/koffice/koffice-14.0.0.spec
index cb5e1e954..8dcbe7f83 100644
--- a/redhat/applications/koffice/koffice-14.0.0.spec
+++ b/redhat/applications/koffice/koffice-14.0.0.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package koffice (version R14.0.0)
+# spec file for package koffice (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 koffice
 %define tde_prefix /opt/trinity
 %define tde_bindir %{tde_prefix}/bin
@@ -243,23 +245,22 @@ KOffice is an integrated office suite.
 %package suite
 Summary:		An integrated office suite
 Group:			Applications/Productivity
-Obsoletes:      %{name} <= %{version}-%{release}
-Obsoletes:      %{name}-i18n < 4:%{version}
-Requires:		%{name}-core = %{version}-%{release} 
-Requires:		%{name}-kword = %{version}-%{release} 
-Requires:		%{name}-kspread = %{version}-%{release} 
-Requires:		%{name}-kpresenter = %{version}-%{release}
-Requires:		%{name}-kivio = %{version}-%{release}
-Requires:		%{name}-karbon = %{version}-%{release}
-Requires:		%{name}-kugar = %{version}-%{release}
-Requires:		%{name}-kexi = %{version}-%{release}
-Requires:		%{name}-kexi-driver-mysql = %{version}-%{release}
-%{?with_postgresql:Requires:       %{name}-kexi-driver-pgsql = %{version}-%{release}}
-Requires:		%{name}-kchart = %{version}-%{release}
-Requires:		%{name}-kformula = %{version}-%{release}
-Requires:		%{name}-filters = %{version}-%{release}
-Requires:		%{name}-kplato = %{version}-%{release}
-Requires:		%{name}-chalk = %{version}-%{release}
+Obsoletes:      %{name} <= %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:		%{name}-core = %{?epoch:%{epoch}:}%{version}-%{release} 
+Requires:		%{name}-kword = %{?epoch:%{epoch}:}%{version}-%{release} 
+Requires:		%{name}-kspread = %{?epoch:%{epoch}:}%{version}-%{release} 
+Requires:		%{name}-kpresenter = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:		%{name}-kivio = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:		%{name}-karbon = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:		%{name}-kugar = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:		%{name}-kexi = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:		%{name}-kexi-driver-mysql = %{?epoch:%{epoch}:}%{version}-%{release}
+%{?with_postgresql:Requires:       %{name}-kexi-driver-pgsql = %{?epoch:%{epoch}:}%{version}-%{release}}
+Requires:		%{name}-kchart = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:		%{name}-kformula = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:		%{name}-filters = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:		%{name}-kplato = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:		%{name}-chalk = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description suite
 KOffice is an integrated office suite.
@@ -272,7 +273,7 @@ KOffice is an integrated office suite.
 %package core
 Summary:		Core support files for %{name} 
 Group:			Applications/Productivity
-Requires:		%{name}-libs = %{version}-%{release}
+Requires:		%{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:		perl
 
 %description core
@@ -408,7 +409,7 @@ License:		LGPLv2+
 %package devel
 Summary:		Development files for %{name} 
 Group:			Development/Libraries
-Requires:		%{name}-libs = %{version}-%{release}
+Requires:		%{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
 License:		LGPLv2+
 
 %description devel
@@ -428,7 +429,7 @@ License:		LGPLv2+
 %package kword
 Summary:		A frame-based word processor capable of professional standard documents
 Group:			Applications/Productivity
-Requires:		%{name}-core = %{version}-%{release}
+Requires:		%{name}-core = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description kword
 %{summary}.
@@ -462,7 +463,7 @@ update-desktop-database -q &> /dev/null ||:
 %package kspread
 Summary:		A powerful spreadsheet application
 Group:			Applications/Productivity
-Requires:		%{name}-core = %{version}-%{release}
+Requires:		%{name}-core = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description kspread
 %{summary}.
@@ -499,7 +500,7 @@ Requires:		%{name}-core = %{version}-%{release}
 %package kpresenter
 Summary:		A full-featured presentation program
 Group:			Applications/Productivity
-Requires:		%{name}-core = %{version}-%{release}
+Requires:		%{name}-core = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description kpresenter
 %{summary}.
@@ -533,7 +534,7 @@ update-desktop-database -q &> /dev/null ||:
 %package kivio
 Summary:		A flowcharting application
 Group:			Applications/Productivity
-Requires:		%{name}-core = %{version}-%{release}
+Requires:		%{name}-core = %{?epoch:%{epoch}:}%{version}-%{release}
 Obsoletes:      kivio < %{version}-%{release}
 
 %description kivio
@@ -557,7 +558,7 @@ Obsoletes:      kivio < %{version}-%{release}
 %package karbon
 Summary:		A vector drawing application
 Group:			Applications/Productivity
-Requires:		%{name}-core = %{version}-%{release}
+Requires:		%{name}-core = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description karbon
 %{summary}.
@@ -589,7 +590,7 @@ Requires:		%{name}-core = %{version}-%{release}
 %package kugar
 Summary:		A tool for generating business quality reports
 Group:			Applications/Productivity
-Requires:		%{name}-core = %{version}-%{release}
+Requires:		%{name}-core = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description kugar
 %{summary}.
@@ -627,7 +628,7 @@ update-desktop-database -q &> /dev/null ||:
 %package kexi
 Summary:		An integrated environment for managing data
 Group:			Applications/Productivity
-Requires:		%{name}-core = %{version}-%{release}
+Requires:		%{name}-core = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %if 0%{?with_postgresql} == 0
 Obsoletes:		%{name}-kexi-driver-pgsql
@@ -681,7 +682,7 @@ update-desktop-database -q &> /dev/null ||:
 %package kexi-driver-mysql
 Summary:		Mysql-driver for kexi
 Group:			Applications/Productivity
-Requires:		%{name}-kexi = %{version}-%{release}
+Requires:		%{name}-kexi = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description kexi-driver-mysql
 %{summary}.
@@ -700,7 +701,7 @@ Requires:		%{name}-kexi = %{version}-%{release}
 %package kexi-driver-pgsql
 Summary:		Postgresql driver for kexi
 Group:			Applications/Productivity
-Requires:		%{name}-kexi = %{version}-%{release}
+Requires:		%{name}-kexi = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description kexi-driver-pgsql
 %{summary}.
@@ -719,7 +720,7 @@ Requires:		%{name}-kexi = %{version}-%{release}
 %package kchart
 Summary:		An integrated graph and chart drawing tool
 Group:			Applications/Productivity
-Requires:		%{name}-core = %{version}-%{release}
+Requires:		%{name}-core = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description kchart
 %{summary}.
@@ -749,7 +750,7 @@ update-desktop-database -q &> /dev/null ||:
 %package kformula
 Summary:		A powerful formula editor
 Group:			Applications/Productivity
-Requires:		%{name}-core = %{version}-%{release}
+Requires:		%{name}-core = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %if 0%{?mgaversion} || 0%{?mdkversion}
 Requires:		fonts-ttf-dejavu
@@ -788,7 +789,7 @@ Requires:		dejavu
 %package filters
 Summary:		Import and Export Filters for KOffice
 Group:			Applications/Productivity
-Requires:		%{name}-core = %{version}-%{release}
+Requires:		%{name}-core = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description filters
 %{summary}.
@@ -858,7 +859,7 @@ Requires:		%{name}-core = %{version}-%{release}
 %package kplato
 Summary:		An integrated project management and planning tool
 Group:			Applications/Productivity
-Requires:		%{name}-core = %{version}-%{release}
+Requires:		%{name}-core = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description kplato
 %{summary}.
@@ -879,9 +880,9 @@ Requires:		%{name}-core = %{version}-%{release}
 %package chalk
 Summary:		pixel-based image manipulation program for the TDE Office Suite [Trinity]
 Group:			Applications/Productivity
-Requires:		%{name}-core = %{version}-%{release}
-Requires:		%{name}-chalk-data = %{version}-%{release}
-Requires:		%{name}-filters
+Requires:		%{name}-core = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:		%{name}-chalk-data = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:		%{name}-filters = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description chalk
 Chalk is a painting and image editing application for KOffice. Chalk contains