Browse code

rpm: make python-rpm depend on its librpm

Change-Id: Ib49f8d17869c1afbf88269c2351b4555b8f99f82
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/3964
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Anish Swaminathan <anishs@vmware.com>

Alexey Makhalov authored on 2017/10/05 07:04:05
Showing 1 changed files
... ...
@@ -4,7 +4,7 @@
4 4
 Summary:        Package manager
5 5
 Name:           rpm
6 6
 Version:        4.13.0.1
7
-Release:        5%{?dist}
7
+Release:        6%{?dist}
8 8
 License:        GPLv2+
9 9
 URL:            http://rpm.org
10 10
 Group:          Applications/System
... ...
@@ -91,8 +91,10 @@ Python3 rpm.
91 91
 
92 92
 %build
93 93
 sed -i '/define _GNU_SOURCE/a #include "../config.h"' tools/sepdebugcrcfix.c
94
-sed -i '/^ *include_dirs = /d' python/setup.py.in
95
-sed -i '/^ *libraries = /d' python/setup.py.in
94
+# pass -L opts to gcc as well to prioritize it over standard libs
95
+sed -i 's/-Wl,-L//g' python/setup.py.in
96
+sed -i 's/extra_link_args/library_dirs/g' python/setup.py.in
97
+
96 98
 ./autogen.sh --noconfigure
97 99
 ./configure \
98 100
     CPPFLAGS='-I/usr/include/nspr -I/usr/include/nss -DLUA_COMPAT_APIINTCASTS' \
... ...
@@ -256,6 +258,8 @@ rm -rf %{buildroot}
256 256
 %{python3_sitelib}/*
257 257
 
258 258
 %changelog
259
+*   Wed Oct 04 2017 Alexey Makhalov <amakhalov@vmware.com> 4.13.0.1-6
260
+-   make python{,3}-rpm depend on current version of librpm
259 261
 *   Wed Jun 28 2017 Xiaolin Li <xiaolinl@vmware.com> 4.13.0.1-5
260 262
 -   Add file-devel to BuildRequires
261 263
 *   Mon Jun 26 2017 Chang Lee <changlee@vmware.com> 4.13.0.1-4