From 92a3302cf1beb9c062fb6ab5f98a950cd3dce7a8 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Wed, 1 Aug 2012 17:17:53 +0100
Subject: [PATCH] 1.3.10.

Also:
Build requirement for libusb has changed to libusb1-devel.
---
 .gitignore                                |   1 +
 sources                                   |   2 +-
 system-config-printer-1.3.10.tar.xz.sig   | Bin 0 -> 280 bytes
 system-config-printer-1.3.9.tar.xz.sig    | Bin 280 -> 0 bytes
 system-config-printer-udev-sys-path.patch |  45 ----------------------
 system-config-printer.spec                |  13 ++++---
 6 files changed, 9 insertions(+), 52 deletions(-)
 create mode 100644 system-config-printer-1.3.10.tar.xz.sig
 delete mode 100644 system-config-printer-1.3.9.tar.xz.sig
 delete mode 100644 system-config-printer-udev-sys-path.patch

diff --git a/.gitignore b/.gitignore
index c00d606..dcc4186 100644
--- a/.gitignore
+++ b/.gitignore
@@ -238,3 +238,4 @@ pycups-1.9.51.tar.bz2
 /system-config-printer-1.3.7.tar.xz
 /system-config-printer-1.3.8.tar.xz
 /system-config-printer-1.3.9.tar.xz
+/system-config-printer-1.3.10.tar.xz
diff --git a/sources b/sources
index 826b202..7913f7b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-df424f127eede63965608e5ec5e27519  system-config-printer-1.3.9.tar.xz
+9de9df07c4c97afa2cea3be2f05d6c18  system-config-printer-1.3.10.tar.xz
diff --git a/system-config-printer-1.3.10.tar.xz.sig b/system-config-printer-1.3.10.tar.xz.sig
new file mode 100644
index 0000000000000000000000000000000000000000..8aa902e3d42f7f3659d3fee681fc64dc096061b3
GIT binary patch
literal 280
zcmV+z0q6dS0TlxU08klHxbDS~s`TEJECB*+<_G_1yIr%d4dYTAx;NU4W=!-`fU3k7
z0iYq|b`+Q0x{lyt;uXPELJ1oU_lLqGH5?U>0*sbI@l`o7;mJO15*PW)Lcl-_Zwooi
zs(W+m{Z3&9f-an!GW1@n%hdKxGJlbnGcUF0Xh49OBbef!OAhVrJn<hG9~9`9W_e@-
zY><RdTJHqN5WyY?rcIIukyea`GCz3hr&G;B7TC|6NrtoCKz&g~c)w{F@t!K3s%L)r
zXwT<cJEQFLIWU`(xcIcW^3xS?n-M`J3!Ny84sd!KHTqP%VbZ6ySzt0f!VIR1(QA@W
elY81!i_9))*dVNj7Vh;Zr##g5sWbMnSyZYP*M;f;

literal 0
HcmV?d00001

