rpms/libpreludedb/devel libpreludedb-x86_64-sqlite3.patch, 1.3, 1.4 libpreludedb.spec, 1.6, 1.7 libpreludedb-0.9.11.1-x86_64-sqlite3.patch, 1.1, NONE

Thorsten Scherf (tscherf) fedora-extras-commits at redhat.com
Fri Jan 5 20:51:38 UTC 2007


Author: tscherf

Update of /cvs/extras/rpms/libpreludedb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24324/devel

Modified Files:
	libpreludedb.spec 
Added Files:
	libpreludedb-x86_64-sqlite3.patch 
Removed Files:
	libpreludedb-0.9.11.1-x86_64-sqlite3.patch 
Log Message:
auto-import libpreludedb-0.9.11.1-1 on branch devel from libpreludedb-0.9.11.1-1.src.rpm

libpreludedb-x86_64-sqlite3.patch:

Index: libpreludedb-x86_64-sqlite3.patch
===================================================================
RCS file: libpreludedb-x86_64-sqlite3.patch
diff -N libpreludedb-x86_64-sqlite3.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ libpreludedb-x86_64-sqlite3.patch	5 Jan 2007 20:51:07 -0000	1.4
@@ -0,0 +1,50 @@
+--- 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: libpreludedb.spec
===================================================================
RCS file: /cvs/extras/rpms/libpreludedb/devel/libpreludedb.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libpreludedb.spec	5 Jan 2007 19:20:55 -0000	1.6
+++ libpreludedb.spec	5 Jan 2007 20:51:07 -0000	1.7
@@ -10,7 +10,7 @@
 URL:		http://prelude-ids.org/
 Source0:	http://prelude-ids.org/download/releases/%{name}-%{version}.tar.gz	
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch0:		%{name}-%{version}-x86_64-sqlite3.patch	
+Patch0:		%{name}-x86_64-sqlite3.patch	
 
 BuildRequires:  libprelude, libprelude-devel, mysql-devel, postgresql-devel, python-devel, sqlite-devel 
 


--- libpreludedb-0.9.11.1-x86_64-sqlite3.patch DELETED ---




More information about the scm-commits mailing list