RPM Packaging: cleanup bibletime

14 files changed, 22 insertions, 452 deletions

diff --git a/redhat/Makefile.r14 b/redhat/Makefile.r14
index 53ff582be..c1198e4c0 100644
--- a/redhat/Makefile.r14
+++ b/redhat/Makefile.r14
@@ -238,12 +238,6 @@ ifneq ($(wildcard /boot/vmlinuz*.el5*),)
 	$(call buildpkg,3rdparty/sip)
 endif
 
-sword:
-# Build on Fedora >= 20, PCLinuxOS, CentOS >= 7
-ifneq ($(wildcard /boot/vmlinuz*.fc20* /etc/pclinuxos-release /boot/vmlinuz*.el7*),)
-	$(call buildpkg,3rdparty/sword)
-endif
-
 torsocks:
 	$(call buildpkg,3rdparty/torsocks)
 
@@ -306,7 +300,7 @@ amarok:	tdebase cmake
 basket:	tdebase
 	$(call buildpkg,applications/basket)
 
-bibletime:	tdebase sword
+bibletime:	tdebase
 	$(call buildpkg,applications/bibletime)
 
 compizconfig-backend-kconfig:	tdebase
@@ -594,7 +588,7 @@ tdeio-ftps:	tdebase
 tdeio-locate:	tdebase
 	$(call buildpkg,applications/tdeio-locate)
 
-tdeio-sword:	tdebase sword
+tdeio-sword:	tdebase
 	$(call buildpkg,applications/tdeio-sword)
 
 tdeio-umountwrapper:	tdebase
@@ -666,12 +660,12 @@ meta:
 	$(call buildpkg,extras/trinity-desktop)
 
 ### Extra packages
+celestia:
+	$(call buildpkg,extras/celestia)
+
 fileshareset:
 	$(call buildpkg,extras/fileshareset)
 
-trinity-filesystem:
-	$(call buildpkg,extras/trinity-filesystem)
-
 hk_classes:
 	$(call buildpkg,extras/hk_classes)
 
@@ -710,3 +704,6 @@ scribus:
 
 style-ia-ora:
 	$(call buildpkg,extras/style-ia-ora)
+
+trinity-filesystem:
+	$(call buildpkg,extras/trinity-filesystem)
diff --git a/redhat/applications/amarok/amarok-14.0.0.spec b/redhat/applications/amarok/amarok-14.0.0.spec
index 3ad958056..3d74ac57a 100644
--- a/redhat/applications/amarok/amarok-14.0.0.spec
+++ b/redhat/applications/amarok/amarok-14.0.0.spec
@@ -167,8 +167,8 @@ BuildRequires: libxine-devel
 %endif
 
 # AKODE support
-%if 0
-%define with_akode 1
+%define with_akode 0
+%if 0 && 0%{?with_akode}
 BuildRequires:	trinity-akode-devel
 %endif
 
@@ -289,7 +289,7 @@ Amarok is a multimedia player with:
 %{tde_tdelibdir}/libamarok_yauap-engine_plugin.*
 %endif
 # AKODE
-%if 0%{?with_akode}
+%if 0 && 0%{?with_akode}
 %{tde_datadir}/services/amarok_aKode-engine.desktop
 %{tde_tdelibdir}/libamarok_aKode-engine.*
 %endif
@@ -410,7 +410,7 @@ fi
   -DWITH_KONQSIDEBAR=ON \
   %{?with_xine:-DWITH_XINE=ON} \
   %{?with_yauap:-DWITH_YAUAP=ON} \
-  %{?with_akode:-DWITH_AKODE=ON} \
+  -DWITH_AKODE=OFF \
   %{?with_gpod:-DWITH_IPOD=ON} \
   %{?with_ifp:-DWITH_IFP=ON} \
   %{?with_njb:-DWITH_NJB=ON} \
diff --git a/redhat/applications/bibletime/bibletime-14.0.0.spec b/redhat/applications/bibletime/bibletime-14.0.0.spec
index 0fd3639ec..f55298ab2 100644
--- a/redhat/applications/bibletime/bibletime-14.0.0.spec
+++ b/redhat/applications/bibletime/bibletime-14.0.0.spec
@@ -100,11 +100,7 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
   --enable-final \
   --enable-closure \
   --enable-rpath \
