RPM packaging: fix FTBFS on bibletime

2 files changed, 86 insertions, 24 deletions

diff --git a/redhat/applications/bibletime/bibletime-14.0.0.patch b/redhat/applications/bibletime/bibletime-14.0.0.patch
new file mode 100644
index 000000000..d8cf2a399
--- /dev/null
+++ b/redhat/applications/bibletime/bibletime-14.0.0.patch
@@ -0,0 +1,26 @@
+diff --git a/bibletime/backend/cswordbackend.cpp b/bibletime/backend/cswordbackend.cpp
+index 1c218b3..dda6275 100644
+--- a/bibletime/backend/cswordbackend.cpp
++++ b/bibletime/backend/cswordbackend.cpp
+@@ -251,7 +251,7 @@ const bool CSwordBackend::shutdownModules() {
+ 
+ /** Returns true if the given option is enabled. */
+ const bool CSwordBackend::isOptionEnabled( const CSwordModuleInfo::FilterTypes type) {
+-	return (getGlobalOption( optionName(type).latin1() ) == "On");
++	return (strcmp(getGlobalOption( optionName(type).latin1() ), "On"));
+ }
+ 
+ /** Sets the given options enabled or disabled depending on the second parameter. */
+diff --git a/bibletime/frontend/cdragdropmgr.cpp b/bibletime/frontend/cdragdropmgr.cpp
+index 52d012f..4f8c4fe 100644
+--- a/bibletime/frontend/cdragdropmgr.cpp
++++ b/bibletime/frontend/cdragdropmgr.cpp
+@@ -36,7 +36,7 @@ bool CDragDropMgr::BTDrag::canDecode( const TQMimeSource * mime ) {
+ };
+ 
+ bool CDragDropMgr::BTDrag::provides( const char* type ) const {
+-	return (type == "BibleTime/DND"); //return only true if the type is BibleTime/DND
++	return (strcmp(type, "BibleTime/DND")); //return only true if the type is BibleTime/DND
+ };
+ 
+ const char* CDragDropMgr::BTDrag::format( int i ) const {
diff --git a/redhat/applications/bibletime/bibletime-14.0.0.spec b/redhat/applications/bibletime/bibletime-14.0.0.spec
index f55298ab2..68e6d26be 100644
--- a/redhat/applications/bibletime/bibletime-14.0.0.spec
+++ b/redhat/applications/bibletime/bibletime-14.0.0.spec
@@ -1,53 +1,83 @@
-# Default version for this component
-%define tde_pkg bibletime
+#
+# spec file for package bibletime (version R14.0.0)
+#
+# Copyright (c) 2014 Trinity Desktop Environment
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+# Please submit bugfixes or comments via http:/www.trinitydesktop.org/
+#
+
+# TDE variables
+%define tde_epoch 2
 %define tde_version 14.0.0
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
-# TDE specific building variables
+%define tde_pkg bibletime
+%define tde_prefix /opt/trinity
 %define tde_bindir %{tde_prefix}/bin
 %define tde_datadir %{tde_prefix}/share
 %define tde_docdir %{tde_datadir}/doc
 %define tde_includedir %{tde_prefix}/include
 %define tde_libdir %{tde_prefix}/%{_lib}
 %define tde_mandir %{tde_datadir}/man
-
 %define tde_tdeappdir %{tde_datadir}/applications/tde
 %define tde_tdedocdir %{tde_docdir}/tde
 %define tde_tdeincludedir %{tde_includedir}/tde
 %define tde_tdelibdir %{tde_libdir}/trinity
 
-%define _docdir %{tde_docdir}
-
 
 Name:			trinity-%{tde_pkg}
-Summary:		A bible study tool for Trinity
+Epoch:			%{tde_epoch}
 Version:		1.6.6.0
-Release:		%{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant}
-
-License:		GPLv2+
+Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Summary:		A bible study tool for Trinity
 Group:			Applications/Utilities
+URL:			http://www.trinitydesktop.org/
 
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://www.trinitydesktop.org
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
 
 Prefix:			%{_prefix}
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+Patch0:			%{tde_pkg}-%{tde_version}.patch
 
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
 
+BuildRequires:	autoconf automake libtool m4
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	libtool
+BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+# BOOST support
+BuildRequires:   boost-devel
+
 # Requires: clucene
 %if 0%{?fedora} || 0%{?suse_version}
 BuildRequires:	clucene-core-devel
@@ -67,14 +97,17 @@ BibleTime provides easy handling of digitized texts (Bibles, commentaries
 and lexicons) and powerful features to work with these texts (search in
 texts, write own notes, save, print etc.).
  
+##########
 
-%if 0%{?suse_version} || 0%{?pclinuxos}
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
 %debug_package
 %endif
 
+##########
 
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+%patch0 -p1 -b .rpmlint
 
 %__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"
@@ -118,6 +151,8 @@ export PATH="%{tde_bindir}:${PATH}"
 %__chmod 644 %{buildroot}%{tde_datadir}/apps/bibletime/bibletimeui.rc
 %__chmod 644 %{buildroot}%{tde_datadir}/apps/bibletime/tips
 
+echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_datadir}/applications/bibletime.desktop"
+
 
 %clean
 %__rm -rf %{buildroot}
@@ -128,6 +163,7 @@ touch --no-create %{tde_datadir}/icons/hicolor || :
 gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 update-desktop-database %{tde_datadir}/applications -q &> /dev/null
 
+
 %postun
 touch --no-create %{tde_datadir}/icons/hicolor || :
 gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
@@ -145,5 +181,5 @@ update-desktop-database %{tde_datadir}/applications -q &> /dev/null
 
 
 %changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.6.6.0-6
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:1.6.6.0-1
 - Initial release for TDE 14.0.0