RPM Packaging: cleanup tqtinterface

1 files changed, 166 insertions, 72 deletions

diff --git a/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.2.spec b/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.2.spec
index 25e2c0256..f681cc5fc 100755
--- a/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.2.spec
+++ b/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.2.spec
@@ -1,37 +1,101 @@
-# TDE specific building variables
-%define tde_version 3.5.13.2
-%define tde_prefix /usr
+#
+# spec file for package tqtinterface (version 3.5.13-SRU)
+#
+# Copyright (c) 2014 Trinity Desktop Environment
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# 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/
+#
+
+# BUILD WARNING:
+#  Remove qt-devel and qt3-devel and any kde*-devel on your system !
+#  Having KDE libraries may cause FTBFS here !
+
+# TDE variables
+%define tde_version 14.0.0
+%define tde_pkg tqtinterface
+%define tde_prefix /opt/trinity
 %define tde_bindir %{tde_prefix}/bin
+%define tde_datadir %{tde_prefix}/share
+%define tde_docdir %{tde_datadir}/doc
 %define tde_includedir %{tde_prefix}/include
 %define tde_libdir %{tde_prefix}/%{_lib}
+%define tde_tdeappdir %{tde_datadir}/applications/kde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
 %define cmake_modules_dir %{_datadir}/cmake/Modules
 
-Name:		trinity-tqtinterface
-Version:	%{tde_version}
-Release:	%{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant}
-License:	GPL
-Summary:	Trinity QT Interface
-Group:		System Environment/Libraries
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?tde_prefix}" != "/usr"
+%define _variant .opt
+%endif
+
+%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
+%define libtqt4 %{_lib}tqt4
+%else
+%define libtqt4 libtqt4
+%endif
 
-Vendor:		Trinity Project
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	4.2.0
+Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Summary:	The Trinity Qt Interface Libraries
+Group:		System/GUI/Other
 URL:		http://www.trinitydesktop.org/
-Packager:	Francois Andriot <francois.andriot@free.fr>
 
-Prefix:		%{tde_prefix}
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Project
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Prefix:		/usr
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0:	%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
 
-BuildRequires:	cmake >= 2.8
+Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+
+BuildRequires:	qt3 >= 3.3.8d
 BuildRequires:	qt3-devel >= 3.3.8d
-Requires:		qt3 >= 3.3.8d
 
+%if 0%{?suse_version} && 0%{?suse_version} < 1300
+BuildRequires:	trinity-cmake-macros
+%endif
+
+BuildRequires:	cmake >= 2.8
 BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
 
 # PTHREAD support
 %if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
 BuildRequires:	pth-devel
 %endif
 
+# MESA support
+%if 0%{?rhel} || 0%{?fedora}
+BuildRequires: mesa-libGL-devel
+BuildRequires: mesa-libGLU-devel
+%endif
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires: mesaglu-devel
+%endif
+%if 0%{?suse_version}
+BuildRequires: Mesa-libGL-devel
+BuildRequires: Mesa-libGLU-devel
+%endif
+
 # X11 libraries
 %if 0%{?rhel} == 4
 BuildRequires:	xorg-x11-devel
@@ -46,78 +110,107 @@ BuildRequires:	libXi-devel
 BuildRequires:	libXi6-devel
 %endif
 
-Obsoletes:	tqtinterface < %{version}-%{release}
-Provides:	tqtinterface = %{version}-%{release}
+%description
+The Trinity Qt Interface is a library that abstracts Qt from Trinity.
+This allows the Trinity code to rapidly port from one version of Qt to another.
+This is primarily accomplished by defining old functions in terms of new functions,
+although some code has been added for useful functions that are no longer part of Qt.
 
 
-%description
-Trinity QT Interface
+##########
 
+%package -n %{libtqt4}
+Group:		System/GUI/Other
+Summary:	The Trinity Qt Interface Libraries
+Provides:	libtqt4 = %{?epoch:%{epoch}:}%{version}-%{release}
 
-%post
-/sbin/ldconfig || :
+Requires:	qt3 >= 3.3.8d
 
-%postun
-/sbin/ldconfig || :
+%if 0%{?suse_version} && 0%{?suse_version} < 1300
+Requires:		trinity-cmake-macros
+%endif
+
+Obsoletes:	trinity-tqtinterface < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-tqtinterface = %{?epoch:%{epoch}:}%{version}-%{release}
 
-%files
+%description -n %{libtqt4}
+The Trinity Qt Interface is a library that abstracts Qt from Trinity.
+This allows the Trinity code to rapidly port from one version of Qt to another.
+This is primarily accomplished by defining old functions in terms of new functions,
+although some code has been added for useful functions that are no longer part of Qt.
+
+%files -n %{libtqt4}
 %defattr(-,root,root,-)
-%{tde_bindir}/convert_qt_tqt1
-%{tde_bindir}/convert_qt_tqt2
-%{tde_bindir}/convert_qt_tqt3
-%{tde_bindir}/dcopidl-tqt
-%{tde_bindir}/dcopidl2cpp-tqt
-%{tde_bindir}/dcopidlng-tqt
-%{tde_bindir}/mcopidl-tqt
-%{tde_bindir}/moc-tqt
-%{tde_bindir}/tmoc
-%{tde_bindir}/tqt-replace
-%{tde_bindir}/tqt-replace-stream
-%{tde_bindir}/uic-tqt
-%{tde_libdir}/libtqassistantclient.so.4
-%{tde_libdir}/libtqassistantclient.so.4.2.0
-%{tde_libdir}/libtqt.so.4
-%{tde_libdir}/libtqt.so.4.2.0
+%{_libdir}/libtqt.so.4
+%{_libdir}/libtqt.so.4.2.0
+
+%post -n %{libtqt4}
+/sbin/ldconfig || :
+
+%postun -n %{libtqt4}
+/sbin/ldconfig || :
 
 ##########
 
