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

[Maxime Gauduin]

    Date: Sunday, March 31, 2013 @ 22:43:55
  Author: alucryd
Revision: 87449

upgpkg: python2-slip 0.4.0-1

Modified:
  python2-slip/trunk/PKGBUILD
Deleted:
  python2-slip/trunk/python2.patch

---------------+
 PKGBUILD      |   18 +++++++-----------
 python2.patch |   54 ------------------------------------------------------
 2 files changed, 7 insertions(+), 65 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-03-31 20:30:15 UTC (rev 87448)
+++ PKGBUILD	2013-03-31 20:43:55 UTC (rev 87449)
@@ -2,22 +2,22 @@
 # Maintainer: Maxime Gauduin <alucryd at gmail.com>
 
 pkgname=python2-slip
-pkgver=0.2.24
-pkgrel=4
+pkgver=0.4.0
+pkgrel=1
 pkgdesc="Simple Library for Python"
 arch=('any')
 url="http://fedorahosted.org/python-slip"
 license=('GPL2')
-depends=('gtk2' 'polkit' 'python2-dbus' 'python2-gobject' 'python2-decorator' 'pygtk')
-source=("http://fedorahosted.org/released/python-slip/python-slip-${pkgver}.tar.bz2" 'python2.patch')
-sha256sums=('ffd4c1beca05b0af9f30923e9304c97e714e2c7e535ff4ccee0486d2d7e7e08b'
-            '9637162d79de637616737977bc4717c1e746435643225f25a19999e48c2b3524')
+depends=('gtk2' 'polkit' 'pygtk' 'python2-dbus' 'python2-decorator' 'python2-gobject')
+source=("http://fedorahosted.org/released/python-slip/python-slip-${pkgver}.tar.bz2")
+sha256sums=('db5afa59681e17f59559c5e1cc32447ae138120ea3058111dd5c61745e079212')
 
 build() {
   cd "${srcdir}"/python-slip-${pkgver}
 
 # Patch
-  patch -Np1 -i "${srcdir}"/python2.patch
+  sed -i 's|^#!.*python$|#!/usr/bin/python2|' $(grep -rl '^#!.*python')
+  sed -i 's|python|python2|g' py_rules.mk
 
 # Build
   make
@@ -28,10 +28,6 @@
 
 # Install
   make DESTDIR="${pkgdir}" install
-
-# Fix permissions
-  find "${pkgdir}" -type d -exec chmod 755 {} +
-  find "${pkgdir}" -type f -exec chmod 644 {} +
 }
 
 # vim: ts=2 sw=2 et:

Deleted: python2.patch
===================================================================
--- python2.patch	2013-03-31 20:30:15 UTC (rev 87448)
+++ python2.patch	2013-03-31 20:43:55 UTC (rev 87449)
@@ -1,54 +0,0 @@
---- a/doc/dbus/example/example-conf-client.py
-+++ b/doc/dbus/example/example-conf-client.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2
- # -*- coding: utf-8 -*-
- 
- import dbus
---- a/doc/dbus/example/example-conf-mechanism.py
-+++ b/doc/dbus/example/example-conf-mechanism.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2
- # -*- coding: utf-8 -*-
- 
- import gobject
---- a/py_rules.mk
-+++ b/py_rules.mk
-@@ -33,15 +33,15 @@ $(_SETUP_PY):	$(_SETUP_PY).in $(PKGNAME).spec
- 
- py-build-ext:	$(_SETUP_PY) $(PY_SOURCES)
- 	cd $(PY_TOPDIR); \
--	python $(SETUP_PY) build_ext -i
-+	python2 $(SETUP_PY) build_ext -i
- 
- py-build:   $(_SETUP_PY) $(PY_SOURCES)
- 	cd $(PY_TOPDIR); \
--	python $(SETUP_PY) build
-+	python2 $(SETUP_PY) build
- 
- py-install:	$(_SETUP_PY)
- 	cd $(PY_TOPDIR); \
--	python $(SETUP_PY) install -O1 \
-+	python2 $(SETUP_PY) install -O1 \
- 		--root $(DESTDIR) \
- 		--prefix $(PREFIX) \
- 		--exec-prefix $(EXEC_PREFIX) \
-@@ -49,7 +49,7 @@ py-install:	$(_SETUP_PY)
- 
- py-clean:	$(_SETUP_PY)
- 	cd $(PY_TOPDIR); \
--	python $(SETUP_PY) clean; \
-+	python2 $(SETUP_PY) clean; \
- 	rm -f $(SETUP_PY); \
- 	rm -rf build
- 
---- a/setup.py.in
-+++ b/setup.py.in
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2
- # -*- coding: utf-8 -*-
- 
- from distutils.core import setup