RHEL/Fedora/MGA/MDV/Suse: update main and libraries for TDE 3.5.13.1

3 files changed, 194 insertions, 0 deletions

diff --git a/redhat/libraries/python-trinity/python-trinity-3.5.13.1-add_include_directory.patch b/redhat/libraries/python-trinity/python-trinity-3.5.13.1-add_include_directory.patch
new file mode 100644
index 000000000..d48270692
--- /dev/null
+++ b/redhat/libraries/python-trinity/python-trinity-3.5.13.1-add_include_directory.patch
@@ -0,0 +1,10 @@
+--- python-trinity-3.5.13.1/configure.py.ORI	2012-10-02 19:01:51.164215802 +0000
++++ python-trinity-3.5.13.1/configure.py	2012-10-02 19:02:06.842913909 +0000
+@@ -411,6 +411,7 @@
+     if not opt_kdeincdir:
+         incSearchPaths = [os.path.join (opt_kdebasedir, "include")]
+         incSearchPaths.append (os.path.join (opt_kdebasedir, "include", "kde")) # Red Hat
++        incSearchPaths.append (os.path.join (opt_kdebasedir, "include", "tde")) # TDE 3.5.13.1
+         opt_kdeincdir = search ("kapplication.h", incSearchPaths)
+ 
+ def check_kde_installation():
diff --git a/redhat/libraries/python-trinity/python-trinity-3.5.13.1.spec b/redhat/libraries/python-trinity/python-trinity-3.5.13.1.spec
new file mode 100644
index 000000000..bcbc29aaa
--- /dev/null
+++ b/redhat/libraries/python-trinity/python-trinity-3.5.13.1.spec
@@ -0,0 +1,183 @@
+%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+
+# 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
+
+# TDE 3.5.13 specific building variables
+%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_mandir %{tde_datadir}/man
+%define tde_appdir %{tde_datadir}/applications
+
+%define tde_tdeappdir %{tde_appdir}/kde
+%define tde_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+%define _docdir %{tde_docdir}
+
+%define __arch_install_post %{nil}
+
+
+Name:		python-trinity
+Summary:	Trinity bindings for Python [Trinity]
+Version:	3.16.3
+Release:	3%{?dist}%{?_variant}
+
+License:	GPLv2+
+Group:		Applications/Utilities
+
+Vendor:		Trinity Project
+Packager:	Francois Andriot <francois.andriot@free.fr>
+URL:		http://www.simonzone.com/software/pykdeextensions
+
+Prefix:    %{_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	python-trinity-3.5.13.1.tar.gz
+
+## RHEL/Fedora patches
+Patch1:		python-trinity-3.5.13-install_directories.patch
+# [python-trinity] Fix Mandrake detection function
+Patch3:		python-trinity-3.5.13-fix_mandrake_detection.patch
+# [python-trinity] Add 'include/tde' include directory
+Patch4:		python-trinity-3.5.13.1-add_include_directory.patch
+
+BuildRequires: trinity-tqtinterface-devel >= 3.5.13.1
+BuildRequires: trinity-arts-devel >= 3.5.13.1
+BuildRequires: trinity-tdelibs-devel >= 3.5.13.1
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
+
+BuildRequires:	python
+
+%if 0%{?rhel} == 5
+# RHEL 5 comes with old version, so we brought ours ...
+BuildRequires:	trinity-sip-devel
+BuildRequires:	trinity-PyQt-devel
+%endif
+
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	python-sip
+BuildRequires:	python-qt
+%endif
+
+%if 0%{?rhel} >= 6 || 0%{?fedora}
+BuildRequires:	sip-devel
+BuildRequires:	PyQt-devel
+%endif
+
+%if 0%{?suse_version}
+BuildRequires:	python-sip-devel
+BuildRequires:	trinity-PyQt-devel
+%endif
+
+%description
+Python binding module that provides wide access to the Trinity API,
+also known as PyKDE. Using this, you'll get (for example) classes
+from kio, kjs, khtml and kprint.
+
+
+%package devel
+Summary:		Trinity bindings for Python - Development files and scripts [Trinity]
+Group:			Development/Libraries
+Requires:		%{name} = %{version}-%{release}
+
+%description devel
+Development .sip files with definitions of PyKDE classes. They
+are needed to build PyKDE, but also as building blocks of other
+packages based on them. 
+The package also contains kdepyuic, a wrapper script around PyQt's 
+user interface compiler.
+
+
+%package doc
+Summary:		Documentation and examples for PyKDE [Trinity]
+Group:			Development/Libraries
+
+%description doc
+General documentation and examples for PyKDE providing programming
+tips and working code you can use to learn from.
+
+
+%if 0%{?suse_version}
+%debug_package
+%endif
+
+
+%prep
+%setup -q -n python-trinity-3.5.13.1
+%patch1 -p1
+%patch3 -p1
+%patch4 -p1
+
+
+# Hack to get TQT include files under /opt
+%__sed -i "configure.py" \
+	-e "s|/usr/include/tqt|%{tde_includedir}/tqt|g"
+
+
+%build
+unset QTDIR; . /etc/profile.d/qt3.sh
+export PATH="%{tde_bindir}:${PATH}"
+export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
+
+export LDFLAGS="${LDFLAGS} -lpython2.7"
+
+export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/trinity-PyQt
+
+%__python configure.py \
+	-k %{tde_prefix} \
+	-L %{_lib} \
+	-v %{_datadir}/sip/trinity
+
+%if 0%{?mgaversion} || 0%{?mdkversion}
+# Shitty hack to add LDFLAGS
+%__sed -i */Makefile \
+	-e "/^LIBS = / s|$| -lpython2.7 -lDCOP -lkdecore -lkdefx -lkdeui -lkresources -lkabc -lkparts -lkio|"
+%endif
+
+%__make %{_smp_mflags}
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot}
+
+# Install documentation
+%__mkdir_p %{buildroot}%{tde_tdedocdir}/HTML/en/
+%__cp -rf doc %{buildroot}%{tde_tdedocdir}/HTML/en/python-trinity/
+
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING NEWS README
+%{python_sitearch}/*.so
+%{python_sitearch}/dcop*.py*
+%{python_sitearch}/pykde*.py*
+
+%files devel
+%defattr(-,root,root,-)
+%{tde_bindir}/kdepyuic
+# The SIP files are outside TDE's prefix
+%{_datadir}/sip/trinity/
+
+%files doc
+%defattr(-,root,root,-)
+%{tde_tdedocdir}/HTML/en/python-trinity/
+
+
+%Changelog
+* Tue Oct 02 2012 Francois Andriot <francois.andriot@free.fr> - 3.16.3-3
+- Initial release for TDE 3.5.13.1
diff --git a/redhat/libraries/python-trinity/python-trinity.spec b/redhat/libraries/python-trinity/python-trinity-3.5.13.spec
index f2815a5c9..b0696ad3e 100644
--- a/redhat/libraries/python-trinity/python-trinity.spec
+++ b/redhat/libraries/python-trinity/python-trinity-3.5.13.spec
@@ -80,6 +80,7 @@ from kio, kjs, khtml and kprint.
 %package devel
 Summary:		Trinity bindings for Python - Development files and scripts [Trinity]
 Group:			Development/Libraries
+Requires:		%{name} = %{version}-%{release}
 
 %description devel
 Development .sip files with definitions of PyKDE classes. They