dist-git conversion

#2781)

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: libpreludedb
-# $Id$
-NAME := libpreludedb
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

libpreludedb-x86_64-sqlite3.patch

@@ -1,52 +0,0 @@
-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
-+          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 -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")

libpreludedb.spec

@@ -2,15 +2,14 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:		libpreludedb		           
-Version:	0.9.15.1 
+Version:	0.9.15.3 
-Release:	5%{?dist}
+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}/%{name}-%{version}.tar.gz	
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch1:		%{name}-x86_64-sqlite3.patch	
 
 BuildRequires:  libprelude, libprelude-devel, mysql-devel, postgresql-devel, python-devel, sqlite-devel, perl-devel
 
@@ -77,8 +76,6 @@ Perl bindings for libpreludedb.
 
 %prep
 %setup -q
-%patch1 -p1
-
 
 %build
 %configure	--with-html-dir=%{_defaultdocdir}/%{name}-%{version}/html \
@@ -91,7 +88,6 @@ sed -i.rpath -e 's|^sys_lib_dlsearch_path_spec="/lib /usr/lib|sys_lib_dlsearch_p
 
 make %{?_smp_mflags}
 
-
 %install
 rm -rf %{buildroot}
 mkdir -p %{buildroot}%{_defaultdocdir}/%{name}-%{version}
@@ -165,6 +161,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Dec 17 2009 Steve Grubb <sgrubb@redhat.com> 0.9.15.3-1
+- new upstream bugfix release
+
 * Tue Aug 25 2009 Steve Grubb <sgrubb@redhat.com> - 0.9.15.1-5
 - rebuild for new openssl
 

sources

@@ -1 +1 @@
-792b6ce058e4b9db44279409dbc662a3  libpreludedb-0.9.15.1.tar.gz
+70a78a092b32449e326ae3b28e57e9b3  libpreludedb-0.9.15.3.tar.gz