diff --git a/.gitignore b/.gitignore index df5540f..bd4f22d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /pysmbc-1.0.10.tar.bz2 /pysmbc-1.0.11.tar.bz2 /pysmbc-1.0.13.tar.bz2 +/pysmbc-1.0.15.4.tar.bz2 diff --git a/pysmbc-1.0.13.tar.bz2.asc b/pysmbc-1.0.13.tar.bz2.asc deleted file mode 100644 index d6a8d73..0000000 --- a/pysmbc-1.0.13.tar.bz2.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.12 (GNU/Linux) - -iQEVAwUATzvaqu7Fkar03pQsAQI8Ygf/b/mu91NiVwHMkdPgm9WpypvDaJCqYqDd -xAWVaB7/dVXfCAcKa5xdc6hjPFo5iuPZqEVpedFy81+u1iYmfZF62XKWuMQwQDFn -wUneyuh6xWztimz4UQNCvNCt9Wl9EW+m0nCwrtXGXDZq6Co7MhlGxRXPEEAvXoVo -JuKJ0QFwF6fOQ62i1DWlH9K9TrNAwzCn5IjSelleW/hnDEKn81KYwqMhAzA/Iy9d -yIkuxcfW83sZyXvut/t8VTXKDOhRh9abWxYjrwhHSQi3cTzcfPysHDxnaGFwhxB4 -kHHF98WDSKYrexMo78fSpvc2z+BATo+IjE/6jjH6DL1JYw3V3qfxxg== -=MLkF ------END PGP SIGNATURE----- diff --git a/pysmbc-1.0.15.4.tar.bz2.asc b/pysmbc-1.0.15.4.tar.bz2.asc new file mode 100644 index 0000000..8d32882 --- /dev/null +++ b/pysmbc-1.0.15.4.tar.bz2.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iEYEABECAAYFAlVQXj0ACgkQFr7RAWBpvlWmJACff+C5yyK9KMSqqrtx8P7/h96h +hZsAn37lHTsiwNDL9Zd8IxY1qdT9Na8S +=sUuD +-----END PGP SIGNATURE----- diff --git a/python-smbc-pkg-config.patch b/python-smbc-pkg-config.patch deleted file mode 100644 index 9586b86..0000000 --- a/python-smbc-pkg-config.patch +++ /dev/null @@ -1,58 +0,0 @@ -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 -@@ -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"))]) diff --git a/python-smbc.spec b/python-smbc.spec index e60c04c..1678664 100644 --- a/python-smbc.spec +++ b/python-smbc.spec @@ -5,11 +5,10 @@ Summary: Python bindings for libsmbclient API from Samba Name: python-smbc -Version: 1.0.13 -Release: 13%{?dist} -URL: http://cyberelk.net/tim/software/pysmbc/ +Version: 1.0.15.4 +Release: 1%{?dist} +URL: https://github.com/hamano/pysmbc Source: http://pypi.python.org/packages/source/p/pysmbc/pysmbc-%{version}.tar.bz2 -Patch1: python-smbc-pkg-config.patch License: GPLv2+ BuildRequires: python2-devel BuildRequires: python3-devel @@ -23,6 +22,7 @@ system-config-printer, but can be put to other uses as well. %package -n python3-smbc Summary: Python3 bindings for libsmbclient API from Samba +%{?python_provide:%python_provide python3-smbc} %description -n python3-smbc This package provides Python bindings for the libsmbclient API @@ -39,7 +39,6 @@ Documentation for python-smbc. %prep %setup -q -n pysmbc-%{version} -%patch1 -p1 -b .pkg-config rm -rf %{py3dir} cp -a . %{py3dir} @@ -47,6 +46,7 @@ cp -a . %{py3dir} %build %py2_build + rm -rf html epydoc -o html --html build/lib*/smbc.so @@ -67,19 +67,20 @@ chmod 755 %{buildroot}%{python_sitearch}/smbc.so %files %doc COPYING README NEWS -%{python_sitearch}/smbc.so -%{python_sitearch}/pysmbc*.egg-info +%{python_sitearch}/* %files doc %doc html %files -n python3-smbc %doc COPYING README NEWS -%{python3_sitearch}/smbc.cpython-3*.so -%{python3_sitearch}/pysmbc*.egg-info +%{python3_sitearch}/* %changelog +* Fri Sep 25 2015 Tim Waugh - 1.0.15.4-1 +- New upstream release (and location). + * Tue Aug 11 2015 Jiri Popelka - 1.0.13-13 - %%py_build && %%py_install diff --git a/sources b/sources index 6dfd4a9..b28e437 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -019dbb3bc6ee217f7389a2330cda9fe0 pysmbc-1.0.13.tar.bz2 +7e1d0b5438bf9c2660a60094d7eaabb3 pysmbc-1.0.15.4.tar.bz2 diff --git a/upstream-key.gpg b/upstream-key.gpg index 967ef1b..684463f 100644 --- a/upstream-key.gpg +++ b/upstream-key.gpg @@ -1,36 +1,31 @@ -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.4.11 (GNU/Linux) +Version: GnuPG v1 -mQGiBEpnDbARBADRsKGwS54yxqAoniGaI8X+saG4ezdZ1OmPr9f7L4PugzjjL7qR -p9O7hj+RZNVM7QR9nPUFTawBTfWQisyS8/a3xiBbQxlhW8uuORhM2gTkVGGlGbCc -jH+RT0T8t/75m6n2IXKATqugrMH60NXreQQuCKWgCrT6TroMldlVQpBaFwCgx/s0 -1KlfCY42Er0YA/DDpMgTYhUEAI0PgOpD6C8ncEpqvSYSs1qyvRsrpp86M/nyi+pm -15+7IZhlXE53gXeSLT+dTutvVQtbXbf2DwJmAKdjQw1Y4esjxwH1bPYnPnTlIlZ6 -CHQbYO0n6u2pDnSF8sxi3ene6BSuL7NvKpejwXqLEQFGjaop5eAdDs6YvHNU3Yev -os0UA/4t9TstI4laLwvCqZ7npwsNxT/1sXa5F09d26oTSZlJwSEmGe6+tOqAbDYn -1mrCajNt40pGPBKXhE2UNJIBrrWSjZCAp4LSmj6KCEXs35fpmUhUp54V79cC4AI/ -rezLlZIB6l4Dey1is5bkw1yOsBT6Qf4lGJHkggyUfW/ymGZfqbQdVGltIFdhdWdo -IDx0d2F1Z2hAcmVkaGF0LmNvbT6IZgQTEQIAJgUCSmcOPwIbAwUJA8JnAAYLCQgH -AwIEFQIIAwQWAgMBAh4BAheAAAoJEAS0Gn2aStrXYHMAoLxVaLxFP6P6rRlQtla+ -NO1KSkMBAJ9jNppMaAf2pHi1b9CoD4f4MEvOS4hGBBARAgAGBQJKZxDHAAoJEO3n -xuaBAwm91N0AoJROznoZyHKXRxgzLyXemIA4TYMAAJ9Y9HdZOenEMw9HMg36guZK -dBIVLLQcVGltIFdhdWdoIDx0aW1AY3liZXJlbGsubmV0PohmBBMRAgAmBQJKZw2w -AhsDBQkDwmcABgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQBLQafZpK2tet4gCf -VKhWbUJAcIlNpWpYD0kYgGty/ucAoIfsKq9FNBPw9pQPaDnxbKDyserxiEYEEBEC -AAYFAkpnEMcACgkQ7efG5oEDCb0RvACePTmfisPxeKkGo6QoA42MFH5wtPIAn329 -9ur6BKDz/QrKVT13CxRoKosLuQINBEpnDbAQCACCZaJHH6EctIyz+PYBCzz889PR -iLAOyKlbrgaR4KhVGBFttKyOJkEk+UvxLUuRkOOY6i6TWbT3qNUnZT6QkftGulal -8MAtBf2xnJXEsyKgPkRkeDAx3uvMBfrW0wgxcFw9K6E+p8x76bFFD+FtrduDRfxk -2jDwJgyYubnM3+nPZzZXfuFnxSRYjJcoAq4O61YdH8O79TElEGqTwd/BHeIexEf2 -BkBAscE4GCmGXTYCsLByY8sGD13U7OO3Kk4ul4FgI/mzM25zgqqhbAObjsIwJqE+ -6MXqkkylmo+noTe3zlfNdnR1xkmYUCfUc4+WeFyziHRiXMkt5OYY5wDW5WGnAAMF -B/4gvjt8SXekSxgdFCuEOQ0J2YM4DElQkaf+Tggbr9F3hnsWfJ49gEipCWEhKPt2 -ks4kDexO/Cn6SI7SQUPiNUWylm80G1Dd+xaQ9qrN1KTsReACXOCKoRgz64MooSOj -Qs8YIGI/ejLzPkn6mUEmFRHssd4jmmSCbF99AmVh6Z4VnkKLTG+z3KQUymF0ng5b -AAcwTOJhlAR7xrBJGfhnRUTIaNtD+UnBsoxApeUJie2lc84Pc10p56TGomkEy3Ib -se1kk4w3mZ8kkR57voh/PovSl/8NyPmv81oVHbJnGLKAVku4XT0IBQOBdDKeRKHB -tlPLsK9KFx2LxhtAmQN4C/j5iE8EGBECAA8FAkpnDbACGwwFCQPCZwAACgkQBLQa -fZpK2teQogCgg68475moQ7dh/HIUHRNJKZJfmoQAoIw92pM7V5VYMpz9kW+701Fu -JofS -=vrpj +mQGiBEqKBDsRBADje4pZPDB+9ZdAjdzQ0O+OnNkoYj0TDGDRxcGZA1l9F2dRs9vL +SRsp+q4zZqRxAo4oMlNzcXZC8/hMHT11N1k8oNssBN/thKafjLRa5veA6v+9rAIS +Smx+JXwO6BsbBscKwq2fdf9QJWBbfUAEBfDFNrYhNtQKcY4YWgfT+b1JawCg2QDq +CFnCE7JzfcspKKBg4AYS/ucD/1evuUhrZZf9wpxNfd/fUEBfURM7+Oew4+mYqPSh +Ru5Sqk5DIoq2seZ0WHfh89Lbh2QqQh81saRUFoh6r/d0BSw9ekWY0iKdkrUw3pKW +ECSc6DNF0sWYBinc9CALYxXO/kYVHhMXnLZwpaaND8Mvgrcw8gKr7LRTyQm7zefk +60Q5A/9ywy6rL6Cj1RpQVDOC0LA+oJkQFaZXyPW1fQBTdLyATsXCuNvsv1eQNXt4 +4n4uoULtPFqgwztQyvAxQ/91+AWCLUU6JHQ97Ar+fZ1DMOET0eB+39JYwfXdK9PW +t2fTbnIbo+3djPT0f1DORwWfWO22u6pwKk//93PE16jJJMEVeohJBCARAgAJBQJV +o4uiAh0BAAoJEBa+0QFgab5VWycAoNE7Hm+anHZIavel43DL25jLPy7IAJ4uG+qm +Q5qwYBuLMvXY+eGmCdZXzrQlVHN1a2FzYSBIYW1hbm8gPGhhbWFub0Bvc3N0ZWNo +LmNvLmpwPohgBBMRAgAgBQJKigQ7AhsDBgsJCAcDAgQVAggDBBYCAwECHgECF4AA +CgkQFr7RAWBpvlWPMACfYHIUHkR1QwP2QEJYFuYexm16a4EAoNHjSi2CdcrAhzWg +PTXAMlyUw91XuQINBEqKBDsQCADkJTHSBj0+OR61XS29KMk9wbVpk9rCNc4iIyYj +7hSR6fed56eEyKGkKfuY6b/joCwn9SAu+vX5r80buZFpToS5+yY1MKioOQGqtYUC +ctUlqRPOUG3chrsxAnWsFdaJh+T5gCfElI9vyqlQQT4VfTYGXc7rmP0FyI/3uQUN +dKm2E4jdqann6NKgjZ1KNjnYnkGcLx3bOkbYH9zxhGOuHo+ZV2dqXH2W2JpJTPFS +UIuIuEEU2lNJAEjE+6C/wLdpQWIEi8k8tEKF2ERe024sXM1nQkRoQ4LP1ByOhJ5p +ytMwxnj5RqTVhWlN56g4TvYMTD0iEY50udR6o8toGgTd/y4HAAMHCACX+zGFo+yk +MTzIcbPQWM/YD+jOrZhBz7ie7XSMS6NWyJS4PKC5JKAHyR/gEjVfBaiOkWxrL5aL +gQ3ejrlzqzjugfpOMWU0Rwzfi4rkTSadhqYMPZ4OPoro/FqPayneuPdRlw+HaE2K +JzpCMWNiPVhU4zjpx80MDKFNgBatQaMaOtuWjrAehmpAdgUNcjy06Iq9mF+lbvdN +KoMq9KlIhbJrWx6s+P60I+6Po39CEPE/4Q8LSQBYZ52bXSCbPc2FPPalTZrAlVyN +/VI0mXATYqGvqEoKhmWd7EY2iVWDVR+c2YG+6fyECsghocK84uhVLOkyB4pS/5r7 +4z52Uu1xDjHRiEkEGBECAAkFAkqKBDsCGwwACgkQFr7RAWBpvlUREgCgw6jTkvP2 +6vYqRXt6WzD4XEP+sToAn1dAgtJS4CHcyOcDWXLnBppT71IG +=WPuf -----END PGP PUBLIC KEY BLOCK-----