[sane-backends] version 1.0.23
Nils Philippsen
nphilipp at fedoraproject.org
Fri Aug 31 14:32:54 UTC 2012
commit c3a3750c0730af054c5f28091eda6a77f3225153
Author: Nils Philippsen <nils at redhat.com>
Date: Fri Aug 31 16:22:37 2012 +0200
version 1.0.23
update udev patch, remove obsolete patches
.gitignore | 1 +
sane-backends-1.0.22-Lexmark-X1100.patch | 39 --
sane-backends-1.0.22-av220-gray-modes.patch | 26 -
sane-backends-1.0.22-avision-init-devices.patch | 91 ----
sane-backends-1.0.22-docs-utf8.patch | 566 --------------------
sane-backends-1.0.22-epson-stylus-sx125.patch | 49 --
sane-backends-1.0.22-man-encoding.patch | 43 --
sane-backends-1.0.22-pkgconfig.patch | 109 ----
sane-backends-1.0.22-udev.patch | 71 ---
sane-backends-1.0.22-v4l.patch | 64 ---
...backends-1.0.22-xerox_mfp-fix-usb-devices.patch | 81 ---
sane-backends-1.0.23-udev.patch | 42 ++
sane-backends.spec | 49 +--
sources | 2 +-
14 files changed, 58 insertions(+), 1175 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6609bfe..39d44c6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
sane-backends-1.0.21.tar.gz
/sane-backends-1.0.22.tar.gz
+/sane-backends-1.0.23.tar.gz
diff --git a/sane-backends-1.0.23-udev.patch b/sane-backends-1.0.23-udev.patch
new file mode 100644
index 0000000..4543143
--- /dev/null
+++ b/sane-backends-1.0.23-udev.patch
@@ -0,0 +1,42 @@
+commit 2fd4ea713546ef0cb9f67ee7853e9b1d01f64071
+Author: Nils Philippsen <nils at redhat.com>
+AuthorDate: Fri Aug 31 15:54:01 2012 +0200
+Commit: Nils Philippsen <nils at redhat.com>
+CommitDate: Fri Aug 31 15:54:01 2012 +0200
+
+ patch: udev
+
+ Squashed commit of the following:
+
+ commit 99a4a33bd297f5b475ac610cf2d51385893596b9
+ Author: Nils Philippsen <nils at redhat.com>
+ Date: Fri Aug 31 15:51:55 2012 +0200
+
+ adapt generated udev rules for Fedora
+
+diff --git a/tools/sane-desc.c b/tools/sane-desc.c
+index 7bbd012..9447cb8 100644
+--- a/tools/sane-desc.c
++++ b/tools/sane-desc.c
+@@ -56,9 +56,9 @@
+ #define COLOR_NEW "\"#F00000\""
+ #define COLOR_UNKNOWN "\"#000000\""
+
+-#define DEVMODE "0664"
++#define DEVMODE "0644"
+ #define DEVOWNER "root"
+-#define DEVGROUP "scanner"
++#define DEVGROUP "root"
+
+ #ifndef PATH_MAX
+ # define PATH_MAX 1024
+@@ -3543,7 +3543,8 @@ print_udev (void)
+ }
+
+ printf("\n# The following rule will disable USB autosuspend for the device\n");
+- printf("ENV{libsane_matched}==\"yes\", RUN+=\"/bin/sh -c 'if test -e /sys/$env{DEVPATH}/power/control; then echo on > /sys/$env{DEVPATH}/power/control; elif test -e /sys/$env{DEVPATH}/power/level; then echo on > /sys/$env{DEVPATH}/power/level; fi'\"\n");
++ printf("ENV{libsane_matched}==\"yes\", TEST==\"power/control\", ATTR{power/control}=\"on\"\n");
++ printf("ENV{libsane_matched}==\"yes\", TEST!=\"power/control\", TEST==\"power/level\", ATTR{power/level}=\"on\"\n");
+
+ printf ("\nLABEL=\"libsane_usb_rules_end\"\n\n");
+
diff --git a/sane-backends.spec b/sane-backends.spec
index 6c03bdc..0ea7b3f 100644
--- a/sane-backends.spec
+++ b/sane-backends.spec
@@ -7,8 +7,8 @@
Summary: Scanner access software
Name: sane-backends
-Version: 1.0.22
-Release: 13%{?dist}
+Version: 1.0.23
+Release: 1%{?dist}
# lib/ is LGPLv2+, backends are GPLv2+ with exceptions
# Tools are GPLv2+, docs are public domain
# see LICENSE for details
@@ -16,30 +16,14 @@ License: GPLv2+ and GPLv2+ with exceptions and Public Domain
Group: System Environment/Libraries
Source0: ftp://ftp.sane-project.org/pub/sane/%{name}-%{version}/%{name}-%{version}.tar.gz
Source1: sane.png
-# Upstreamed at: https://alioth.debian.org/tracker/index.php?func=detail&aid=313038
-Patch0: sane-backends-1.0.22-pkgconfig.patch
+
# Fedora-specific, not generally applicable:
-Patch1: sane-backends-1.0.22-udev.patch
-# Upstreamed at: https://alioth.debian.org/tracker/index.php?func=detail&aid=313039
-Patch2: sane-backends-1.0.22-man-encoding.patch
+Patch0: sane-backends-1.0.23-udev.patch
# Upstreamed at: https://alioth.debian.org/tracker/index.php?func=detail&aid=313040
-Patch3: sane-backends-1.0.21-epson-expression800.patch
-# Upstreamed at: https://alioth.debian.org/tracker/index.php?func=detail&aid=313042
-Patch4: sane-backends-1.0.22-docs-utf8.patch
+Patch1: sane-backends-1.0.21-epson-expression800.patch
# Upstreamed at: https://alioth.debian.org/tracker/index.php?func=detail&aid=313043
-Patch5: sane-backends-1.0.21-SCX4500W.patch
-# backported from upstream c5ca46c2d1be78c651afb843cc834cf2b5b24953
-Patch6: sane-backends-1.0.22-v4l.patch
-# backported from upstream 5ea227caeacd504b64eef301e83fa63e0a25b3f7
-Patch7: sane-backends-1.0.22-xerox_mfp-fix-usb-devices.patch
-# backported from upstream 058f423a302e12196028f218dcb2eca7cc8a250a
-Patch8: sane-backends-1.0.22-epson-stylus-sx125.patch
-# submitted upstream: c648a4411e5eacf19da2de726dac06ec07dae302
-Patch9: sane-backends-1.0.22-av220-gray-modes.patch
-# backported from upstream: cef28b4d46a0faa4d4acb60d815ac9a49036ba85
-Patch10: sane-backends-1.0.22-Lexmark-X1100.patch
-# backported from upstream: 33bb529c5f8ca013fb499addc14c7fb229203ea8
-Patch11: sane-backends-1.0.22-avision-init-devices.patch
+Patch2: sane-backends-1.0.21-SCX4500W.patch
+
URL: http://www.sane-project.org
BuildRequires: tetex-latex
@@ -119,18 +103,9 @@ This package contains backend drivers to access digital cameras through SANE.
%prep
%setup -q
-%patch0 -p1 -b .pkgconfig
-%patch1 -p1 -b .udev
-%patch2 -p1 -b .man-encoding
-%patch3 -p1 -b .epson-expression800
-%patch4 -p1 -b .docs-utf8
-%patch5 -p1 -b .SCX4500W
-%patch6 -p1 -b .v4l
-%patch7 -p1 -b .xerox_mfp-fix-usb-devices
-%patch8 -p1 -b .epson-stylus-sx125
-%patch9 -p1 -b .av220-gray-modes
-%patch10 -p1 -b .Lexmark-X1100
-%patch11 -p1 -b .avision-init-devices
+%patch0 -p1 -b .udev
+%patch1 -p1 -b .epson-expression800
+%patch2 -p1 -b .SCX4500W
%build
# use PIC/PIE because SANE-enabled software is likely to deal with data coming
@@ -206,6 +181,10 @@ install -m 0644 tools/sane-backends.pc %{buildroot}%{_libdir}/pkgconfig/
%{_libdir}/sane/*gphoto2.so.*
%changelog
+* Fri Aug 31 2012 Nils Philippsen <nils at redhat.com> - 1.0.23-1
+- version 1.0.23
+- update udev patch, remove obsolete patches
+
* Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.22-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
diff --git a/sources b/sources
index 1a49297..2ee1dc7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fadf56a60f4776bfb24491f66b617cf5 sane-backends-1.0.22.tar.gz
+e226a89c54173efea80e91e9a5eb6573 sane-backends-1.0.23.tar.gz
More information about the scm-commits
mailing list