summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--redhat/applications/bibletime/bibletime-3.5.13-clucene_detection.patch20
-rw-r--r--redhat/applications/bibletime/trinity-bibletime.spec12
-rwxr-xr-xredhat/genrpm.sh2
3 files changed, 32 insertions, 2 deletions
diff --git a/redhat/applications/bibletime/bibletime-3.5.13-clucene_detection.patch b/redhat/applications/bibletime/bibletime-3.5.13-clucene_detection.patch
new file mode 100644
index 000000000..2e5d6db69
--- /dev/null
+++ b/redhat/applications/bibletime/bibletime-3.5.13-clucene_detection.patch
@@ -0,0 +1,20 @@
+--- 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/trinity-bibletime.spec b/redhat/applications/bibletime/trinity-bibletime.spec
index d18884140..0c6e8b0d8 100644
--- a/redhat/applications/bibletime/trinity-bibletime.spec
+++ b/redhat/applications/bibletime/trinity-bibletime.spec
@@ -33,12 +33,21 @@ 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
+
BuildRequires: tqtinterface-devel
BuildRequires: trinity-kdelibs-devel
BuildRequires: trinity-kdebase-devel
BuildRequires: desktop-file-utils
BuildRequires: gettext
+%if 0%{?fedora} >= 16
+BuildRequires: clucene09-core-devel
+%else
+BuildRequires: clucene-core-devel
+%endif
+
BuildRequires: sword-devel
Requires: sword
@@ -52,6 +61,7 @@ texts, write own notes, save, print etc.).
%prep
%setup -q -n applications/%{kdecomp}
+%patch0 -p0
# Ugly hack to modify TQT include directory inside autoconf files.
# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
@@ -112,8 +122,8 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
%{_includedir}/bibletimeinterface.h
%{_datadir}/applications/bibletime.desktop
%{_datadir}/apps/bibletime
-%{tde_docdir}/HTML/en/bibletime/
%{_datadir}/icons/hicolor/*/*/*.png
+%{tde_docdir}/HTML/en/bibletime/
%Changelog
diff --git a/redhat/genrpm.sh b/redhat/genrpm.sh
index c16c7ab1f..68a82b470 100755
--- a/redhat/genrpm.sh
+++ b/redhat/genrpm.sh
@@ -90,7 +90,7 @@ EOF
# Specific prefix for installation of some components
case "${COMP##*/}" in
- "qt3") PREFIX="/usr";;
+ "qt3"|"libkarma") PREFIX="/usr";;
esac
# Determines if we are running an i386 or x86_64 distro