diff options
| author | François Andriot <albator78@libertysurf.fr> | 2014-03-07 20:01:19 +0100 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2014-03-07 20:01:19 +0100 |
| commit | 420b1189896aae59757997087773c8488b7c0c3b (patch) | |
| tree | 0e1268d91ace5007e4736e621923262cc824d891 /redhat/applications/bibletime | |
| parent | 0bba90061f0fbda1e3e284a052f714b0c203ed7b (diff) | |
| download | tde-packaging-420b1189896aae59757997087773c8488b7c0c3b.tar.gz tde-packaging-420b1189896aae59757997087773c8488b7c0c3b.zip | |
RPM packaging: update applications
Diffstat (limited to 'redhat/applications/bibletime')
| -rw-r--r-- | redhat/applications/bibletime/bibletime-14.0.0.spec | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/redhat/applications/bibletime/bibletime-14.0.0.spec b/redhat/applications/bibletime/bibletime-14.0.0.spec index cd2730021..e1d4a97a5 100644 --- a/redhat/applications/bibletime/bibletime-14.0.0.spec +++ b/redhat/applications/bibletime/bibletime-14.0.0.spec @@ -39,6 +39,7 @@ Prefix: %{_prefix} 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 @@ -75,6 +76,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" @@ -84,6 +86,7 @@ texts, write own notes, save, print etc.). %build unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" +export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" %configure \ --prefix=%{tde_prefix} \ @@ -99,13 +102,17 @@ export PATH="%{tde_bindir}:${PATH}" --enable-final \ --enable-closure \ --enable-rpath \ - --disable-gcc-hidden-visibility + --disable-gcc-hidden-visibility \ + \ +%if 0%{?fedora} >= 20 + --with-sword-dir=%{tde_prefix} +%endif # Not SMP safe ! %__make -C bibletime/frontend # SMP safe ! -%__make %{?_smp_mflags} +%__make %{?_smp_mflags} || %__make %install |