-%package devel
-Group:		Development/Libraries
-Summary:	%{name} - Development files
-Requires:	%{name} = %{version}-%{release}
+%package -n %{libtqt4}-devel
+Group:		Development/Libraries/X11
+Summary:	The Trinity Qt Interface Libraries (Development Files)
+Provides:	libtqt4-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+
+Requires:	%{libtqt4} = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:	qt3-devel >= 3.3.8d
 
-Obsoletes:	tqtinterface-devel < %{version}-%{release}
-Provides:	tqtinterface-devel = %{version}-%{release}
+%if 0%{?suse_version} && 0%{?suse_version} < 1300
+Requires:		trinity-cmake-macros
+%endif
+
+Obsoletes:	trinity-tqtinterface-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:	trinity-tqtinterface-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 
-%description devel
-Development files for %{name}
+%description -n %{libtqt4}-devel
+The Trinity Qt Interface is a library that abstracts Qt from Trinity.
+This allows the Trinity code to rapidly port from one version of Qt to another.
+This is primarily accomplished by defining old functions in terms of new functions,
+although some code has been added for useful functions that are no longer part of Qt.
 
-%post devel
+%post -n %{libtqt4}-devel
 /sbin/ldconfig || :
 
-%postun devel
+%postun -n %{libtqt4}-devel
 /sbin/ldconfig || :
 
-%files devel
+%files -n %{libtqt4}-devel
 %defattr(-,root,root,-)
-%{tde_includedir}/tqt/
-%{tde_libdir}/libtqassistantclient.la
-%{tde_libdir}/libtqassistantclient.so
-%{tde_libdir}/libtqt.la
-%{tde_libdir}/libtqt.so
-%{tde_libdir}/pkgconfig/tqt.pc
+%{_bindir}/convert_qt_tqt1
+%{_bindir}/convert_qt_tqt2
+%{_bindir}/convert_qt_tqt3
+%{_bindir}/dcopidl-tqt
+%{_bindir}/dcopidl2cpp-tqt
+%{_bindir}/dcopidlng-tqt
+%{_bindir}/mcopidl-tqt
+%{_bindir}/moc-tqt
+%{_bindir}/tmoc
+%{_bindir}/tqt-replace
+%{_bindir}/tqt-replace-stream
+%{_bindir}/uic-tqt
+%{_includedir}/tqt/
+%{_libdir}/libtqt.la
+%{_libdir}/libtqt.so
+%{_libdir}/pkgconfig/tqt.pc
+%{_libdir}/pkgconfig/tqtqui.pc
 %{cmake_modules_dir}/*.cmake
 
 ##########
 
-%if 0%{?suse_version} || 0%{?pclinuxos}
+%if 0%{?pclinuxos}
 %debug_package
 %endif
 
+##########
 
 %prep
-%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
 
 %build
 unset QTDIR QTINC QTLIB
@@ -128,8 +221,6 @@ if ! rpm -E %%cmake|grep -q "cd build"; then
   cd build
 fi
 
-pwd
-
 # Note: specifying 'QT_LIBRARY_DIR' allow using QT3 libraries under
 #  another directory than QT3_PREFIX. (E.g. Mageia 2, Mandriva ...)
 #  Otherwise, it defaults to ${QTDIR}/lib !
@@ -144,23 +235,26 @@ pwd
   -DQT_VERSION=3 \
   -DQT_LIBRARY_DIR="${QTLIB:-${QTDIR}/%{_lib}}" \
   \
-  -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
-  -DPKGCONFIG_INSTALL_DIR="%{tde_libdir}/pkgconfig" \
-  -DINCLUDE_INSTALL_DIR=%{tde_includedir}/tqt \
-  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  -DBIN_INSTALL_DIR=%{tde_bindir} \
+  -DCMAKE_INSTALL_PREFIX="%{_prefix}" \
+  -DPKGCONFIG_INSTALL_DIR="%{_libdir}/pkgconfig" \
+  -DINCLUDE_INSTALL_DIR=%{_includedir}/tqt \
+  -DLIB_INSTALL_DIR=%{_libdir} \
+  -DBIN_INSTALL_DIR=%{_bindir} \
+  \
+  -DCMAKE_LIBRARY_PATH="%{_libdir}" \
+  -DCMAKE_INCLUDE_PATH="%{_includedir}" \
   \
   -DWITH_QT3="ON" \
   -DBUILD_ALL="ON" \
   -DUSE_QT3="ON" \
   ..
 
-%__make %{?_smp_mflags}
+%__make %{?_smp_mflags} || %__make
 
 
 %install
-%__rm -rf %{?buildroot}
-%__make install DESTDIR=%{?buildroot} -C build
+%__rm -rf "%{?buildroot}"
+%__make install DESTDIR="%{?buildroot}" -C build
 
 # RHEL 5: add newline at end of include files to avoid warnings
 %if 0%{?rhel} && 0%{?rhel} <= 5
@@ -170,14 +264,14 @@ done
 %endif
 
 # Install 'cmake' modules for development use
-%__mkdir_p %{?buildroot}%{cmake_modules_dir}
+%__mkdir_p "%{?buildroot}%{cmake_modules_dir}"
 for i in cmake/modules/*.cmake; do
-  %__install -m 644 $i %{?buildroot}%{cmake_modules_dir}
+  %__install -m 644 "$i" "%{?buildroot}%{cmake_modules_dir}"
 done
 
 
 %clean
-%__rm -rf %{?buildroot}
+%__rm -rf "%{?buildroot}"
 
 
 %changelog