RPM Packaging: update packages R14

5 files changed, 9 insertions, 10 deletions

diff --git a/redhat/applications/k9copy/k9copy-14.0.0.spec b/redhat/applications/k9copy/k9copy-14.0.0.spec
index 74c5402da..13f59ddd9 100644
--- a/redhat/applications/k9copy/k9copy-14.0.0.spec
+++ b/redhat/applications/k9copy/k9copy-14.0.0.spec
@@ -43,7 +43,6 @@ Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
 Patch1:			k9copy-14.0.0-fix_k3b_link.patch
 Patch2:			k9copy-3.5.13.2-ftbfs.patch
-Patch3:			k9copy-14.0.0-fix_author.patch
 
 BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
 BuildRequires:	trinity-arts-devel >= 1:1.5.10
@@ -73,7 +72,6 @@ This is the Trinity version.
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 %patch1 -p1 -b .ftbfs
 %patch2 -p1 -b .ftbfs
-%patch3 -p1 -b .k9author
 
 # Removes internal dvdread headers
 %__rm -rf dvdread
diff --git a/redhat/applications/kbiff/kbiff-14.0.0.spec b/redhat/applications/kbiff/kbiff-14.0.0.spec
index 23cc770bf..ac1633c80 100644
--- a/redhat/applications/kbiff/kbiff-14.0.0.spec
+++ b/redhat/applications/kbiff/kbiff-14.0.0.spec
@@ -35,10 +35,12 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
+BuildRequires:	tqt3-compat-headers >= 3.5.0
+BuildRequires:	libtqt4-devel >= 2:4.2.0
+BuildRequires:	trinity-arts-devel >= 2:1.5.10
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+
 BuildRequires:	desktop-file-utils
 
 BuildRequires:	gettext
diff --git a/redhat/applications/kmymoney/kmymoney-14.0.0.spec b/redhat/applications/kmymoney/kmymoney-14.0.0.spec
index af1666131..0a169c4c1 100644
--- a/redhat/applications/kmymoney/kmymoney-14.0.0.spec
+++ b/redhat/applications/kmymoney/kmymoney-14.0.0.spec
@@ -75,8 +75,8 @@ BuildRequires:	openjade-devel
 %endif
 
 # TQT3-sqlite3
-BuildRequires:	trinity-tqt3-sqlite3
-Requires:		trinity-tqt3-sqlite3
+BuildRequires:	libtqt3-mt-sqlite3
+Requires:		libtqt3-mt-sqlite3
 
 Requires:		%{name}-common == %{version}-%{release}
 
diff --git a/redhat/applications/kpilot/kpilot-14.0.0.spec b/redhat/applications/kpilot/kpilot-14.0.0.spec
index 801b4b89f..3ae6d12ea 100644
--- a/redhat/applications/kpilot/kpilot-14.0.0.spec
+++ b/redhat/applications/kpilot/kpilot-14.0.0.spec
@@ -49,7 +49,7 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
 # FLEX
-%if 0%{?suse_version}
+%if 0%{?suse_version} || 0%{?mgaversion}
 BuildRequires:	flex
 %else
 BuildRequires:	flex-devel
@@ -66,7 +66,7 @@ software does for Windows.  KPilot can back-up and restore your Palm Pilot
 and synchronize the built-in applications with their TDE counterparts.
 
 
-%if 0%{?suse_version} || 0%{?pclinuxos}
+%if 0%{?pclinuxos}
 %debug_package
 %endif
 
diff --git a/redhat/applications/ksensors/ksensors-14.0.0.spec b/redhat/applications/ksensors/ksensors-14.0.0.spec
index 5cb57fb87..f0396bafa 100644
--- a/redhat/applications/ksensors/ksensors-14.0.0.spec
+++ b/redhat/applications/ksensors/ksensors-14.0.0.spec
@@ -74,7 +74,6 @@ temperatures with KSensors.
 %build
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
 # Warning: --enable-final causes FTBFS
 %configure \
@@ -93,7 +92,7 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
   --enable-rpath \
   --disable-gcc-hidden-visibility
 
-%__make %{?_smp_mflags}
+%__make %{?_smp_mflags} || %__make
 
 
 %install