RPM: merge redhat directory with master branch

1 files changed, 47 insertions, 14 deletions

diff --git a/redhat/dependencies/tqt3/tqt3-14.0.0.spec b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
index 893e10952..dda0eb54c 100644
--- a/redhat/dependencies/tqt3/tqt3-14.0.0.spec
+++ b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package tqt3 (version R14.0.0)
+# spec file for package tqt3 (version R14)
 #
 # Copyright (c) 2014 Trinity Desktop Environment
 #
@@ -12,11 +12,13 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 #
-# Please submit bugfixes or comments via http:/www.trinitydesktop.org/
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
 #
 
 # TDE variables
+%if "%{?tde_version}" == ""
 %define tde_version 14.0.0
+%endif
 
 %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
 %define libtqt3 %{_lib}tqt3
@@ -27,7 +29,7 @@
 
 Name:		trinity-tqt3
 Version:	3.5.0
-Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
 Summary:	TQt GUI Library, Version 3
 Group:		System/GUI/Other
 URL:		http://www.trinitydesktop.org/
@@ -109,15 +111,10 @@ BuildRequires: cups-devel
 %{?uuid_devel:BuildRequires: %{uuid_devel}}
 
 # LIBAUDIO support
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%define with_nas 1
 %if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%define with_nas 1
 %define libaudio_devel nas-devel
 %endif
-%if 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%define libaudio_devel libaudio-devel
-%endif
-%endif
 %{?libaudio_devel:BuildRequires: %{libaudio_devel}}
 
 # Xrender support
@@ -134,8 +131,12 @@ BuildRequires: cups-devel
 %define xrandr_devel libXrandr-devel
 %endif
 %if 0%{?mdkversion} || 0%{?mgaversion}
+%if 0%{?pclinuxos}
+%define xrandr_devel %{_lib}xrandr2-devel
+%else
 %define xrandr_devel libxrandr-devel
 %endif
+%endif
 %{?xrandr_devel:BuildRequires: %{xrandr_devel}}
 
 # Xcursor support
@@ -225,7 +226,7 @@ BuildRequires:	%{_lib}xmu%{?mgaversion:6}-devel
 %define xi_devel xorg-x11-devel
 %endif
 %if 0%{?mgaversion} || 0%{?mdkversion}
-%define xi_devel %{_lib}xi-devel
+%define xi_devel libxi-devel
 %endif
 %if 0%{?suse_version} >= 1220 || 0%{?rhel} >= 5 || 0%{?fedora}
 %define xi_devel libXi-devel
@@ -246,8 +247,12 @@ BuildRequires: mesa-libGL-devel
 BuildRequires: mesa-libGLU-devel
 %endif
 %if 0%{?mdkversion} || 0%{?mgaversion}
+%if 0%{?pclinuxos}
+BuildRequires: MesaGLU-devel
+%else
 BuildRequires: mesaglu-devel
 %endif
+%endif
 %if 0%{?suse_version}
 BuildRequires: Mesa-libGL-devel
 BuildRequires: Mesa-libGLU-devel
@@ -262,6 +267,11 @@ BuildRequires: unixODBC-devel
 # SQLITE support
 BuildRequires: sqlite-devel
 
+# SQLITE3 support
+%if 0%{?mgaversion}
+BuildRequires: sqlite3-devel
+%endif
+
 # POSTGRESQL support
 BuildRequires: postgresql
 BuildRequires: postgresql-devel
@@ -272,6 +282,24 @@ BuildRequires: postgresql-devel
 BuildRequires:	firebird-devel
 %endif
 
+# FBCLIENT support
+%if 0%{?mgaversion} >= 6
+BuildRequires:	%{_lib}fbclient-devel
+%endif
+
+# NIS support
+%define with_nis 1
+
+# RPC support
+%if 0%{?fedora} >= 28 || 0%{?suse_version} >= 1500
+%if 0%{?fedora}
+BuildRequires:		libnsl2-devel
+%else
+BuildRequires:		libnsl-devel
+%endif
+BuildRequires:		libtirpc-devel
+%endif
+
 # x86_64 specific stuff
 %if "%{_lib}" != "lib"
 %if 0%{?mdkversion} || ( 0%{?mgaversion} && 0%{?mgaversion} <= 2)
@@ -1250,7 +1278,12 @@ things that are possible with TQt3.
 
 # Fix strange FTBFS on RHEL5
 %if 0%{?rhel} == 5
-%__sed -i src/kernel/ntqstyle.h -e "s|#ifdef ENABLE_TQSTYLECONTROLELEMENTDATA_SLOW_COPY|#if 1|"
+%__sed -i "src/kernel/ntqstyle.h" -e "s|#ifdef ENABLE_T*QSTYLECONTROLELEMENTDATA_SLOW_COPY|#if 1|"
+%endif
+
+%if 0%{?suse_version}
+echo "suse_version = %{?suse_version}"
+echo "sle_version = %{?sle_version}"
 %endif
 
 # Add missing sqlite3 header
@@ -1291,6 +1324,8 @@ for d in \
 	%{_includedir}/Xft2/X11/Xft \
 	%{_includedir}/mysql \
 	%{_includedir}/libpng15 \
+	%{_includedir}/libpng16 \
+	%{_includedir}/tirpc \
 ; do
 	if [ -d "${d}" ]; then
 		INCDIRS="${INCDIRS} -I${d}"
@@ -1332,7 +1367,7 @@ echo yes | ./configure \
 		-platform linux-g++ \
 %endif
 		\
-		-nis				\
+		%{?with_nis:-nis} %{?!with_nis:-no-nis}		\
 		-no-pch				\
 		-cups				\
 		-stl				\
@@ -1504,5 +1539,3 @@ chmod 644 "%{?buildroot}%{_datadir}/tqt3/mkspecs/"*/*
 
 
 %changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.0-1
-- Initial release for TDE R14.0.0