1.3.10.
Also: Build requirement for libusb has changed to libusb1-devel.
This commit is contained in:
parent
9e92f511bb
commit
92a3302cf1
1
.gitignore
vendored
1
.gitignore
vendored
@ -238,3 +238,4 @@ pycups-1.9.51.tar.bz2
|
|||||||
/system-config-printer-1.3.7.tar.xz
|
/system-config-printer-1.3.7.tar.xz
|
||||||
/system-config-printer-1.3.8.tar.xz
|
/system-config-printer-1.3.8.tar.xz
|
||||||
/system-config-printer-1.3.9.tar.xz
|
/system-config-printer-1.3.9.tar.xz
|
||||||
|
/system-config-printer-1.3.10.tar.xz
|
||||||
|
2
sources
2
sources
@ -1 +1 @@
|
|||||||
df424f127eede63965608e5ec5e27519 system-config-printer-1.3.9.tar.xz
|
9de9df07c4c97afa2cea3be2f05d6c18 system-config-printer-1.3.10.tar.xz
|
||||||
|
BIN
system-config-printer-1.3.10.tar.xz.sig
Normal file
BIN
system-config-printer-1.3.10.tar.xz.sig
Normal file
Binary file not shown.
Binary file not shown.
@ -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
|
|
||||||
|
|
@ -1,18 +1,17 @@
|
|||||||
Summary: A printer administration tool
|
Summary: A printer administration tool
|
||||||
Name: system-config-printer
|
Name: system-config-printer
|
||||||
Version: 1.3.9
|
Version: 1.3.10
|
||||||
Release: 5%{?dist}
|
Release: 1%{?dist}
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
URL: http://cyberelk.net/tim/software/system-config-printer/
|
URL: http://cyberelk.net/tim/software/system-config-printer/
|
||||||
Group: System Environment/Base
|
Group: System Environment/Base
|
||||||
Source0: http://cyberelk.net/tim/data/system-config-printer/1.3/%{name}-%{version}.tar.xz
|
Source0: http://cyberelk.net/tim/data/system-config-printer/1.3/%{name}-%{version}.tar.xz
|
||||||
Patch1: system-config-printer-no-applet-in-gnome.patch
|
Patch1: system-config-printer-no-applet-in-gnome.patch
|
||||||
Patch2: system-config-printer-udev-sys-path.patch
|
|
||||||
BuildRequires: cups-devel >= 1.2
|
BuildRequires: cups-devel >= 1.2
|
||||||
BuildRequires: desktop-file-utils >= 0.2.92
|
BuildRequires: desktop-file-utils >= 0.2.92
|
||||||
BuildRequires: gettext-devel
|
BuildRequires: gettext-devel
|
||||||
BuildRequires: intltool
|
BuildRequires: intltool
|
||||||
BuildRequires: libusb-devel, glib2-devel
|
BuildRequires: libusb1-devel, glib2-devel
|
||||||
BuildRequires: xmlto
|
BuildRequires: xmlto
|
||||||
BuildRequires: systemd-units, systemd-devel
|
BuildRequires: systemd-units, systemd-devel
|
||||||
|
|
||||||
@ -63,8 +62,6 @@ printers.
|
|||||||
|
|
||||||
# Don't start the applet in GNOME.
|
# Don't start the applet in GNOME.
|
||||||
%patch1 -p1 -b .no-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
|
%build
|
||||||
%configure --with-udev-rules
|
%configure --with-udev-rules
|
||||||
@ -185,6 +182,10 @@ if [ $1 -ge 1 ] ; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
%changelog
|
%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
|
* Tue Jul 31 2012 Tim Waugh <twaugh@redhat.com> 1.3.9-5
|
||||||
- Reverted previous change. New systemd-devel does provide libudev.pc
|
- Reverted previous change. New systemd-devel does provide libudev.pc
|
||||||
after all.
|
after all.
|
||||||
|
Loading…
Reference in New Issue
Block a user