summaryrefslogtreecommitdiffstats
path: root/redhat/applications
diff options
context:
space:
mode:
authorFrançois Andriot <[email protected]>2014-07-14 00:03:38 +0200
committerFrançois Andriot <[email protected]>2014-07-14 00:03:38 +0200
commitc6eec582c412347deeb9681922c1c204c49d74b0 (patch)
tree35cfbbaab3b012adda6cbeeb2df96d926ddde418 /redhat/applications
parent2df1d237581f87abb0cf8da09e8faf984c26e8db (diff)
downloadtde-packaging-c6eec582c412347deeb9681922c1c204c49d74b0.tar.gz
tde-packaging-c6eec582c412347deeb9681922c1c204c49d74b0.zip
RPM Packaging: build 3.5.13.2 for CentOS 7
Diffstat (limited to 'redhat/applications')
-rw-r--r--redhat/applications/bibletime/bibletime-3.5.13.2-fix_sword_detection.patch38
-rw-r--r--redhat/applications/bibletime/bibletime-3.5.13.2.spec4
-rw-r--r--redhat/applications/kaffeine/kaffeine-3.5.13.2.spec2
3 files changed, 41 insertions, 3 deletions
diff --git a/redhat/applications/bibletime/bibletime-3.5.13.2-fix_sword_detection.patch b/redhat/applications/bibletime/bibletime-3.5.13.2-fix_sword_detection.patch
new file mode 100644
index 000000000..0f6364921
--- /dev/null
+++ b/redhat/applications/bibletime/bibletime-3.5.13.2-fix_sword_detection.patch
@@ -0,0 +1,38 @@
+commit 298da70ab4f6da3780c617a85957a80f2e7ae71b
+Author: Francois Andriot <[email protected]>
+Date: 1398949579 +0200
+
+ Fix FTBFS on Fedora 20
+ Fix custom-installed Sword detection
+
+diff --git a/bibletime/backend/clanguagemgr.cpp b/bibletime/backend/clanguagemgr.cpp
+index 8f73ec3..ac94790 100644
+--- a/bibletime/backend/clanguagemgr.cpp
++++ b/bibletime/backend/clanguagemgr.cpp
+@@ -95,10 +95,10 @@ const CLanguageMgr::LangMap& CLanguageMgr::availableLanguages() {
+
+ 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 );
+ }
+ };
+
+diff --git a/sword.m4 b/sword.m4
+index 2f19b3f..8326ba3 100644
+--- a/sword.m4
++++ b/sword.m4
+@@ -28,7 +28,7 @@ AC_ARG_ENABLE(static-sword,
+ 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-3.5.13.2.spec b/redhat/applications/bibletime/bibletime-3.5.13.2.spec
index 9a1848430..a6cac4a44 100644
--- a/redhat/applications/bibletime/bibletime-3.5.13.2.spec
+++ b/redhat/applications/bibletime/bibletime-3.5.13.2.spec
@@ -40,7 +40,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-Patch0: bibletime-14.0.0-ftbfs.patch
+Patch0: bibletime-3.5.13.2-fix_sword_detection.patch
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
BuildRequires: trinity-arts-devel >= 1:1.5.10
@@ -105,7 +105,7 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
--enable-closure \
--enable-rpath \
\
-%if 0%{?fedora} >= 20 || 0%{?pclinuxos}
+%if 0%{?fedora} >= 20 || 0%{?pclinuxos} || 0%{?rhel} >= 7
--with-sword-dir=%{tde_prefix}
%endif
diff --git a/redhat/applications/kaffeine/kaffeine-3.5.13.2.spec b/redhat/applications/kaffeine/kaffeine-3.5.13.2.spec
index 0570ac1ac..298618821 100644
--- a/redhat/applications/kaffeine/kaffeine-3.5.13.2.spec
+++ b/redhat/applications/kaffeine/kaffeine-3.5.13.2.spec
@@ -56,7 +56,7 @@ BuildRequires: libcdda-devel
BuildRequires: cdparanoia
BuildRequires: cdparanoia-devel
%endif
-%if 0%{?suse_version} >= 1210 || 0%{?fedora} >= 19
+%if 0%{?suse_version} >= 1210 || 0%{?fedora} >= 19 || 0%{?rhel} >= 7
BuildRequires: libcdio-paranoia-devel
%endif