2167250 - sane-backends-1.2.1 is available

This commit is contained in:
Zdenek Dohnal 2023-02-17 11:26:13 +01:00
parent 3e5dcd3e9a
commit 5129b23286
5 changed files with 11 additions and 44 deletions

1
.gitignore vendored
View File

@ -10,3 +10,4 @@ sane-backends-1.0.21.tar.gz
/sane-backends-1.0.31.tar.gz /sane-backends-1.0.31.tar.gz
/sane-backends-1.0.32.tar.gz /sane-backends-1.0.32.tar.gz
/sane-backends-1.1.1.tar.gz /sane-backends-1.1.1.tar.gz
/sane-backends-1.2.1.tar.gz

View File

@ -1,19 +0,0 @@
diff --git a/tools/sane-backends.pc.in b/tools/sane-backends.pc.in
index b4d9731..43f3ac5 100644
--- a/tools/sane-backends.pc.in
+++ b/tools/sane-backends.pc.in
@@ -2,7 +2,6 @@ prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
-ldflags=@LDFLAGS@ @GPHOTO2_LDFLAGS@
libs=@LIBS@ @DL_LIBS@ @LIBV4L_LIBS@ @MATH_LIB@ @TIFF_LIBS@ @JPEG_LIBS@ @GPHOTO2_LIBS@ @SOCKET_LIBS@ @AVAHI_LIBS@ @USB_LIBS@ @SCSI_LIBS@ @RESMGR_LIBS@
Name: SANE Backends
@@ -10,5 +9,5 @@ Description: Backends for SANE, the universal scanner interface
Version: @VERSION@
Requires:
Libs: -L${libdir} -lsane
-Libs.private: ${ldflags} ${libs}
+Libs.private: ${libs}
Cflags: -I${includedir}

View File

@ -17,8 +17,8 @@
Summary: Scanner access software Summary: Scanner access software
Name: sane-backends Name: sane-backends
Version: 1.1.1 Version: 1.2.1
Release: 11%{?dist} Release: 1%{?dist}
# 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
# see LICENSE for details # see LICENSE for details
@ -40,15 +40,9 @@ Patch0: sane-backends-1.0.25-udev.patch
Patch1: sane-backends-1.0.23-soname.patch Patch1: sane-backends-1.0.23-soname.patch
# Fedora-specific (for now): make installed sane-config multi-lib aware again # Fedora-specific (for now): make installed sane-config multi-lib aware again
Patch2: sane-backends-1.0.23-sane-config-multilib.patch Patch2: sane-backends-1.0.23-sane-config-multilib.patch
# 2042316 - genesys: backend crashes because it attempts to access a member outside of vector
# sent upstream as https://gitlab.com/sane-project/backends/-/merge_requests/688
Patch3: sane-genesys-gl845-crash.patch
# 2043092 - ldflags that only make sense during build are exposed in pkgconf file
# sent upstream as https://gitlab.com/sane-project/backends/-/merge_requests/768
Patch4: sane-backends-pkgconfig-misunderstanding.patch
# 2139882 - Plustek 8100 scanner not detected # 2139882 - Plustek 8100 scanner not detected
# sent upstream as https://gitlab.com/sane-project/backends/-/merge_requests/767 # sent upstream as https://gitlab.com/sane-project/backends/-/merge_requests/767
Patch5: sane-genesys-plustek7600i-8100-support.patch Patch3: sane-genesys-plustek7600i-8100-support.patch
URL: http://www.sane-project.org URL: http://www.sane-project.org
@ -343,7 +337,7 @@ udevadm hwdb --update >/dev/null 2>&1 || :
%files libs %files libs
%{_libdir}/libsane.so.1 %{_libdir}/libsane.so.1
%{_libdir}/libsane.so.1.1.1 %{_libdir}/libsane.so.1.2.1
%files devel %files devel
%{_bindir}/sane-config %{_bindir}/sane-config
@ -358,7 +352,7 @@ udevadm hwdb --update >/dev/null 2>&1 || :
# and configure printed only warning. So now we can figure out missing backend support # and configure printed only warning. So now we can figure out missing backend support
# during build # during build
%{_libdir}/sane/*.so.1 %{_libdir}/sane/*.so.1
%{_libdir}/sane/*.so.1.1.1 %{_libdir}/sane/*.so.1.2.1
%exclude %{_libdir}/sane/*dc210.so* %exclude %{_libdir}/sane/*dc210.so*
%exclude %{_libdir}/sane/*dc240.so* %exclude %{_libdir}/sane/*dc240.so*
@ -380,7 +374,7 @@ udevadm hwdb --update >/dev/null 2>&1 || :
%{_libdir}/sane/libsane-qcam.so %{_libdir}/sane/libsane-qcam.so
%endif %endif
%{_libdir}/sane/*.so.1 %{_libdir}/sane/*.so.1
%{_libdir}/sane/*.so.1.1.1 %{_libdir}/sane/*.so.1.2.1
%files daemon %files daemon
%{_sbindir}/saned %{_sbindir}/saned
@ -392,6 +386,9 @@ udevadm hwdb --update >/dev/null 2>&1 || :
%{_unitdir}/saned@.service %{_unitdir}/saned@.service
%changelog %changelog
* Fri Feb 17 2023 Zdenek Dohnal <zdohnal@redhat.com> - 1.2.1-1
- 2167250 - sane-backends-1.2.1 is available
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.1-11 * Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.1-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

View File

@ -1,12 +0,0 @@
diff --git a/backend/genesys/genesys.cpp b/backend/genesys/genesys.cpp
index 9552fa9..c95de7b 100644
--- a/backend/genesys/genesys.cpp
+++ b/backend/genesys/genesys.cpp
@@ -367,6 +367,7 @@ void sanei_genesys_create_default_gamma_table(Genesys_Device* dev,
}
max = size - 1;
} else if (dev->model->asic_type == AsicType::GL124 ||
+ dev->model->asic_type == AsicType::GL845 ||
dev->model->asic_type == AsicType::GL846 ||
dev->model->asic_type == AsicType::GL847) {
size = 257;

View File

@ -1 +1 @@
SHA512 (sane-backends-1.1.1.tar.gz) = 25bd9f90d550cfe6a6d01c48e83716a53f4b0e3a294287e455ecb5e5b80c8fe1699f45c6c87f694475cceb85745c70597e18a7b1094669d5091c5fb183dfe94d SHA512 (sane-backends-1.2.1.tar.gz) = 3ffce67e409caa5d32684290a56a46a68fef6991a14858d89cbab5aeb364fbbfd6d7c85bcbc4932c9167073a3a6ba682b4730f11fb320f0c4de53a7e7d3edba1