rpm 4.14 version used in qemu-accelsandbox/wangbiao/rpm_upgrade_new

Change-Id: Ie91906c49ea86ea74270a58cc65d930f03f20721
Signed-off-by: biao716.wang <biao716.wang@samsung.com>

4 files changed, 40 insertions, 32 deletions

diff --git a/packaging/qemu-accel-aarch64.spec b/packaging/qemu-accel-aarch64.spec
index cfa953f..84e6ca2 100644
--- a/packaging/qemu-accel-aarch64.spec
+++ b/packaging/qemu-accel-aarch64.spec
@@ -178,8 +178,10 @@ binaries="%{_libdir}/libnsl.so.1 %{_libdir}/libnss_compat.so.2" # loaded via dlo
 
 for executable in $LD \
    $BASH_EXECUTABLE \
-   %{_bindir}/{rpm,rpm2cpio,rpmdb,rpmkeys,rpmqpack,rpmbuild,rpmsign,rpmspec} \
-   %{_libdir}/rpm-plugins/exec.so \
+   %{_bindir}/{rpm,rpm2cpio,rpmdb,rpmkeys,rpmqpack,rpmbuild,rpmsign,rpmspec,rpm2archive} \
+   %{_libdir}/rpm-plugins/ima.so \
+   %{_libdir}/rpm-plugins/prioreset.so \
+   %{_libdir}/rpm-plugins/syslog.so \
    %{_libdir}/{libdb-4.8.so,libdb_cxx-4.8.so} \
    %{_bindir}/{tar,gzip,bzip2,xz,xzdec} \
    %{_bindir}/{grep,sed} \
@@ -540,6 +542,12 @@ sed -e 's|^|%{emul_path}|;s|%{emul_path}/%{_lib}|%{emul_path}%{_libdir}|' clang.
 # Remove common files from clang-accel
 comm -13 %{_sourcedir}/qemu-accel.list clang-full.list > %{_sourcedir}/clang-accel.list
 
+#Fix build error with rpm 4.14.1:#Not a directory
+# Add symlinks to qemu-accel packaging
+echo '%{emul_path}/bin' >> %{_sourcedir}/qemu-accel.list
+echo '%{emul_path}/%{_lib}' >> %{_sourcedir}/qemu-accel.list
+%{?multilib:echo '%{emul_path}/lib' >> %{_sourcedir}/qemu-accel.list}
+
 %fdupes %{buildroot}
 %filter_provides_in %{emul_path}
 
