From: Harvie <tomas@mudrunka.cz>
Date: Sat, 30 Oct 2010 13:42:47 +0000 (+0200)
Subject: Added some workarounds to AppArmor + color messages as bonus :-)
X-Git-Url: https://git.harvie.cz/?a=commitdiff_plain;h=7bf59e8a4357cbe0e79ac00a20cb5baab041ed95;p=mirrors%2FArchLinux-Packages.git

Added some workarounds to AppArmor + color messages as bonus :-)
---

diff --git a/apparmor/PKGBUILD b/apparmor/PKGBUILD
index 58004b1..a41e16f 100644
--- a/apparmor/PKGBUILD
+++ b/apparmor/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=apparmor
 pkgver=2.5.1
-pkgrel=4
+pkgrel=5
 pkgdesc="Linux application security framework - mandatory access control for programs"
 arch=(i686 x86_64)
 license=(GPL)
@@ -23,11 +23,13 @@ md5sums=('76b37656bf42fedab0d0b9d47e690a8b')
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 
+	msg2 'Global configuration'
 	export MAKEFLAGS+=' POD2MAN=/usr/lib/perl5/core_perl/bin/pod2man'
 	export MAKEFLAGS+=' POD2HTML=/usr/lib/perl5/core_perl/bin/pod2html'
 	export MAKEFLAGS+=' PROVE=/usr/lib/perl5/core_perl/bin/prove'
 	export PYTHON='/usr/bin/python2'
 
+	msg2 'Patching...'
 	#Patch (maybe we can avoid patching by ./configuring things better)
 	patch=parser/Makefile; { rm "$patch"
 		sed -e 's/pdflatex/true/g' > "$patch" #just workaround until we'll get pdflatex package
@@ -35,12 +37,12 @@ build() {
 	echo '#!/bin/true' > parser/tst/caching.sh #Can't pass this test with current kernel
 
 
-	#Build (these sections can be used for splitpkg in future...)
-	( cd parser
+	msg 'Build (these sections can be used for splitpkg in future...)'
+	( cd parser; msg2 "${PWD##*/}"
 		make
 		make install DESTDIR=${pkgdir}
 		)
-	( cd libraries/libapparmor
+	( cd libraries/libapparmor; msg2 "${PWD##*/}"
 		./autogen.sh
 		./configure --prefix=/usr --with-perl --with-python --with-ruby
 		make
@@ -48,31 +50,39 @@ build() {
 		#FIXME: this file should install automatically:
 		cp swig/perl/LibAppArmor.pm ${pkgdir}/usr/lib/perl5/vendor_perl/
 		)
-	( cd utils
+	( cd utils; msg2 "${PWD##*/}"
 		make
 		make install DESTDIR=${pkgdir}
 		)
-	( cd profiles
+	( cd profiles; msg2 "${PWD##*/}"
 		make
 		make install DESTDIR=${pkgdir}
 		)
-	( cd deprecated/management/profile-editor
+
+	#FIXME: depends on this package itself (logparse.h,...):
+	#We should build it in splitpkg with proper dependences
+	#Now you can build, install, build and install again to enable:
+	if pacman -Qi apparmor &>/dev/null; then
+
+	( cd deprecated/management/profile-editor; msg2 "${PWD##*/}"
 		./macros/autogen.sh
 		./configure --prefix=/usr
 		make
 		make install DESTDIR=${pkgdir}
 		)
-	( cd deprecated/management/apparmor-dbus
+	( cd deprecated/management/apparmor-dbus; msg2 "${PWD##*/}"
 		./autogen.sh
 		./configure --prefix=/usr
 		make
 		make install DESTDIR=${pkgdir}
 		)
 	#FIXME: can't build this:
-	#( cd deprecated/management/applets/apparmorapplet-gnome
+	#( cd deprecated/management/applets/apparmorapplet-gnome; msg2 "${PWD##*/}"
 	#	./autogen.sh
 	#	./configure --prefix=/usr
 	#	make
 	#	make install DESTDIR=${pkgdir}
 	#	)
+
+	fi;
 }