summaryrefslogtreecommitdiffstats
path: root/redhat/libraries
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2013-12-24 18:18:33 +0100
committerFrançois Andriot <albator78@libertysurf.fr>2013-12-24 18:18:33 +0100
commit55bddf58868a60bd9282233024948707f441d679 (patch)
tree163ab09ea22c1fc100ee9975b48cc4e0caed7a75 /redhat/libraries
parentf4d8002c33f7660d874c3c667a25bfe01e278a71 (diff)
downloadtde-packaging-55bddf58868a60bd9282233024948707f441d679.tar.gz
tde-packaging-55bddf58868a60bd9282233024948707f441d679.zip
RPM Packaging: update R14 packages
Diffstat (limited to 'redhat/libraries')
-rw-r--r--redhat/libraries/python-trinity/python-trinity-14.0.0.spec9
1 files changed, 8 insertions, 1 deletions
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