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

[Maxime Gauduin]

    Date: Thursday, March 7, 2013 @ 00:48:35
  Author: alucryd
Revision: 85768

upgpkg: firewalld 0.2.12-6

Modified:
  firewalld/trunk/PKGBUILD
  firewalld/trunk/firewalld.install
Deleted:
  firewalld/trunk/python2.patch

-------------------+
 PKGBUILD          |   19 +++++-------
 firewalld.install |    1 
 python2.patch     |   79 ----------------------------------------------------
 3 files changed, 8 insertions(+), 91 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-03-06 23:21:50 UTC (rev 85767)
+++ PKGBUILD	2013-03-06 23:48:35 UTC (rev 85768)
@@ -5,19 +5,19 @@
 
 pkgname=firewalld
 pkgver=0.2.12
-pkgrel=5
+pkgrel=6
 pkgdesc="Firewall service daemon that provides a dynamic customizable firewall with a D-BUS interface"
 arch=('any')
 url="http://fedorahosted.org/firewalld"
 license=('GPL2')
-depends=('desktop-file-utils' 'ebtables' 'gtk3' 'hicolor-icon-theme' 'iptables' 'python2-slip')
+depends=('ebtables' 'gtk3' 'hicolor-icon-theme' 'iptables' 'libnotify' 'networkmanager' 'python2-slip')
 makedepends=('intltool')
+backup=('etc/conf.d/firewalld' 'etc/firewalld/firewalld.conf')
 install=${pkgname}.install
-source=("http://fedorahosted.org/released/${pkgname}/${pkgname}-${pkgver}.tar.bz2" 'default-zone.patch' 'paths.patch' 'python2.patch')
+source=("http://fedorahosted.org/released/${pkgname}/${pkgname}-${pkgver}.tar.bz2" 'default-zone.patch' 'paths.patch')
 sha256sums=('02da3b1660ba87056615f64714dcdcc13694e953d07fb415b1b23d57d94b3071'
             '32e12e9b6e70b0ea9e0714d770dedf17b4732c563e41a35616b8106a6141146f'
-            '97b9f97b91cb188e51fbabcdde43de26abc7b17e8ee6de1c6450ca606d291754'
-            'cb5f73c1c7622c35552d60c6e774d82cf11f4d5794238b50e02799c9f88cb558')
+            '97b9f97b91cb188e51fbabcdde43de26abc7b17e8ee6de1c6450ca606d291754')
 
 build() {
   cd "${srcdir}"/${pkgname}-${pkgver}
@@ -25,7 +25,9 @@
 # Patches
   patch -Np1 -i "${srcdir}"/default-zone.patch
   patch -Np1 -i "${srcdir}"/paths.patch
-  patch -Np1 -i "${srcdir}"/python2.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 ./autogen.sh --prefix=/usr --sysconfdir=/etc --disable-schemas-compile
@@ -37,11 +39,6 @@
 
 # Install
   make DESTDIR="${pkgdir}" install
-
-# Fix permissions
-  find "${pkgdir}" -type d -exec chmod 755 {} +
-  find "${pkgdir}" -type f -exec chmod 644 {} +
-  chmod -R 755 "${pkgdir}"/usr/{bin,sbin}
 }
 
 # vim: ts=2 sw=2 et:

Modified: firewalld.install
===================================================================
--- firewalld.install	2013-03-06 23:21:50 UTC (rev 85767)
+++ firewalld.install	2013-03-06 23:48:35 UTC (rev 85768)
@@ -1,7 +1,6 @@
 post_install() {
   glib-compile-schemas usr/share/glib-2.0/schemas
   gtk-update-icon-cache -ftq usr/share/icons/hicolor
-  update-desktop-database -q
 }
 
 post_upgrade() {

Deleted: python2.patch
===================================================================
--- python2.patch	2013-03-06 23:21:50 UTC (rev 85767)
+++ python2.patch	2013-03-06 23:48:35 UTC (rev 85768)
@@ -1,79 +0,0 @@
---- a/fix_python_shebang.sh
-+++ b/fix_python_shebang.sh
-@@ -1,3 +1,3 @@
- #!/bin/bash
- 
--sed -e "s@^#\!/usr/bin/python\$@#\!/usr/bin/python -Es@" -i $@
-+sed -e "s@^#\!/usr/bin/python2\$@#\!/usr/bin/python2 -Es@" -i $@
---- a/src/firewall-applet
-+++ b/src/firewall-applet
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2
- # -*- coding: utf-8 -*-
- #
- # Copyright (C) 2010-2012 Red Hat, Inc.
---- a/src/firewall-cmd
-+++ b/src/firewall-cmd
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2
- # -*- coding: utf-8 -*-
- #
- # Copyright (C) 2009-2012 Red Hat, Inc.
---- a/src/firewall-config
-+++ b/src/firewall-config
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2
- # -*- coding: utf-8 -*-
- #
- # Copyright (C) 2011-2012 Red Hat, Inc.
---- a/src/firewall-offline-cmd
-+++ b/src/firewall-offline-cmd
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2
- # -*- coding: utf-8 -*-
- #
- # Copyright (C) 2009-2012 Red Hat, Inc.
---- a/src/firewalld
-+++ b/src/firewalld
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2
- # -*- coding: utf-8 -*-
- #
- # Copyright (C) 2010-2012 Red Hat, Inc.
---- a/src/gtk3_chooserbutton.py
-+++ b/src/gtk3_chooserbutton.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/python -Es
-+#!/usr/bin/python2 -Es
- # -*- coding: utf-8 -*-
- #
- # Copyright (C) 2008,2012 Red Hat, Inc.
---- a/src/tests/firewalld_config.py
-+++ b/src/tests/firewalld_config.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2
- # -*- coding: utf-8 -*-
- #
- # Copyright (C) 2010-2012 Red Hat, Inc.
---- a/src/tests/firewalld_direct.py
-+++ b/src/tests/firewalld_direct.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2
- # -*- coding: utf-8 -*-
- #
- # Copyright (C) 2012 Red Hat, Inc.
---- a/src/tests/firewalld_test.py
-+++ b/src/tests/firewalld_test.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2
- # -*- coding: utf-8 -*-
- #
- # Copyright (C) 2010-2012 Red Hat, Inc.