-  --disable-gcc-hidden-visibility \
-  \
-%if 0%{?pclinuxos} || 0%{?rhel} >= 7
-  --with-sword-dir=%{tde_prefix}
-%endif
+  --disable-gcc-hidden-visibility
 
 # Not SMP safe !
 %__make -C bibletime/frontend
diff --git a/redhat/applications/bibletime/bibletime-3.5.13-clucene_detection.patch b/redhat/applications/bibletime/bibletime-3.5.13-clucene_detection.patch
deleted file mode 100644
index 2e5d6db69..000000000
--- a/redhat/applications/bibletime/bibletime-3.5.13-clucene_detection.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- clucene.m4.ORI	2011-11-30 19:22:02.284530031 +0100
-+++ clucene.m4	2011-11-30 20:03:45.704532045 +0100
-@@ -28,7 +28,7 @@
- 
- dnl try to find CLucene library files
- AC_MSG_CHECKING([for CLucene library files])
--ac_clucene_library_dirs="$ac_clucene_dir/lib $exec_prefix/lib $prefix/lib /usr/lib /usr/lib64 /usr/local/lib"
-+ac_clucene_library_dirs="/usr/lib/clucene09 /usr/lib64/clucene09 $ac_clucene_dir/lib $exec_prefix/lib $prefix/lib /usr/lib /usr/lib64 /usr/local/lib"
- 
- if test "x$ac_static_clucene" = "xYES"; then
- 	SEARCH_LIBS="libclucene.a";
-@@ -62,7 +62,7 @@
- 
- dnl -- try to find CLucene include files --
- AC_MSG_CHECKING([for Clucene include files])
--ac_clucene_include_dirs="$ac_clucene_dir/include $exec_prefix/include $prefix/include /usr/include /usr/local/include"
-+ac_clucene_include_dirs=" /usr/include/clucene09 $ac_clucene_dir/include $exec_prefix/include $prefix/include /usr/include /usr/local/include"
- 
- AC_CACHE_VAL(ac_cv_clucene_incdir, AC_FIND_FILE(CLucene.h, $ac_clucene_include_dirs, ac_cv_clucene_incdir))
- 
diff --git a/redhat/applications/bibletime/bibletime-3.5.13-fix_gcc47_compilation.patch b/redhat/applications/bibletime/bibletime-3.5.13-fix_gcc47_compilation.patch
deleted file mode 100644
index aca2be126..000000000
--- a/redhat/applications/bibletime/bibletime-3.5.13-fix_gcc47_compilation.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- bibletime/bibletime/frontend/cinfodisplay.cpp.ORI	2012-05-01 14:13:38.750903801 +0200
-+++ bibletime/bibletime/frontend/cinfodisplay.cpp	2012-05-01 14:14:59.998011927 +0200
-@@ -229,8 +229,8 @@
- 			VerseKey vk;
- 			sword::ListKey refs = vk.ParseVerseList((const char*)data.mid((pos == -1) ? 0 : pos+1).utf8(), "Gen 1:1", true);
- 
--			for (int i = 0; i < refs.Count(); ++i) {
--				SWKey* key = refs.getElement(i);
-+			for (int j = 0; j < refs.Count(); ++j) {
-+				SWKey* key = refs.getElement(j);
- 				Q_ASSERT(key);
- 				VerseKey* vk = dynamic_cast<VerseKey*>(key);
- 
diff --git a/redhat/applications/bibletime/bibletime-3.5.13-fix_sword_linking.patch b/redhat/applications/bibletime/bibletime-3.5.13-fix_sword_linking.patch
deleted file mode 100644
index bedb9f820..000000000
--- a/redhat/applications/bibletime/bibletime-3.5.13-fix_sword_linking.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- bibletime/sword.m4.ftbfs	2011-05-17 20:42:02.000000000 +0200
-+++ bibletime/sword.m4	2012-08-03 17:40:00.461746639 +0200
-@@ -119,7 +119,7 @@
- EOF
- 
- 
--ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-+ac_link='$LIBTOOL_SHELL --silent --mode=link --tag=LD ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
- if AC_TRY_EVAL(ac_link) && test -s conftest; then
- 	if test -x conftest; then
- 		eval ac_cv_installed_sword_version=`./conftest 2>&5`
-@@ -192,7 +192,7 @@
- }
- EOF
- 
--ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-+ac_link='$LIBTOOL_SHELL --silent --mode=link --tag=LD ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
- if AC_TRY_EVAL(ac_link) && test -s conftest; then
- 	if test -x conftest; then
- 		eval ac_cv_sword_recent_version=`./conftest $1 2>&5`
---- bibletime/clucene.m4.ORI	2012-08-03 17:41:19.989067063 +0200
-+++ bibletime/clucene.m4	2012-08-03 17:41:35.675734952 +0200
-@@ -119,7 +119,7 @@
- EOF
- 
- 
--ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-+ac_link='$LIBTOOL_SHELL --silent --mode=link --tag=LD ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
- if AC_TRY_EVAL(ac_link) && test -s conftest; then
- 	if test -x conftest; then
- 		eval ac_cv_installed_clucene_version=`./conftest 2>&5`
diff --git a/redhat/applications/bibletime/bibletime-3.5.13.1.spec b/redhat/applications/bibletime/bibletime-3.5.13.1.spec
deleted file mode 100644
index 520f147cb..000000000
--- a/redhat/applications/bibletime/bibletime-3.5.13.1.spec
+++ /dev/null
@@ -1,164 +0,0 @@
-# Default version for this component
-%define kdecomp bibletime
-
-# 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 3.5.13 specific building variables
-%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/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	A bible study tool for Trinity
-Version:	1.6.6.0
-Release:	3%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org
-
-Prefix:    %{_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.1.tar.gz
-
-# Fix detection of older versions of clucene in Fedora >= 16
-Patch0:		bibletime-3.5.13-clucene_detection.patch
-# [bibletime] Fix FTBFS on Mageia 2, error at linking with 'sword'
-Patch2:		bibletime-3.5.13-fix_sword_linking.patch
-
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.1
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-# Bibletime only works with clucene 0.9 ! Mageia 2 does not ship with that old version !
-%if 0%{?fedora} >= 16 || 0%{?suse_version}
-BuildRequires:	clucene09-core-devel
-%else
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	clucene-devel < 1.0
-%else
-BuildRequires:	clucene-core-devel
-%endif
-%endif
-
-BuildRequires:	sword-devel
-Requires:		sword
-
-%description
-BibleTime is a free and easy to use bible study tool for UNIX systems.
-It requires a working KDE environment and the SWORD library.
-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}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{kdecomp}-3.5.13.1
-%patch0 -p0 -b .clucene
-%patch2 -p1 -b .ftbfs
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__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"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-	--prefix=%{tde_prefix} \
-	--exec-prefix=%{tde_prefix} \
-	--bindir=%{tde_bindir} \
-	--libdir=%{tde_libdir} \
-	--datadir=%{tde_datadir} \
-	--includedir=%{tde_tdeincludedir} \
-	--disable-rpath \
-	--with-extra-includes=%{tde_includedir}/tqt
-
-# Not SMP safe !
-%__make -C bibletime/frontend
-
-# SMP safe !
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%__chmod 644 %{buildroot}%{tde_datadir}/apps/bibletime/pics/*
-%__chmod 644 %{buildroot}%{tde_datadir}/apps/bibletime/bibletimeui.rc
-%__chmod 644 %{buildroot}%{tde_datadir}/apps/bibletime/tips
-
-
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-/sbin/ldconfig || :
-
-%postun
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-/sbin/ldconfig || :
-
-
-%files
-%defattr(-,root,root,-)
-%{tde_bindir}/bibletime
-%{tde_tdeincludedir}/bibletimeinterface.h
-%{tde_datadir}/applications/bibletime.desktop
-%{tde_datadir}/apps/bibletime/
-%{tde_datadir}/icons/hicolor/*/*/*.png
-%{tde_tdedocdir}/HTML/en/bibletime/
-
-
-%changelog
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.6.6.0-3
-- Initial release for TDE 3.5.13.1
-
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 1.6.6.0-2
-- Fix compilation on RHEL 5
-- Fix compilation with GCC 4.7
-
-* Tue Nov 29 2011 Francois Andriot <francois.andriot@free.fr> - 1.6.6.0-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
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
deleted file mode 100644
index 0f6364921..000000000
--- a/redhat/applications/bibletime/bibletime-3.5.13.2-fix_sword_detection.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-commit 298da70ab4f6da3780c617a85957a80f2e7ae71b
-Author: Francois Andriot <francois.andriot@free.fr>
-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 a6cac4a44..9a1a1f366 100644
--- a/redhat/applications/bibletime/bibletime-3.5.13.2.spec
+++ b/redhat/applications/bibletime/bibletime-3.5.13.2.spec
@@ -26,7 +26,7 @@
 Name:			trinity-%{tde_pkg}
 Summary:		A bible study tool for Trinity
 Version:		1.6.6.0
-Release:		%{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant}
+Release:		%{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant}
 
 License:		GPLv2+
 Group:			Applications/Utilities
@@ -40,8 +40,6 @@ BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-Patch0:			bibletime-3.5.13.2-fix_sword_detection.patch
-
 BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
 BuildRequires:	trinity-arts-devel >= 1:1.5.10
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
@@ -77,7 +75,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"
@@ -152,6 +149,9 @@ update-desktop-database %{tde_datadir}/applications -q &> /dev/null
 
 
 %changelog
+* Sun Sep 21 2014 Francois Andriot <francois.andriot@free.fr> - 1.6.6.0-7
+- Fix build with Sword 1.7
+
 * Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1.6.6.0-5
 - Build for Fedora 19
 
diff --git a/redhat/applications/bibletime/bibletime-3.5.13.spec b/redhat/applications/bibletime/bibletime-3.5.13.spec
deleted file mode 100644
index 8b8bfe792..000000000
--- a/redhat/applications/bibletime/bibletime-3.5.13.spec
+++ /dev/null
@@ -1,159 +0,0 @@
-# Default version for this component
-%define kdecomp bibletime
-
-# 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 3.5.13 specific building variables
-%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/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	A bible study tool for Trinity
-Version:	1.6.6.0
-Release:	2%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org
-
-Prefix:    %{_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.tar.gz
-
-# Fix detection of older versions of clucene in Fedora >= 16
-Patch0:		bibletime-3.5.13-clucene_detection.patch
-# [bibletime] Fix compilation with GCC 4.7
-Patch1:		bibletime-3.5.13-fix_gcc47_compilation.patch
-# [bibletime] Fix FTBFS on Mageia 2, error at linking with 'sword'
-Patch2:		bibletime-3.5.13-fix_sword_linking.patch
-
-BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-kdelibs-devel
-BuildRequires:	trinity-kdebase-devel
-BuildRequires:	desktop-file-utils
-BuildRequires:	gettext
-
-# Bibletime only works with clucene 0.9 ! Mageia 2 does not ship with that old version !
-%if 0%{?fedora} >= 16
-BuildRequires:	clucene09-core-devel
-%else
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	clucene-devel
-%else
-BuildRequires:	clucene-core-devel
-%endif
-%endif
-
-BuildRequires:	sword-devel
-Requires:		sword
-
-%description
-BibleTime is a free and easy to use bible study tool for UNIX systems.
-It requires a working KDE environment and the SWORD library.
-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.).
- 
-
-%prep
-%setup -q -n applications/%{kdecomp}
-%patch0 -p0
-%patch1 -p1 -b .gcc47
-%patch2 -p1 -b .ftbfs
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__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"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-	--prefix=%{tde_prefix} \
-	--exec-prefix=%{tde_prefix} \
-	--bindir=%{tde_bindir} \
-	--libdir=%{tde_libdir} \
-	--datadir=%{tde_datadir} \
-	--includedir=%{tde_tdeincludedir} \
-	--disable-rpath \
-    --with-extra-includes=%{tde_includedir}/tqt
-
-# Not SMP safe !
-%__make -C bibletime/frontend
-
-# SMP safe !
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%__chmod 644 %{buildroot}%{tde_datadir}/apps/bibletime/pics/*
-%__chmod 644 %{buildroot}%{tde_datadir}/apps/bibletime/bibletimeui.rc
-%__chmod 644 %{buildroot}%{tde_datadir}/apps/bibletime/tips
-
-
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-/sbin/ldconfig || :
-
-%postun
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-/sbin/ldconfig || :
-
-
-%files
-%defattr(-,root,root,-)
-%{tde_bindir}/bibletime
-%{tde_tdeincludedir}/bibletimeinterface.h
-%{tde_datadir}/applications/bibletime.desktop
-%{tde_datadir}/apps/bibletime/
-%{tde_datadir}/icons/hicolor/*/*/*.png
-%{tde_tdedocdir}/HTML/en/bibletime/
-
-
-%Changelog
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 1.6.6.0-2
-- Fix compilation on RHEL 5
-- Fix compilation with GCC 4.7
-
-* Tue Nov 29 2011 Francois Andriot <francois.andriot@free.fr> - 1.6.6.0-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/build/build_rpm_package.sh b/redhat/build/build_rpm_package.sh
index 0e267111b..d36f44299 100755
--- a/redhat/build/build_rpm_package.sh
+++ b/redhat/build/build_rpm_package.sh
@@ -29,7 +29,7 @@ if [ -r "${PATCHLIST}" ]; then
     APPLY=""
     case "${l}" in
       ""|"#"*);;
-     "*opensuse*") [ -r /etc/SuSE-release ] && APPLY=1;;
+     *"opensuse"*) [ -r /etc/SuSE-release ] && APPLY=1;;
      *) APPLY=1;;
     esac
     
diff --git a/redhat/packages.fedora b/redhat/packages.fedora
index 6c0d413a2..f1d6680a1 100644
--- a/redhat/packages.fedora
+++ b/redhat/packages.fedora
@@ -29,6 +29,7 @@ doxygen
 dssi-devel
 esound-devel
 exiv2-devel
+fdupes
 ffmpeg-devel
 fftw-devel
 file-devel
diff --git a/redhat/tdeartwork/tdeartwork-14.0.0.spec b/redhat/tdeartwork/tdeartwork-14.0.0.spec
index abc7828bc..b05600151 100644
--- a/redhat/tdeartwork/tdeartwork-14.0.0.spec
+++ b/redhat/tdeartwork/tdeartwork-14.0.0.spec
@@ -667,6 +667,7 @@ This package is part of Trinity, and a component of the TDE artwork module.
 %if 0%{?fedora} >= 20
 %{tde_datadir}/applnk/System/ScreenSavers/projectiveplane.desktop
 %{tde_datadir}/applnk/System/ScreenSavers/tessellimage.desktop
+%{tde_datadir}/applnk/System/ScreenSavers/winduprobot.desktop
 %endif
 
 %endif
diff --git a/redhat/tdelibs/tdelibs-14.0.0.spec b/redhat/tdelibs/tdelibs-14.0.0.spec
index f3b474dba..f08be1206 100644
--- a/redhat/tdelibs/tdelibs-14.0.0.spec
+++ b/redhat/tdelibs/tdelibs-14.0.0.spec
@@ -253,12 +253,12 @@ BuildRequires:	xz-devel
 %endif
 
 # Certificates support
-%if 0%{?rhel} == 6 || 0%{?fedora}
+%if 0%{?rhel} == 6 || 0%{?fedora} == 18 || 0%{?fedora} == 19
 %define	cacert	%{_sysconfdir}/ssl/certs/ca-certificates.crt
 BuildRequires:	ca-certificates
 Requires:		ca-certificates
 %endif
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 7
+%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 7 || 0%{?fedora} >= 20
 %define	cacert	%{_sysconfdir}/ssl/certs/ca-bundle.crt
 Requires:		openssl
 %endif