diff options
Diffstat (limited to 'redhat/libraries/python-trinity')
3 files changed, 60 insertions, 29 deletions
diff --git a/redhat/libraries/python-trinity/python-trinity-3.5.13-fix_mandrake_detection.patch b/redhat/libraries/python-trinity/python-trinity-3.5.13-fix_mandrake_detection.patch new file mode 100644 index 000000000..7769b4f27 --- /dev/null +++ b/redhat/libraries/python-trinity/python-trinity-3.5.13-fix_mandrake_detection.patch @@ -0,0 +1,11 @@ +--- python-trinity/configure.py.ORI 2012-08-05 00:02:51.785715468 +0200 ++++ python-trinity/configure.py 2012-08-05 00:03:02.312464939 +0200 +@@ -513,7 +513,7 @@ + + for file in dist: + if file.find ("andrake") > 0: +- kde_sip_flags.remove ("ALL") ++ kde_sip_flags.pop() + kde_sip_flags.append ("D_MANDRAKE") + + def set_sip_flags(): diff --git a/redhat/libraries/python-trinity/python-trinity-3.5.13-fix_min_sip_version.patch b/redhat/libraries/python-trinity/python-trinity-3.5.13-fix_min_sip_version.patch deleted file mode 100644 index dd2877616..000000000 --- a/redhat/libraries/python-trinity/python-trinity-3.5.13-fix_min_sip_version.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- python-trinity/configure.py.ORI 2012-05-12 10:52:21.457246722 +0200 -+++ python-trinity/configure.py 2012-05-12 10:52:43.558700741 +0200 -@@ -74,7 +74,7 @@ - kde_version_extra = None - kde_max_version = 0x030503 - --sip_min_v4_version = 0x040900 -+sip_min_v4_version = 0x040400 - qt_min_version = 0x030200 - pyqt_min_version = 0x031000 - diff --git a/redhat/libraries/python-trinity/python-trinity.spec b/redhat/libraries/python-trinity/python-trinity.spec index 0adf450ff..00dc3cf26 100644 --- a/redhat/libraries/python-trinity/python-trinity.spec +++ b/redhat/libraries/python-trinity/python-trinity.spec @@ -1,16 +1,27 @@ %{!?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 "%{?_prefix}" != "/usr" +%if "%{?tde_prefix}" != "/usr" %define _variant .opt -%define _docdir %{_datadir}/doc %endif # TDE 3.5.13 specific building variables -BuildRequires: autoconf automake libtool m4 -%define tde_docdir %{_docdir}/kde -%define tde_includedir %{_includedir}/kde -%define tde_libdir %{_libdir}/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_mandir %{tde_datadir}/man +%define tde_appdir %{tde_datadir}/applications + +%define tde_tdeappdir %{tde_appdir}/kde +%define tde_tdedocdir %{tde_docdir}/kde +%define tde_tdeincludedir %{tde_includedir}/kde +%define tde_tdelibdir %{tde_libdir}/trinity + +%define _docdir %{tde_docdir} + +%define __arch_install_post %{nil} Name: python-trinity @@ -32,9 +43,11 @@ Source0: python-trinity-3.5.13.tar.gz ## RHEL/Fedora patches Patch1: python-trinity-3.5.13-install_directories.patch - # [python-trinity] Fix compilation with GCC 4.7 Patch2: python-trinity-3.5.13-fix_gcc47_compilation.patch +# [python-trinity] Fix Mandrake detection function +Patch3: python-trinity-3.5.13-fix_mandrake_detection.patch + BuildRequires: tqtinterface-devel BuildRequires: trinity-kdelibs-devel @@ -44,14 +57,19 @@ BuildRequires: gettext BuildRequires: python +%if 0%{?mgaversion} || 0%{?mdkversion} +BuildRequires: python-sip +BuildRequires: python-qt +%else %if 0%{?rhel} == 5 +# RHEL 5 comes with old version, so we brought ours ... BuildRequires: trinity-sip-devel BuildRequires: trinity-PyQt-devel %else BuildRequires: sip-devel BuildRequires: PyQt-devel %endif - +%endif %description Python binding module that provides wide access to the Trinity API, @@ -84,32 +102,44 @@ tips and working code you can use to learn from. %setup -q -n libraries/python-trinity %patch1 -p1 %patch2 -p1 +%patch3 -p1 + # Hack to get TQT include files under /opt %__sed -i "configure.py" \ - -e "s|/usr/include/tqt|%{_includedir}/tqt|g" + -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" + %build -export PATH="%{_bindir}:${PATH}" -export LDFLAGS="-L%{_libdir} -I%{_includedir}" +unset QTDIR; . /etc/profile.d/qt.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 %{_prefix} \ + -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="%{_bindir}:${PATH}" +export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} # Install documentation -%__mkdir_p %{buildroot}%{tde_docdir}/HTML/en -%__cp -rf doc %{buildroot}%{tde_docdir}/HTML/en/%{name} +%__mkdir_p %{buildroot}%{tde_tdedocdir}/HTML/en/ +%__cp -rf doc %{buildroot}%{tde_tdedocdir}/HTML/en/python-trinity/ @@ -127,12 +157,13 @@ export PATH="%{_bindir}:${PATH}" %files devel %defattr(-,root,root,-) -%{_bindir}/kdepyuic -%{_datadir}/sip/trinity +%{tde_bindir}/kdepyuic +# The SIP files are outside TDE's prefix +%{_datadir}/sip/trinity/ %files doc %defattr(-,root,root,-) -%{tde_docdir}/HTML/en/%{name} +%{tde_tdedocdir}/HTML/en/python-trinity/ %Changelog |