[tabled] Update to 0.5.2

[Pete Zaitcev]

commit 70f07277a26c7eec49791fd41343469db8f07364
Author: Pete Zaitcev <zaitcev at kotori.zaitcev.us>
Date:   Tue Apr 23 17:22:44 2013 -0600

    Update to 0.5.2
    
    It all started with our tabled failing builds because db4 is no more.
    Fair enough, switching to libdb... But then the db replicator cannot
    be built, because we use fairly esoteric features of Oracle Berkley
    DB and those changed. Thankfully long time ago I fixed it all up,
    or we'd be really stuck. An update to 0.5.2 seems to be enough.

 .gitignore  |    1 +
 sources     |    2 +-
 tabled.spec |   28 +++++++++++++++-------------
 3 files changed, 17 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 99f7199..b6cb8f5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 tabled-0.5.1git.tar.gz
+/tabled-0.5.2.tar.bz2
diff --git a/sources b/sources
index 076a99a..bb21802 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c596e90c63c3c85a71f59e6830815600  tabled-0.5.1git.tar.gz
+c30033019ddd106aef2e6a3e4297d031  tabled-0.5.2.tar.bz2
diff --git a/tabled.spec b/tabled.spec
index 3b9e9d1..7d77ea4 100644
--- a/tabled.spec
+++ b/tabled.spec
@@ -1,26 +1,25 @@
 Name:		tabled
-Version:	0.5.1
-Release:	0.7.g33595340%{?dist}
+Version:	0.5.2
+Release:	1%{?dist}
 Summary:	Distributed key/value table service
 
 Group:		System Environment/Base
 License:	GPLv2
 URL:		http://hail.wiki.kernel.org/
 
-# pulled from upstream git, commit 33595340bc7ed226623baf75a9ccdabfc2a47a7f
-# to recreate tarball, check out commit, then run "make dist"
-Source0:	tabled-%{version}git.tar.gz
-
-#uncomment this, if a full release version of tabled
+# Jeff Garzik never restored the files lost in kernel.org breach, use a mirror
 #Source0:	http://www.kernel.org/pub/software/network/distsrv/tabled/tabled-%{version}.tar.gz
+Source0:	ftp://ftp.nara.wide.ad.jp/pub/Linux/kernel.org/software/network/distsrv/tabled/tabled-%{version}.tar.bz2
 
 Source2:	tabled.init
 Source3:	tabled.sysconf
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch1:		tabled-0.5.2-libdb.patch
+
 # N.B. We need chunkd and cld to build, because our "make check" spawns
 # private copies of infrastructure daemons.
-BuildRequires:	db4-devel libevent-devel glib2-devel pcre-devel
+BuildRequires:	libdb-devel libevent-devel glib2-devel pcre-devel
 BuildRequires:	chunkd cld libcurl-devel libxml2-devel
 BuildRequires:	procps
 BuildRequires:	hail-devel >= 0.7
@@ -36,16 +35,15 @@ any size, including several gigabytes or more.
 tabled user interface is HTTP REST, and is intended to be compatible with
 existing Amazon S3 clients.
 
-
 %prep
-%setup -q -n tabled-0.5.1git
-
+%setup -q
+%patch1 -p1
 
 %build
+sh autogen.sh
 %configure --disable-static
 make %{?_smp_mflags}
 
-
 %install
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
@@ -90,6 +88,10 @@ fi
 %config(noreplace)	%{_sysconfdir}/sysconfig/tabled
 
 %changelog
+* Tue Apr 23 2013 Pete Zaitcev <zaitcev at redhat.com>  - 0.5.2-1
+- Switch from db4 to libdb, as a patch
+- Bump to 0.5.2 or else we cannot build the replicator against libdb
+
 * Fri Feb 15 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.1-0.7.g33595340
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
@@ -113,7 +115,7 @@ fi
 - build against newly consolidated 'hail' pkg
 - removed now-unneeded tabled-devel RPM
 
-* Mon Jun 28 2010 Pete Zaitce <zaitcev at redhat.com> - 0.5-0.7.m1
+* Mon Jun 28 2010 Pete Zaitcev <zaitcev at redhat.com> - 0.5-0.7.m1
 - Revert to a staggered start in start-daemon
 - Test build, bump to 0.5-0.7.m1 (from 0.5-0.7.g091d6a5d)