sane 1.2.1-1 (aarch64;znver1;x86_64) 2023-17307
-9999

Status rejected
Submitter benbullard79 [@T] cox.net
Platform rolling
Repository main
URL https://abf.openmandriva.org/build_lists/292183
Packages
lib64sane1-1.2.1-1.aarch64.binary
lib64sane1-debuginfo-1.2.1-1.aarch64.debuginfo
lib64sane1-devel-1.2.1-1.aarch64.binary
sane-1.2.1-1.aarch64.source
sane-backends-1.2.1-1.aarch64.binary
sane-backends-debuginfo-1.2.1-1.aarch64.debuginfo
sane-backends-doc-1.2.1-1.aarch64.binary
sane-debuginfo-1.2.1-1.aarch64.debuginfo
sane-debugsource-1.2.1-1.aarch64.binary
saned-1.2.1-1.aarch64.binary
saned-debuginfo-1.2.1-1.aarch64.debuginfo
lib64sane1-1.2.1-1.znver1.binary
lib64sane1-debuginfo-1.2.1-1.znver1.debuginfo
lib64sane1-devel-1.2.1-1.znver1.binary
libsane1-1.2.1-1.znver1.binary
libsane1-debuginfo-1.2.1-1.znver1.debuginfo
libsane1-devel-1.2.1-1.znver1.binary
sane-1.2.1-1.znver1.source
sane-backends-1.2.1-1.znver1.binary
sane-backends-debuginfo-1.2.1-1.znver1.debuginfo
sane-backends-doc-1.2.1-1.znver1.binary
sane-debugsource-1.2.1-1.znver1.binary
saned-1.2.1-1.znver1.binary
saned-debuginfo-1.2.1-1.znver1.debuginfo
lib64sane1-1.2.1-1.x86_64.binary
lib64sane1-debuginfo-1.2.1-1.x86_64.debuginfo
lib64sane1-devel-1.2.1-1.x86_64.binary
libsane1-1.2.1-1.x86_64.binary
libsane1-debuginfo-1.2.1-1.x86_64.debuginfo
libsane1-devel-1.2.1-1.x86_64.binary
sane-1.2.1-1.x86_64.source
sane-backends-1.2.1-1.x86_64.binary
sane-backends-debuginfo-1.2.1-1.x86_64.debuginfo
sane-backends-doc-1.2.1-1.x86_64.binary
sane-debugsource-1.2.1-1.x86_64.binary
saned-1.2.1-1.x86_64.binary
saned-debuginfo-1.2.1-1.x86_64.debuginfo
Build Date 2023-02-28 23:48:43 +0000 UTC
Last Updated 2023-03-05 01:15:53.684824335 +0000 UTC
$ git diff --patch-with-stat --summary 16f73ffe4c8b168b91418900a8bb5437d5cca028..2169fc46c664692451bdf22a9b3b7b184cac4b84

 .abf.yml                   |  2 +-
 01_missing_pthreads.dpatch | 12 ------------
 sane.spec                  | 23 +++++++++--------------
 3 files changed, 10 insertions(+), 27 deletions(-)
 delete mode 100644 01_missing_pthreads.dpatch

diff --git a/.abf.yml b/.abf.yml
index 479f953..89911c2 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -2,6 +2,6 @@ sources:
   iscan-2.30.4-2-free.tar.bz2: bf368b38ecb24e9d2eee82d22fd233e3557c3904
   primaxscan-1.1.beta1.tar.bz2: 66fa1b44258916ea8d437c4a3636a78fc657b139
   sane-backend-geniusvp2_1.0.16.1.tar.gz: 4af825c231c8c048f8145af26b8fda3b66cb8be8
-  sane-backends-1.1.1.tar.gz: c9bc2da229bb242520a2acda1e79e8a1c33e1e44
   sane-driver-0.2.tar.bz2: 5364b5fd66788908e989c58c1afa3ce4cfcf8104
   sane_hp_rts88xx-0.18.tar.bz2: 213b4f9696c2684b5fc45ce8f77b6f6fed4afaca
