From e1030ca9c51e8319b25a756ed45b274a2ab28ac9bf7b4e89fef8aad6e2f03ad4 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Tue, 27 Mar 2012 14:38:32 +0000
Subject: [PATCH] nfacct 1.0.0

OBS-URL: https://build.opensuse.org/package/show/security:netfilter/nfacct?expand=0&rev=6
---
 nfacct-1.0.0.tar.bz2     |   3 +++
 nfacct-1.0.0.tar.bz2.sig | Bin 0 -> 543 bytes
 nfacct-1.0.0.tar.xz      |   3 ---
 nfacct.changes           |   6 ++++++
 nfacct.spec              |  24 +++++++++++++++---------
 5 files changed, 24 insertions(+), 12 deletions(-)
 create mode 100644 nfacct-1.0.0.tar.bz2
 create mode 100644 nfacct-1.0.0.tar.bz2.sig
 delete mode 100644 nfacct-1.0.0.tar.xz

diff --git a/nfacct-1.0.0.tar.bz2 b/nfacct-1.0.0.tar.bz2
new file mode 100644
index 0000000..5a43253
--- /dev/null
+++ b/nfacct-1.0.0.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:eb7e64c3ee4f1e4b5d508e933dc9dc2f91e14ea3ee5f1926aad76c114d1d2014
+size 255640
diff --git a/nfacct-1.0.0.tar.bz2.sig b/nfacct-1.0.0.tar.bz2.sig
new file mode 100644
index 0000000000000000000000000000000000000000000000000000000000000000..5919d25c4c8a83317ceb6cff385a70ef46cc3be2f4630be949f8b7cb1586f68c
GIT binary patch
literal 543
zcmV+)0^t3L0vrSY0RjL91p-fTp+^7;2@s?aABnqPSj=t;5CDzYw#f4fU{c(5&2eLq
z9EG5o)$Z%GZu9`LN*4eU^mZ70#zd-pQ87d|=N+T&wI#HOx&3)UuweM-(e?lne!eBb
zwp<hG{Pn48c-oXygd)WAa7b{Ak1~_wo7{UeR-YJO(xs9<`A6W{0N57`xft!22?PuD
z_R9zVRJ_3ZujPeDu-n|YCh(+8Ns%XrPL3|ad`*ss<q++D_Tz8F?ZWG}NU~|oBqLQ}
zG;aBJ^~rC*715SK5*cMp+6bR1vdlcUcE-3Wd-;hWMs2{3r>+{tpCHJjDuCWo@MdaD
z*9>uMR=!hfeAAi9({jvAs|Kv46|wh_O4{WEu60`fi#ftRWgsy-R#`xRk(CQb++#1!
zzP~B@G8$AZgW;}4)ACCxWXtrod-sP5mZ0({FGu%*Y(b?&sli6tY8}bj9P5ImteBvo
z{RZ$R1J>1?+zg?l;xY5%y#pJZ(3ZxhjK(u6jKXKm181bM&VkDu$a{tCofmX2ijTM(
z?_3dQL1RR!p|=4rCuiVVxx}im)CorS7v20fP?<Mz8E_o$xiC+tvy_s@K}N=);_xHg
z#u-&Pv2=&0?kvF*hiZP834y^`&FWo_#aDvQFUi>DdY265EfTZe-Cs1q8K-5DloeMT
hU%G?s+}EDaeMYr7{1&_WUmFsFYW0+Xn-9tN)}?nW6W0I$

literal 0
HcmV?d00001

diff --git a/nfacct-1.0.0.tar.xz b/nfacct-1.0.0.tar.xz
deleted file mode 100644
index 78561fe..0000000
--- a/nfacct-1.0.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a2a0b8d7b0249857d9ed540f301894882173aefc0ae89c498835b9de93ef9997
-size 10980
diff --git a/nfacct.changes b/nfacct.changes
index 3a7f317..3217b3f 100644
--- a/nfacct.changes
+++ b/nfacct.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Mar 27 14:11:18 UTC 2012 - jengelh@medozas.de
+
+- Update to new upstream release 1.0.0
+* add support for XML output
+
 -------------------------------------------------------------------
 Sun Jan  1 00:19:55 UTC 2012 - jengelh@medozas.de
 
diff --git a/nfacct.spec b/nfacct.spec
index 110d9a6..62a7eea 100644
--- a/nfacct.spec
+++ b/nfacct.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package nfacct
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -14,6 +14,8 @@
 
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
+
+
 Name:           nfacct
 Version:        1.0.0
 Release:        0
@@ -23,12 +25,16 @@ Group:          Productivity/Networking/Security
 
 #Git-Web:	http://git.netfilter.org/
 #Git-Clone:	git://git.netfilter.org/nfacct
-Source:         %name-%version.tar.xz
-URL:            http://netfilter.org/
+Source:         %name-%version.tar.bz2
+Source2:        %name-%version.tar.bz2.sig
+Url:            http://netfilter.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  autoconf, automake >= 1.6, libtool, pkgconfig >= 0.23
-BuildRequires:	pkgconfig(libmnl) >= 1, pkgconfig(libnetfilter_acct) >= 1.0.0
-BuildRequires:	xz
+BuildRequires:  autoconf
+BuildRequires:  automake >= 1.6
+BuildRequires:  libtool
+BuildRequires:  pkgconfig >= 0.21
+BuildRequires:  pkgconfig(libmnl) >= 1
+BuildRequires:  pkgconfig(libnetfilter_acct) >= 1.0.0
 
 %description
 This utility allows you to manipulate the extended accounting
@@ -36,10 +42,10 @@ infrastructure.
 
 %prep
 %if 0%{?__xz:1}
-%setup -qn %name
+%setup -q
 %else
-tar -xf "%{S:0}" --use=xz;
-%setup -DTqn %name
+tar -xf "%{S:0}" --use=bzip2;
+%setup -DTq
 %endif
 
 %build