Fix build error with rpm 4.14 versionsandbox/wangbiao/rpm_upgrade

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

4 files changed, 44 insertions, 24 deletions

diff --git a/packaging/qemu-accel-aarch64.spec b/packaging/qemu-accel-aarch64.spec
index a183920..000590d 100644
--- a/packaging/qemu-accel-aarch64.spec
+++ b/packaging/qemu-accel-aarch64.spec
@@ -178,7 +178,6 @@ 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 \
    %{_libdir}/{libdb-4.8.so,libdb_cxx-4.8.so} \
    %{_bindir}/{tar,gzip,bzip2,xz,xzdec} \
    %{_bindir}/{grep,sed} \
@@ -537,6 +536,11 @@ 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
 
+# 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}
 
@@ -556,11 +560,12 @@ ldconfig
 %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
-}
+#Fix build error with rpm 4.14.1:#Not a directory
+#%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 5f711d0..9190765 100644
--- a/packaging/qemu-accel-armv7hl.spec
+++ b/packaging/qemu-accel-armv7hl.spec
@@ -178,7 +178,6 @@ 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 \
    %{_libdir}/{libdb-4.8.so,libdb_cxx-4.8.so} \
    %{_bindir}/{tar,gzip,bzip2,xz,xzdec} \
    %{_bindir}/{grep,sed} \
@@ -537,6 +536,11 @@ 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
 
+# 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}
 
@@ -556,11 +560,12 @@ ldconfig
 %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
-}
+#Fix build error with rpm 4.14.1:#Not a directory
+#%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 62ab2da..34265a5 100644
--- a/packaging/qemu-accel-armv7l.spec
+++ b/packaging/qemu-accel-armv7l.spec
@@ -178,7 +178,6 @@ 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 \
    %{_libdir}/{libdb-4.8.so,libdb_cxx-4.8.so} \
    %{_bindir}/{tar,gzip,bzip2,xz,xzdec} \
    %{_bindir}/{grep,sed} \
@@ -537,6 +536,11 @@ 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
 
+# 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}
 
@@ -556,11 +560,12 @@ ldconfig
 %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
-}
+#Fix build error with rpm 4.14.1:#Not a directory
+#%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 681396e..c18cfec 100644
--- a/packaging/qemu-accel.spec.in
+++ b/packaging/qemu-accel.spec.in
@@ -175,7 +175,6 @@ 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 \
    %{_libdir}/{libdb-4.8.so,libdb_cxx-4.8.so} \
    %{_bindir}/{tar,gzip,bzip2,xz,xzdec} \
    %{_bindir}/{grep,sed} \
@@ -534,6 +533,11 @@ 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
 
+# 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}
 
@@ -553,11 +557,12 @@ ldconfig
 %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
-}
+#Fix build error with rpm 4.14.1:#Not a directory
+#%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)