rpms/libpreludedb/FC-5 libpreludedb-x86_64-sqlite3.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 libpreludedb.spec, 1.5, 1.6 sources, 1.2, 1.3 libpreludedb-0.9.11-x86_64-sqlite3.patch, 1.1, NONE

[Thorsten Scherf (tscherf)]

Author: tscherf

Update of /cvs/extras/rpms/libpreludedb/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28699/FC-5

Modified Files:
	.cvsignore libpreludedb.spec sources 
Added Files:
	libpreludedb-x86_64-sqlite3.patch 
Removed Files:
	libpreludedb-0.9.11-x86_64-sqlite3.patch 
Log Message:
auto-import libpreludedb-0.9.11.1-2 on branch FC-5 from libpreludedb-0.9.11.1-2.src.rpm

libpreludedb-x86_64-sqlite3.patch:

--- NEW FILE libpreludedb-x86_64-sqlite3.patch ---
--- libpreludedb-0.9.11/configure.in.lib64	2006-12-21 02:51:35.000000000 +0900
+++ libpreludedb-0.9.11/configure.in	2007-01-02 00:54:27.000000000 +0900
@@ -212,7 +212,10 @@
    for dir in $default_path; do
        AC_CHECK_FILE($dir/lib/libsqlite3.so, SQLITE3_LIBS="-L$dir -lsqlite3")
        if test -z "$SQLITE3_LIBS"; then
-	  continue
+          AC_CHECK_FILE($dir/lib64/libsqlite3.so, SQLITE3_LIBS="-L$dir -L$dir/lib64 -lsqlite3")
+	  if test -z "$SQLITE3_LIBS"; then
+	     continue
+	  fi
        fi
 
        AC_CHECK_FILE($dir/include/sqlite3.h, SQLITE3_CFLAGS="-I$dir")
--- libpreludedb-0.9.11/configure.lib64	2006-12-21 02:53:18.000000000 +0900
+++ libpreludedb-0.9.11/configure	2007-01-02 00:57:35.000000000 +0900
@@ -27318,7 +27318,32 @@
 fi
 
        if test -z "$SQLITE3_LIBS"; then
-	  continue
+          as_ac_File=`echo "ac_cv_file_$dir/lib64/libsqlite3.so" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $dir/lib64/libsqlite3.so" >&5
+echo $ECHO_N "checking for $dir/lib64/libsqlite3.so... $ECHO_C" >&6; }
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  test "$cross_compiling" = yes &&
+  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
+if test -r "$dir/lib64/libsqlite3.so"; then
+  eval "$as_ac_File=yes"
+else
+  eval "$as_ac_File=no"
+fi
+fi
+ac_res=`eval echo '${'$as_ac_File'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_File'}'` = yes; then
+  SQLITE3_LIBS="-L$dir -L$dir/lib64 -lsqlite3"
+fi
+
+	  if test -z "$SQLITE3_LIBS"; then
+	     continue
+	  fi
        fi
 
        as_ac_File=`echo "ac_cv_file_$dir/include/sqlite3.h" | $as_tr_sh`


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libpreludedb/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	1 Jan 2007 12:14:37 -0000	1.2
+++ .cvsignore	5 Jan 2007 21:05:11 -0000	1.3
@@ -1 +1 @@
-libpreludedb-0.9.11.tar.gz
+libpreludedb-0.9.11.1.tar.gz


Index: libpreludedb.spec
===================================================================
RCS file: /cvs/extras/rpms/libpreludedb/FC-5/libpreludedb.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libpreludedb.spec	5 Jan 2007 19:04:57 -0000	1.5
+++ libpreludedb.spec	5 Jan 2007 21:05:11 -0000	1.6
@@ -3,7 +3,7 @@
 
 Name:		libpreludedb		           
 Version:	0.9.11.1 
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Provide the framework for easy access to the Prelude database
 Group:		System Environment/Libraries
 License:	GPL
@@ -165,7 +165,7 @@
 
 
 %changelog
-* Fri Jan 05 2007 Thorsten Scherf <tscherf at redhat.com> 0.9.11.1-1
+* Fri Jan 05 2007 Thorsten Scherf <tscherf at redhat.com> 0.9.11.1-2
 - moved to new upstream version 0.9.11.1
 
 * Mon Jan 01 2007 Thorsten Scherf <tscherf at redhat.com> 0.9.11-4


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libpreludedb/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Jan 2007 12:14:37 -0000	1.2
+++ sources	5 Jan 2007 21:05:11 -0000	1.3
@@ -1 +1 @@
-f0b2a1229784419be1f9602f3f06d539  libpreludedb-0.9.11.tar.gz
+e50b62ff520c25a48aac3577cc1f92f0  libpreludedb-0.9.11.1.tar.gz


--- libpreludedb-0.9.11-x86_64-sqlite3.patch DELETED ---