@@ -558,12 +566,6 @@ ldconfig
 %files -f %{_sourcedir}/qemu-accel.list
 %defattr(-,root,root)
 %exclude %{emul_path}%{py_libdir}/*
-# Add symlinks to qemu-accel packaging
-%dir %{emul_path}/bin
-%dir %{emul_path}/%{_lib}
-%{?multilib:
-  %dir %{emul_path}/lib
-}
 
 %files -n python-accel -f %{_sourcedir}/python-accel.list
 %defattr(-,root,root)
diff --git a/packaging/qemu-accel-armv7hl.spec b/packaging/qemu-accel-armv7hl.spec
index 0cd6f0a..ec77c06 100644
--- a/packaging/qemu-accel-armv7hl.spec
+++ b/packaging/qemu-accel-armv7hl.spec
@@ -178,8 +178,10 @@ binaries="%{_libdir}/libnsl.so.1 %{_libdir}/libnss_compat.so.2" # loaded via dlo
 
 for executable in $LD \
    $BASH_EXECUTABLE \
-   %{_bindir}/{rpm,rpm2cpio,rpmdb,rpmkeys,rpmqpack,rpmbuild,rpmsign,rpmspec} \
-   %{_libdir}/rpm-plugins/exec.so \
+   %{_bindir}/{rpm,rpm2cpio,rpmdb,rpmkeys,rpmqpack,rpmbuild,rpmsign,rpmspec,rpm2archive} \
+   %{_libdir}/rpm-plugins/ima.so \
+   %{_libdir}/rpm-plugins/prioreset.so \
+   %{_libdir}/rpm-plugins/syslog.so \
    %{_libdir}/{libdb-4.8.so,libdb_cxx-4.8.so} \
    %{_bindir}/{tar,gzip,bzip2,xz,xzdec} \
    %{_bindir}/{grep,sed} \
@@ -540,6 +542,12 @@ sed -e 's|^|%{emul_path}|;s|%{emul_path}/%{_lib}|%{emul_path}%{_libdir}|' clang.
 # Remove common files from clang-accel
 comm -13 %{_sourcedir}/qemu-accel.list clang-full.list > %{_sourcedir}/clang-accel.list
 
+#Fix build error with rpm 4.14.1:#Not a directory
+# Add symlinks to qemu-accel packaging
+echo '%{emul_path}/bin' >> %{_sourcedir}/qemu-accel.list
+echo '%{emul_path}/%{_lib}' >> %{_sourcedir}/qemu-accel.list
+%{?multilib:echo '%{emul_path}/lib' >> %{_sourcedir}/qemu-accel.list}
+
 %fdupes %{buildroot}
 %filter_provides_in %{emul_path}
 
@@ -558,12 +566,6 @@ ldconfig
 %files -f %{_sourcedir}/qemu-accel.list
 %defattr(-,root,root)
 %exclude %{emul_path}%{py_libdir}/*
-# Add symlinks to qemu-accel packaging
-%dir %{emul_path}/bin
-%dir %{emul_path}/%{_lib}
-%{?multilib:
-  %dir %{emul_path}/lib
-}
 
 %files -n python-accel -f %{_sourcedir}/python-accel.list
 %defattr(-,root,root)
diff --git a/packaging/qemu-accel-armv7l.spec b/packaging/qemu-accel-armv7l.spec
index d977b73..7f11089 100644
--- a/packaging/qemu-accel-armv7l.spec
+++ b/packaging/qemu-accel-armv7l.spec
@@ -178,8 +178,10 @@ binaries="%{_libdir}/libnsl.so.1 %{_libdir}/libnss_compat.so.2" # loaded via dlo
 
 for executable in $LD \
    $BASH_EXECUTABLE \
-   %{_bindir}/{rpm,rpm2cpio,rpmdb,rpmkeys,rpmqpack,rpmbuild,rpmsign,rpmspec} \
-   %{_libdir}/rpm-plugins/exec.so \
+   %{_bindir}/{rpm,rpm2cpio,rpmdb,rpmkeys,rpmqpack,rpmbuild,rpmsign,rpmspec,rpm2archive} \
+   %{_libdir}/rpm-plugins/ima.so \
+   %{_libdir}/rpm-plugins/prioreset.so \
+   %{_libdir}/rpm-plugins/syslog.so \
    %{_libdir}/{libdb-4.8.so,libdb_cxx-4.8.so} \
    %{_bindir}/{tar,gzip,bzip2,xz,xzdec} \
    %{_bindir}/{grep,sed} \
@@ -540,6 +542,12 @@ sed -e 's|^|%{emul_path}|;s|%{emul_path}/%{_lib}|%{emul_path}%{_libdir}|' clang.
 # Remove common files from clang-accel
 comm -13 %{_sourcedir}/qemu-accel.list clang-full.list > %{_sourcedir}/clang-accel.list
 
+#Fix build error with rpm 4.14.1:#Not a directory
+# Add symlinks to qemu-accel packaging
+echo '%{emul_path}/bin' >> %{_sourcedir}/qemu-accel.list
+echo '%{emul_path}/%{_lib}' >> %{_sourcedir}/qemu-accel.list
+%{?multilib:echo '%{emul_path}/lib' >> %{_sourcedir}/qemu-accel.list}
+
 %fdupes %{buildroot}
 %filter_provides_in %{emul_path}
 
@@ -558,12 +566,6 @@ ldconfig
 %files -f %{_sourcedir}/qemu-accel.list
 %defattr(-,root,root)
 %exclude %{emul_path}%{py_libdir}/*
-# Add symlinks to qemu-accel packaging
-%dir %{emul_path}/bin
-%dir %{emul_path}/%{_lib}
-%{?multilib:
-  %dir %{emul_path}/lib
-}
 
 %files -n python-accel -f %{_sourcedir}/python-accel.list
 %defattr(-,root,root)
diff --git a/packaging/qemu-accel.spec.in b/packaging/qemu-accel.spec.in
index 567a9d2..bc198ab 100644
--- a/packaging/qemu-accel.spec.in
+++ b/packaging/qemu-accel.spec.in
@@ -175,8 +175,10 @@ binaries="%{_libdir}/libnsl.so.1 %{_libdir}/libnss_compat.so.2" # loaded via dlo
 
 for executable in $LD \
    $BASH_EXECUTABLE \
-   %{_bindir}/{rpm,rpm2cpio,rpmdb,rpmkeys,rpmqpack,rpmbuild,rpmsign,rpmspec} \
-   %{_libdir}/rpm-plugins/exec.so \
+   %{_bindir}/{rpm,rpm2cpio,rpmdb,rpmkeys,rpmqpack,rpmbuild,rpmsign,rpmspec,rpm2archive} \
+   %{_libdir}/rpm-plugins/ima.so \
+   %{_libdir}/rpm-plugins/prioreset.so \
+   %{_libdir}/rpm-plugins/syslog.so \
    %{_libdir}/{libdb-4.8.so,libdb_cxx-4.8.so} \
    %{_bindir}/{tar,gzip,bzip2,xz,xzdec} \
    %{_bindir}/{grep,sed} \
@@ -537,6 +539,12 @@ sed -e 's|^|%{emul_path}|;s|%{emul_path}/%{_lib}|%{emul_path}%{_libdir}|' clang.
 # Remove common files from clang-accel
 comm -13 %{_sourcedir}/qemu-accel.list clang-full.list > %{_sourcedir}/clang-accel.list
 
+#Fix build error with rpm 4.14.1:#Not a directory
+# Add symlinks to qemu-accel packaging
+echo '%{emul_path}/bin' >> %{_sourcedir}/qemu-accel.list
+echo '%{emul_path}/%{_lib}' >> %{_sourcedir}/qemu-accel.list
+%{?multilib:echo '%{emul_path}/lib' >> %{_sourcedir}/qemu-accel.list}
+
 %fdupes %{buildroot}
 %filter_provides_in %{emul_path}
 
@@ -555,12 +563,6 @@ ldconfig
 %files -f %{_sourcedir}/qemu-accel.list
 %defattr(-,root,root)
 %exclude %{emul_path}%{py_libdir}/*
-# Add symlinks to qemu-accel packaging
-%dir %{emul_path}/bin
-%dir %{emul_path}/%{_lib}
-%{?multilib:
-  %dir %{emul_path}/lib
-}
 
 %files -n python-accel -f %{_sourcedir}/python-accel.list
 %defattr(-,root,root)