diff options
Diffstat (limited to 'redhat/libraries')
| -rw-r--r-- | redhat/libraries/pytdeextensions/pytdeextensions-3.5.13.2.spec | 8 | ||||
| -rw-r--r-- | redhat/libraries/python-trinity/python-trinity-14.0.0.spec | 9 |
2 files changed, 13 insertions, 4 deletions
diff --git a/redhat/libraries/pytdeextensions/pytdeextensions-3.5.13.2.spec b/redhat/libraries/pytdeextensions/pytdeextensions-3.5.13.2.spec index f26445c40..a9b5fffd9 100644 --- a/redhat/libraries/pytdeextensions/pytdeextensions-3.5.13.2.spec +++ b/redhat/libraries/pytdeextensions/pytdeextensions-3.5.13.2.spec @@ -54,8 +54,8 @@ BuildRequires: desktop-file-utils BuildRequires: gettext # Python stuff -BuildRequires: trinity-python-trinity-devel BuildRequires: python-qt3-devel +BuildRequires: trinity-python-trinity-devel Requires: trinity-libpythonize0 = %{version}-%{release} @@ -175,7 +175,8 @@ fi %build -unset QTDIR QTINC QTLIB; . /etc/profile.d/qt3.sh +unset QTDIR QTINC QTLIB +. /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/python-qt3 @@ -183,7 +184,8 @@ export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/python-qt3 ./setup.py build_libpythonize %install -unset QTDIR QTINC QTLIB; . /etc/profile.d/qt3.sh +unset QTDIR QTINC QTLIB +. /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/python-qt3 diff --git a/redhat/libraries/python-trinity/python-trinity-14.0.0.spec b/redhat/libraries/python-trinity/python-trinity-14.0.0.spec index 4a90da275..f2da1f06d 100644 --- a/redhat/libraries/python-trinity/python-trinity-14.0.0.spec +++ b/redhat/libraries/python-trinity/python-trinity-14.0.0.spec @@ -43,6 +43,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz +Patch0: python-trinity-14.0.0-ftbfs.patch +Patch1: python-trinity-14.0.0-ftbfs2.patch + BuildRequires: trinity-tqtinterface-devel >= %{tde_version} BuildRequires: trinity-arts-devel >= 1:1.5.10 BuildRequires: trinity-tdelibs-devel >= %{tde_version} @@ -113,6 +116,10 @@ tips and working code you can use to learn from. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} +%if 0%{?suse_version} == 1310 +%patch0 -p1 -b .ftbfs +#patch1 -p1 -b .ftbfs +%endif %build @@ -127,7 +134,7 @@ export DH_OPTIONS -L %{_lib} \ -v %{_datadir}/sip/trinity -%__make %{_smp_mflags} +%__make %{_smp_mflags} || %__make %install |