diff options
| author | François Andriot <albator78@libertysurf.fr> | 2014-05-02 18:57:56 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2014-05-02 18:57:56 +0200 |
| commit | 831abc8987e241e38503fa2ca00b7eadaeb310d1 (patch) | |
| tree | e07493d7b546e99817687265f2bb8686ab75ee80 /redhat/applications/bibletime | |
| parent | 9ebddd3f9aeb750653cc10a36fe5b3fe6fa5451b (diff) | |
| download | tde-packaging-831abc8987e241e38503fa2ca00b7eadaeb310d1.tar.gz tde-packaging-831abc8987e241e38503fa2ca00b7eadaeb310d1.zip | |
RPM Packaging: update
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, 0 insertions, 29 deletions
diff --git a/redhat/applications/bibletime/bibletime-14.0.0-ftbfs.patch b/redhat/applications/bibletime/bibletime-14.0.0-ftbfs.patch deleted file mode 100644 index 562dc2812..000000000 --- a/redhat/applications/bibletime/bibletime-14.0.0-ftbfs.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- ./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 dc30cfc8a..62ef360a5 100644 --- a/redhat/applications/bibletime/bibletime-14.0.0.spec +++ b/redhat/applications/bibletime/bibletime-14.0.0.spec @@ -39,7 +39,6 @@ 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 @@ -80,7 +79,6 @@ 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" |