[arch-commits] Commit in firewalld/trunk (PKGBUILD default-zone.patch)

[Maxime Gauduin]

    Date: Friday, May 3, 2013 @ 09:54:04
  Author: alucryd
Revision: 89840

upgpkg: firewalld 0.3.2-1

Modified:
  firewalld/trunk/PKGBUILD
Deleted:
  firewalld/trunk/default-zone.patch

--------------------+
 PKGBUILD           |   16 +++++++++-------
 default-zone.patch |   11 -----------
 2 files changed, 9 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-03 06:49:03 UTC (rev 89839)
+++ PKGBUILD	2013-05-03 07:54:04 UTC (rev 89840)
@@ -4,7 +4,7 @@
 # Contributor: speed145a <jonathan at tagchapter dot com>
 
 pkgname=firewalld
-pkgver=0.3.1
+pkgver=0.3.2
 pkgrel=1
 pkgdesc="A firewall daemon with D-BUS interface providing a dynamic firewall"
 arch=('any')
@@ -15,27 +15,29 @@
 backup=('etc/conf.d/firewalld' 'etc/firewalld/firewalld.conf')
 install=${pkgname}.install
 source=("http://fedorahosted.org/released/${pkgname}/${pkgname}-${pkgver}.tar.bz2" 'paths.patch')
-sha256sums=('069791fbc12bc1751ffb62bcf5a8ed45640d45e3edcdb9a2af3f4ed4b6fdc6d0'
+sha256sums=('aa52ea143d6df474f81f599f148d9db4c8f54fd78c5878ab3ae9b461584bd68e'
             'ee826f06ec8d8fc964d63005850dbc8da9058a3d49b5ccd5df21c7dd52b3de7f')
 
-build() {
+prepare() {
   cd "${srcdir}"/${pkgname}-${pkgver}
 
-# Patches
   patch -Np1 -i "${srcdir}"/paths.patch
   sed -i 's|^#!.*python$|#!/usr/bin/python2|
           s|^#!.*python -Es$|#!/usr/bin/python2|' $(grep -rl '^#!.*python')
   sed -i 's|python|python2|g' fix_python_shebang.sh
+}
 
-# Build
-  PYTHON=python2 ./configure --prefix=/usr --sysconfdir=/etc --disable-schemas-compile
+build() {
+  cd "${srcdir}"/${pkgname}-${pkgver}
+
+  export  PYTHON=python2
+  ./configure --prefix=/usr --sysconfdir=/etc --disable-schemas-compile
   make
 }
 
 package() {
   cd "${srcdir}"/${pkgname}-${pkgver}
 
-# Install
   make DESTDIR="${pkgdir}" install
 }
 

Deleted: default-zone.patch
===================================================================
--- default-zone.patch	2013-05-03 06:49:03 UTC (rev 89839)
+++ default-zone.patch	2013-05-03 07:54:04 UTC (rev 89840)
@@ -1,11 +0,0 @@
---- a/src/firewall/core/io/firewalld_conf.py
-+++ b/src/firewall/core/io/firewalld_conf.py
-@@ -37,7 +37,7 @@ class firewalld_conf:
-         self._deleted = [ ]
- 
-     def get(self, key):
--        self._config.get(key.strip())
-+        return self._config.get(key.strip())
- 
-     def set(self, key, value):
-         _key = key.strip()