rpms/system-config-printer/F-13 .cvsignore, 1.221, 1.222 sources, 1.227, 1.228 system-config-printer.spec, 1.398, 1.399 system-config-printer-no-epydoc.patch, 1.6, NONE

[Tim Waugh]

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv15406

Modified Files:
	.cvsignore sources system-config-printer.spec 
Removed Files:
	system-config-printer-no-epydoc.patch 
Log Message:
* Fri Jun 25 2010 Tim Waugh <twaugh at redhat.com> - 1.2.3-3
- Updated pycups to 1.9.51 (bug #584991).



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-13/.cvsignore,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -p -r1.221 -r1.222
--- .cvsignore	24 Jun 2010 16:58:52 -0000	1.221
+++ .cvsignore	25 Jun 2010 16:22:55 -0000	1.222
@@ -221,3 +221,4 @@ system-config-printer-1.2.2.tar.xz
 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-13/sources,v
retrieving revision 1.227
retrieving revision 1.228
diff -u -p -r1.227 -r1.228
--- sources	24 Jun 2010 16:58:52 -0000	1.227
+++ sources	25 Jun 2010 16:22:55 -0000	1.228
@@ -1,3 +1,4 @@
 89e6fd9129f1700eec16156bdbf60dda  pysmbc-1.0.7.tar.bz2
 cae67ab1207f5ffa93edc9b5867738bb  pycups-1.9.50.tar.bz2
 e9ab97e4b0fdff5a75e1a5874808c2c1  system-config-printer-1.2.3.tar.xz
+7e9de64bce9496ce2d36ab513dd69dd5  pycups-1.9.51.tar.bz2


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-13/system-config-printer.spec,v
retrieving revision 1.398
retrieving revision 1.399
diff -u -p -r1.398 -r1.399
--- system-config-printer.spec	24 Jun 2010 16:58:52 -0000	1.398
+++ system-config-printer.spec	25 Jun 2010 16:22:55 -0000	1.399
@@ -1,4 +1,4 @@
-%global pycups_version 1.9.50
+%global pycups_version 1.9.51
 %global pysmbc_version 1.0.7
 %{!?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)")}
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.2.3
-Release: 1%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -17,8 +17,6 @@ Source1: http://cyberelk.net/tim/data/py
 # Python bindings for libsmbclient
 Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2
 
-Patch1: system-config-printer-no-epydoc.patch
-
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
 BuildRequires: libsmbclient-devel >= 3.2
@@ -26,7 +24,7 @@ BuildRequires: desktop-file-utils >= 0.2
 BuildRequires: gettext-devel
 BuildRequires: intltool
 BuildRequires: libusb-devel, libudev-devel, glib2-devel
-BuildRequires: xmlto
+BuildRequires: epydoc, xmlto
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -76,8 +74,6 @@ printers.
 
 %prep
 %setup -q -a 1 -a 2
-# Don't require epydoc.
-%patch1 -p1 -b .no-epydoc
 
 %build
 %configure --with-udev-rules
@@ -197,6 +193,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Fri Jun 25 2010 Tim Waugh <twaugh at redhat.com> - 1.2.3-3
+- Updated pycups to 1.9.51 (bug #584991).
+
 * Thu Jun 24 2010 Tim Waugh <twaugh at redhat.com> - 1.2.3-1
 - Updated to 1.2.3:
   - Use toolbar instead of menubar in JobsViewer (trac #205).


--- system-config-printer-no-epydoc.patch DELETED ---