diff --git a/.cvsignore b/.cvsignore index b8539eb..2345a11 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,3 @@ libpreludedb-0.9.11.1.tar.gz libpreludedb-0.9.14.1.tar.gz +libpreludedb-0.9.15.tar.gz diff --git a/libpreludedb-x86_64-sqlite3.patch b/libpreludedb-x86_64-sqlite3.patch index a76f012..cebc8a3 100644 --- a/libpreludedb-x86_64-sqlite3.patch +++ b/libpreludedb-x86_64-sqlite3.patch @@ -1,24 +1,11 @@ ---- 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 @@ +diff -ur libpreludedb-0.9.15.orig/configure libpreludedb-0.9.15/configure +--- libpreludedb-0.9.15.orig/configure 2008-08-27 12:06:58.000000000 -0400 ++++ libpreludedb-0.9.15/configure 2008-08-27 16:47:11.000000000 -0400 +@@ -22912,7 +22912,32 @@ fi if test -z "$SQLITE3_LIBS"; then -- continue +- 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; } @@ -48,3 +35,18 @@ fi as_ac_File=`echo "ac_cv_file_$dir/include/sqlite3.h" | $as_tr_sh` +diff -ur libpreludedb-0.9.15.orig/configure.in libpreludedb-0.9.15/configure.in +--- libpreludedb-0.9.15.orig/configure.in 2008-08-27 12:06:58.000000000 -0400 ++++ libpreludedb-0.9.15/configure.in 2008-08-27 16:47:11.000000000 -0400 +@@ -226,7 +226,10 @@ + for dir in $default_path; do + AC_CHECK_FILE($dir/lib/libsqlite3.$libext, SQLITE3_LIBS="-L$dir -lsqlite3") + if test -z "$SQLITE3_LIBS"; then +- continue ++ AC_CHECK_FILE($dir/lib64/libsqlite3.$libext, 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") diff --git a/libpreludedb.spec b/libpreludedb.spec index f89b675..e2970e2 100644 --- a/libpreludedb.spec +++ b/libpreludedb.spec @@ -2,15 +2,15 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: libpreludedb -Version: 0.9.14.1 -Release: 4%{?dist} +Version: 0.9.15 +Release: 1%{?dist} Summary: Provide the framework for easy access to the Prelude database Group: System Environment/Libraries License: GPLv2+ URL: http://prelude-ids.org/ -Source0: http://prelude-ids.org/download/releases/%{name}-%{version}.tar.gz +Source0: http://prelude-ids.org/download/releases/%{name}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch0: %{name}-x86_64-sqlite3.patch +Patch1: %{name}-x86_64-sqlite3.patch BuildRequires: libprelude, libprelude-devel, mysql-devel, postgresql-devel, python-devel, sqlite-devel, perl-devel @@ -77,7 +77,7 @@ Perl bindings for libpreludedb. %prep %setup -q -%patch0 -p1 +%patch1 -p1 %build @@ -165,6 +165,9 @@ rm -rf %{buildroot} %changelog +* Wed Aug 27 2008 Steve Grubb 0.9.15-1 +- new upstream release + * Fri Jul 04 2008 Steve Grubb - 0.9.14.1-4 - Fix perl bindings (#453935) diff --git a/sources b/sources index 7c44a4d..c62d819 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d5e37cccc32ca54fece68b7eee589f01 libpreludedb-0.9.14.1.tar.gz +96a85f4ba47042e7a2243aed4bb00e98 libpreludedb-0.9.15.tar.gz