Author: tpg
Date: Tue Jan 30 14:00:22 2007
New Revision: 115423
Added:
packages/cooker/recoll/current/SOURCES/recoll-configure.patch
Modified:
packages/cooker/recoll/current/SPECS/recoll.spec
Log:
- add path 1 - fix build on x86_64
Added: packages/cooker/recoll/current/SOURCES/recoll-configure.patch
==============================================================================
--- (empty file)
+++ packages/cooker/recoll/current/SOURCES/recoll-configure.patch Tue Jan
30 14:00:22 2007
@@ -0,0 +1,47 @@
+--- configure 2006-12-24 07:40:26.000000000 +0000
++++ configure.tpg 2007-01-30 12:51:59.000000000 +0000
+@@ -1410,7 +1410,7 @@
+ case $withFam in
+ no);;
+ yes)
+- for dir in /usr/local/lib /usr/lib;do
++ for dir in /usr/local/lib ${libdir};do
+ if test -f $dir/libfam.so ; then famLib=$dir/libfam.so;break;fi
+ done
+ ;;
+@@ -1498,7 +1498,7 @@
+
+ LIBICONV=""
+ S_LDFLAGS=$LDFLAGS
+-dir=/usr/local/lib
++dir=${libdir}
+ LDFLAGS="$S_LDFLAGS -L$dir"
+ unset ac_cv_lib_iconv_iconv_open
+ ac_ext=c
+@@ -2501,7 +2501,7 @@
+ fi
+
+ if test A"$LIBICONV" = A ; then
+- dir=/usr/lib
++ dir=${libdir}
+ LDFLAGS="$S_LDFLAGS -L$dir"
+ unset ac_cv_lib_iconv_iconv_open
+ echo "$as_me:$LINENO: checking for iconv_open in -liconv" >&5
+@@ -2573,7 +2573,7 @@
+ fi
+
+ if test A"$LIBICONV" = A; then
+- dir=/usr/lib
++ dir=${libdir}
+ LDFLAGS="$S_LDFLAGS -L$dir"
+ unset ac_cv_lib_iconv_iconv_open
+ echo "$as_me:$LINENO: checking for iconv_open in -lc" >&5
+@@ -3130,7 +3130,7 @@
+ *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
+ esac
+ case $ac_im_usrlibdir in
+- /usr/lib | /lib) ;;
++ ${libdir} | /lib) ;;
+ *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;;
+ esac
+ fi
Modified: packages/cooker/recoll/current/SPECS/recoll.spec
==============================================================================
--- packages/cooker/recoll/current/SPECS/recoll.spec (original)
+++ packages/cooker/recoll/current/SPECS/recoll.spec Tue Jan 30 14:00:22 2007
@@ -7,6 +7,7 @@
URL: http://www.recoll.org/
Source0: http://www.lesbonscomptes.com/recoll/%{name}-%{version}.tar.bz2
Patch0: %{name}-desktop.patch
+Patch1: %{name}-configure.patch
BuildRequires: libxapian-devel
BuildRequires: libfam-devel
BuildRequires: libqt-devel >= 3.3.7
@@ -23,6 +24,7 @@
%prep
%setup -q
%patch0 -p0
+%patch1 -p0
%build
%configure2_5x \
