[libnftables] Update to 20131202 snapshot, switch to upstream snapshot repo instead of git checkouts.

[Kevin Fenzi]

commit 1ef1cead691ecac55c11780f8c61e371c6c47b91
Author: Kevin Fenzi <kevin at scrye.com>
Date:   Mon Dec 2 15:16:10 2013 -0700

    Update to 20131202 snapshot, switch to upstream snapshot repo instead of git checkouts.

 libnftables-disable-xmltests.patch |   10 ++++++++++
 libnftables.spec                   |   24 +++++++++++++++---------
 2 files changed, 25 insertions(+), 9 deletions(-)
---
diff --git a/libnftables-disable-xmltests.patch b/libnftables-disable-xmltests.patch
new file mode 100644
index 0000000..4e6c3f2
--- /dev/null
+++ b/libnftables-disable-xmltests.patch
@@ -0,0 +1,10 @@
+diff -Nur libnftables-20131202.orig/tests/test-script.sh libnftables-20131202/tests/test-script.sh
+--- libnftables-20131202.orig/tests/test-script.sh	2013-12-01 22:27:51.000000000 -0700
++++ libnftables-20131202/tests/test-script.sh	2013-12-02 15:01:40.007155268 -0700
+@@ -18,5 +18,5 @@
+ ./nft-rule-test
+ ./nft-set-test
+ ./nft-table-test
+-./nft-parsing-test xmlfiles
++#./nft-parsing-test xmlfiles
+ ./nft-parsing-test jsonfiles
diff --git a/libnftables.spec b/libnftables.spec
index 3fe7778..9f1baaf 100644
--- a/libnftables.spec
+++ b/libnftables.spec
@@ -1,24 +1,26 @@
-%global gitcheckout 20131130
+%global gitcheckout 20131202
 
 Name:           libnftables
 Version:        0
-Release:        0.2.%{gitcheckout}git%{?dist}
+Release:        0.3.%{gitcheckout}git%{?dist}
 Summary:        Library for low-level interaction with nftables Netlink's API over libmnl
 
 License:        GPLv2+
 URL:            http://netfilter.org/projects/nftables/
+Source0:        http://ftp.netfilter.org/pub/libnftables/snapshot/libnftables-20131202.tar.bz2
 #
-# There is currently no upstream releases yet, so we pull from git
-# git clone git://git.netfilter.org/libnftables
-# git archive -o libnftables-0.0-%{gitcheckout}git.tar.gz --prefix=libnftables-0.0/ master
-# 
-Source0:        libnftables-0.0-%{gitcheckout}git.tar.gz
+# Disable the xml tests until we can build with xml
+#
+Patch1:         libnftables-disable-xmltests.patch
 
 BuildRequires:  autogen
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  libtool
 BuildRequires:  libmnl-devel
+# mxml is too old, enable when it's updated
+#BuildRequires:  mxml-devel
+BuildRequires:  jansson-devel
 
 %description
 A library for low-level interaction with nftables Netlink's API over libmnl.
@@ -32,12 +34,13 @@ The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
 
 %prep
-%setup -q -n libnftables-0.0
+%setup -q -n libnftables-%{gitcheckout}
 
+%patch1 -p1
 
 %build
 ./autogen.sh
-%configure --disable-static --disable-silent-rules
+%configure --disable-static --disable-silent-rules --with-json-parsing
 make %{?_smp_mflags}
 
 %check
@@ -65,6 +68,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 %{_includedir}/libnftables
 
 %changelog
+* Mon Dec 02 2013 Kevin Fenzi <kevin at scrye.com> 0-0.3.git
+- Update to 20131202 snapshot, switch to upstream snapshot repo instead of git checkouts. 
+
 * Mon Dec 02 2013 Kevin Fenzi <kevin at scrye.com> 0-0.2
 - Fixes from review.