Cleaned up apparmor bit

diff --git a/apparmor/PKGBUILD b/apparmor/PKGBUILD
index a5f867546e72906ad880ffff5735999eeb65c77c..a79cfd6aed5531585a300b68f62d3a17901a10d8 100644 (file)
--- a/apparmor/PKGBUILD
+++ b/apparmor/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=apparmor
 pkgver=2.5.1
-pkgrel=3
+pkgrel=4
 pkgdesc="Linux application security framework - mandatory access control for programs"
 arch=(i686 x86_64)
 license=(GPL)
@@ -23,15 +23,12 @@ md5sums=('76b37656bf42fedab0d0b9d47e690a8b')
 build() {
        cd "${srcdir}/${pkgname}-${pkgver}"
 
-       #Patch
-       patch=common/Make.rules; { rm "$patch"
-               sed -e 's/\/usr\/bin\/pod2man/\/usr\/lib\/perl5\/core_perl\/bin\/pod2man/g' |
-               sed -e 's/\/usr\/bin\/pod2html/\/usr\/lib\/perl5\/core_perl\/bin\/pod2html/g' > "$patch"
-       } < "$patch"
+       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'
 
-       patch=parser/tst/Makefile; { rm "$patch"
-               sed -e 's/\/usr\/bin\/prove/\/usr\/lib\/perl5\/core_perl\/bin\/prove/g' > "$patch"
-       } < "$patch"
+       #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
        } < "$patch"
@@ -44,11 +41,12 @@ build() {
                make install DESTDIR=${pkgdir}
                )
        ( cd libraries/libapparmor
-               export PYTHON=/usr/bin/python2
                ./autogen.sh
                ./configure --prefix=/usr --with-perl --with-python --with-ruby
                make
                make install DESTDIR=${pkgdir}
+               #FIXME: this file should install automatically:
+               cp swig/perl/LibAppArmor.pm ${pkgdir}/usr/lib/perl5/vendor_perl/
                )
        ( cd utils
                make
@@ -70,6 +68,7 @@ build() {
                make
                make install DESTDIR=${pkgdir}
                )
+       #FIXME: can't build this:
        #( cd deprecated/management/applets/apparmorapplet-gnome
        #       ./autogen.sh
        #       ./configure --prefix=/usr