Revert "Modify eu-strip option to perform strip in post script of rpm package & add...

[platform/upstream/rpm.git] / packaging / rpm.spec

diff --git a/packaging/rpm.spec b/packaging/rpm.spec
index 5027ba0..9555fca 100644 (file)
--- a/packaging/rpm.spec
+++ b/packaging/rpm.spec
@@ -38,16 +38,16 @@ BuildRequires:  fdupes
 Provides:       rpminst
 Provides:       rpm-libs
 
-Source1:       db-4.8.30.tar.bz2
-Source2:       db-4.8.30-integration.dif
-Source4:       rpm-tizen_macros
-Source8:       rpmconfigcheck
-Source13:      find-docs.sh
-Source22:      device-sec-policy
-Source23:      find-provides.ksyms
-Source1001:    rpm.manifest
+Source1:        db-4.8.30.tar.bz2
+Source2:        db-4.8.30-integration.dif
+Source4:        rpm-tizen_macros
+Source8:        rpmconfigcheck
+Source13:       find-docs.sh
+Source22:       device-sec-policy
+Source23:       find-provides.ksyms
+Source1001:     rpm.manifest
 Source0:        rpm-%{version}.tar.bz2
-#
+
 # avoid bootstrapping problem
 %define _binary_payload w9.bzdio
 
@@ -118,7 +118,7 @@ that will manipulate RPM packages and databases.
 cp %{SOURCE1001} .
 rm -rf sqlite
 tar xjf %{S:1}
-ln -s db-4.8.30 db
+ln -sfn db-4.8.30 db
 chmod -R u+w db/*
 # will get linked from db3
 rm -f rpmdb/db.h
@@ -184,7 +184,8 @@ rm -f %{buildroot}%{rpmlibdir}/rpmpopt
 rm -rf %{buildroot}%{_mandir}/{fr,ja,ko,pl,ru,sk}
 rm -f %{buildroot}%{_datadir}/locale/de/LC_MESSAGES/rpm.mo
 rm -f %{buildroot}%{rpmhome}/cpanflute %{buildroot}%{rpmhome}/cpanflute2
-install -m 755 scripts/find-supplements{,.ksyms} %{buildroot}%{rpmhome}
+install -m 755 scripts/find-supplements %{buildroot}%{rpmhome}
+install -m 755 scripts/find-supplements.ksyms %{buildroot}%{rpmhome}
 install -m 755 scripts/firmware.prov %{buildroot}%{rpmhome}
 install -m 755 scripts/debuginfo.prov %{buildroot}%{rpmhome}
 rm -f %{buildroot}%{rpmlibdir}/locale %{buildroot}%{rpmlibdir}/rpmrc
@@ -192,20 +193,22 @@ mkdir -p %{buildroot}%{_sysconfdir}/rpm
 chmod 755 %{buildroot}%{_sysconfdir}/rpm
 mkdir -p %{buildroot}%{rpmhome}/macros.d
 # remove some nonsense or non-working scripts
-pushd %{buildroot}%{rpmhome}/
 for f in rpm2cpio.sh rpm.daily rpmdiff* rpm.log rpm.xinetd freshen.sh u_pkg.sh \
          magic magic.mgc magic.mime* rpmfile *.pl javadeps brp-redhat \
          brp-strip-static-archive vpkg-provides*.sh http.req sql.req tcl.req \
          rpmdb_* brp-sparc64-linux brp-strip-comment-note brp-java-gcjcompile
 do
-    rm -f $f
+    rm -f %{buildroot}%{rpmhome}/$f
 done
 for i in %{_datadir}/automake-*/*; do
-  if test -f "$i" && test -f "${i##*/}"; then
-    rm -f "${i##*/}"
+  if test -f "$i" && test -f %{buildroot}%{rpmhome}/"${i##*/}"; then
+    rm -f %{buildroot}%{rpmhome}/"${i##*/}"
   fi
 done
-popd
+%ifarch aarch64 ppc64le
+install -m 755 config.guess %{buildroot}/usr/lib/rpm
+install -m 755 config.sub %{buildroot}/usr/lib/rpm
+%endif
 rm -f %{buildroot}%{_libdir}/*.la
 rm -f %{buildroot}%{__plugindir}/*.la
 
@@ -290,6 +293,9 @@ rm -f %{_dbpath}/Filemd5s \
 %{rpmhome}/*.req
 %{rpmhome}/macros.*
 %{rpmhome}/fileattrs
+%ifarch aarch64 ppc64le
+%{rpmhome}/config.*
+%endif
 
 %files devel
 %manifest %{name}.manifest