rpm/qemu
SHA256
1
0
Fork 0
forked from pool/qemu
Code Pull Requests Activity

Accepting request 233897 from home:a_faerber:branches:Virtualization

Browse Source 
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
This commit is contained in:
Bruce Rogers 2014-05-14 18:43:09 +00:00 committed by Git OBS Bridge
parent 7af5077dec
commit da55aad53e
3 changed files with 85 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
qemu.changes
View File

@ -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 Tue May 13 08:17:18 UTC 2014 - afaerber@suse.de

64
qemu.spec
View File

@ -350,6 +350,8 @@ This sub-package contains translations.
Summary: Universal CPU emulator -- Tools Summary: Universal CPU emulator -- Tools
Group: System/Emulators/PC Group: System/Emulators/PC
Provides: qemu:%_libexecdir/qemu-bridge-helper Provides: qemu:%_libexecdir/qemu-bridge-helper
Obsoletes: libcacard <= 0.1.2
Provides: libcacard
PreReq: permissions PreReq: permissions
%description tools %description tools
@ -362,32 +364,32 @@ as PC and PowerMac systems.
This sub-package contains various tools, including a bridge helper. This sub-package contains various tools, including a bridge helper.
%package -n libcacard0 %package -n libcacard0
Summary: Universal CPU emulator -- Smartcard emulation Summary: Common Access Card (CAC) emulation
Group: System/Emulators/PC Group: System/Emulators/PC
%description -n libcacard0 %description -n libcacard0
QEMU is an extremely well-performing CPU emulator that allows you to This emulator is designed to provide emulation of actual smart cards to a
choose between simulating an entire system and running userspace virtual card reader running in a guest virtual machine. The emulated smart
binaries for different architectures under your native operating cards can be representations of real smart cards, where the necessary functions
system. It currently emulates x86, ARM, PowerPC and SPARC CPUs as well such as signing, card removal/insertion, etc. are mapped to real, physical
as PC and PowerMac systems. 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 the Smartcard library.
%package -n libcacard-devel %package -n libcacard-devel
Summary: Universal CPU emulator -- Smartcard emulation Summary: Common Access Card (CAC) emulation -- Development files
Group: System/Emulators/PC Group: Development/Languages/C and C++
Requires: glib2-devel Requires: glib2-devel
Requires: libcacard0 = %version Requires: libcacard0 = %version
Requires: mozilla-nspr Requires: mozilla-nspr
Requires: mozilla-nss Requires: mozilla-nss
%description -n libcacard-devel %description -n libcacard-devel
QEMU is an extremely well-performing CPU emulator that allows you to This emulator is designed to provide emulation of actual smart cards to a
choose between simulating an entire system and running userspace virtual card reader running in a guest virtual machine. The emulated smart
binaries for different architectures under your native operating cards can be representations of real smart cards, where the necessary functions
system. It currently emulates x86, ARM, PowerPC and SPARC CPUs as well such as signing, card removal/insertion, etc. are mapped to real, physical
as PC and PowerMac systems. 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. This sub-package contains development files for the Smartcard library.
@ -608,6 +610,8 @@ make check V=1
%install %install
make install DESTDIR=$RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT
rm -fr $RPM_BUILD_ROOT/%_datadir/doc 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 install -D -m 644 %{SOURCE302} $RPM_BUILD_ROOT/%{_sysconfdir}/qemu/bridge.conf
%find_lang %name %find_lang %name
%if %{legacy_qemu_kvm} %if %{legacy_qemu_kvm}
@ -775,15 +779,25 @@ fi
%files extra %files extra
%defattr(-, root, root) %defattr(-, root, root)
%_bindir/qemu-system-* %_bindir/qemu-system-alpha
%exclude %_bindir/qemu-system-i386 %_bindir/qemu-system-cris
%exclude %_bindir/qemu-system-x86_64 %_bindir/qemu-system-lm32
%exclude %_bindir/qemu-system-ppc %_bindir/qemu-system-m68k
%exclude %_bindir/qemu-system-ppc64 %_bindir/qemu-system-microblaze
%exclude %_bindir/qemu-system-ppcemb %_bindir/qemu-system-microblazeel
%exclude %_bindir/qemu-system-s390x %_bindir/qemu-system-mips
%exclude %_bindir/qemu-system-arm %_bindir/qemu-system-mipsel
%exclude %_bindir/qemu-system-aarch64 %_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/palcode-clipper
%_datadir/%name/openbios-sparc32 %_datadir/%name/openbios-sparc32
%_datadir/%name/openbios-sparc64 %_datadir/%name/openbios-sparc64
@ -859,8 +873,6 @@ fi
%defattr(-, root, root) %defattr(-, root, root)
%dir %_includedir/cacard %dir %_includedir/cacard
%_includedir/cacard/*.h %_includedir/cacard/*.h
%_libdir/libcacard.la
%_libdir/libcacard.a
%_libdir/libcacard.so %_libdir/libcacard.so
%_libdir/pkgconfig/libcacard.pc %_libdir/pkgconfig/libcacard.pc

64
qemu.spec.in
View File

@ -306,6 +306,8 @@ This sub-package contains translations.
Summary: Universal CPU emulator -- Tools Summary: Universal CPU emulator -- Tools
Group: System/Emulators/PC Group: System/Emulators/PC
Provides: qemu:%_libexecdir/qemu-bridge-helper Provides: qemu:%_libexecdir/qemu-bridge-helper
Obsoletes: libcacard <= 0.1.2
Provides: libcacard
PreReq: permissions PreReq: permissions
%description tools %description tools
@ -318,32 +320,32 @@ as PC and PowerMac systems.
This sub-package contains various tools, including a bridge helper. This sub-package contains various tools, including a bridge helper.
%package -n libcacard0 %package -n libcacard0
Summary: Universal CPU emulator -- Smartcard emulation Summary: Common Access Card (CAC) emulation
Group: System/Emulators/PC Group: System/Emulators/PC
%description -n libcacard0 %description -n libcacard0
QEMU is an extremely well-performing CPU emulator that allows you to This emulator is designed to provide emulation of actual smart cards to a
choose between simulating an entire system and running userspace virtual card reader running in a guest virtual machine. The emulated smart
binaries for different architectures under your native operating cards can be representations of real smart cards, where the necessary functions
system. It currently emulates x86, ARM, PowerPC and SPARC CPUs as well such as signing, card removal/insertion, etc. are mapped to real, physical
as PC and PowerMac systems. 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 the Smartcard library.
%package -n libcacard-devel %package -n libcacard-devel
Summary: Universal CPU emulator -- Smartcard emulation Summary: Common Access Card (CAC) emulation -- Development files
Group: System/Emulators/PC Group: Development/Languages/C and C++
Requires: glib2-devel Requires: glib2-devel
Requires: libcacard0 = %version Requires: libcacard0 = %version
Requires: mozilla-nspr Requires: mozilla-nspr
Requires: mozilla-nss Requires: mozilla-nss
%description -n libcacard-devel %description -n libcacard-devel
QEMU is an extremely well-performing CPU emulator that allows you to This emulator is designed to provide emulation of actual smart cards to a
choose between simulating an entire system and running userspace virtual card reader running in a guest virtual machine. The emulated smart
binaries for different architectures under your native operating cards can be representations of real smart cards, where the necessary functions
system. It currently emulates x86, ARM, PowerPC and SPARC CPUs as well such as signing, card removal/insertion, etc. are mapped to real, physical
as PC and PowerMac systems. 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. This sub-package contains development files for the Smartcard library.
@ -520,6 +522,8 @@ make check V=1
%install %install
make install DESTDIR=$RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT
rm -fr $RPM_BUILD_ROOT/%_datadir/doc 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 install -D -m 644 %{SOURCE302} $RPM_BUILD_ROOT/%{_sysconfdir}/qemu/bridge.conf
%find_lang %name %find_lang %name
%if %{legacy_qemu_kvm} %if %{legacy_qemu_kvm}
@ -687,15 +691,25 @@ fi
%files extra %files extra
%defattr(-, root, root) %defattr(-, root, root)
%_bindir/qemu-system-* %_bindir/qemu-system-alpha
%exclude %_bindir/qemu-system-i386 %_bindir/qemu-system-cris
%exclude %_bindir/qemu-system-x86_64 %_bindir/qemu-system-lm32
%exclude %_bindir/qemu-system-ppc %_bindir/qemu-system-m68k
%exclude %_bindir/qemu-system-ppc64 %_bindir/qemu-system-microblaze
%exclude %_bindir/qemu-system-ppcemb %_bindir/qemu-system-microblazeel
%exclude %_bindir/qemu-system-s390x %_bindir/qemu-system-mips
%exclude %_bindir/qemu-system-arm %_bindir/qemu-system-mipsel
%exclude %_bindir/qemu-system-aarch64 %_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/palcode-clipper
%_datadir/%name/openbios-sparc32 %_datadir/%name/openbios-sparc32
%_datadir/%name/openbios-sparc64 %_datadir/%name/openbios-sparc64
@ -771,8 +785,6 @@ fi
%defattr(-, root, root) %defattr(-, root, root)
%dir %_includedir/cacard %dir %_includedir/cacard
%_includedir/cacard/*.h %_includedir/cacard/*.h
%_libdir/libcacard.la
%_libdir/libcacard.a
%_libdir/libcacard.so %_libdir/libcacard.so
%_libdir/pkgconfig/libcacard.pc %_libdir/pkgconfig/libcacard.pc