From b9f018d58e129d0d97df1b2ab22982e1cefb9d7d Mon Sep 17 00:00:00 2001
From: Steve Grubb <sgrubb@fedoraproject.org>
Date: Aug 18 2009 18:13:00 +0000
Subject: - New upstream release


---

diff --git a/.cvsignore b/.cvsignore
index add3166..2d5c672 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -99,3 +99,4 @@ audit-1.7.10.tar.gz
 audit-1.7.11.tar.gz
 audit-1.7.12.tar.gz
 audit-1.7.13.tar.gz
+audit-2.0.tar.gz
diff --git a/audit.spec b/audit.spec
index 2d5bfc1..66ebed1 100644
--- a/audit.spec
+++ b/audit.spec
@@ -1,23 +1,17 @@
-%define audit_version 1.7.13
-%define audit_release 2%{?dist}
-%define sca_version 0.4.8
-%define sca_release 21
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Summary: User space tools for 2.6 kernel auditing
 Name: audit
-Version: %{audit_version}
-Release: %{audit_release}
+Version: 2.0
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://people.redhat.com/sgrubb/audit/
 Source0: http://people.redhat.com/sgrubb/audit/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: gettext-devel intltool libtool swig python-devel
-BuildRequires: tcp_wrappers-devel 
-BuildRequires: kernel-headers >= 2.6.18
-BuildRequires: automake >= 1.9
-BuildRequires: autoconf >= 2.59
+BuildRequires: swig python-devel
+BuildRequires: tcp_wrappers-devel libcap-ng-devel 
+BuildRequires: kernel-headers >= 2.6.29
 Requires: %{name}-libs = %{version}-%{release}
 Requires: chkconfig
 Requires(pre): coreutils
@@ -41,7 +35,7 @@ Summary: Header files and static library for libaudit
 License: LGPLv2+
 Group: Development/Libraries
 Requires: %{name}-libs = %{version}-%{release}
-Requires: kernel-headers >= 2.6.18
+Requires: kernel-headers >= 2.6.29
 
 %description libs-devel
 The audit-libs-devel package contains the static libraries and header 
@@ -74,24 +68,11 @@ interface to the audit system, audispd. These plugins can do things
 like relay events to remote machines or analyze events for suspicious
 behavior.
 
-%package -n system-config-audit
-Summary: Utility for editing audit configuration
-Version: %{sca_version}
-Release: %{sca_release}%{?dist}
-License: GPLv2+
-Group: Applications/System
-BuildRequires: desktop-file-utils
-Requires: pygtk2-libglade usermode usermode-gtk
-Requires: %{name}-libs = %{audit_version}-%{audit_release}
-
-%description -n system-config-audit
-A graphical utility for editing audit configuration.
-
 %prep
 %setup -q
 
 %build
-%configure --sbindir=/sbin --libdir=/%{_lib} --with-prelude --with-libwrap --enable-gssapi-krb5=no
+%configure --sbindir=/sbin --libdir=/%{_lib} --with-prelude --with-libwrap --enable-gssapi-krb5=no --with-libcap-ng=yes
 make %{?_smp_mflags}
 
 %install
@@ -102,7 +83,6 @@ mkdir -p $RPM_BUILD_ROOT/%{_lib}
 mkdir -p $RPM_BUILD_ROOT/%{_libdir}/audit
 mkdir -p $RPM_BUILD_ROOT/%{_var}/log/audit
 make DESTDIR=$RPM_BUILD_ROOT %{?_smp_mflags} install
-make -C system-config-audit DESTDIR=$RPM_BUILD_ROOT install-fedora
 
 mkdir -p $RPM_BUILD_ROOT/%{_libdir}
 # This winds up in the wrong place when libtool is involved
@@ -130,13 +110,6 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/python?.?/site-packages/auparse.la
 # On platforms with 32 & 64 bit libs, we need to coordinate the timestamp
 touch -r ./audit.spec $RPM_BUILD_ROOT/etc/libaudit.conf
 
-%find_lang system-config-audit
-
-desktop-file-install					\
-	--dir $RPM_BUILD_ROOT/%{_datadir}/applications	\
-	--delete-original				\
-	system-config-audit/system-config-audit.desktop
-
 %ifnarch ppc ppc64
 %check
 make check
@@ -164,13 +137,13 @@ if [ $1 -ge 1 ]; then
 fi
 
 %files libs
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %attr(755,root,root) /%{_lib}/libaudit.*
 %attr(755,root,root) /%{_lib}/libauparse.*
 %config(noreplace) %attr(640,root,root) /etc/libaudit.conf
 
 %files libs-devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc contrib/skeleton.c contrib/plugin
 %{_libdir}/libaudit.a
 %{_libdir}/libauparse.a
@@ -182,7 +155,7 @@ fi
 %{_mandir}/man3/*
 
 %files libs-python
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %attr(755,root,root) %{python_sitearch}/_audit.so
 %attr(755,root,root) %{python_sitearch}/auparse.so
 %{python_sitearch}/audit.py*
@@ -242,22 +215,10 @@ fi
 %attr(644,root,root) %{_mandir}/man5/audisp-remote.conf.5.gz
 %attr(644,root,root) %{_mandir}/man8/audisp-remote.8.gz
 
-%files -n system-config-audit -f system-config-audit.lang
-%defattr(-,root,root,-)
-%doc system-config-audit/AUTHORS
-%doc system-config-audit/COPYING
-%doc system-config-audit/ChangeLog
-%doc system-config-audit/NEWS
-%doc system-config-audit/README
-%{_bindir}/system-config-audit
-%{_datadir}/applications/system-config-audit.desktop
-%{_datadir}/system-config-audit
-%{_libexecdir}/system-config-audit-server-real
-%{_libexecdir}/system-config-audit-server
-%config(noreplace) %{_sysconfdir}/pam.d/system-config-audit-server
-%config(noreplace) %{_sysconfdir}/security/console.apps/system-config-audit-server
-
 %changelog
+* Tue Aug 18 2009 Steve Grubb <sgrubb@redhat.com> 2.0-1
+- New upstream release
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7.13-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
diff --git a/sources b/sources
index 2d7d334..bfa443c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-967776cbec046043ef02ffefe0e89cb7  audit-1.7.13.tar.gz
+d0c064c4646f8fe5c50de789c627f2da  audit-2.0.tar.gz