[arch-commits] Commit in audit/trunk (PKGBUILD python2.patch)

[Massimiliano Torromeo]

    Date: Thursday, September 5, 2013 @ 11:27:43
  Author: mtorromeo
Revision: 96791

upgpkg: audit 2.3.2-1

Updated to version 2.3.2

Modified:
  audit/trunk/PKGBUILD
Deleted:
  audit/trunk/python2.patch

---------------+
 PKGBUILD      |   20 ++++++++------------
 python2.patch |   11 -----------
 2 files changed, 8 insertions(+), 23 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-09-05 08:50:02 UTC (rev 96790)
+++ PKGBUILD	2013-09-05 09:27:43 UTC (rev 96791)
@@ -4,10 +4,10 @@
 # Contributor: henning mueller <henning at orgizm.net>
 
 pkgname=audit
-pkgver=2.2.3
-pkgrel=4
+pkgver=2.3.2
+pkgrel=1
 pkgdesc='User space utilities for storing and searching the audit records generated by the audit subsystem in the Linux kernel.'
-url=http://people.redhat.com/sgrubb/$pkgname
+url="http://people.redhat.com/sgrubb/$pkgname"
 arch=(i686 x86_64)
 depends=(krb5 libcap-ng)
 makedepends=(libldap swig linux-headers python2)
@@ -15,7 +15,7 @@
 options=(!libtool emptydirs)
 backup=(
 	etc/libaudit.conf
-	etc/audit/audit.rules
+	etc/audit/rules.d/audit.rules
 	etc/audit/auditd.conf
 	etc/audisp/audispd.conf
 	etc/audisp/audisp-remote.conf
@@ -25,14 +25,11 @@
 	etc/audisp/plugins.d/au-remote.conf
 	etc/audisp/plugins.d/syslog.conf
 )
-source=(
-	$url/$pkgname-$pkgver.tar.gz
-	python2.patch
-)
+source=("$url/$pkgname-$pkgver.tar.gz")
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
-	patch -p0 -i "$srcdir/python2.patch"
+	export PYTHON=/usr/bin/python2
 	./configure \
 		--prefix=/usr \
 		--sbindir=/usr/bin \
@@ -51,7 +48,7 @@
 
 	cd "$pkgdir"
 	install -d var/log/audit
-	rm -rf etc/rc.d etc/sysconfig
+	rm -rf etc/rc.d etc/sysconfig usr/lib/audit
 
 	sed -ri 's|/sbin|/usr/bin|' \
 		etc/audit/*.conf \
@@ -61,5 +58,4 @@
 	chmod 644 usr/lib/systemd/system/auditd.service
 }
 
-sha256sums=('2fc8f97020121593f516dc011ef61f39043c4cea9b2cb9ab3849bf9e41dedf02'
-            '6adadb405bebe99bb6a50e80e7c1a356996626e135d566283448fe4019fff3a4')
+sha256sums=('8872e0b5392888789061db8034164305ef0e1b34543e1e7004d275f039081d29')

Deleted: python2.patch
===================================================================
--- python2.patch	2013-09-05 08:50:02 UTC (rev 96790)
+++ python2.patch	2013-09-05 09:27:43 UTC (rev 96791)
@@ -1,11 +0,0 @@
---- configure.orig	2013-01-16 09:19:32.475800853 +0100
-+++ configure	2013-01-16 09:20:45.764146581 +0100
-@@ -13076,7 +13076,7 @@
- 
-         # Find any Python interpreter.
-     if test -z "$PYTHON"; then
--      for ac_prog in python python2 python3 python3.2 python3.1 python3.0 python2.7  python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0
-+      for ac_prog in python2
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2