From b134601bb89cca2d9bbfe31ae4176c5f6da46b93 Mon Sep 17 00:00:00 2001 From: Thorsten Scherf Date: Jan 05 2007 20:51:07 +0000 Subject: auto-import libpreludedb-0.9.11.1-1 on branch devel from libpreludedb-0.9.11.1-1.src.rpm --- diff --git a/libpreludedb-0.9.11.1-x86_64-sqlite3.patch b/libpreludedb-0.9.11.1-x86_64-sqlite3.patch deleted file mode 100644 index 7715a1b..0000000 --- a/libpreludedb-0.9.11.1-x86_64-sqlite3.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- libpreludedb-0.9.11.1/configure.in.lib64 2006-12-21 02:51:35.000000000 +0900 -+++ libpreludedb-0.9.11.1/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.1/configure.lib64 2006-12-21 02:53:18.000000000 +0900 -+++ libpreludedb-0.9.11.1/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` diff --git a/libpreludedb-x86_64-sqlite3.patch b/libpreludedb-x86_64-sqlite3.patch new file mode 100644 index 0000000..a76f012 --- /dev/null +++ b/libpreludedb-x86_64-sqlite3.patch @@ -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` diff --git a/libpreludedb.spec b/libpreludedb.spec index 739e796..6a4400f 100644 --- a/libpreludedb.spec +++ b/libpreludedb.spec @@ -10,7 +10,7 @@ License: GPL 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