From 1de15bc00932e65cdb8b4141d8e7bb23f1551295cd76b8ad40aa9f7da23f5e4e Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sun, 15 Nov 2009 13:43:12 +0000 Subject: [PATCH 1/5] Accepting request 23781 from home:coolo:branches:openSUSE:Factory:branched Copy from home:coolo:branches:openSUSE:Factory:branched/sane-backends via accept of submit request 23781 revision 2. Request was accepted with message: ok OBS-URL: https://build.opensuse.org/request/show/23781 OBS-URL: https://build.opensuse.org/package/show/graphics/sane-backends?expand=0&rev=13 --- disable-resmgr-support.patch | 12 +++++++----- sane-backends.changes | 5 +++++ 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/disable-resmgr-support.patch b/disable-resmgr-support.patch index 8b30805..091ec78 100644 --- a/disable-resmgr-support.patch +++ b/disable-resmgr-support.patch @@ -1,6 +1,8 @@ ---- configure.in.orig 2006-07-03 00:21:42.000000000 +0200 -+++ configure.in 2006-09-11 10:47:29.000000000 +0200 -@@ -131,15 +131,21 @@ AC_CHECK_HEADERS([io/cam/cam.h],,,[#incl +Index: configure.in +=================================================================== +--- configure.in.orig ++++ configure.in +@@ -155,15 +155,21 @@ AC_CHECK_HEADERS([asm/io.h],,,[#include SANE_CHECK_MISSING_HEADERS @@ -29,5 +31,5 @@ +# ) +#]) - AC_CHECK_HEADER(usbcalls.h,[ - AC_DEFINE(HAVE_USBCALLS,1,[define if you have the usbcalls library]) + + dnl *********************************************************************** diff --git a/sane-backends.changes b/sane-backends.changes index 496437c..6c7a3bf 100644 --- a/sane-backends.changes +++ b/sane-backends.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Nov 3 19:09:44 UTC 2009 - coolo@novell.com + +- updated patches to apply with fuzz=0 + ------------------------------------------------------------------- Thu Oct 8 09:35:17 UTC 2009 - lnussel@suse.de From 2e9ec5c961a23e64875267c0328462eb7f394e875f588705a38f89dded0dd12e Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Mon, 16 Nov 2009 13:09:40 +0000 Subject: [PATCH 2/5] checked in OBS-URL: https://build.opensuse.org/package/show/graphics/sane-backends?expand=0&rev=14 --- disable-resmgr-support.patch | 12 +++++------- sane-backends.changes | 5 ----- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/disable-resmgr-support.patch b/disable-resmgr-support.patch index 091ec78..8b30805 100644 --- a/disable-resmgr-support.patch +++ b/disable-resmgr-support.patch @@ -1,8 +1,6 @@ -Index: configure.in -=================================================================== ---- configure.in.orig -+++ configure.in -@@ -155,15 +155,21 @@ AC_CHECK_HEADERS([asm/io.h],,,[#include +--- configure.in.orig 2006-07-03 00:21:42.000000000 +0200 ++++ configure.in 2006-09-11 10:47:29.000000000 +0200 +@@ -131,15 +131,21 @@ AC_CHECK_HEADERS([io/cam/cam.h],,,[#incl SANE_CHECK_MISSING_HEADERS @@ -31,5 +29,5 @@ Index: configure.in +# ) +#]) - - dnl *********************************************************************** + AC_CHECK_HEADER(usbcalls.h,[ + AC_DEFINE(HAVE_USBCALLS,1,[define if you have the usbcalls library]) diff --git a/sane-backends.changes b/sane-backends.changes index 6c7a3bf..496437c 100644 --- a/sane-backends.changes +++ b/sane-backends.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Tue Nov 3 19:09:44 UTC 2009 - coolo@novell.com - -- updated patches to apply with fuzz=0 - ------------------------------------------------------------------- Thu Oct 8 09:35:17 UTC 2009 - lnussel@suse.de From 0c21de4b5defbb2a5b61536000eee97d202ab8b449903f547dac9a516c8eb9e5 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Mon, 21 Dec 2009 20:12:27 +0000 Subject: [PATCH 3/5] Accepting request 27069 from home:seife:branches:graphics Copy from home:seife:branches:graphics/sane-backends via accept of submit request 27069 revision 2. Request was accepted with message: OBS-URL: https://build.opensuse.org/request/show/27069 OBS-URL: https://build.opensuse.org/package/show/graphics/sane-backends?expand=0&rev=15 --- disable-resmgr-support.patch | 12 +++++++----- sane-backends.changes | 10 ++++++++++ sane-backends.spec | 10 +++++++--- 3 files changed, 24 insertions(+), 8 deletions(-) diff --git a/disable-resmgr-support.patch b/disable-resmgr-support.patch index 8b30805..091ec78 100644 --- a/disable-resmgr-support.patch +++ b/disable-resmgr-support.patch @@ -1,6 +1,8 @@ ---- configure.in.orig 2006-07-03 00:21:42.000000000 +0200 -+++ configure.in 2006-09-11 10:47:29.000000000 +0200 -@@ -131,15 +131,21 @@ AC_CHECK_HEADERS([io/cam/cam.h],,,[#incl +Index: configure.in +=================================================================== +--- configure.in.orig ++++ configure.in +@@ -155,15 +155,21 @@ AC_CHECK_HEADERS([asm/io.h],,,[#include SANE_CHECK_MISSING_HEADERS @@ -29,5 +31,5 @@ +# ) +#]) - AC_CHECK_HEADER(usbcalls.h,[ - AC_DEFINE(HAVE_USBCALLS,1,[define if you have the usbcalls library]) + + dnl *********************************************************************** diff --git a/sane-backends.changes b/sane-backends.changes index 496437c..4abc27a 100644 --- a/sane-backends.changes +++ b/sane-backends.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Fri Dec 18 00:04:42 UTC 2009 - seife@opensuse.org + +- fix udev warnings 'NAME="%k" is superfluous' + +------------------------------------------------------------------- +Tue Nov 3 19:09:44 UTC 2009 - coolo@novell.com + +- updated patches to apply with fuzz=0 + ------------------------------------------------------------------- Thu Oct 8 09:35:17 UTC 2009 - lnussel@suse.de diff --git a/sane-backends.spec b/sane-backends.spec index e06b8e5..ff9aa2b 100644 --- a/sane-backends.spec +++ b/sane-backends.spec @@ -20,12 +20,12 @@ Name: sane-backends BuildRequires: libgphoto2-devel libieee1284 libjpeg-devel net-snmp-devel pkg-config texlive-latex -License: GPL v2 only ; GPL v2 or later ; LGPL v2.1 or later ; Public Domain, Freeware +License: GPL v2 only ; GPL v2 or later ; LGPL v2.1 or later ; Public Domain, Freeware Group: Hardware/Scanner AutoReqProv: on Summary: SANE (Scanner Access Now Easy) Scanner Drivers Version: 1.0.20 -Release: 7 +Release: 8 Url: http://www.sane-project.org/ # URL for Source0: http://alioth.debian.org/frs/download.php/2318/sane-backends-1.0.19.tar.gz Source0: sane-backends-%{version}.tar.bz2 @@ -257,7 +257,7 @@ Authors: Wittawat Yamwong %package autoconfig -License: GPL v2 or later ; LGPL v2.1 or later ; Public Domain, Freeware +License: GPL v2 or later ; LGPL v2.1 or later ; Public Domain, Freeware Group: Hardware/Scanner Summary: USB Scanner Autoconfiguration Requires: sane-backends @@ -544,6 +544,10 @@ done for m in $( sed -e 's/0x/./ig' -e 's/:/.,.ATTR.idProduct.==/' unsupportedUSBIDs ) do sed -i -e "/^ATTR.idVendor.==$m/Is/^ATTR/# ATTR/" tools/udev/libsane.rules done + +# newer udev versions complain about NAME="%k" usage, saying it's superfluous +sed -i -e 's/NAME="%k", //' tools/udev/libsane.rules + # Install the udev rules file: install -m644 tools/udev/libsane.rules %{buildroot}%{_sysconfdir}/udev/rules.d/55-libsane.rules # Regarding HAL: From ad9f70a08ce75d56fb4bec48f807076f0e8f0677c2d12d5ef965b87fa93085c3 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Fri, 29 Jan 2010 15:18:09 +0000 Subject: [PATCH 4/5] checked in (request 30745) OBS-URL: https://build.opensuse.org/package/show/graphics/sane-backends?expand=0&rev=16 --- sane-backends.changes | 5 ----- sane-backends.spec | 4 ---- 2 files changed, 9 deletions(-) diff --git a/sane-backends.changes b/sane-backends.changes index 4abc27a..6c7a3bf 100644 --- a/sane-backends.changes +++ b/sane-backends.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Fri Dec 18 00:04:42 UTC 2009 - seife@opensuse.org - -- fix udev warnings 'NAME="%k" is superfluous' - ------------------------------------------------------------------- Tue Nov 3 19:09:44 UTC 2009 - coolo@novell.com diff --git a/sane-backends.spec b/sane-backends.spec index ff9aa2b..3249271 100644 --- a/sane-backends.spec +++ b/sane-backends.spec @@ -544,10 +544,6 @@ done for m in $( sed -e 's/0x/./ig' -e 's/:/.,.ATTR.idProduct.==/' unsupportedUSBIDs ) do sed -i -e "/^ATTR.idVendor.==$m/Is/^ATTR/# ATTR/" tools/udev/libsane.rules done - -# newer udev versions complain about NAME="%k" usage, saying it's superfluous -sed -i -e 's/NAME="%k", //' tools/udev/libsane.rules - # Install the udev rules file: install -m644 tools/udev/libsane.rules %{buildroot}%{_sysconfdir}/udev/rules.d/55-libsane.rules # Regarding HAL: From 31e425d90d6218382c26ad9426fe54a50e000cf6cce6a727390a311ff2388a97 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Fri, 29 Jan 2010 15:18:10 +0000 Subject: [PATCH 5/5] Updating link to change in openSUSE:Factory/sane-backends revision 39.0 OBS-URL: https://build.opensuse.org/package/show/graphics/sane-backends?expand=0&rev=16b45ae614d656e33e489ad823065bd4 --- sane-backends.changes | 5 +++++ sane-backends.spec | 10 ++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/sane-backends.changes b/sane-backends.changes index 6c7a3bf..4abc27a 100644 --- a/sane-backends.changes +++ b/sane-backends.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Dec 18 00:04:42 UTC 2009 - seife@opensuse.org + +- fix udev warnings 'NAME="%k" is superfluous' + ------------------------------------------------------------------- Tue Nov 3 19:09:44 UTC 2009 - coolo@novell.com diff --git a/sane-backends.spec b/sane-backends.spec index 3249271..c4eb876 100644 --- a/sane-backends.spec +++ b/sane-backends.spec @@ -1,7 +1,7 @@ # # spec file for package sane-backends (Version 1.0.20) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,12 +20,12 @@ Name: sane-backends BuildRequires: libgphoto2-devel libieee1284 libjpeg-devel net-snmp-devel pkg-config texlive-latex -License: GPL v2 only ; GPL v2 or later ; LGPL v2.1 or later ; Public Domain, Freeware +License: GPLv2 ; GPLv2+ ; LGPLv2.1+ ; Public Domain, Freeware Group: Hardware/Scanner AutoReqProv: on Summary: SANE (Scanner Access Now Easy) Scanner Drivers Version: 1.0.20 -Release: 8 +Release: 9 Url: http://www.sane-project.org/ # URL for Source0: http://alioth.debian.org/frs/download.php/2318/sane-backends-1.0.19.tar.gz Source0: sane-backends-%{version}.tar.bz2 @@ -257,7 +257,7 @@ Authors: Wittawat Yamwong %package autoconfig -License: GPL v2 or later ; LGPL v2.1 or later ; Public Domain, Freeware +License: GPLv2+ ; LGPLv2.1+ ; Public Domain, Freeware Group: Hardware/Scanner Summary: USB Scanner Autoconfiguration Requires: sane-backends @@ -544,6 +544,8 @@ done for m in $( sed -e 's/0x/./ig' -e 's/:/.,.ATTR.idProduct.==/' unsupportedUSBIDs ) do sed -i -e "/^ATTR.idVendor.==$m/Is/^ATTR/# ATTR/" tools/udev/libsane.rules done +# newer udev versions complain about NAME="%k" usage, saying it's superfluous +sed -i -e 's/NAME="%k", //' tools/udev/libsane.rules # Install the udev rules file: install -m644 tools/udev/libsane.rules %{buildroot}%{_sysconfdir}/udev/rules.d/55-libsane.rules # Regarding HAL: