RPM Packaging: update R14 packages

7 files changed, 6 insertions, 14 deletions

diff --git a/redhat/applications/kmymoney/kmymoney-14.0.0.spec b/redhat/applications/kmymoney/kmymoney-14.0.0.spec
index 75a5d9c0a..af1666131 100644
--- a/redhat/applications/kmymoney/kmymoney-14.0.0.spec
+++ b/redhat/applications/kmymoney/kmymoney-14.0.0.spec
@@ -45,7 +45,6 @@ BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 Source1:		kmymoneytitlelabel.png
-Patch0:			kmymoney-sqlite3-detection.diff
 
 BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
 BuildRequires:	trinity-arts-devel >= 1:1.5.10
@@ -91,7 +90,7 @@ support.
 %package common
 Summary:		KMyMoney architecture independent files
 Group:			Applications/Utilities
-Requires:		%{name} == %{version}
+Requires:		%{name} == %{version}-%{release}
 
 %description common
 This package contains architecture independent files needed for KMyMoney to
@@ -102,7 +101,7 @@ have '%{name}' package installed, you will hardly find this package useful.
 %package devel
 Summary:		KMyMoney development files
 Group:			Development/Libraries
-Requires:		%{name} == %{version}
+Requires:		%{name} == %{version}-%{release}
 
 %description devel
 This package contains development files needed for KMyMoney plugins.
@@ -115,7 +114,6 @@ This package contains development files needed for KMyMoney plugins.
 
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%patch0 -p1 -b .sqlite3
 
 %__install -m644 %{SOURCE1} kmymoney2/widgets/
 
diff --git a/redhat/applications/koffice/koffice-14.0.0.spec b/redhat/applications/koffice/koffice-14.0.0.spec
index c1ce15c41..6803cf68a 100644
--- a/redhat/applications/koffice/koffice-14.0.0.spec
+++ b/redhat/applications/koffice/koffice-14.0.0.spec
@@ -55,8 +55,6 @@ BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-#Patch0:			koffice-14.0.0-ftbfs.patch
-
 # BuildRequires: world-devel ;)
 BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
 BuildRequires:	trinity-arts-devel >= 1:1.5.10
@@ -1063,7 +1061,6 @@ This package is part of the TDE Office Suite.
 
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-#patch0 -p1 -b .ftbfs
 
 %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
 %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
diff --git a/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec b/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec
index 288aed62d..268c2d341 100644
--- a/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec
+++ b/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec
@@ -41,8 +41,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-Patch1:		1391880088:c68a1bac04c5cfdb0cdcbd91dc54995bfa05e292.diff
-
 BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
 BuildRequires:	trinity-arts-devel >= 1:1.5.10
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
@@ -89,7 +87,6 @@ settings for:
 
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%patch1 -R -p1
 
 
 %build
diff --git a/redhat/applications/tdmtheme/kdmtheme-3.5.13.1.spec b/redhat/applications/tdmtheme/kdmtheme-3.5.13.1.spec
index 4c0d455af..ff99cfcee 100644
--- a/redhat/applications/tdmtheme/kdmtheme-3.5.13.1.spec
+++ b/redhat/applications/tdmtheme/kdmtheme-3.5.13.1.spec
@@ -48,7 +48,7 @@ BuildRequires:	gettext
 
 
 %description
-kdmtheme is a theme manager for KDM. It provides a TDE Control Module (KCM)
+kdmtheme is a theme manager for KDM. It provides a Trinity Control Module (KCM)
 that allows you to easily install, remove and change your KDM themes.
 
 
diff --git a/redhat/applications/tdmtheme/kdmtheme-3.5.13.spec b/redhat/applications/tdmtheme/kdmtheme-3.5.13.spec
index 63f849db5..22f3cd396 100644
--- a/redhat/applications/tdmtheme/kdmtheme-3.5.13.spec
+++ b/redhat/applications/tdmtheme/kdmtheme-3.5.13.spec
@@ -48,7 +48,7 @@ BuildRequires:	gettext
 
 
 %description
-kdmtheme is a theme manager for KDM. It provides a TDE Control Module (KCM)
+kdmtheme is a theme manager for KDM. It provides a Trinity Control Module (KCM)
 that allows you to easily install, remove and change your KDM themes.
 
 
diff --git a/redhat/applications/tdmtheme/tdmtheme-14.0.0.spec b/redhat/applications/tdmtheme/tdmtheme-14.0.0.spec
index 371e18702..88bb45713 100644
--- a/redhat/applications/tdmtheme/tdmtheme-14.0.0.spec
+++ b/redhat/applications/tdmtheme/tdmtheme-14.0.0.spec
@@ -54,7 +54,7 @@ Provides:		trinity-kdmtheme = %{version}-%{release}
 
 
 %description
-kdmtheme is a theme manager for KDM. It provides a TDE Control Module (KCM)
+kdmtheme is a theme manager for KDM. It provides a Trinity Control Module (KCM)
 that allows you to easily install, remove and change your KDM themes.
 
 
diff --git a/redhat/applications/tdmtheme/tdmtheme-3.5.13.2.spec b/redhat/applications/tdmtheme/tdmtheme-3.5.13.2.spec
index 8df2bce99..23c609037 100644
--- a/redhat/applications/tdmtheme/tdmtheme-3.5.13.2.spec
+++ b/redhat/applications/tdmtheme/tdmtheme-3.5.13.2.spec
@@ -54,7 +54,7 @@ Provides:		trinity-kdmtheme = %{version}-%{release}
 
 
 %description
-kdmtheme is a theme manager for KDM. It provides a TDE Control Module (KCM)
+kdmtheme is a theme manager for KDM. It provides a Trinity Control Module (KCM)
 that allows you to easily install, remove and change your KDM themes.