diff --git a/libvirt-sandbox.spec b/libvirt-sandbox.spec index cca5f85..35afaac 100644 --- a/libvirt-sandbox.spec +++ b/libvirt-sandbox.spec @@ -1,22 +1,20 @@ # -*- rpm-spec -*- -%define with_introspection 0 %define with_tcg 1 -%define with_python 0 +%define with_kvm 1 -%if 0%{?fedora} >= 15 -%define with_introspection 1 -%endif -%if 0%{?rhel} >= 6 -%define with_introspection 1 +# RHEL does not provide the 9p.ko kernel module +# nor the virtio-9p KVM backend driver. +%if 0%{?rhel} %define with_tcg 0 +%define with_kvm 0 %endif %define libvirt_version 1.0.2 Name: libvirt-sandbox -Version: 0.1.2 +Version: 0.2.0 Release: 1%{?dist}%{?extra_release} Summary: libvirt application sandbox framework Group: Development/Tools @@ -25,23 +23,26 @@ URL: http://libvirt.org/ Source0: ftp://libvirt.org/libvirt/sandbox/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libvirt-gobject-devel >= 0.0.9 -%if %{with_introspection} BuildRequires: gobject-introspection-devel -%endif BuildRequires: libselinux-devel BuildRequires: glibc-static BuildRequires: /usr/bin/pod2man +BuildRequires: intltool +Requires: rpm-python Requires: glib2-devel >= 2.32.0 # For virsh lxc-enter-namespace command Requires: libvirt-client >= %{libvirt_version} +Requires: systemd >= 198 %package libs Group: Development/Libraries Summary: libvirt application sandbox framework libraries # So we get the full libvirtd daemon, not just client libs %ifarch %{ix86} x86_64 +%if %{with_kvm} Requires: libvirt-daemon-kvm >= %{libvirt_version} %endif +%endif %if %{with_tcg} Requires: libvirt-daemon-qemu >= %{libvirt_version} %endif @@ -69,13 +70,7 @@ the libvirt sandbox %build -%if %{with_introspection} -%define introspection_arg --enable-introspection -%else -%define introspection_arg --disable-introspection -%endif - -%configure %{introspection_arg} +%configure --enable-introspection %__make %{?_smp_mflags} @@ -86,6 +81,8 @@ chmod a-x examples/*.py examples/*.pl examples/*.js rm -f $RPM_BUILD_ROOT%{_libdir}/libvirt-sandbox-1.0.a rm -f $RPM_BUILD_ROOT%{_libdir}/libvirt-sandbox-1.0.la +%find_lang %{name} + %clean rm -rf $RPM_BUILD_ROOT @@ -94,7 +91,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%{_sysconfdir}/bash_completion.d/virt-sandbox-service-bash-completion.sh +%{_datadir}/bash-completion/completions/virt-sandbox-service %config(noreplace) %{_sysconfdir}/cron.daily/virt-sandbox-service.logrotate %dir %{_sysconfdir}/libvirt-sandbox/services %{_bindir}/virt-sandbox @@ -104,7 +101,7 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/virt-sandbox-service.1* %{_mandir}/man1/virt-sandbox-service-*.1* -%files libs +%files libs -f %{name}.lang %defattr(-,root,root,-) %doc README COPYING AUTHORS ChangeLog NEWS %dir %{_sysconfdir}/libvirt-sandbox @@ -114,9 +111,7 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/libvirt-sandbox-init-lxc %{_libexecdir}/libvirt-sandbox-init-qemu %{_libdir}/libvirt-sandbox-1.0.so.* -%if %{with_introspection} %{_libdir}/girepository-1.0/LibvirtSandbox-1.0.typelib -%endif %files devel %defattr(-,root,root,-) @@ -130,12 +125,13 @@ rm -rf $RPM_BUILD_ROOT %dir %{_includedir}/libvirt-sandbox-1.0/libvirt-sandbox %{_includedir}/libvirt-sandbox-1.0/libvirt-sandbox/libvirt-sandbox.h %{_includedir}/libvirt-sandbox-1.0/libvirt-sandbox/libvirt-sandbox-*.h -%if %{with_introspection} %{_datadir}/gir-1.0/LibvirtSandbox-1.0.gir -%endif %{_datadir}/gtk-doc/html/Libvirt-sandbox %changelog +* Tue May 7 2013 Daniel P. Berrange - 0.2.0-1 +- Update to 0.2.0 release + * Tue Mar 5 2013 Daniel P. Berrange - 0.1.2-1 - Update to 0.1.2 release diff --git a/sources b/sources index de50e0d..d8a0a14 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1c0bd8f6c85c43d8bf7894266511ce39 libvirt-sandbox-0.1.2.tar.gz +538b3eb2bef4f82eecd8a42a0581ea6c libvirt-sandbox-0.2.0.tar.gz