RPM Packaging: update R14 packages

5 files changed, 8 insertions, 7 deletions

diff --git a/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec b/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec
index 798bbdf78..ecce24978 100644
--- a/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec
+++ b/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec
@@ -63,6 +63,8 @@ especially suitable for embedded applications.
 %package -n %{libart}_lgpl_2-2
 Summary:        Library of functions for 2D graphics - runtime files
 Group:			System/Libraries
+Obsoletes:		libart_lgpl < %{version}-%{release}
+Provides:		libart_lgpl = %{version}-%{release}
 Provides:		libart_lgpl_2-2 = %{version}-%{release}
 
 %description -n %{libart}_lgpl_2-2
@@ -88,6 +90,7 @@ especially suitable for embedded applications.
 %package -n %{libart}_lgpl-devel
 Summary:        Library of functions for 2D graphics - development files
 Group:          Development/Libraries
+Provides:		libart_lgpl-devel = %{version}-%{release}
 Requires:       %{libart}_lgpl_2-2 = %{version}-%{release}
 
 %description -n %{libart}_lgpl-devel
diff --git a/redhat/dependencies/sip4-tqt/sip4-tqt.spec b/redhat/dependencies/sip4-tqt/sip4-tqt.spec
index 5b6485d34..8e1ea70cb 100644
--- a/redhat/dependencies/sip4-tqt/sip4-tqt.spec
+++ b/redhat/dependencies/sip4-tqt/sip4-tqt.spec
@@ -38,7 +38,7 @@ BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
 
 # TDE specific building variables
 BuildRequires:	python
-BuildRequires:	trinity-tqt3-devel >= 3.5.0
+BuildRequires:	libtqt4-devel >= 2:4.2.0
 
 %description
 SIP is a tool for generating bindings for C++ classes with some ideas
diff --git a/redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec b/redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec
index a85bae95c..8c24acab0 100644
--- a/redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec
+++ b/redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec
@@ -30,8 +30,7 @@ BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-BuildRequires:  trinity-tqt3-devel >= 3.5.0
-BuildRequires:  trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires:  libtqt4-devel >= 2:4.2.0
 BuildRequires:	trinity-tqca-devel >= 1.0
 BuildRequires:	openssl-devel >= 0.9.8
 
diff --git a/redhat/dependencies/tqca/tqca-14.0.0.spec b/redhat/dependencies/tqca/tqca-14.0.0.spec
index 19010e5db..093461890 100644
--- a/redhat/dependencies/tqca/tqca-14.0.0.spec
+++ b/redhat/dependencies/tqca/tqca-14.0.0.spec
@@ -33,8 +33,7 @@ BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-BuildRequires:  trinity-tqt3-devel >= 3.5.0
-BuildRequires:  trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires:  libtqt4-devel >= 2:4.2.0
 
 
 %description
@@ -81,7 +80,7 @@ This packages contains the development files for TQCA
 
 ##########
 
-%if 0%{?suse_version} || 0%{?pclinuxos}
+%if 0%{?pclinuxos}
 %debug_package
 %endif
 
diff --git a/redhat/dependencies/tqt3/tqt3-14.0.0.spec b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
index 21f080922..fa1a1790a 100644
--- a/redhat/dependencies/tqt3/tqt3-14.0.0.spec
+++ b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
@@ -327,7 +327,7 @@ Requires:	%{libtqt3}-mt = %{version}-%{release}
 
 Requires: glibc-devel
 Requires: fontconfig-devel
-Requires: freetype2-devel
+Requires: freetype-devel
 Requires: libjpeg-devel
 Requires: libpng-devel
 Requires: zlib-devel