diff --git a/.abf.yml b/.abf.yml index 08a5c40..b99516d 100644 --- a/.abf.yml +++ b/.abf.yml @@ -2,6 +2,6 @@ sources: iscan-2.29.3-3-free.tar.bz2: f15e0b0c518ebdf1774e14bf2fbe26066c23b7b2 primaxscan-1.1.beta1.tar.gz: 374e2790fd6b3879835e10969dbe28aebe3025b7 sane-backend-geniusvp2_1.0.16.1.tar.gz: 4af825c231c8c048f8145af26b8fda3b66cb8be8 - sane-backends-1.0.24.tar.gz: c10bcb30a1b092b2c2fe5a86d6a5efc29123ccf9 sane-driver-0.2.tar.gz: 59fbb163d4c9eba89d6fa6c4f9dc5229fae2dbdf sane_hp_rts88xx-0.18.tar.gz: 02ed0f305fe100ff234e9250cdc618eba4b19a16 + sane-backends-1.0.25.tar.gz: 05824922d91571e1fc2f5cdd270745783d593754 diff --git a/sane-backends-1.0.21-epson-expression800.patch b/sane-backends-1.0.21-epson-expression800.patch deleted file mode 100644 index 8a6fb5d..0000000 --- a/sane-backends-1.0.21-epson-expression800.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 305535e303032814b65bf6d889a95f00f08a9071 Mon Sep 17 00:00:00 2001 -From: Nils Philippsen -Date: Wed, 5 May 2010 12:49:02 +0200 -Subject: [PATCH] patch: epson-expression800 - -Squashed commit of the following: - -commit 3b501d7499357438a1fbd63fefb2f977ae3051f5 -Author: Nils Philippsen -Date: Wed May 5 12:14:23 2010 +0200 - - Improve Epson Expression 800 - - Epson Expression 800 models announce themselves as "processor", not - "scanner". ---- - doc/descriptions/epson.desc | 1 + - doc/descriptions/epson2.desc | 1 + - 2 files changed, 2 insertions(+), 0 deletions(-) - -diff --git a/doc/descriptions/epson.desc b/doc/descriptions/epson.desc -index a22325c..55a0136 100644 ---- a/doc/descriptions/epson.desc -+++ b/doc/descriptions/epson.desc -@@ -174,6 +174,7 @@ - :model "Expression 800" - :interface "SCSI" - :status :complete -+:scsi "EPSON" "Expression800" "processor" - - :model "Expression 1600" - :interface "SCSI USB IEEE-1394" -diff --git a/doc/descriptions/epson2.desc b/doc/descriptions/epson2.desc -index 9a14f4f..56cabcd 100644 ---- a/doc/descriptions/epson2.desc -+++ b/doc/descriptions/epson2.desc -@@ -241,6 +241,7 @@ - :model "Expression 800" ; command spec - :interface "SCSI" - :status :complete -+:scsi "EPSON" "Expression800" "processor" - :comment "overseas version of the GT-9600" - - :model "Expression 836XL" ; command spec --- -1.6.6.1 - diff --git a/sane-backends-1.0.22-fix-str-fmt.patch b/sane-backends-1.0.22-fix-str-fmt.patch deleted file mode 100644 index d6e1895..0000000 --- a/sane-backends-1.0.22-fix-str-fmt.patch +++ /dev/null @@ -1,22 +0,0 @@ -Index: frontend/scanimage.c -=================================================================== ---- frontend/scanimage.c -+++ frontend/scanimage.c 2011-03-17 12:17:35.350469332 +0100 -@@ -1891,7 +1891,7 @@ - printf (start, int_arg); - break; - case 0: -- printf (start); -+ printf ("%s", start); - break; - } - *percent = cc; -@@ -1905,7 +1905,7 @@ - } - } - if (*start) -- printf (start); -+ printf ("%s", start); - } - } - if (i == 0 && ch != 'f') diff --git a/sane.spec b/sane.spec index 0b456a2..773bd08 100644 --- a/sane.spec +++ b/sane.spec @@ -4,7 +4,7 @@ %define libname %mklibname %{name} %{major} %define devname %mklibname %{name} %{major} -d -%bcond_without gphoto2 +%bcond_without gphoto2 %bcond_without primax %bcond_without v4l %bcond_without epkowa @@ -27,14 +27,14 @@ Summary: SANE - local and remote scanner access Name: sane -Version: 1.0.24 -Release: 8 +Version: 1.0.25 +Release: 1 # lib/ is LGPLv2+, backends are GPLv2+ with exceptions # Tools are GPLv2+, docs are public domain License: GPLv2+ and GPLv2+ with exceptions and Public Domain Group: Graphics Url: http://www.sane-project.org/ -Source0: http://alioth.debian.org/frs/download.php/file/3958/sane-backends-1.0.24.tar.gz +Source0: http://alioth.debian.org/frs/download.php/file/3958/sane-backends-%{version}.tar.gz Source3: http://downloads.sourceforge.net/project/px-backend/primaxscan-source/1.1.beta1/primaxscan-1.1.beta1.tar.gz Source5: saned-xinetd Source9: http://downloads.sourceforge.net/project/hp44x0backend/hp44x0backend/sane_hp_rts88xx-0.18/sane_hp_rts88xx-0.18.tar.gz @@ -61,7 +61,6 @@ Patch29: sane-backends-1.0.21-primascan.patch # (fc) list Brother MFC-260C, DCP130C as supported (Mdv bug # 52951) Patch30: sane-backends-1.0.22-brother2list.patch Patch31: sane-backends-1.0.20-strformat.patch -Patch32: sane-backends-1.0.22-fix-str-fmt.patch Patch33: sane-backends-1.0.23-have-pthread.patch # Debian patches @@ -83,7 +82,6 @@ Patch115: 24_sane-desc.c_debian_mods.dpatch # Fedora patches Patch202: sane-backends-1.0.20-open-macro.patch Patch203: sane-backends-1.0.23-udev.patch -Patch204: sane-backends-1.0.21-epson-expression800.patch BuildRequires: gettext BuildRequires: gettext-devel @@ -190,7 +188,6 @@ access image acquisition devices available on the local host. %patch28 -p1 -b .group %patch30 -p1 -b .brother2list %patch31 -p1 -b .strformat -%patch32 -p0 %patch33 -p1 -b .pthread %patch101 -p1 @@ -202,7 +199,6 @@ access image acquisition devices available on the local host. # Fedora patches %patch202 -p1 -b .open-macro %patch203 -p1 -b .udev -%patch204 -p1 -b .epson-expression800 # "geniusvp2" backend #setup -q -T -D -a 14 -n sane-backends-%{version} @@ -430,6 +426,7 @@ systemctl restart xinetd %if %{with primax} %{_bindir}/primax_scan %endif +%{_bindir}/umax_pp %{_mandir}/man1/* %{_mandir}/man5/* %{_mandir}/man7/*