- 1.0.5.

.cvsignore

@@ -177,3 +177,4 @@ pycups-1.9.40.tar.bz2
 system-config-printer-1.0.3.tar.bz2
 system-config-printer-1.0.4.tar.bz2
 pycups-1.9.41.tar.bz2
+system-config-printer-1.0.5.tar.bz2

pycups-requested_attributes.patch

@@ -1,60 +0,0 @@
-diff -U0 pycups-1.9.40/ChangeLog.requested_attributes pycups-1.9.40/ChangeLog
---- pycups-1.9.40/ChangeLog.requested_attributes	2008-06-20 17:58:49.000000000 +0100
-+++ pycups-1.9.40/ChangeLog	2008-07-10 16:52:05.000000000 +0100
-@@ -0,0 +1,5 @@
-+2008-07-09  Tim Waugh  <twaugh@redhat.com>
-+
-+	* cupsconnection.c (Connection_getPrinterAttributes): Fixed
-+	requested_attributes parameter.
-+
-diff -up pycups-1.9.40/cupsconnection.c.requested_attributes pycups-1.9.40/cupsconnection.c
---- pycups-1.9.40/cupsconnection.c.requested_attributes	2008-06-20 10:36:50.000000000 +0100
-+++ pycups-1.9.40/cupsconnection.c	2008-07-10 16:52:05.000000000 +0100
-@@ -2240,6 +2240,7 @@ Connection_getPrinterAttributes (Connect
-   char *uri;
-   PyObject *requested_attrs = NULL;
-   char **attrs = NULL; /* initialised to calm compiler */
-+  size_t n_attrs;
-   ipp_t *request, *answer;
-   ipp_attribute_t *attr;
-   char consuri[HTTP_MAX_URI];
-@@ -2269,16 +2270,16 @@ Connection_getPrinterAttributes (Connect
-   }
- 
-   if (requested_attrs) {
--    int i, n;
-+    int i;
- 
-     if (!PyList_Check (requested_attrs)) {
-       PyErr_SetString (PyExc_TypeError, "List required");
-       return NULL;
-     }
- 
--    n = PyList_Size (requested_attrs);
--    attrs = malloc ((n + 1) * sizeof (char *));
--    for (i = 0; i < n; i++) {
-+    n_attrs = PyList_Size (requested_attrs);
-+    attrs = malloc ((n_attrs + 1) * sizeof (char *));
-+    for (i = 0; i < n_attrs; i++) {
-       PyObject *val = PyList_GetItem (requested_attrs, i); // borrowed ref
-       if (!PyString_Check (val)) {
- 	PyErr_SetString (PyExc_TypeError, "String required");
-@@ -2294,7 +2295,7 @@ Connection_getPrinterAttributes (Connect
- 
-       attrs[i] = strdup (PyString_AsString (val));
-     }
--    attrs[n] = NULL;
-+    attrs[n_attrs] = NULL;
-   }
- 
-   debugprintf ("-> Connection_getPrinterAttributes(%s)\n",
-@@ -2318,8 +2319,7 @@ Connection_getPrinterAttributes (Connect
- 		  "printer-uri", NULL, uri);
-     if (requested_attrs)
-       ippAddStrings (request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
--		     "requested-attributes",
--		     sizeof (attrs) / sizeof (attrs[0]), NULL,
-+		     "requested-attributes", n_attrs, NULL,
- 		     (const char **) attrs);
-     debugprintf ("trying request with uri %s\n", uri);
-     answer = cupsDoRequest (self->http, request, "/");

sources

@@ -1,3 +1,3 @@
 41bc000026ea8d01f684705a99ac01d5  pysmbc-1.0.4.tar.bz2
-5f63211606efd0913b14dfaf4de9403d  system-config-printer-1.0.4.tar.bz2
 f5f1b33696c5dc52e5563d69d29330e9  pycups-1.9.41.tar.bz2
+4ff9e4b6e78c9a8ada56dac0ce695798  system-config-printer-1.0.5.tar.bz2

system-config-printer.spec

@@ -6,7 +6,7 @@
 
 Summary: A printer administration tool
 Name: system-config-printer
-Version: 1.0.4
+Version: 1.0.5
 Release: 1%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
@@ -15,7 +15,6 @@ Source0: http://cyberelk.net/tim/data/system-config-printer/1.0.x/system-config-
 Source1: http://cyberelk.net/tim/data/pycups/pycups-%{pycups_version}.tar.bz2
 Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2
 
-Patch0: pycups-requested_attributes.patch
 Patch1: pysmbc-debug.patch
 
 BuildRequires: cups-devel >= 1.2
@@ -64,10 +63,6 @@ the configuration tool.
 %prep
 %setup -q -a 1 -a 2
 
-pushd pycups-%{pycups_version}
-%patch0 -p1 -b .requested_attributes
-popd
-
 pushd pysmbc-%{pysmbc_version}
 %patch1 -p1 -b .debug
 popd
@@ -125,6 +120,7 @@ rm -rf %buildroot
 %{_bindir}/%{name}-applet
 %{_bindir}/my-default-printer
 %dir %{_datadir}/%{name}
+%{_datadir}/%{name}/AdvancedServerSettings.py*
 %{_datadir}/%{name}/authconn.py*
 %{_datadir}/%{name}/config.py*
 %{_datadir}/%{name}/contextmenu.py*
@@ -158,7 +154,8 @@ rm -rf %buildroot
 exit 0
 
 %changelog
-* Mon Jul 14 2008 Tim Waugh <twaugh@redhat.com>
+* Mon Aug 11 2008 Tim Waugh <twaugh@redhat.com> 1.0.5-1
+- 1.0.5.
 - Updated pycups to 1.9.41.
 
 * Thu Jul 10 2008 Tim Waugh <twaugh@redhat.com> 1.0.4-1