summaryrefslogtreecommitdiffstats
path: root/redhat/applications/bibletime
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2014-04-04 22:47:12 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2014-04-04 22:47:12 +0200
commit2bccc67f69c937e4db4e12f77182be57dbbb9a6a (patch)
treeb5e373b52fbb70d9965dd446300766b449cf524d /redhat/applications/bibletime
parent7b26da834f79b8b6eb2d8e99a1467ffea2791380 (diff)
downloadtde-packaging-2bccc67f69c937e4db4e12f77182be57dbbb9a6a.tar.gz
tde-packaging-2bccc67f69c937e4db4e12f77182be57dbbb9a6a.zip
RPM Packaging: update 3.5.13.2 packages
Diffstat (limited to 'redhat/applications/bibletime')
-rw-r--r--redhat/applications/bibletime/bibletime-3.5.13.2.spec12
1 files changed, 10 insertions, 2 deletions
diff --git a/redhat/applications/bibletime/bibletime-3.5.13.2.spec b/redhat/applications/bibletime/bibletime-3.5.13.2.spec
index 95521dbc6..9a1848430 100644
--- a/redhat/applications/bibletime/bibletime-3.5.13.2.spec
+++ b/redhat/applications/bibletime/bibletime-3.5.13.2.spec
@@ -40,6 +40,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+Patch0: bibletime-14.0.0-ftbfs.patch
+
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
@@ -75,6 +77,7 @@ texts, write own notes, save, print etc.).
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+%patch0 -p1 -b .ftbfs
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
@@ -85,6 +88,7 @@ texts, write own notes, save, print etc.).
unset QTDIR QTINC QTLIB
. /etc/profile.d/qt3.sh
export PATH="%{tde_bindir}:${PATH}"
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
%configure \
--prefix=%{tde_prefix} \
@@ -99,13 +103,17 @@ export PATH="%{tde_bindir}:${PATH}"
--enable-new-ldflags \
--enable-final \
--enable-closure \
- --enable-rpath
+ --enable-rpath \
+ \
+%if 0%{?fedora} >= 20 || 0%{?pclinuxos}
+ --with-sword-dir=%{tde_prefix}
+%endif
# Not SMP safe !
%__make -C bibletime/frontend
# SMP safe !
-%__make %{?_smp_mflags}
+%__make %{?_smp_mflags} || %__make
%install