diff options
| author | François Andriot <albator78@libertysurf.fr> | 2014-04-05 14:36:13 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2014-04-05 14:36:13 +0200 |
| commit | 693e9a10c0362708a18799f301e8e68752e3b376 (patch) | |
| tree | 24ed89d67c723ed22bfb6be8344eee5cb353ba6e /redhat/applications/bibletime | |
| parent | 2bccc67f69c937e4db4e12f77182be57dbbb9a6a (diff) | |
| download | tde-packaging-693e9a10c0362708a18799f301e8e68752e3b376.tar.gz tde-packaging-693e9a10c0362708a18799f301e8e68752e3b376.zip | |
RPM Packaging: update R14 packages
Diffstat (limited to 'redhat/applications/bibletime')
| -rw-r--r-- | redhat/applications/bibletime/bibletime-14.0.0-ftbfs.patch | 27 | ||||
| -rw-r--r-- | redhat/applications/bibletime/bibletime-14.0.0.spec | 2 |
2 files changed, 28 insertions, 1 deletions
diff --git a/redhat/applications/bibletime/bibletime-14.0.0-ftbfs.patch b/redhat/applications/bibletime/bibletime-14.0.0-ftbfs.patch new file mode 100644 index 000000000..562dc2812 --- /dev/null +++ b/redhat/applications/bibletime/bibletime-14.0.0-ftbfs.patch @@ -0,0 +1,27 @@ +--- ./bibletime/backend/clanguagemgr.cpp.ORI 2014-02-23 21:50:05.169018790 +0100 ++++ ./bibletime/backend/clanguagemgr.cpp 2014-02-23 21:55:06.105229001 +0100 +@@ -95,10 +95,10 @@ + + for (ListCSwordModuleInfo::iterator it(mods.begin()); it != end_it; ++it) { + // for (CSwordModuleInfo* m = mods.first(); m; m = mods.next()) { +- abbrev = (*it)->module()->Lang(); ++ const char* mod = (*it)->module()->Lang(); + +- if (abbrev && !abbrevs.contains(abbrev)) { +- abbrevs.append( abbrev ); ++ if (mod && !abbrevs.contains(mod)) { ++ abbrevs.append( mod ); + } + }; + +--- ./sword.m4.ori 2014-02-23 22:31:45.119410870 +0100 ++++ ./sword.m4 2014-02-23 22:32:45.468246504 +0100 +@@ -28,7 +28,7 @@ + dnl try to find Sword library files + AC_MSG_CHECKING([for Sword library files]) + AC_REQUIRE([AC_FIND_ZLIB]) +-ac_sword_library_dirs="$ac_sword_dir/lib $exec_prefix/lib $prefix/lib /usr/lib /usr/lib64 /usr/lib/sword /usr/local/lib /usr/local/lib/sword /usr/local/sword/lib" ++ac_sword_library_dirs="$ac_sword_dir/lib64 $ac_sword_dir/lib $exec_prefix/lib $prefix/lib64 $prefix/lib /usr/lib /usr/lib64 /usr/lib/sword /usr/local/lib /usr/local/lib/sword /usr/local/sword/lib" + + if test "x$ac_static_sword" = "xYES"; then + SEARCH_LIBS="libsword.a"; diff --git a/redhat/applications/bibletime/bibletime-14.0.0.spec b/redhat/applications/bibletime/bibletime-14.0.0.spec index 80a34485e..dc30cfc8a 100644 --- a/redhat/applications/bibletime/bibletime-14.0.0.spec +++ b/redhat/applications/bibletime/bibletime-14.0.0.spec @@ -55,7 +55,7 @@ BuildRequires: clucene-core-devel %endif %if 0%{?mgaversion} || 0%{?mdkversion} %if 0%{?pclinuxos} -BuildRequires: %{_lib}clucene2-devel +BuildRequires: %{_lib}clucene-devel %else BuildRequires: %{_lib}clucene-devel %endif |