diff --git a/system-config-printer-1.3.9.tar.xz.sig b/system-config-printer-1.3.9.tar.xz.sig
deleted file mode 100644
index c25031ea18900fcd2476250797e863303a759827..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 280
zcmV+z0q6dS0TlxU08dYaBJRbJs`TEJECB*KN(cN6Bg_6bi$-HDVFJ5}wW?>w4K<)a
z$ehfr)l1;)>c>QO8ekvX#(#zWw8&J=d}?hPUb;f0S|KSfF?DM;o|@|*t<Pz>bCX6{
z&q&L<?Dh#RFTa-aJ-i#(^Neb^rk(|M{oSysVCG(>6@Lh`XrrihXtHG9(r`bOhx%-B
zQ}e037j%mEHUEVA8;RbJiHNYHqg|D)kX(>~p{_wzERHxs4pek=<(0Ps&jYW_0wNS!
zy_#drbuoton1(BC0hF#v#iGHCBf9WB;}j(zuE0;huE^L=oM!z2ag_^2Id<QuU3L3H
ekcVo7<K|X!6WY*|3~6IcLa~`Vqr&ZNlLEO*35!zz

diff --git a/system-config-printer-udev-sys-path.patch b/system-config-printer-udev-sys-path.patch
deleted file mode 100644
index 7be5547..0000000
--- a/system-config-printer-udev-sys-path.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From cbacff0c9f7e3e6549c9b33a42e805a935db36e6 Mon Sep 17 00:00:00 2001
-From: Jiri Popelka <jpopelka@redhat.com>
-Date: Tue, 5 Jun 2012 14:28:36 +0200
-Subject: [PATCH] udev: replace udev_get_sys_path() with hard-coded "/sys"
- (trac #223)
-
-udev_get_sys_path() is no longer provided by libudev
----
- udev/udev-configure-printer.c |    6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/udev/udev-configure-printer.c b/udev/udev-configure-printer.c
-index 1d89f9a..8d349e4 100644
---- a/udev/udev-configure-printer.c
-+++ b/udev/udev-configure-printer.c
-@@ -451,7 +451,6 @@ device_id_from_devpath (const char *devpath,
-   struct usb_uri_map_entry *entry;
-   struct udev *udev;
-   struct udev_device *dev, *parent_dev = NULL;
--  const char *sys;
-   const char *idVendorStr, *idProductStr, *serial;
-   char *end;
-   unsigned long idVendor, idProduct;
-@@ -500,8 +499,7 @@ device_id_from_devpath (const char *devpath,
-       *dest = '\0';
-     }
- 
--  sys = udev_get_sys_path (udev);
--  syslen = strlen (sys);
-+  syslen = strlen ("/sys");
-   devpathlen = strlen (devpath);
-   syspath = malloc (syslen + devpathlen + 1);
-   if (syspath == NULL)
-@@ -511,7 +509,7 @@ device_id_from_devpath (const char *devpath,
-       exit (1);
-     }
- 
--  memcpy (syspath, sys, syslen);
-+  memcpy (syspath, "/sys", syslen);
-   memcpy (syspath + syslen, devpath, devpathlen);
-   syspath[syslen + devpathlen] = '\0';
- 
--- 
-1.7.10.2
-
diff --git a/system-config-printer.spec b/system-config-printer.spec
index 6c64b7a..a735224 100644
--- a/system-config-printer.spec
+++ b/system-config-printer.spec
@@ -1,18 +1,17 @@
 Summary: A printer administration tool
 Name: system-config-printer
-Version: 1.3.9
-Release: 5%{?dist}
+Version: 1.3.10
+Release: 1%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
 Source0: http://cyberelk.net/tim/data/system-config-printer/1.3/%{name}-%{version}.tar.xz
 Patch1: system-config-printer-no-applet-in-gnome.patch
-Patch2: system-config-printer-udev-sys-path.patch
 BuildRequires: cups-devel >= 1.2
 BuildRequires: desktop-file-utils >= 0.2.92
 BuildRequires: gettext-devel
 BuildRequires: intltool
-BuildRequires: libusb-devel, glib2-devel
+BuildRequires: libusb1-devel, glib2-devel
 BuildRequires: xmlto
 BuildRequires: systemd-units, systemd-devel
 
@@ -63,8 +62,6 @@ printers.
 
 # Don't start the applet in GNOME.
 %patch1 -p1 -b .no-applet-in-gnome
-# replace udev_get_sys_path() with hard-coded "/sys"
-%patch2 -p1 -b .sys-path
 
 %build
 %configure --with-udev-rules
@@ -185,6 +182,10 @@ if [ $1 -ge 1 ] ; then
 fi
 
 %changelog
+* Wed Aug  1 2012 Tim Waugh <twaugh@redhat.com> 1.3.10-1
+- 1.3.10.
+- Build requirement for libusb has changed to libusb1-devel.
+
 * Tue Jul 31 2012 Tim Waugh <twaugh@redhat.com> 1.3.9-5
 - Reverted previous change. New systemd-devel does provide libudev.pc
   after all.