RPM Packaging: update python-tqt

1 files changed, 96 insertions, 44 deletions

diff --git a/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec b/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec
index 567f9cf62..d6e5050af 100644
--- a/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec
+++ b/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec
@@ -1,55 +1,109 @@
+#
+# spec file for package python-tqt (version R14.0.0)
+#
+# 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 !
+
 %{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
+# TDE variables
+%define tde_epoch 2
 %define tde_version 14.0.0
+%define tde_pkg python-tqt
 %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/tde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+# 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
+
 
-Name:		trinity-python-tqt
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
 Version:	3.18.1
 Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
-License:	GPL
-
 Summary:	TQt bindings for Python
-Group:		System Environment/Libraries
+Group:		Development/Libraries/Python
+URL:		http://www.trinitydesktop.org/
 
-#Obsoletes:		PyQt
-Obsoletes:		trinity-PyQt
-Obsoletes:		trinity-python-qt3
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
 
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
+#Vendor:		Trinity Project
+#Packager:	Francois Andriot <francois.andriot@free.fr>
 
 Prefix:		%{tde_prefix}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-BuildRequires:	gcc-c++
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-tqscintilla-devel
+Obsoletes:		trinity-PyQt
+Obsoletes:		trinity-python-qt3
 
-# SIP
-BuildRequires:	trinity-sip4-tqt-devel >= 4.10.5
-Requires:		trinity-sip4-tqt >= 4.10.5
+BuildRequires:	libtqt4-devel >= %{?epoch:%{epoch}:}4.2.0
+BuildRequires:	trinity-filesystem >= %{tde_version}
+BuildRequires:	sip4-tqt-devel >= %{?epoch:%{epoch}:}4.10.5
 
-# TDE specific building variables
-BuildRequires:	trinity-tqt3-devel >= 3.5.0
-Requires:		trinity-tqt3 >= 3.5.0
+BuildRequires:	gcc-c++
+BuildRequires:	python
+BuildRequires:	python-devel
 
 
 %description
 Python binding module that allows use of TQt X Window toolkit v3.
-You can use it to create portable graphics-capable scripts (there
-are PyQt versions for Linux, Windows and MacOS X).
+You can use it to create portable graphics-capable scripts.
 
-At this moment PyQt offers a vast subset of TQt API. There are
+At this moment python-tqt offers a vast subset of TQt API. There are
 some minor issues related to the differences between C++ and Python
 (types, etc), but usually you'll be able to write code pretty much the
 same way in both languages (with syntax differences, of course)
 
-%files
+##########
+
+%package -n python-tqt
+Summary:	TQt bindings for Python
+Group:		Development/Libraries/Python
+Requires:	trinity-filesystem >= %{tde_version}
+Requires:	sip4-tqt >= %{?epoch:%{epoch}:}4.10.5
+Requires:	libtqt4 >= %{?epoch:%{epoch}:}4.2.0
+
+%description -n python-tqt
+Python binding module that allows use of TQt X Window toolkit v3.
+You can use it to create portable graphics-capable scripts.
+
+At this moment python-tqt offers a vast subset of TQt API. There are
+some minor issues related to the differences between C++ and Python
+(types, etc), but usually you'll be able to write code pretty much the
+same way in both languages (with syntax differences, of course)
+
+%files -n python-tqt
 %defattr(-,root,root,-)
 %doc NEWS README
 %dir %{python_sitearch}/python_tqt
@@ -64,33 +118,32 @@ same way in both languages (with syntax differences, of course)
 
 ##########
 
-%package gl
+%package -n python-tqt-gl
 Summary:	TQt OpenGL bindings for Python
-Requires:	%{name} = %{version}-%{release}
+Requires:	python-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
 
-%description gl
+%description -n python-tqt-gl
 Python binding module that allows use of the OpenGL facilities
 offered by the TQt X Window toolkit v3. You can use it to create
-portable graphics-capable scripts (there are PyQt versions for
-Linux, Windows and MacOS X).
+portable graphics-capable scripts.
 
-%files gl
+%files -n python-tqt-gl
 %defattr(-,root,root,-)
 %{python_sitearch}/python_tqt/qtgl.so
 
 ##########
 
-%package tqtext
-Summary:	TQt extensions for PyQt
-Requires:	%{name} = %{version}-%{release}
+%package -n python-tqt-tqtext
+Summary:	TQtext extensions for python-tqt
+Requires:	python-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
 
-%description tqtext
-PyQt Extensions. Contains:
+%description -n python-tqt-tqtext
+python-tqt Extensions. Contains:
 
 * TQScintilla: a featureful TQt source code editing component based
               on Scintilla.
 
-%files tqtext
+%files -n python-tqt-tqtext
 %defattr(-,root,root,-)
 %{python_sitearch}/python_tqt/qtext.so
 
@@ -98,6 +151,7 @@ PyQt Extensions. Contains:
 
 %package -n trinity-pytqt-tools
 Summary:	pyuic and pylupdate for TQt
+Requires:	python-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n trinity-pytqt-tools
 pyuic is the PyQt counterpart for TQt's uic. It takes an XML
@@ -112,24 +166,25 @@ Linguist translation files from Python code.
 
 ##########
 
-%package devel
+%package -n python-tqt-devel
 Summary:	TQt bindings for Python - Development files
-Requires:	%{name} = %{version}-%{release}
-Requires:	trinity-pytqt-tools = %{version}-%{release}
+Requires:	python-tqt = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	trinity-pytqt-tools = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	libtqt4-devel >= %{?epoch:%{epoch}:}4.2.0
 
-%description devel
+%description -n python-tqt-devel
 Development .sip files with definitions of PyQt classes. They
 are needed to build PyQt, but also as building blocks of other
 packages based on them, like PyTDE.
 
-%files devel
+%files -n python-tqt-devel
 %defattr(-,root,root,-)
 %{python_sitearch}/python_tqt/pyqtconfig.py*
 %{_datadir}/sip/tqt/
 
 ##########
 
-%if 0%{?suse_version} || 0%{?pclinuxos}
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
 %debug_package
 %endif
 
@@ -148,7 +203,7 @@ cd build
 # WTF ? CentOS 6 !
 cp -rf ../pyuic3 ../pylupdate3 
 
-echo yes | python ../configure.py \
+echo yes | %__python ../configure.py \
 	-c -n %{_includedir}/tqscintilla \
 	-q %{_datadir}/tqt3 \
 	-y tqt-mt \
@@ -169,9 +224,6 @@ echo yes | python ../configure.py \
 %__install -d %{?buildroot}%{_datadir}/sip/
 %__cp -rf sip/* %{?buildroot}%{_datadir}/sip/tqt/
 
-# Dummy file to make a Python module
-touch %{?buildroot}%{python_sitearch}/python_tqt/__init__.py
-
 
 %clean
 %__rm -rf %{?buildroot}%{python_sitearch}/python_tqt/__init__.py