diff --git a/qemu-testsuite.changes b/qemu-testsuite.changes index c7a2717b..70a58c92 100644 --- a/qemu-testsuite.changes +++ b/qemu-testsuite.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jan 21 16:07:16 UTC 2016 - afaerber@suse.de + +- Clean up qemu-tools libcacard Provides/Obsoletes - separate again +- Drop u-boot.e500 - being packaged as u-boot-ppce500 + ------------------------------------------------------------------- Fri Jan 8 14:54:22 UTC 2016 - afaerber@suse.de diff --git a/qemu-testsuite.spec b/qemu-testsuite.spec index a71c7490..263d0281 100644 --- a/qemu-testsuite.spec +++ b/qemu-testsuite.spec @@ -480,8 +480,6 @@ over an SSH network connection from qemu-img tool and QEMU system emulation. Summary: Universal CPU emulator -- Tools Group: System/Emulators/PC Provides: qemu:%_libexecdir/qemu-bridge-helper -Obsoletes: libcacard <= 0.1.2 -Provides: libcacard PreReq: permissions Recommends: qemu-block-curl @@ -861,6 +859,7 @@ for f in acpi-dsdt.aml q35-acpi-dsdt.aml bios-256k.bin bios.bin efi-*.rom pxe-*. rm $RPM_BUILD_ROOT/%_datadir/%name/$f done %endif +rm -f %{buildroot}%{_datadir}/%{name}/u-boot.e500 install -D -m 644 %{SOURCE302} $RPM_BUILD_ROOT/%{_sysconfdir}/qemu/bridge.conf %find_lang %name %if %{legacy_qemu_kvm} @@ -1004,7 +1003,6 @@ fi %_datadir/%name/openbios-ppc %_datadir/%name/slof.bin %_datadir/%name/spapr-rtas.bin -%_datadir/%name/u-boot.e500 %_datadir/%name/bamboo.dtb %_datadir/%name/petalogix-ml605.dtb diff --git a/qemu.changes b/qemu.changes index c7a2717b..70a58c92 100644 --- a/qemu.changes +++ b/qemu.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jan 21 16:07:16 UTC 2016 - afaerber@suse.de + +- Clean up qemu-tools libcacard Provides/Obsoletes - separate again +- Drop u-boot.e500 - being packaged as u-boot-ppce500 + ------------------------------------------------------------------- Fri Jan 8 14:54:22 UTC 2016 - afaerber@suse.de diff --git a/qemu.spec b/qemu.spec index 815e051f..cb0fdd43 100644 --- a/qemu.spec +++ b/qemu.spec @@ -480,8 +480,6 @@ over an SSH network connection from qemu-img tool and QEMU system emulation. Summary: Universal CPU emulator -- Tools Group: System/Emulators/PC Provides: qemu:%_libexecdir/qemu-bridge-helper -Obsoletes: libcacard <= 0.1.2 -Provides: libcacard PreReq: permissions Recommends: qemu-block-curl @@ -861,6 +859,7 @@ for f in acpi-dsdt.aml q35-acpi-dsdt.aml bios-256k.bin bios.bin efi-*.rom pxe-*. rm $RPM_BUILD_ROOT/%_datadir/%name/$f done %endif +rm -f %{buildroot}%{_datadir}/%{name}/u-boot.e500 install -D -m 644 %{SOURCE302} $RPM_BUILD_ROOT/%{_sysconfdir}/qemu/bridge.conf %find_lang %name %if %{legacy_qemu_kvm} @@ -1004,7 +1003,6 @@ fi %_datadir/%name/openbios-ppc %_datadir/%name/slof.bin %_datadir/%name/spapr-rtas.bin -%_datadir/%name/u-boot.e500 %_datadir/%name/bamboo.dtb %_datadir/%name/petalogix-ml605.dtb diff --git a/qemu.spec.in b/qemu.spec.in index 2d3146f9..9bbc51a5 100644 --- a/qemu.spec.in +++ b/qemu.spec.in @@ -443,8 +443,6 @@ over an SSH network connection from qemu-img tool and QEMU system emulation. Summary: Universal CPU emulator -- Tools Group: System/Emulators/PC Provides: qemu:%_libexecdir/qemu-bridge-helper -Obsoletes: libcacard <= 0.1.2 -Provides: libcacard PreReq: permissions Recommends: qemu-block-curl @@ -787,6 +785,7 @@ for f in acpi-dsdt.aml q35-acpi-dsdt.aml bios-256k.bin bios.bin efi-*.rom pxe-*. rm $RPM_BUILD_ROOT/%_datadir/%name/$f done %endif +rm -f %{buildroot}%{_datadir}/%{name}/u-boot.e500 install -D -m 644 %{SOURCE302} $RPM_BUILD_ROOT/%{_sysconfdir}/qemu/bridge.conf %find_lang %name %if %{legacy_qemu_kvm} @@ -931,7 +930,6 @@ fi %_datadir/%name/openbios-ppc %_datadir/%name/slof.bin %_datadir/%name/spapr-rtas.bin -%_datadir/%name/u-boot.e500 %_datadir/%name/bamboo.dtb %_datadir/%name/petalogix-ml605.dtb