From 916f95a447bf1a2f020966ed3b9c2ad76fb5683f Mon Sep 17 00:00:00 2001
From: Mikhail Kashkarov <m.kashkarov@partner.samsung.com>
Date: Fri, 24 May 2019 16:44:54 +0300
Subject: [PATCH] [1/7] Remove unused variables, clean up

All of changes in the following patchset doesn't modify final rpms.

- Remove useless 'Provides:'
- real_compiler was removed in b112bfee.
- '$sanitizer_enabled' is not used anymore.

Change-Id: I5229e3276de13f91dc6d13a56ddb08d385e93558
---
 packaging/qemu-accel-aarch64.spec | 12 +-----------
 packaging/qemu-accel-armv7hl.spec | 12 +-----------
 packaging/qemu-accel-armv7l.spec  | 12 +-----------
 packaging/qemu-accel.spec.in      | 12 +-----------
 4 files changed, 4 insertions(+), 44 deletions(-)

diff --git a/packaging/qemu-accel-aarch64.spec b/packaging/qemu-accel-aarch64.spec
index ffb0cd8..44fda70 100644
--- a/packaging/qemu-accel-aarch64.spec
+++ b/packaging/qemu-accel-aarch64.spec
@@ -86,7 +86,6 @@ This should not be installed on systems, it is just intended for qemu environmen
 %package -n python-accel
 AutoReqProv: off
 Requires: qemu-accel
-Provides: python-accel
 Version: %{version}
 Release: %{release}
 Summary: Binaries for python acceleration
@@ -99,7 +98,6 @@ This package is used in qemu-accel to accelerate python.
 %package -n clang-accel
 AutoReqProv: off
 Requires: qemu-accel
-Provides: clang-accel
 Version: %{version}
 Release: %{release}
 Summary: Binaries for clang acceleration
@@ -163,7 +161,6 @@ for executable in $LD \
    %{_bindir}/file \
    %{_bindir}/icecc \
    %{_bindir}/icerun \