+  sane-backends-1.2.1.tar.gz: 849c5970b8160408637c2ae1680dfc977cda6747
diff --git a/01_missing_pthreads.dpatch b/01_missing_pthreads.dpatch
deleted file mode 100644
index d6e3a5c..0000000
--- a/01_missing_pthreads.dpatch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up sane-backends-1.0.30/backend/Makefile.in.pthread~ sane-backends-1.0.30/backend/Makefile.in
---- sane-backends-1.0.30/backend/Makefile.in.pthread~	2020-06-16 00:43:30.016070048 +0200
-+++ sane-backends-1.0.30/backend/Makefile.in	2020-06-16 00:43:55.329593301 +0200
-@@ -2596,7 +2596,7 @@ EXTRA_LTLIBRARIES = $(be_convenience_lib
- lib_LTLIBRARIES = libsane.la
- sanelibdir = $(libdir)/sane
- sanelib_LTLIBRARIES = $(BACKEND_LIBS_ENABLED) libsane-dll.la
--COMMON_LIBS = ../lib/liblib.la $(XML_LIBS)
-+COMMON_LIBS = ../lib/liblib.la $(XML_LIBS) $(PTHREAD_LIBS)
- 
- # Each backend should define a convenience library that compiles
- # all related files within backend directory.  General guideline
diff --git a/sane.spec b/sane.spec
index 8938ada..967e6db 100644
--- a/sane.spec
+++ b/sane.spec
@@ -43,14 +43,14 @@
 
 Summary:	SANE - local and remote scanner access
 Name:		sane
-Version:	1.1.1
-Release:	2
+Version:	1.2.1
+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:	https://gitlab.com/sane-project/backends/-/releases/%{version}/sane-backends-%{version}.tar.gz
+Source0:	https://gitlab.com/sane-project/backends/uploads/110fc43336d0fb5e514f1fdc7360dd87/sane-backends-%{version}.tar.gz
 Source3:	http://belnet.dl.sourceforge.net/sourceforge/px-backend/primaxscan-1.1.beta1.tar.bz2
 Source9:	http://heanet.dl.sourceforge.net/sourceforge/hp44x0backend/sane_hp_rts88xx-0.18.tar.bz2
 Source10:	http://heanet.dl.sourceforge.net/sourceforge/brother-mfc/sane-driver-0.2.tar.bz2
@@ -75,8 +75,6 @@ Patch3:		sane-backends-1.0.20-strformat.patch
 Patch5:		epkowa-compile.patch
 
 # Debian patches
-# new build system breaks build when using pthreads.
-Patch10:	01_missing_pthreads.dpatch
 # add back SANE_CAP_ALWAYS_SETTABLE which was mistakenly
 # removed from SANE 1.0.20
 Patch11:	06_cap_always_settable.dpatch
@@ -120,7 +118,7 @@ BuildRequires:	autoconf
 # ensure resmgr is not pulled
 BuildConflicts:	resmgr-devel
 %if %{with compat32}
-BuildRequires:	devel(libintl)
+# BuildRequires:	devel(libintl)
 BuildRequires:	devel(libieee1284)
 BuildRequires:	devel(libltdl)
 BuildRequires:	devel(libjpeg)
@@ -240,7 +238,6 @@ to develop applications using SANE.
 %patch2 -p1 -b .brother2list
 %patch3 -p1 -b .strformat
 
-%patch10 -p1 -b .pthread~
 %patch11 -p1
 
 # Fedora patches
@@ -298,12 +295,14 @@ if echo %__cc |grep -q clang; then
 fi
 %endif
 
+[ -e configure ] || ./autogen.sh
+
 %build
 export CONFIGURE_TOP="$(pwd)"
 %if %{with compat32}
 mkdir build32
 cd build32
-CPPFLAGS="$(pkg-config --cflags libusb-1.0)" %configure32 \
+CPPFLAGS="$(pkg-config --cflags libusb-1.0 libgphoto2)" %configure32 \
 	--enable-rpath \
 	--enable-libusb_1_0
 
@@ -312,7 +311,7 @@ cd ..
 
 mkdir build
 cd build
-CPPFLAGS="$(pkg-config --cflags libusb-1.0)" %configure \
+CPPFLAGS="$(pkg-config --cflags libusb-1.0 libgphoto2)" %configure \
 	--disable-static \
 	--enable-rpath=no \
 	--enable-avahi \
@@ -325,7 +324,7 @@ CPPFLAGS="$(pkg-config --cflags libusb-1.0)" %configure \
 cd ..
 
 %if %{with compat32}
-%make_build -C build32
+%make_build -C build32 GPHOTO2_CPPFLAGS="$(pkg-config --cflags-only-I libgphoto2)"
 %endif
 %make_build -C build
 
@@ -458,10 +457,6 @@ install -Dpm 644 %{SOURCE19} %{buildroot}%{_sysusersdir}/saned.conf
 sed -i '/^%dir/d' sane-backends.lang
 
 %pre -n saned
-# Add saned to group cdwriter and ub for scanner access.
-#/usr/sbin/useradd -r -M -s /bin/false  -c "system user for saned" saned -G cdwriter,usb || :
-%_pre_useradd saned /etc/sane.d /bin/false
-/usr/sbin/usermod -G cdwriter,usb saned
 %sysusers_create_package %{name} %{SOURCE6}
 
 %post -n saned
Not Available

benbullard79 [@T] cox.netNo Comment.410d 06hrs
benbullard79 [@T] cox.netNo Comment.410d 06hrs
benbullard79 [@T] cox.netNo Comment.410d 06hrs