From 20c2cec91337d9def29b777037869f659dc359f0 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Aug 22 2010 16:29:14 +0000
Subject: Merge branch 'f13' into f14


---

diff --git a/.gitignore b/.gitignore
index 87d91c3..e4ae4f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -222,3 +222,4 @@ pysmbc-1.0.7.tar.bz2
 pycups-1.9.50.tar.bz2
 system-config-printer-1.2.3.tar.xz
 pycups-1.9.51.tar.bz2
+/pysmbc-1.0.9.tar.bz2
diff --git a/pysmbc-1.0.7.tar.bz2.sig b/pysmbc-1.0.7.tar.bz2.sig
deleted file mode 100644
index c76411b..0000000
--- a/pysmbc-1.0.7.tar.bz2.sig
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iD8DBQBL8nU8BLQafZpK2tcRAoYjAKCWjLs2dyh1TSsj+UQ7sPmf/Frk/ACgkwNw
-O8USf8fZmPPt14wAZPt5Phk=
-=TdIr
------END PGP SIGNATURE-----
diff --git a/pysmbc-1.0.9.tar.bz2.asc b/pysmbc-1.0.9.tar.bz2.asc
new file mode 100644
index 0000000..b5af10c
--- /dev/null
+++ b/pysmbc-1.0.9.tar.bz2.asc
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iEYEABECAAYFAkwxlm4ACgkQFr7RAWBpvlXMCwCeOiCNTkzubSy+9ZwMW3/BbdwD
+T+QAniGOj/VeRsr7Zl2nHCe1+5l5t7Ns
+=1EcU
+-----END PGP SIGNATURE-----
diff --git a/pysmbc-doczip.patch b/pysmbc-doczip.patch
new file mode 100644
index 0000000..0918409
--- /dev/null
+++ b/pysmbc-doczip.patch
@@ -0,0 +1,12 @@
+diff -up pysmbc-1.0.9/Makefile.doczip pysmbc-1.0.9/Makefile
+--- pysmbc-1.0.9/Makefile.doczip	2010-06-29 06:18:10.000000000 +0100
++++ pysmbc-1.0.9/Makefile	2010-08-22 15:42:14.085916441 +0100
+@@ -9,6 +9,8 @@ smbc.so: force
+ doc: smbc.so
+ 	rm -rf html
+ 	epydoc -o html --html $<
++
++doczip:	doc
+ 	cd html && zip ../smbc-html.zip *
+ 
+ clean:
diff --git a/sources b/sources
index 67139b4..0f83d0c 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-89e6fd9129f1700eec16156bdbf60dda  pysmbc-1.0.7.tar.bz2
 e9ab97e4b0fdff5a75e1a5874808c2c1  system-config-printer-1.2.3.tar.xz
 7e9de64bce9496ce2d36ab513dd69dd5  pycups-1.9.51.tar.bz2
+32b995dbf8419128f652279881b9023d  pysmbc-1.0.9.tar.bz2
diff --git a/system-config-printer.spec b/system-config-printer.spec
index d5035ff..aeedfde 100644
--- a/system-config-printer.spec
+++ b/system-config-printer.spec
@@ -1,5 +1,5 @@
 %global pycups_version 1.9.51
-%global pysmbc_version 1.0.7
+%global pysmbc_version 1.0.9
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 %{!?pyver: %global pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
@@ -15,8 +15,8 @@ Source0: http://cyberelk.net/tim/data/system-config-printer/1.2/%{name}-%{versio
 # Python bindings for libcups
 Source1: http://cyberelk.net/tim/data/pycups/pycups-%{pycups_version}.tar.bz2
 # Python bindings for libsmbclient
-Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2
-
+Source2: http://pypi.python.org/packages/source/p/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2
+Patch1: pysmbc-doczip.patch
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
 BuildRequires: libsmbclient-devel >= 3.2
@@ -75,6 +75,10 @@ printers.
 %prep
 %setup -q -a 1 -a 2
 
+pushd pysmbc-%{pysmbc_version}
+%patch1 -p1 -b .doczip
+popd
+
 %build
 %configure --with-udev-rules
 
@@ -194,6 +198,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Sun Aug 22 2010 Tim Waugh <twaugh@redhat.com>
+- Updated pysmbc to 1.0.9.
+
 * Thu Jul 22 2010 David Malcolm <dmalcolm@redhat.com> - 1.2.3-5
 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild