Hello community, here is the log from the commit of package sane-backends for openSUSE:Factory checked in at 2012-04-23 16:13:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sane-backends (Old) and /work/SRC/openSUSE:Factory/.sane-backends.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sane-backends", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/sane-backends/sane-backends.changes 2012-03-22 13:36:55.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.sane-backends.new/sane-backends.changes 2012-04-23 16:13:08.000000000 +0200 @@ -1,0 +2,18 @@ +Fri Apr 20 12:24:49 CEST 2012 - [email protected] + +- Configure --enable-libusb_1_0 plus BuildRequires libusb-1_0-devel + to use libusb1 (instead of using libusb0 via libusb-compat), + see https://bugzilla.novell.com/show_bug.cgi?id=559697#c7 + for the libusb versioning numbering. +- Use traditional bash scriptlets for post/postun with + an explicite "exit 0" line at the end to be fail safe + and therefore also "PreReq: /sbin/ldconfig" explicitly, + see the "Shared_libraries" section in + http://en.opensuse.org/openSUSE:Packaging_scriptlet_snippets +- BuildIgnore ghostscript-x11 because BuildRequires texlive-latex + is needed for sane.tex -> sane.dvi -> sane.ps but texlive-latex + requires texlive which requires ghostscript-x11 but the latter + is not needed and blows up the build system. +- Minor cleanups in the spec file. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sane-backends.spec ++++++ --- /var/tmp/diff_new_pack.u3XQay/_old 2012-04-23 16:13:10.000000000 +0200 +++ /var/tmp/diff_new_pack.u3XQay/_new 2012-04-23 16:13:10.000000000 +0200 @@ -18,17 +18,23 @@ Name: sane-backends BuildRequires: libgphoto2-devel -BuildRequires: libjpeg-devel -BuildRequires: libtool -BuildRequires: libusb-compat-devel -BuildRequires: net-snmp-devel -BuildRequires: pkg-config -BuildRequires: texlive-latex %if 0%{?suse_version} > 1130 BuildRequires: libieee1284-devel %else BuildRequires: libieee1284 %endif +BuildRequires: libjpeg-devel +BuildRequires: libtool +BuildRequires: libusb-1_0-devel +BuildRequires: net-snmp-devel +BuildRequires: pkg-config +# texlive-latex is needed to make doc/sane.ps from doc/sane.tex +# but texlive-latex requires texlive which requires ghostscript-x11 +# but ghostscript-x11 is not needed for sane.tex -> sane.dvi -> sane.ps +# so that the needless package ghostscript-x11 blows up the build system +# and is explicitly excluded to be installed in the build system: +BuildRequires: texlive-latex +#!BuildIgnore: ghostscript-x11 Summary: SANE (Scanner Access Now Easy) Scanner Drivers License: GPL-2.0 ; GPL-2.0+ ; LGPL-2.1+ ; SUSE-Public-Domain Group: Hardware/Scanner @@ -80,7 +86,7 @@ Source201: create_sane-backends-autoconfig.rules # Patch1 does locale rename: no -> nb: # Patch1 is obsolete since sane-backends-1.0.19 because it uses 'nb'. -# Patch2 fixes too small arrays in backend/niash.c: +# Patch2 fix-buffer-overflow.patch fixes too small arrays in backend/niash.c: Patch2: fix-buffer-overflow.patch # Patch3 replaces fixed HZ compile-time value by sysconf(_SC_CLK_TCK) runtime value: # Patch3 is obsolete since sane-backends-1.0.19 because it is fixed in the source. @@ -93,17 +99,17 @@ # Patch7 lets sanei_scsi_find_devices continue on to look at subsequent devices # if the attach callback returns anything other than SANE_STATUS_GOOD: # Patch7 is obsolete since sane-backends-1.0.20 because it is fixed in the source. -# Patch8 re-adds SANE_CAP_ALWAYS_SETTABLE to sane.h which was erroneously -# removed in sane-backends-1.0.20 so that sane-frontends and xsane can no longer build, -# see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=527675 +# Patch8 re-add-SANE_CAP_ALWAYS_SETTABLE.patch re-adds SANE_CAP_ALWAYS_SETTABLE to sane.h +# which was erroneously removed in sane-backends-1.0.20 so that sane-frontends and xsane +# can no longer build, see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=527675 # SANE_CAP_ALWAYS_SETTABLE is still missing in sane-backends-1.0.21 Patch8: re-add-SANE_CAP_ALWAYS_SETTABLE.patch # Patch9 fix-hp3900_config.c.patch fixes a possible for loop overflow in hp3900_config.c # see https://bugzilla.novell.com/show_bug.cgi?id=517281 # and https://alioth.debian.org/tracker/index.php?func=detail&aid=311856&group_id=30186&atid=410366 # which is obsolete since sane-backends-1.0.21 because it is fixed in the source. -# Patch10 fixes undefined 'foo = ++foo modulo bar' operations in mustek_pp_ccd300.c -# see https://bugzilla.novell.com/show_bug.cgi?id=498435 +# Patch10 fix-mustek_pp_ccd300.c.patch fixes undefined 'foo = ++foo modulo bar' operations +# in mustek_pp_ccd300.c see https://bugzilla.novell.com/show_bug.cgi?id=498435 # and https://alioth.debian.org/tracker/index.php?func=detail&aid=311857&group_id=30186&atid=410366 # where the upstream maintainer did not understand what is wrong and closed it as "Wont Fix" # so that we have to keep this patch: @@ -149,23 +155,23 @@ # The libtool script used in sane-backends is slightly modified to support that. # Patch102 was dropped because there is no reason to build them as libtool modules # and it would make our package incompatible with the rest of the SANE world. -# Patch103 installs tools/umax_pp as /usr/bin/umax_pp which is built +# Patch103 install-umax_pp-tool.patch installs tools/umax_pp as /usr/bin/umax_pp which is built # but not installed but it is needed to recover from a failed scan # with scanners which use the umax_pp backend, see http://bugs.debian.org/496833 Patch103: install-umax_pp-tool.patch -# Patch104 removes descriptions-external/hpoj.desc from doc/Makefile.am +# Patch104 no-descriptions-external-hpoj.patch removes descriptions-external/hpoj.desc from doc/Makefile.am # because it is intentionally removed from the sources in the prep section: Patch104: no-descriptions-external-hpoj.patch -# additional usb id -Patch105: sane-backends-1.0.21-SCX4500W.patch -# fix usb device support in xerox_mfp (bnc#745245) -Patch106: sane-backends-1.0.22-xerox_mfp-fix-usb-devices.patch # Patch105 sane-backends-1.0.20-xerox_mfp.diff backports post 1.0.20 xerox_mfp changes # and is therefore removed since sane-backends-1.0.21 which contains those changes. +# Patch106 sane-backends-1.0.21-SCX4500W.patch adds usb id for SCX4500W: +Patch106: sane-backends-1.0.21-SCX4500W.patch +# Patch107 sane-backends-1.0.22-xerox_mfp-fix-usb-devices.patch fixes usb device support in xerox_mfp (bnc#745245): +Patch107: sane-backends-1.0.22-xerox_mfp-fix-usb-devices.patch # Install into this non-root directory (required when norootforbuild is used): BuildRoot: %{_tmppath}/%{name}-%{version}-build -# The postinstall script requires this: -PreReq: coreutils, /bin/sed, /bin/grep +# Prerequire /sbin/ldconfig which is used in the traditional bash scriptlets for post/postun: +PreReq: /sbin/ldconfig # See https://bugzilla.novell.com/show_bug.cgi?id=437293 %ifarch ppc64 Obsoletes: sane-64bit @@ -193,108 +199,6 @@ that are connected to a server via network from client hosts that run the "net" meta driver. - - -Authors: --------- - Abel Deuring <[email protected]> - Andras Major <[email protected]> - Andreas Beck <[email protected]> - Andreas Bolsch <[email protected]> - Andreas Czechanowski <[email protected]> - Andreas Nowack <[email protected]> - Andreas Rick <[email protected]> - Andrew Kuchling <[email protected]> - Bernd Schroeder <[email protected]> - Bertrik Sikken <[email protected]> - Brian J. Murrell <[email protected]> - Chris Bagwell <[email protected]> - Chris Pinkham <[email protected]> - Christian Bucher <[email protected]> - David Etherton <[email protected]> - David F. Skoll <[email protected]> - David Huggins-Daines <[email protected]> - David Mosberger <[email protected]> - David Stevenson <[email protected]> - Didier Carlier <[email protected]> - Earle F. Philhower III <[email protected]> - Eddy De Greef <[email protected]> - Eugene S. Weiss <[email protected]> - Feico W. Dillema <[email protected]> - Franck Schneider <[email protected]> - Frank Zago <[email protected]> - Frederik Ramm <[email protected]> - Fred Odendaal <[email protected]> - Gerard Klaver <[email protected]> - Gerhard Jaeger <[email protected]> - Giuseppe Sacco <[email protected]> - Glenn Ramsey <[email protected]> - Gordon Matzigkeit <[email protected]> - Guido Muesch <[email protected]> - Helmut Koeberle <[email protected]> - Henning Geinitz <[email protected]> - Henrik Johansson <[email protected]> - Ilia Sotnikov <[email protected]> - Ingo Schneider <[email protected]> - Ingo Wilken <[email protected]> - James Perry <[email protected]> - Jeff Freedman <[email protected]> - Jochen Eisinger <[email protected]> - Jonathan Bravo Lopez <[email protected]> - Jon Chambers <[email protected]> - Juergen G. Schimmer <[email protected]> - Julien Blache <[email protected]> - Karl Anders Oygard <[email protected]> - Karl Heinz Kremer <[email protected]> - Karsten Festag <[email protected]> - Kazuhiro Sasayama <[email protected]> - Kazuya Fukuda <[email protected]> - Kevin Charter <[email protected]> - M. Allan Noah <[email protected]> - Manuel Panea <[email protected]> - Marcio Teixeira <[email protected]> - Marian Eichholz <[email protected]> - Markus Mertinat <[email protected]> - Martijn van Oosterhout <[email protected]> - Matthew Duggan <[email protected]> - Matthew Marjanovic <[email protected]> - Mattias Ellert <[email protected]> - Max Vorobiev <[email protected]> - Meino Christian Cramer <[email protected]> - M.F. <[email protected]> - Michael Herder <[email protected]> - Michael K. Johnson <[email protected]> - Michel Roelofs <[email protected]> - Milon Firikis <[email protected]> - Mitsuru Okaniwa <[email protected]> - Nathan Rutman <[email protected]> - Oliver Rauch <[email protected]> - Oliver Schirrmeister <[email protected]> - Oliver Schwartz <[email protected]> - Patrick Lessard <[email protected]> - Patrick Reynolds <[email protected]> - Peter Fales <[email protected]> - Peter Kirchgessner <[email protected]> - Petter Reinholdtsen <[email protected]> - Pierre Willenbrock <[email protected]> - Randolph Bentson <[email protected]> - Rene Rebe <[email protected]> - Roger Wolff <[email protected]> - Roy Zhou <[email protected]> - Sebastien Sable <[email protected]> - Sergey Vlasov <[email protected]> - Simon Krix <[email protected]> - Simon Munton <[email protected]> - Stephane Voltz <[email protected]> - Thomas Soumarmon <[email protected]> - Tom Martone <[email protected]> - Tom Wang <[email protected]> - Tristan Tarrant <[email protected]> - Troy Rollo <[email protected]> - Ullrich Sigwanz <[email protected]> - Ulrich Deiters <[email protected]> - Wittawat Yamwong <[email protected]> - %package devel Summary: Development files for sane-backends License: GPL-2.0 ; GPL-2.0+ ; LGPL-2.1+ ; SUSE-Public-Domain @@ -335,30 +239,26 @@ If you do not like automated driver activation, do not install this package or remove it when it is already installed. - - -Authors: --------- - Johannes Meixner <[email protected]> - %prep %setup -q # Apply upstream patches first of all: # Then apply non-upstream patches: -# Patch2 fixes too small arrays in backend/niash.c: +# Patch2 fix-buffer-overflow.patch fixes too small arrays in backend/niash.c: %patch2 -# Patch8 re-adds SANE_CAP_ALWAYS_SETTABLE to sane.h which was erroneously removed: +# Patch8 re-add-SANE_CAP_ALWAYS_SETTABLE.patch re-adds SANE_CAP_ALWAYS_SETTABLE to sane.h which was erroneously removed: %patch8 -# Patch10 fixes undefined 'foo = ++foo modulo bar' operations in mustek_pp_ccd300.c: +# Patch10 fix-mustek_pp_ccd300.c.patch fixes undefined 'foo = ++foo modulo bar' operations in mustek_pp_ccd300.c: %patch10 # Patch100... is SUSE specific stuff: -# Patch103 installs tools/umax_pp as /usr/bin/umax_pp: +# Patch103 install-umax_pp-tool.patch installs tools/umax_pp as /usr/bin/umax_pp: %patch103 -# Patch104 removes descriptions-external/hpoj.desc from doc/Makefile.am +# Patch104 no-descriptions-external-hpoj.patch removes descriptions-external/hpoj.desc from doc/Makefile.am # because it is intentionally removed from the sources in the prep section: %patch104 -%patch105 -p1 +# Patch106 sane-backends-1.0.21-SCX4500W.patch adds usb id for SCX4500W: %patch106 -p1 +# Patch107 sane-backends-1.0.22-xerox_mfp-fix-usb-devices.patch fixes usb device support in xerox_mfp (bnc#745245): +%patch107 -p1 # Source100... is SUSE specific stuff: # Remove hpoj.desc completely to avoid confusion with its successor hpaio.desc # because since openSUSE 10.3 the package hp-officeJet (for hpoj.desc) is dropped. @@ -398,6 +298,8 @@ export LDFLAGS="-L/%_lib $LDFLAGS" # Enable pthread instead of fork (used in Debian since Feb 2009 and no issues so far), # see https://bugzilla.novell.com/show_bug.cgi?id=633780 +# Enable libusb-1.0 support which is available since sane-backends 1.0.20 +# and libusb-1_0 is available at least since openSUSE 11.1. # Disable locking because /var/lock/sane/ would be a world-writable directory. ./configure --prefix=/usr \ --exec-prefix=/usr \ @@ -409,6 +311,7 @@ --with-gphoto2 \ --with-docdir=%{_defaultdocdir}/sane-backends \ --enable-pthread \ + --enable-libusb_1_0 \ --disable-locking # Enable locking for backends where "99" is the group of the lockfile path (LOCKPATH_GROUP) # because "99" is the group of the user who runs the build when norootforbuild is used @@ -606,9 +509,13 @@ rm %{buildroot}%{_defaultdocdir}/sane-backends/{README.os2,README.aix,README.solaris} %find_lang sane-backends -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig +%post +/sbin/ldconfig +exit 0 + +%postun +/sbin/ldconfig +exit 0 %files -f sane-backends.lang %defattr(-,root,root) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
