[packages/rpm/rpm.org] - add pkgconfig patch to fix cflags and add missing lib to ldlibs

baggins baggins at pld-linux.org
Mon Oct 19 01:16:09 CEST 2020


commit 837ad262ba9de0b2a4d1822f990fe4ec0057ddc2
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Mon Oct 19 01:15:35 2020 +0200

    - add pkgconfig patch to fix cflags and add missing lib to ldlibs

 pkgconfig.patch | 11 +++++++++++
 rpm.spec        |  2 ++
 2 files changed, 13 insertions(+)
---
diff --git a/rpm.spec b/rpm.spec
index 35e2370..246a402 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -69,6 +69,7 @@ Patch15:	x32.patch
 Patch16:	rpm5-db-compat.patch
 Patch17:	python-internal-build.patch
 Patch18:	rpmversion.patch
+Patch19:	pkgconfig.patch
 URL:		https://rpm.org/
 BuildRequires:	db-devel >= %{db_ver}
 BuildRequires:	autoconf >= 2.63
@@ -553,6 +554,7 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 %patch16 -p1
 %patch17 -p1
 %patch18 -p1
+%patch19 -p1
 
 install %{SOURCE15} scripts/perl.prov.in
 
diff --git a/pkgconfig.patch b/pkgconfig.patch
new file mode 100644
index 0000000..d4f39e6
--- /dev/null
+++ b/pkgconfig.patch
@@ -0,0 +1,11 @@
+--- rpm-4.16.0/rpm.pc.in.orig	2020-05-28 12:04:25.000000000 +0200
++++ rpm-4.16.0/rpm.pc.in	2020-10-18 23:32:46.339081527 +0200
+@@ -11,6 +11,6 @@
+ URL: http://rpm.org
+ Requires.private: @ZSTD_REQUIRES@
+ # Conflicts:
+-Cflags: -I${includedir}
+-Libs: -L${libdir} -lrpm -lrpmio
++Cflags: -I${includedir}/rpm
++Libs: -L${libdir} -lrpm -lrpmio -lrpmbuild
+ Libs.private: -lpopt -lrt -lpthread @WITH_LZMA_LIB@ @WITH_DB_LIB@ @WITH_BZ2_LIB@ @WITH_ZLIB_LIB@ @WITH_BEECRYPT_LIB@ @WITH_NSS_LIB@ @LUA_LIBS@
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/837ad262ba9de0b2a4d1822f990fe4ec0057ddc2



More information about the pld-cvs-commit mailing list