Date: Thursday, March 6, 2014 @ 11:57:48
Author: andrea
Revision: 206929
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
pysmbc/repos/extra-i686/PKGBUILD
(from rev 206928, pysmbc/trunk/PKGBUILD)
pysmbc/repos/extra-i686/pkg-config.patch
(from rev 206928, pysmbc/trunk/pkg-config.patch)
pysmbc/repos/extra-x86_64/PKGBUILD
(from rev 206928, pysmbc/trunk/PKGBUILD)
pysmbc/repos/extra-x86_64/pkg-config.patch
(from rev 206928, pysmbc/trunk/pkg-config.patch)
Deleted:
pysmbc/repos/extra-i686/PKGBUILD
pysmbc/repos/extra-x86_64/PKGBUILD
-------------------------------+
/PKGBUILD | 62 ++++++++++++++++++++++++++++++++++++++++
extra-i686/PKGBUILD | 24 ---------------
extra-i686/pkg-config.patch | 58 +++++++++++++++++++++++++++++++++++++
extra-x86_64/PKGBUILD | 24 ---------------
extra-x86_64/pkg-config.patch | 58 +++++++++++++++++++++++++++++++++++++
5 files changed, 178 insertions(+), 48 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2014-03-06 10:57:40 UTC (rev 206928)
+++ extra-i686/PKGBUILD 2014-03-06 10:57:48 UTC (rev 206929)
@@ -1,24 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <and...@archlinux.org>
-# Contributor: Shane Peelar <lookatyouhacker@gm@il(d0t)c0m>
-
-pkgname=pysmbc
-pkgver=1.0.13
-pkgrel=1
-pkgdesc="Python bindings for libsmbclient"
-arch=('i686' 'x86_64')
-url="http://pypi.python.org/pypi/pysmbc/";
-license=('GPL')
-depends=('python2' 'smbclient')
-source=("http://pypi.python.org/packages/source/p/${pkgname}/${pkgname}-${pkgver}.tar.bz2";)
-md5sums=('019dbb3bc6ee217f7389a2330cda9fe0')
-
-build(){
- cd "${srcdir}/${pkgname}-${pkgver}"
- python2 setup.py build
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- python2 setup.py install --root="$pkgdir" --optimize=1
-}
Copied: pysmbc/repos/extra-i686/PKGBUILD (from rev 206928,
pysmbc/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2014-03-06 10:57:48 UTC (rev 206929)
@@ -0,0 +1,31 @@
+# $Id$
+# Maintainer: Andrea Scarpino <and...@archlinux.org>
+# Contributor: Shane Peelar <lookatyouhacker@gm@il(d0t)c0m>
+
+pkgname=pysmbc
+pkgver=1.0.13
+pkgrel=2
+pkgdesc="Python bindings for libsmbclient"
+arch=('i686' 'x86_64')
+url="http://pypi.python.org/pypi/pysmbc/";
+license=('GPL')
+depends=('python2' 'smbclient')
+source=("http://pypi.python.org/packages/source/p/${pkgname}/${pkgname}-${pkgver}.tar.bz2";
+ 'pkg-config.patch')
+md5sums=('019dbb3bc6ee217f7389a2330cda9fe0'
+ '4b1d5498780181cdc9a217894c1cf85c')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+ patch -p1 -i "${srcdir}"/pkg-config.patch
+}
+
+build(){
+ cd ${pkgname}-${pkgver}
+ python2 setup.py build
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+ python2 setup.py install --root="$pkgdir" --optimize=1
+}
Copied: pysmbc/repos/extra-i686/pkg-config.patch (from rev 206928,
pysmbc/trunk/pkg-config.patch)
===================================================================
--- extra-i686/pkg-config.patch (rev 0)
+++ extra-i686/pkg-config.patch 2014-03-06 10:57:48 UTC (rev 206929)
@@ -0,0 +1,58 @@
+diff -up pysmbc-1.0.13/Makefile.pkg-config pysmbc-1.0.13/Makefile
+--- pysmbc-1.0.13/Makefile.pkg-config 2010-08-22 15:59:36.000000000 +0100
++++ pysmbc-1.0.13/Makefile 2012-11-21 12:44:29.051173967 +0000
+@@ -4,7 +4,7 @@ SDIST_ARGS=--formats=bztar -d.
+
+ smbc.so: force
+ python setup.py build
+- mv build/lib*/$@ .
++ mv build/lib*/smbc*.so .
+
+ doc: smbc.so
+ rm -rf html
+@@ -14,7 +14,7 @@ doczip: doc
+ cd html && zip ../smbc-html.zip *
+
+ clean:
+- -rm -rf build smbc.so *.pyc tests/*.pyc *~ tests/*~
++ -rm -rf build smbc*.so *.pyc tests/*.pyc *~ tests/*~
+
+ dist:
+ python setup.py sdist $(SDIST_ARGS)
+diff -up pysmbc-1.0.13/setup.py.pkg-config pysmbc-1.0.13/setup.py
+--- pysmbc-1.0.13/setup.py.pkg-config 2012-02-15 16:12:44.000000000 +0000
++++ pysmbc-1.0.13/setup.py 2012-11-21 12:45:05.362285519 +0000
+@@ -1,6 +1,6 @@
+ #!/usr/bin/env python
+
+-## Copyright (C) 2002, 2005, 2006, 2007, 2008, 2010, 2011 Red Hat, Inc
++## Copyright (C) 2002, 2005, 2006, 2007, 2008, 2010, 2011, 2012 Red Hat, Inc
+ ## Copyright (C) 2010 Open Source Solution Technology Corporation
+ ## Authors:
+ ## Tim Waugh <twa...@redhat.com>
+@@ -51,6 +51,18 @@ hello
+ """
+
+ from distutils.core import setup, Extension
++import subprocess
++
++def pkgconfig_I (pkg):
++ dirs = []
++ c = subprocess.Popen (["pkg-config", "--cflags", pkg],
++ stdout=subprocess.PIPE)
++ (stdout, stderr) = c.communicate ()
++ for p in stdout.decode (encoding='ascii').split ():
++ if p.startswith ("-I"):
++ dirs.append (p[2:])
++ return dirs
++
+ setup (name="pysmbc",
+ version="1.0.13",
+ description="Python bindings for libsmbclient",
+@@ -74,4 +86,5 @@ setup (name="pysmbc",
+ "dir.c",
+ "file.c",
+ "smbcdirent.c"],
+- libraries=["smbclient"])])
++ libraries=["smbclient"],
++ include_dirs=pkgconfig_I("smbclient"))])
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2014-03-06 10:57:40 UTC (rev 206928)
+++ extra-x86_64/PKGBUILD 2014-03-06 10:57:48 UTC (rev 206929)
@@ -1,24 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <and...@archlinux.org>
-# Contributor: Shane Peelar <lookatyouhacker@gm@il(d0t)c0m>
-
-pkgname=pysmbc
-pkgver=1.0.13
-pkgrel=1
-pkgdesc="Python bindings for libsmbclient"
-arch=('i686' 'x86_64')
-url="http://pypi.python.org/pypi/pysmbc/";
-license=('GPL')
-depends=('python2' 'smbclient')
-source=("http://pypi.python.org/packages/source/p/${pkgname}/${pkgname}-${pkgver}.tar.bz2";)
-md5sums=('019dbb3bc6ee217f7389a2330cda9fe0')
-
-build(){
- cd "${srcdir}/${pkgname}-${pkgver}"
- python2 setup.py build
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- python2 setup.py install --root="$pkgdir" --optimize=1
-}
Copied: pysmbc/repos/extra-x86_64/PKGBUILD (from rev 206928,
pysmbc/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2014-03-06 10:57:48 UTC (rev 206929)
@@ -0,0 +1,31 @@
+# $Id$
+# Maintainer: Andrea Scarpino <and...@archlinux.org>
+# Contributor: Shane Peelar <lookatyouhacker@gm@il(d0t)c0m>
+
+pkgname=pysmbc
+pkgver=1.0.13
+pkgrel=2
+pkgdesc="Python bindings for libsmbclient"
+arch=('i686' 'x86_64')
+url="http://pypi.python.org/pypi/pysmbc/";
+license=('GPL')
+depends=('python2' 'smbclient')
+source=("http://pypi.python.org/packages/source/p/${pkgname}/${pkgname}-${pkgver}.tar.bz2";
+ 'pkg-config.patch')
+md5sums=('019dbb3bc6ee217f7389a2330cda9fe0'
+ '4b1d5498780181cdc9a217894c1cf85c')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+ patch -p1 -i "${srcdir}"/pkg-config.patch
+}
+
+build(){
+ cd ${pkgname}-${pkgver}
+ python2 setup.py build
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+ python2 setup.py install --root="$pkgdir" --optimize=1
+}
Copied: pysmbc/repos/extra-x86_64/pkg-config.patch (from rev 206928,
pysmbc/trunk/pkg-config.patch)
===================================================================
--- extra-x86_64/pkg-config.patch (rev 0)
+++ extra-x86_64/pkg-config.patch 2014-03-06 10:57:48 UTC (rev 206929)
@@ -0,0 +1,58 @@
+diff -up pysmbc-1.0.13/Makefile.pkg-config pysmbc-1.0.13/Makefile
+--- pysmbc-1.0.13/Makefile.pkg-config 2010-08-22 15:59:36.000000000 +0100
++++ pysmbc-1.0.13/Makefile 2012-11-21 12:44:29.051173967 +0000
+@@ -4,7 +4,7 @@ SDIST_ARGS=--formats=bztar -d.
+
+ smbc.so: force
+ python setup.py build
+- mv build/lib*/$@ .
++ mv build/lib*/smbc*.so .
+
+ doc: smbc.so
+ rm -rf html
+@@ -14,7 +14,7 @@ doczip: doc
+ cd html && zip ../smbc-html.zip *
+
+ clean:
+- -rm -rf build smbc.so *.pyc tests/*.pyc *~ tests/*~
++ -rm -rf build smbc*.so *.pyc tests/*.pyc *~ tests/*~
+
+ dist:
+ python setup.py sdist $(SDIST_ARGS)
+diff -up pysmbc-1.0.13/setup.py.pkg-config pysmbc-1.0.13/setup.py
+--- pysmbc-1.0.13/setup.py.pkg-config 2012-02-15 16:12:44.000000000 +0000
++++ pysmbc-1.0.13/setup.py 2012-11-21 12:45:05.362285519 +0000
+@@ -1,6 +1,6 @@
+ #!/usr/bin/env python
+
+-## Copyright (C) 2002, 2005, 2006, 2007, 2008, 2010, 2011 Red Hat, Inc
++## Copyright (C) 2002, 2005, 2006, 2007, 2008, 2010, 2011, 2012 Red Hat, Inc
+ ## Copyright (C) 2010 Open Source Solution Technology Corporation
+ ## Authors:
+ ## Tim Waugh <twa...@redhat.com>
+@@ -51,6 +51,18 @@ hello
+ """
+
+ from distutils.core import setup, Extension
++import subprocess
++
++def pkgconfig_I (pkg):
++ dirs = []
++ c = subprocess.Popen (["pkg-config", "--cflags", pkg],
++ stdout=subprocess.PIPE)
++ (stdout, stderr) = c.communicate ()
++ for p in stdout.decode (encoding='ascii').split ():
++ if p.startswith ("-I"):
++ dirs.append (p[2:])
++ return dirs
++
+ setup (name="pysmbc",
+ version="1.0.13",
+ description="Python bindings for libsmbclient",
+@@ -74,4 +86,5 @@ setup (name="pysmbc",
+ "dir.c",
+ "file.c",
+ "smbcdirent.c"],
+- libraries=["smbclient"])])
++ libraries=["smbclient"],
++ include_dirs=pkgconfig_I("smbclient"))])
