diff options
author | biao716.wang <biao716.wang@samsung.com> | 2021-01-05 14:51:28 +0900 |
---|---|---|
committer | biao716.wang <biao716.wang@samsung.com> | 2021-01-05 14:51:28 +0900 |
commit | 9de33a8a7cd9eae05c3c1df4b2c0e1e4cd2bd40a (patch) | |
tree | 03067d36d530c3eeb623e601b0c12a98f744376d /packaging | |
parent | 287097d4d8079b4485870c08cf5675b0bdd37ed9 (diff) | |
download | rpm-9de33a8a7cd9eae05c3c1df4b2c0e1e4cd2bd40a.tar.gz rpm-9de33a8a7cd9eae05c3c1df4b2c0e1e4cd2bd40a.tar.bz2 rpm-9de33a8a7cd9eae05c3c1df4b2c0e1e4cd2bd40a.zip |
upgrade rpm version to 4.14.1upstream/4.14.1.1submit/tizen_base/20210113.025730submit/tizen_base/20210105.160930accepted/tizen/base/tool/20210118.215949
Change-Id: Iab5438d6e4d45c937b191c03e9ef5dd3fad165c8
Signed-off-by: biao716.wang <biao716.wang@samsung.com>
Diffstat (limited to 'packaging')
-rw-r--r-- | packaging/rpm.spec | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/packaging/rpm.spec b/packaging/rpm.spec index 506b1016b..9bb1322fe 100644 --- a/packaging/rpm.spec +++ b/packaging/rpm.spec @@ -5,8 +5,8 @@ Name: rpm Summary: The Package Manager License: LGPL-2.0+ and GPL-2.0+ Group: Base/Package Management -Version: 4.11.0.1 -Release: 0 +Version: 4.14.1.1 +Release: 1 Url: http://www.rpm.org BuildRequires: binutils BuildRequires: bzip2 @@ -33,7 +33,11 @@ BuildRequires: pkgconfig(nss) BuildRequires: uthash-devel BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(libsmack) +BuildRequires: pkgconfig(libarchive) BuildRequires: fdupes +BuildRequires: libdw-devel +BuildRequires: libelf-devel +BuildRequires: pkgconfig(libzstd) Provides: rpminst Provides: rpm-libs @@ -139,14 +143,14 @@ rm -f m4/libtool.m4 rm -f m4/lt*.m4 # Change hard-coded paths in man pages and .rc files -[[ x"/usr/lib/rpm" != x%{rpmhome} ]] && \ +#[[ x"/usr/lib/rpm" != x%{rpmhome} ]] && \ /bin/bash -c '/usr/bin/find %{_builddir} -type f -exec sed -e "s|/usr/lib/rpm|%{rpmhome}|g" -i {} \;' %build CPPFLAGS="$CPPFLAGS `pkg-config --cflags nss`" export CPPFLAGS -export CFLAGS="%{optflags} -ffunction-sections" -export LDFLAGS="${LDFLAGS} -Wl,-Bsymbolic-functions -ffunction-sections" +export CFLAGS="%{optflags} -ffunction-sections -fstack-protector-strong -Wl,-z,relro -D_FORTIFY_SOURCE=2 -fPIE" +export LDFLAGS="${LDFLAGS} -pie -Wl,-Bsymbolic-functions -ffunction-sections" %ifarch armv5tel export CFLAGS="-g -O0 -fno-strict-aliasing -ffunction-sections" %endif @@ -160,6 +164,7 @@ export CFLAGS="-g -O0 -fno-strict-aliasing -ffunction-sections" --enable-python \ --with-vendor=tizen \ --with-msm \ + --enable-zstd \ --with-rpmconfigdir=%{rpmhome} make %{?_smp_mflags} @@ -263,6 +268,7 @@ rm -f %{_dbpath}/Filemd5s \ %{_bindir}/rpmquery %{_bindir}/rpmverify %{_bindir}/rpmqpack +%{_bindir}/rpm2archive %attr(0755, root, root) %dir %{rpmhome} %{rpmhome}/macros %{rpmhome}/macros.d @@ -275,7 +281,9 @@ rm -f %{_dbpath}/Filemd5s \ %{rpmhome}/tgpg %{rpmhome}/platform %dir %{__plugindir} -%{__plugindir}/exec.so +%{__plugindir}/ima.so +%{__plugindir}/prioreset.so +%{__plugindir}/syslog.so %{_libdir}/librpm.so.* %{_libdir}/librpmio.so.* %{_libdir}/librpmbuild.so.* @@ -303,6 +311,8 @@ rm -f %{_dbpath}/Filemd5s \ %{rpmhome}/find-supplements* %{rpmhome}/check-* %{rpmhome}/debugedit +%{rpmhome}/sepdebugcrcfix +%{rpmhome}/python-macro-helper %{rpmhome}/find-debuginfo.sh %{rpmhome}/find-lang.sh %{rpmhome}/find-provides.ksyms |