[shorewall/el5: 10/10] Merge branch 'master' into el5

[Jonathan G. Underwood]

commit 5144f7b284e9d5c771bea014c8bbea861409fd56
Merge: 6c5570e af60e8b
Author: Jonathan G. Underwood <jonathan.underwood at gmail.com>
Date:   Thu Jul 21 01:39:15 2011 +0100

    Merge branch 'master' into el5
    
    Conflicts:
    	shorewall.spec

 .gitignore              |   10 +++
 shorewall-lite.service  |   16 ++++
 shorewall.service       |   16 ++++
 shorewall.spec          |  194 ++++++++++++++++-------------------------------
 shorewall6-lite.service |   16 ++++
 shorewall6.service      |   16 ++++
 sources                 |   10 +-
 7 files changed, 144 insertions(+), 134 deletions(-)
---
diff --cc shorewall.spec
index a9e8331,e699515..e6f9803
--- a/shorewall.spec
+++ b/shorewall.spec
@@@ -1,5 -1,4 +1,4 @@@
- 
 -%global _baseurl http://www.shorewall.net/pub/shorewall/4.4/shorewall-%{mainver}/
 +%global _baseurl http://www.shorewall.net/pub/shorewall/4.4/shorewall-%{version}/
  # A very helpful document for packaging Shorewall is "Anatomy of Shorewall 4.0"
  # which is found at http://www.shorewall.net/Anatomy.html
  
@@@ -131,9 -131,10 +133,11 @@@ find . -name "lib.*" -exec sed -i -e '/
  %build
  
  %install
 +rm -rf $RPM_BUILD_ROOT
  export PREFIX=$RPM_BUILD_ROOT
  export DEST=%{_initrddir}
+ export LIBEXEC=%{_libexecdir}
+ export PERLIB=%{perl_vendorlib}
  
  targets="shorewall-%{version} shorewall-lite-%{version} \
  shorewall6-%{version} shorewall6-lite-%{version} \