Rebase to qemu-2.9.0-rc2

Add Obsoletes for or32-or1k rename (bz 1435016)
This commit is contained in:
Cole Robinson 2017-03-29 11:43:01 -04:00
parent 996634350a
commit 0db3257f1a
3 changed files with 10 additions and 2 deletions

1
.gitignore vendored
View File

@ -4,3 +4,4 @@
/qemu-*.tar.bz2 /qemu-*.tar.bz2
/qemu-2.9.0-rc0.tar.xz /qemu-2.9.0-rc0.tar.xz
/qemu-2.9.0-rc1.tar.xz /qemu-2.9.0-rc1.tar.xz
/qemu-2.9.0-rc2.tar.xz

View File

@ -82,7 +82,7 @@ Requires: %{name}-block-ssh = %{epoch}:%{version}-%{release}
%undefine _hardened_build %undefine _hardened_build
# Release candidate version tracking # Release candidate version tracking
%global rcver rc1 %global rcver rc2
%if 0%{?rcver:1} %if 0%{?rcver:1}
%global rcrel .%{rcver} %global rcrel .%{rcver}
%global rcstr -%{rcver} %global rcstr -%{rcver}
@ -705,6 +705,7 @@ This package provides the system emulator for Microblaze boards.
Summary: QEMU system emulator for OpenRisc32 Summary: QEMU system emulator for OpenRisc32
Group: Development/Tools Group: Development/Tools
Requires: %{name}-system-or1k-core = %{epoch}:%{version}-%{release} Requires: %{name}-system-or1k-core = %{epoch}:%{version}-%{release}
Obsoletes: %{name}-system-or32 < 2:2.9.0
%{requires_all_block_modules} %{requires_all_block_modules}
%description system-or1k %description system-or1k
QEMU is a generic and open source processor emulator which achieves a good QEMU is a generic and open source processor emulator which achieves a good
@ -716,6 +717,7 @@ This package provides the system emulator for OpenRisc32 boards.
Summary: QEMU system emulator for OpenRisc32 Summary: QEMU system emulator for OpenRisc32
Group: Development/Tools Group: Development/Tools
Requires: %{name}-common = %{epoch}:%{version}-%{release} Requires: %{name}-common = %{epoch}:%{version}-%{release}
Obsoletes: %{name}-system-or32-core < 2:2.9.0
%description system-or1k-core %description system-or1k-core
QEMU is a generic and open source processor emulator which achieves a good QEMU is a generic and open source processor emulator which achieves a good
emulation speed by using dynamic translation. emulation speed by using dynamic translation.
@ -1998,6 +2000,11 @@ getent passwd qemu >/dev/null || \
%changelog %changelog
* Wed Mar 29 2017 Cole Robinson <crobinso@redhat.com> - 2:2.9.0-0.1-rc2
- Rebase to qemu-2.9.0-rc2
- Add Obsoletes for or32-or1k rename (bz 1435016)
- spec: Pull in vga and pxe roms for ppc64 (bz 1431403)
* Tue Mar 21 2017 Cole Robinson <crobinso@redhat.com> - 2:2.9.0-0.1-rc1 * Tue Mar 21 2017 Cole Robinson <crobinso@redhat.com> - 2:2.9.0-0.1-rc1
- Rebase to qemu-2.9.0-rc1 - Rebase to qemu-2.9.0-rc1

View File

@ -1 +1 @@
SHA512 (qemu-2.9.0-rc1.tar.xz) = c3df38741c5417a33179d764a0730f4ca85a5b8f505e04081ee7d8bd58d5f9d8a7d5f7bd497e798272c6a123b5b500bd392b6fa20883302b8ce777685dbb2bd1 SHA512 (qemu-2.9.0-rc2.tar.xz) = 57fc5c63eaf1f72d331196a4d6c4b2a5b5d367e9b7f33b2bb8c6b95e0d85a6718c341afdafefae9a08369303b1236eefe125cd02587b801b781dac6969b6ca3f