diff --git a/qemu.changes b/qemu.changes index 21750047..20b0b39f 100644 --- a/qemu.changes +++ b/qemu.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Mar 26 14:16:39 UTC 2014 - afaerber@suse.de + +- Fix library directory +- Set default file attributes for qemu-ksm +- Enable Smartcard emulation +* Reorder package definitions to avoid %version troubles + ------------------------------------------------------------------- Tue Mar 19 12:36:56 UTC 2014 - afaerber@suse.de diff --git a/qemu.spec b/qemu.spec index 628e13b8..fb6b5113 100644 --- a/qemu.spec +++ b/qemu.spec @@ -129,6 +129,7 @@ BuildRequires: libpcap-devel BuildRequires: libpixman-1-0-devel BuildRequires: libpng-devel BuildRequires: libpulse-devel +BuildRequires: libtool %if 0%{?suse_version} > 1310 BuildRequires: libusb %endif @@ -136,6 +137,7 @@ BuildRequires: libvdeplug3-devel %if 0%{?suse_version} > 1220 BuildRequires: makeinfo %endif +BuildRequires: mozilla-nss-devel BuildRequires: ncurses-devel BuildRequires: pwdutils BuildRequires: python @@ -320,6 +322,65 @@ as PC and PowerMac systems. This sub-package contains translations. %endif +%package tools +Summary: Universal CPU emulator -- Tools +Group: System/Emulators/PC +Provides: qemu:%_libexecdir/qemu-bridge-helper +PreReq: permissions + +%description tools +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 various tools, including a bridge helper. + +%package -n libcacard0 +Summary: Universal CPU emulator -- Smartcard 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. + +%package -n libcacard-devel +Summary: Universal CPU emulator -- Smartcard emulation +Group: System/Emulators/PC +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 sub-package contains development files for the Smartcard library. + +%package guest-agent +Summary: Universal CPU emulator -- Guest agent +Group: System/Emulators/PC +Provides: qemu:%_bindir/qemu-ga + +%description guest-agent +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 guest agent. + %package seabios Summary: X86 BIOS for QEMU Group: System/Emulators/PC @@ -370,35 +431,6 @@ Conflicts: qemu < 1.6.0 Preboot Execution Environment (PXE) ROM support for various emulated network adapters available with QEMU. -%package tools -Summary: Universal CPU emulator -- Tools -Group: System/Emulators/PC -Provides: qemu:%_libexecdir/qemu-bridge-helper -PreReq: permissions - -%description tools -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 various tools, including a bridge helper. - -%package guest-agent -Summary: Universal CPU emulator -- Guest agent -Group: System/Emulators/PC -Provides: qemu:%_bindir/qemu-ga - -%description guest-agent -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 guest agent. - %if 0%{?with_systemd} %package ksm Summary: Kernel Samepage Merging services @@ -467,6 +499,7 @@ done %build ./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \ + --libdir=%_libdir \ --libexecdir=%_libexecdir \ --extra-cflags="%{optflags}" \ --disable-strip \ @@ -491,6 +524,7 @@ done --enable-modules \ --enable-sdl \ --with-sdlabi=1.2 \ + --enable-smartcard-nss \ %if 0%{?suse_version} >= 1140 %ifarch %ix86 x86_64 --enable-spice \ @@ -589,6 +623,10 @@ fi %verify_permissions %_libexecdir/qemu-bridge-helper %endif +%post -n libcacard0 -p /sbin/ldconfig + +%postun -n libcacard0 -p /sbin/ldconfig + %if 0%{?with_systemd} %pre ksm %service_add_pre ksm.service @@ -605,8 +643,8 @@ fi %files %defattr(-, root, root) -%dir %_libexecdir/%name -%_libexecdir/%name/block-curl.so +%dir %_libdir/%name +%_libdir/%name/block-curl.so %doc COPYING COPYING.LIB Changelog README VERSION qemu-doc.html qemu-tech.html %doc %_mandir/man1/qemu.1.gz %_datadir/%name @@ -762,16 +800,31 @@ fi %_bindir/qemu-img %_bindir/qemu-nbd %_bindir/virtfs-proxy-helper +%_bindir/vscclient %verify(not mode) %_libexecdir/qemu-bridge-helper %dir %_sysconfdir/%name %config %_sysconfdir/%name/bridge.conf +%files -n libcacard0 +%defattr(-, root, root) +%_libdir/libcacard.so.0* + +%files -n libcacard-devel +%defattr(-, root, root) +%dir %_includedir/cacard +%_includedir/cacard/*.h +%_libdir/libcacard.la +%_libdir/libcacard.a +%_libdir/libcacard.so +%_libdir/pkgconfig/libcacard.pc + %files guest-agent %defattr(-, root, root) %attr(755,root,kvm) %_bindir/qemu-ga %if 0%{?with_systemd} %files ksm +%defattr(-, root, root) %{_unitdir}/ksm.service %endif diff --git a/qemu.spec.in b/qemu.spec.in index f522219c..1266a7f3 100644 --- a/qemu.spec.in +++ b/qemu.spec.in @@ -91,6 +91,7 @@ BuildRequires: libpcap-devel BuildRequires: libpixman-1-0-devel BuildRequires: libpng-devel BuildRequires: libpulse-devel +BuildRequires: libtool %if 0%{?suse_version} > 1310 BuildRequires: libusb %endif @@ -98,6 +99,7 @@ BuildRequires: libvdeplug3-devel %if 0%{?suse_version} > 1220 BuildRequires: makeinfo %endif +BuildRequires: mozilla-nss-devel BuildRequires: ncurses-devel BuildRequires: pwdutils BuildRequires: python @@ -282,6 +284,65 @@ as PC and PowerMac systems. This sub-package contains translations. %endif +%package tools +Summary: Universal CPU emulator -- Tools +Group: System/Emulators/PC +Provides: qemu:%_libexecdir/qemu-bridge-helper +PreReq: permissions + +%description tools +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 various tools, including a bridge helper. + +%package -n libcacard0 +Summary: Universal CPU emulator -- Smartcard 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. + +%package -n libcacard-devel +Summary: Universal CPU emulator -- Smartcard emulation +Group: System/Emulators/PC +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 sub-package contains development files for the Smartcard library. + +%package guest-agent +Summary: Universal CPU emulator -- Guest agent +Group: System/Emulators/PC +Provides: qemu:%_bindir/qemu-ga + +%description guest-agent +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 guest agent. + %package seabios Summary: X86 BIOS for QEMU Group: System/Emulators/PC @@ -332,35 +393,6 @@ Conflicts: qemu < 1.6.0 Preboot Execution Environment (PXE) ROM support for various emulated network adapters available with QEMU. -%package tools -Summary: Universal CPU emulator -- Tools -Group: System/Emulators/PC -Provides: qemu:%_libexecdir/qemu-bridge-helper -PreReq: permissions - -%description tools -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 various tools, including a bridge helper. - -%package guest-agent -Summary: Universal CPU emulator -- Guest agent -Group: System/Emulators/PC -Provides: qemu:%_bindir/qemu-ga - -%description guest-agent -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 guest agent. - %if 0%{?with_systemd} %package ksm Summary: Kernel Samepage Merging services @@ -391,6 +423,7 @@ done %build ./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \ + --libdir=%_libdir \ --libexecdir=%_libexecdir \ --extra-cflags="%{optflags}" \ --disable-strip \ @@ -415,6 +448,7 @@ done --enable-modules \ --enable-sdl \ --with-sdlabi=1.2 \ + --enable-smartcard-nss \ %if 0%{?suse_version} >= 1140 %ifarch %ix86 x86_64 --enable-spice \ @@ -513,6 +547,10 @@ fi %verify_permissions %_libexecdir/qemu-bridge-helper %endif +%post -n libcacard0 -p /sbin/ldconfig + +%postun -n libcacard0 -p /sbin/ldconfig + %if 0%{?with_systemd} %pre ksm %service_add_pre ksm.service @@ -529,8 +567,8 @@ fi %files %defattr(-, root, root) -%dir %_libexecdir/%name -%_libexecdir/%name/block-curl.so +%dir %_libdir/%name +%_libdir/%name/block-curl.so %doc COPYING COPYING.LIB Changelog README VERSION qemu-doc.html qemu-tech.html %doc %_mandir/man1/qemu.1.gz %_datadir/%name @@ -686,16 +724,31 @@ fi %_bindir/qemu-img %_bindir/qemu-nbd %_bindir/virtfs-proxy-helper +%_bindir/vscclient %verify(not mode) %_libexecdir/qemu-bridge-helper %dir %_sysconfdir/%name %config %_sysconfdir/%name/bridge.conf +%files -n libcacard0 +%defattr(-, root, root) +%_libdir/libcacard.so.0* + +%files -n libcacard-devel +%defattr(-, root, root) +%dir %_includedir/cacard +%_includedir/cacard/*.h +%_libdir/libcacard.la +%_libdir/libcacard.a +%_libdir/libcacard.so +%_libdir/pkgconfig/libcacard.pc + %files guest-agent %defattr(-, root, root) %attr(755,root,kvm) %_bindir/qemu-ga %if 0%{?with_systemd} %files ksm +%defattr(-, root, root) %{_unitdir}/ksm.service %endif