-   ${real_compiler} \
    %{_bindir}/{find,xargs,readlink,ls,cpio} \
    %{_rpmconfigdir}/debugedit \
    %{_rpmconfigdir}/*deps \
@@ -369,14 +366,7 @@ cp %{_libdir}/python${python_version}/encodings/*.py %{buildroot}%{our_path}%{_l
 find %{buildroot} -name 'python*' | sed -e 's|%{buildroot}%{our_path}||' | tee -a python.list
 
 # rename gcc binaries
-for bin in c++ g++ gcc gfortran
-do
-  [ x"$sanitizer_enabled" == x"1" ] && bin+="-real"
-  mv %{buildroot}%{our_path}%{_bindir}/%{target_arch}-$bin %{buildroot}/%{our_path}%{_bindir}/$bin
-  ln -s $bin %{buildroot}%{our_path}%{_bindir}/%{target_arch}-$bin
-  echo "%{our_path}%{_bindir}/$bin" >> %{_sourcedir}/all-accel.list
-done
-for bin in cpp gcc-ar gcc-nm gcc-ranlib
+for bin in c++ g++ gcc gfortran cpp gcc-ar gcc-nm gcc-ranlib
 do
   mv %{buildroot}%{our_path}%{_bindir}/%{target_arch}-$bin %{buildroot}/%{our_path}%{_bindir}/$bin
   ln -s $bin %{buildroot}%{our_path}%{_bindir}/%{target_arch}-$bin
diff --git a/packaging/qemu-accel-armv7hl.spec b/packaging/qemu-accel-armv7hl.spec
index 7c2c619..212db5b 100644
--- a/packaging/qemu-accel-armv7hl.spec
+++ b/packaging/qemu-accel-armv7hl.spec
@@ -86,7 +86,6 @@ This should not be installed on systems, it is just intended for qemu environmen
 %package -n python-accel
 AutoReqProv: off
 Requires: qemu-accel
-Provides: python-accel
 Version: %{version}
 Release: %{release}
 Summary: Binaries for python acceleration
@@ -99,7 +98,6 @@ This package is used in qemu-accel to accelerate python.
 %package -n clang-accel
 AutoReqProv: off
 Requires: qemu-accel
-Provides: clang-accel
 Version: %{version}
 Release: %{release}
 Summary: Binaries for clang acceleration
@@ -163,7 +161,6 @@ for executable in $LD \
    %{_bindir}/file \
    %{_bindir}/icecc \
    %{_bindir}/icerun \
-   ${real_compiler} \
    %{_bindir}/{find,xargs,readlink,ls,cpio} \
    %{_rpmconfigdir}/debugedit \
    %{_rpmconfigdir}/*deps \
@@ -369,14 +366,7 @@ cp %{_libdir}/python${python_version}/encodings/*.py %{buildroot}%{our_path}%{_l
 find %{buildroot} -name 'python*' | sed -e 's|%{buildroot}%{our_path}||' | tee -a python.list
 
 # rename gcc binaries
-for bin in c++ g++ gcc gfortran
-do
-  [ x"$sanitizer_enabled" == x"1" ] && bin+="-real"
-  mv %{buildroot}%{our_path}%{_bindir}/%{target_arch}-$bin %{buildroot}/%{our_path}%{_bindir}/$bin
-  ln -s $bin %{buildroot}%{our_path}%{_bindir}/%{target_arch}-$bin
-  echo "%{our_path}%{_bindir}/$bin" >> %{_sourcedir}/all-accel.list
-done
-for bin in cpp gcc-ar gcc-nm gcc-ranlib
+for bin in c++ g++ gcc gfortran cpp gcc-ar gcc-nm gcc-ranlib
 do
   mv %{buildroot}%{our_path}%{_bindir}/%{target_arch}-$bin %{buildroot}/%{our_path}%{_bindir}/$bin
   ln -s $bin %{buildroot}%{our_path}%{_bindir}/%{target_arch}-$bin
diff --git a/packaging/qemu-accel-armv7l.spec b/packaging/qemu-accel-armv7l.spec
index 031d8d7..4df7d54 100644
--- a/packaging/qemu-accel-armv7l.spec
+++ b/packaging/qemu-accel-armv7l.spec
@@ -86,7 +86,6 @@ This should not be installed on systems, it is just intended for qemu environmen
 %package -n python-accel
 AutoReqProv: off
 Requires: qemu-accel
-Provides: python-accel
 Version: %{version}
 Release: %{release}
 Summary: Binaries for python acceleration
@@ -99,7 +98,6 @@ This package is used in qemu-accel to accelerate python.
 %package -n clang-accel
 AutoReqProv: off
 Requires: qemu-accel
-Provides: clang-accel
 Version: %{version}
 Release: %{release}
 Summary: Binaries for clang acceleration
@@ -163,7 +161,6 @@ for executable in $LD \
    %{_bindir}/file \
    %{_bindir}/icecc \
    %{_bindir}/icerun \
-   ${real_compiler} \
    %{_bindir}/{find,xargs,readlink,ls,cpio} \
    %{_rpmconfigdir}/debugedit \
    %{_rpmconfigdir}/*deps \
@@ -369,14 +366,7 @@ cp %{_libdir}/python${python_version}/encodings/*.py %{buildroot}%{our_path}%{_l
 find %{buildroot} -name 'python*' | sed -e 's|%{buildroot}%{our_path}||' | tee -a python.list
 
 # rename gcc binaries
-for bin in c++ g++ gcc gfortran
-do
-  [ x"$sanitizer_enabled" == x"1" ] && bin+="-real"
-  mv %{buildroot}%{our_path}%{_bindir}/%{target_arch}-$bin %{buildroot}/%{our_path}%{_bindir}/$bin
-  ln -s $bin %{buildroot}%{our_path}%{_bindir}/%{target_arch}-$bin
-  echo "%{our_path}%{_bindir}/$bin" >> %{_sourcedir}/all-accel.list
-done
-for bin in cpp gcc-ar gcc-nm gcc-ranlib
+for bin in c++ g++ gcc gfortran cpp gcc-ar gcc-nm gcc-ranlib
 do
   mv %{buildroot}%{our_path}%{_bindir}/%{target_arch}-$bin %{buildroot}/%{our_path}%{_bindir}/$bin
   ln -s $bin %{buildroot}%{our_path}%{_bindir}/%{target_arch}-$bin
diff --git a/packaging/qemu-accel.spec.in b/packaging/qemu-accel.spec.in
index 9ef9bdd..245a0ab 100644
--- a/packaging/qemu-accel.spec.in
+++ b/packaging/qemu-accel.spec.in
@@ -83,7 +83,6 @@ This should not be installed on systems, it is just intended for qemu environmen
 %package -n python-accel
 AutoReqProv: off
 Requires: qemu-accel
-Provides: python-accel
 Version: %{version}
 Release: %{release}
 Summary: Binaries for python acceleration
@@ -96,7 +95,6 @@ This package is used in qemu-accel to accelerate python.
 %package -n clang-accel
 AutoReqProv: off
 Requires: qemu-accel
-Provides: clang-accel
 Version: %{version}
 Release: %{release}
 Summary: Binaries for clang acceleration
@@ -160,7 +158,6 @@ for executable in $LD \
    %{_bindir}/file \
    %{_bindir}/icecc \
    %{_bindir}/icerun \
-   ${real_compiler} \
    %{_bindir}/{find,xargs,readlink,ls,cpio} \
    %{_rpmconfigdir}/debugedit \
    %{_rpmconfigdir}/*deps \
@@ -366,14 +363,7 @@ cp %{_libdir}/python${python_version}/encodings/*.py %{buildroot}%{our_path}%{_l
 find %{buildroot} -name 'python*' | sed -e 's|%{buildroot}%{our_path}||' | tee -a python.list
 
 # rename gcc binaries
-for bin in c++ g++ gcc gfortran
-do
-  [ x"$sanitizer_enabled" == x"1" ] && bin+="-real"
-  mv %{buildroot}%{our_path}%{_bindir}/%{target_arch}-$bin %{buildroot}/%{our_path}%{_bindir}/$bin
-  ln -s $bin %{buildroot}%{our_path}%{_bindir}/%{target_arch}-$bin
-  echo "%{our_path}%{_bindir}/$bin" >> %{_sourcedir}/all-accel.list
-done
-for bin in cpp gcc-ar gcc-nm gcc-ranlib
+for bin in c++ g++ gcc gfortran cpp gcc-ar gcc-nm gcc-ranlib
 do
   mv %{buildroot}%{our_path}%{_bindir}/%{target_arch}-$bin %{buildroot}/%{our_path}%{_bindir}/$bin
   ln -s $bin %{buildroot}%{our_path}%{_bindir}/%{target_arch}-$bin
-- 
2.7.4