Updated iscan to 2.29.3

This commit is contained in:
Denis Silakov 2014-09-24 06:52:07 -04:00
parent 728b46afe5
commit fc852ae6ca
4 changed files with 14 additions and 13 deletions

View file

@ -1,5 +1,6 @@
sources: sources:
iscan-2.28.1-3-free.tar.bz2: e55ef6c94c49a877d7c41e74cfbd015448a7c5f4 iscan-2.28.1-3-free.tar.bz2: e55ef6c94c49a877d7c41e74cfbd015448a7c5f4
iscan-2.29.3-3-free.tar.bz2: f15e0b0c518ebdf1774e14bf2fbe26066c23b7b2
iscan_2.24.0-4-free.tar.bz2: 8228edc1cfaa75fd0cfba631746376bf1f166f53 iscan_2.24.0-4-free.tar.bz2: 8228edc1cfaa75fd0cfba631746376bf1f166f53
primaxscan-1.1.beta1.tar.gz: 374e2790fd6b3879835e10969dbe28aebe3025b7 primaxscan-1.1.beta1.tar.gz: 374e2790fd6b3879835e10969dbe28aebe3025b7
sane-backend-geniusvp2_1.0.16.1.tar.gz: 4af825c231c8c048f8145af26b8fda3b66cb8be8 sane-backend-geniusvp2_1.0.16.1.tar.gz: 4af825c231c8c048f8145af26b8fda3b66cb8be8

View file

@ -1,10 +0,0 @@
--- configure.ac.iscan-2.10.0-1_fix_link 2011-12-01 02:30:53.000000000 +0100
+++ configure.ac 2011-12-23 07:11:25.448858406 +0100
@@ -168,6 +168,7 @@
PKG_CHECK_MODULES(XML, libxml-2.0)
AC_CHECK_LIB([usb], [usb_get_busses])
+AC_CHECK_LIB([m], [floor])
AC_CHECK_LIB([sane], [sane_init])
AC_CHECK_LIB([rt], [clock_gettime], [HAVE_LIBRT=1])

View file

@ -0,0 +1,10 @@
--- configure.ac.orig 2014-09-24 06:41:44.754444670 -0400
+++ configure.ac 2014-09-24 06:42:07.426443639 -0400
@@ -171,6 +171,7 @@
],[
AC_CHECK_LIB([usb], [usb_get_busses])
])
+AC_CHECK_LIB([m], [floor])
AC_CHECK_LIB([sane], [sane_init])
AC_CHECK_LIB([rt], [clock_gettime], [HAVE_LIBRT=1])

View file

@ -1,4 +1,4 @@
%define iscanversion 2.28.1 %define iscanversion 2.29.3
%define beta %nil %define beta %nil
%define major 1 %define major 1
%define libname %mklibname %{name} %{major} %define libname %mklibname %{name} %{major}
@ -28,7 +28,7 @@
Summary: SANE - local and remote scanner access Summary: SANE - local and remote scanner access
Name: sane Name: sane
Version: 1.0.24 Version: 1.0.24
Release: 4 Release: 5
# lib/ is LGPLv2+, backends are GPLv2+ with exceptions # lib/ is LGPLv2+, backends are GPLv2+ with exceptions
# Tools are GPLv2+, docs are public domain # Tools are GPLv2+, docs are public domain
License: GPLv2+ and GPLv2+ with exceptions and Public Domain License: GPLv2+ and GPLv2+ with exceptions and Public Domain
@ -50,7 +50,7 @@ Source14: http://downloads.sourceforge.net/project/geniusvp2/sane-backend-genius
Source15: sane.rpmlintrc Source15: sane.rpmlintrc
Patch0: sane-backends-1.0.19-fix-str-fmt.patch Patch0: sane-backends-1.0.19-fix-str-fmt.patch
Patch1: sane-backends-1.0.18-plustek-s12.patch Patch1: sane-backends-1.0.18-plustek-s12.patch
Patch23: iscan-2.28.1-fix-link.patch Patch23: iscan-2.29.3-fix-link.patch
Patch24: sane-backends-1.0.21-link.patch Patch24: sane-backends-1.0.21-link.patch
Patch26: iscan-2.20.1-no_non-free_please.diff Patch26: iscan-2.20.1-no_non-free_please.diff
Patch27: iscan-2.28.1-linkage_fix.patch Patch27: iscan-2.28.1-linkage_fix.patch