From 7e20b346a58b83957215ee63ccd8b916dc69f661662ed9a51a2c6e5a5afe16e8 Mon Sep 17 00:00:00 2001 From: Bruce Rogers Date: Wed, 14 May 2014 18:43:09 +0000 Subject: [PATCH] Accepting request 233897 from home:a_faerber:branches:Virtualization Tidy libcacard and qemu-extra OBS-URL: https://build.opensuse.org/request/show/233897 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=209 --- qemu.changes | 9 ++++++++ qemu.spec | 64 +++++++++++++++++++++++++++++++--------------------- qemu.spec.in | 64 +++++++++++++++++++++++++++++++--------------------- 3 files changed, 85 insertions(+), 52 deletions(-) diff --git a/qemu.changes b/qemu.changes index d5ffe6c3..964d1cc5 100644 --- a/qemu.changes +++ b/qemu.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed May 14 13:44:38 UTC 2014 - afaerber@suse.de + +- Fix conflict with libcacard 0.1.2 from project security +* Adopt description and group for libcacard-devel from there +- Drop libcacard.{a,la} from libcacard-devel + If needed, libcacard.a should go into a libcacard-devel-static. +- Change qemu-extra to explicitly list qemu-system-* binaries + ------------------------------------------------------------------- Tue May 13 08:17:18 UTC 2014 - afaerber@suse.de diff --git a/qemu.spec b/qemu.spec index 97003f2d..51de5b5e 100644 --- a/qemu.spec +++ b/qemu.spec @@ -350,6 +350,8 @@ This sub-package contains translations. Summary: Universal CPU emulator -- Tools Group: System/Emulators/PC Provides: qemu:%_libexecdir/qemu-bridge-helper +Obsoletes: libcacard <= 0.1.2 +Provides: libcacard PreReq: permissions %description tools @@ -362,32 +364,32 @@ as PC and PowerMac systems. This sub-package contains various tools, including a bridge helper. %package -n libcacard0 -Summary: Universal CPU emulator -- Smartcard emulation +Summary: Common Access Card (CAC) emulation Group: System/Emulators/PC %description -n libcacard0 -QEMU is an extremely well-performing CPU emulator that allows you to -choose between simulating an entire system and running userspace -binaries for different architectures under your native operating -system. It currently emulates x86, ARM, PowerPC and SPARC CPUs as well -as PC and PowerMac systems. - -This sub-package contains the Smartcard library. +This emulator is designed to provide emulation of actual smart cards to a +virtual card reader running in a guest virtual machine. The emulated smart +cards can be representations of real smart cards, where the necessary functions +such as signing, card removal/insertion, etc. are mapped to real, physical +cards which are shared with the client machine the emulator is running on, or +the cards could be pure software constructs. %package -n libcacard-devel -Summary: Universal CPU emulator -- Smartcard emulation -Group: System/Emulators/PC +Summary: Common Access Card (CAC) emulation -- Development files +Group: Development/Languages/C and C++ Requires: glib2-devel Requires: libcacard0 = %version Requires: mozilla-nspr Requires: mozilla-nss %description -n libcacard-devel -QEMU is an extremely well-performing CPU emulator that allows you to -choose between simulating an entire system and running userspace -binaries for different architectures under your native operating -system. It currently emulates x86, ARM, PowerPC and SPARC CPUs as well -as PC and PowerMac systems. +This emulator is designed to provide emulation of actual smart cards to a +virtual card reader running in a guest virtual machine. The emulated smart +cards can be representations of real smart cards, where the necessary functions +such as signing, card removal/insertion, etc. are mapped to real, physical +cards which are shared with the client machine the emulator is running on, or +the cards could be pure software constructs. This sub-package contains development files for the Smartcard library. @@ -608,6 +610,8 @@ make check V=1 %install make install DESTDIR=$RPM_BUILD_ROOT rm -fr $RPM_BUILD_ROOT/%_datadir/doc +rm -f $RPM_BUILD_ROOT/%_libdir/libcacard.a +rm -f $RPM_BUILD_ROOT/%_libdir/libcacard.la install -D -m 644 %{SOURCE302} $RPM_BUILD_ROOT/%{_sysconfdir}/qemu/bridge.conf %find_lang %name %if %{legacy_qemu_kvm} @@ -775,15 +779,25 @@ fi %files extra %defattr(-, root, root) -%_bindir/qemu-system-* -%exclude %_bindir/qemu-system-i386 -%exclude %_bindir/qemu-system-x86_64 -%exclude %_bindir/qemu-system-ppc -%exclude %_bindir/qemu-system-ppc64 -%exclude %_bindir/qemu-system-ppcemb -%exclude %_bindir/qemu-system-s390x -%exclude %_bindir/qemu-system-arm -%exclude %_bindir/qemu-system-aarch64 +%_bindir/qemu-system-alpha +%_bindir/qemu-system-cris +%_bindir/qemu-system-lm32 +%_bindir/qemu-system-m68k +%_bindir/qemu-system-microblaze +%_bindir/qemu-system-microblazeel +%_bindir/qemu-system-mips +%_bindir/qemu-system-mipsel +%_bindir/qemu-system-mips64 +%_bindir/qemu-system-mips64el +%_bindir/qemu-system-moxie +%_bindir/qemu-system-or32 +%_bindir/qemu-system-sh4 +%_bindir/qemu-system-sh4eb +%_bindir/qemu-system-sparc +%_bindir/qemu-system-sparc64 +%_bindir/qemu-system-unicore32 +%_bindir/qemu-system-xtensa +%_bindir/qemu-system-xtensaeb %_datadir/%name/palcode-clipper %_datadir/%name/openbios-sparc32 %_datadir/%name/openbios-sparc64 @@ -859,8 +873,6 @@ fi %defattr(-, root, root) %dir %_includedir/cacard %_includedir/cacard/*.h -%_libdir/libcacard.la -%_libdir/libcacard.a %_libdir/libcacard.so %_libdir/pkgconfig/libcacard.pc diff --git a/qemu.spec.in b/qemu.spec.in index ba7c7d40..40c58795 100644 --- a/qemu.spec.in +++ b/qemu.spec.in @@ -306,6 +306,8 @@ This sub-package contains translations. Summary: Universal CPU emulator -- Tools Group: System/Emulators/PC Provides: qemu:%_libexecdir/qemu-bridge-helper +Obsoletes: libcacard <= 0.1.2 +Provides: libcacard PreReq: permissions %description tools @@ -318,32 +320,32 @@ as PC and PowerMac systems. This sub-package contains various tools, including a bridge helper. %package -n libcacard0 -Summary: Universal CPU emulator -- Smartcard emulation +Summary: Common Access Card (CAC) emulation Group: System/Emulators/PC %description -n libcacard0 -QEMU is an extremely well-performing CPU emulator that allows you to -choose between simulating an entire system and running userspace -binaries for different architectures under your native operating -system. It currently emulates x86, ARM, PowerPC and SPARC CPUs as well -as PC and PowerMac systems. - -This sub-package contains the Smartcard library. +This emulator is designed to provide emulation of actual smart cards to a +virtual card reader running in a guest virtual machine. The emulated smart +cards can be representations of real smart cards, where the necessary functions +such as signing, card removal/insertion, etc. are mapped to real, physical +cards which are shared with the client machine the emulator is running on, or +the cards could be pure software constructs. %package -n libcacard-devel -Summary: Universal CPU emulator -- Smartcard emulation -Group: System/Emulators/PC +Summary: Common Access Card (CAC) emulation -- Development files +Group: Development/Languages/C and C++ Requires: glib2-devel Requires: libcacard0 = %version Requires: mozilla-nspr Requires: mozilla-nss %description -n libcacard-devel -QEMU is an extremely well-performing CPU emulator that allows you to -choose between simulating an entire system and running userspace -binaries for different architectures under your native operating -system. It currently emulates x86, ARM, PowerPC and SPARC CPUs as well -as PC and PowerMac systems. +This emulator is designed to provide emulation of actual smart cards to a +virtual card reader running in a guest virtual machine. The emulated smart +cards can be representations of real smart cards, where the necessary functions +such as signing, card removal/insertion, etc. are mapped to real, physical +cards which are shared with the client machine the emulator is running on, or +the cards could be pure software constructs. This sub-package contains development files for the Smartcard library. @@ -520,6 +522,8 @@ make check V=1 %install make install DESTDIR=$RPM_BUILD_ROOT rm -fr $RPM_BUILD_ROOT/%_datadir/doc +rm -f $RPM_BUILD_ROOT/%_libdir/libcacard.a +rm -f $RPM_BUILD_ROOT/%_libdir/libcacard.la install -D -m 644 %{SOURCE302} $RPM_BUILD_ROOT/%{_sysconfdir}/qemu/bridge.conf %find_lang %name %if %{legacy_qemu_kvm} @@ -687,15 +691,25 @@ fi %files extra %defattr(-, root, root) -%_bindir/qemu-system-* -%exclude %_bindir/qemu-system-i386 -%exclude %_bindir/qemu-system-x86_64 -%exclude %_bindir/qemu-system-ppc -%exclude %_bindir/qemu-system-ppc64 -%exclude %_bindir/qemu-system-ppcemb -%exclude %_bindir/qemu-system-s390x -%exclude %_bindir/qemu-system-arm -%exclude %_bindir/qemu-system-aarch64 +%_bindir/qemu-system-alpha +%_bindir/qemu-system-cris +%_bindir/qemu-system-lm32 +%_bindir/qemu-system-m68k +%_bindir/qemu-system-microblaze +%_bindir/qemu-system-microblazeel +%_bindir/qemu-system-mips +%_bindir/qemu-system-mipsel +%_bindir/qemu-system-mips64 +%_bindir/qemu-system-mips64el +%_bindir/qemu-system-moxie +%_bindir/qemu-system-or32 +%_bindir/qemu-system-sh4 +%_bindir/qemu-system-sh4eb +%_bindir/qemu-system-sparc +%_bindir/qemu-system-sparc64 +%_bindir/qemu-system-unicore32 +%_bindir/qemu-system-xtensa +%_bindir/qemu-system-xtensaeb %_datadir/%name/palcode-clipper %_datadir/%name/openbios-sparc32 %_datadir/%name/openbios-sparc64 @@ -771,8 +785,6 @@ fi %defattr(-, root, root) %dir %_includedir/cacard %_includedir/cacard/*.h -%_libdir/libcacard.la -%_libdir/libcacard.a %_libdir/libcacard.so %_libdir/pkgconfig/libcacard.pc