rpms/sane-backends
6
0
Fork 0
Code Issues Pull Requests Releases Activity

remove ldflags from pkgconfig file completely

Browse Source 
ldflags are no longer needed in pkgconfig file.
Additional changes:
- move to %%autosetup
- fix typo, remove stray comment
This commit is contained in:
Zdenek Dohnal 2022-12-01 06:53:37 +01:00
parent d1bd0e0a93
commit aaad54b5bd
2 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sane-backends-pkgconfig-misunderstanding.patch
View File

@ -1,11 +1,16 @@
Libs.private should contain a list of libraries the library that the package diff --git a/tools/sane-backends.pc.in b/tools/sane-backends.pc.in
exposes is linked too. So let's filter out unrelated link flags. index b4d9731..43f3ac5 100644
--- a/tools/sane-backends.pc.in
diff --git sane-backends-1.1.1/tools/sane-backends.pc.in~ sane-backends-1.1.1/tools/sane-backends.pc.in +++ b/tools/sane-backends.pc.in
index b4d9731f82..dd8adfd89c 100644 @@ -2,7 +2,6 @@ prefix=@prefix@
--- sane-backends-1.1.1/tools/sane-backends.pc.in~ exec_prefix=@exec_prefix@
+++ sane-backends-1.1.1/tools/sane-backends.pc.in libdir=@libdir@
@@ -10,5 +10,5 @@ Description: Backends for SANE, the universal scanner interface 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@ Version: @VERSION@
Requires: Requires:
Libs: -L${libdir} -lsane Libs: -L${libdir} -lsane

18
sane-backends.spec
View File

@ -57,8 +57,10 @@ BuildRequires: autoconf
BuildRequires: gettext BuildRequires: gettext
# gcc is no longer in buildroot by default # gcc is no longer in buildroot by default
BuildRequires: gcc BuildRequires: gcc
# genesys backend is not written in C++, so it is needed as buildrequire # genesys backend is written in C++, so it is needed as buildrequire
BuildRequires: gcc-c++ BuildRequires: gcc-c++
# for autosetup
BuildRequires: git-core
BuildRequires: gphoto2-devel BuildRequires: gphoto2-devel
BuildRequires: texlive-base BuildRequires: texlive-base
BuildRequires: libieee1284-devel BuildRequires: libieee1284-devel
@ -100,7 +102,6 @@ hand-held scanner, video and still cameras, frame-grabbers, etc.).
%package doc %package doc
Summary: SANE backends documentation Summary: SANE backends documentation
BuildArch: noarch BuildArch: noarch
# Don't drag around obsoletes forever
%description doc %description doc
This package contains documentation for SANE backends. This package contains documentation for SANE backends.
@ -168,15 +169,7 @@ This package contains saned which is the daemon that allows remote clients to
access image acquisition devices available on the local host. access image acquisition devices available on the local host.
%prep %prep
%setup -q %autosetup -S git
%patch0 -p1 -b .udev
%patch1 -p1 -b .soname
%patch2 -p1 -b .sane-config-multilib
# 2042316 - genesys: backend crashes because it attempts to access a member outside of vector
%patch3 -p1 -b .genesys-gl845-crash
%patch4 -p1
%patch5 -p1 -b .genesys-plustek7600i-8100-support
%build %build
CFLAGS="%optflags -fno-strict-aliasing" CFLAGS="%optflags -fno-strict-aliasing"
@ -399,6 +392,9 @@ udevadm hwdb --update >/dev/null 2>&1 || :
%{_unitdir}/saned@.service %{_unitdir}/saned@.service
%changelog %changelog
* Thu Dec 01 2022 Zdenek Dohnal <zdohnal@redhat.com> - 1.1.1-10
- remove ldflags from pkgconfig file completely
* Wed Nov 30 2022 Zdenek Dohnal <zdohnal@redhat.com> - 1.1.1-10 * Wed Nov 30 2022 Zdenek Dohnal <zdohnal@redhat.com> - 1.1.1-10
- put epsonds.conf back to sane-backends - put epsonds.conf back to sane-backends