Author: qboosh Date: Sun Sep 25 15:33:44 2011 GMT Module: packages Tag: HEAD ---- Log message: - removed outdated gcrypt patch - moved polkit file to -utils - python packaging fix
---- Files affected: packages/libvirt: libvirt.spec (1.36 -> 1.37) , gcrypt.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ Index: packages/libvirt/libvirt.spec diff -u packages/libvirt/libvirt.spec:1.36 packages/libvirt/libvirt.spec:1.37 --- packages/libvirt/libvirt.spec:1.36 Sat Sep 24 23:12:23 2011 +++ packages/libvirt/libvirt.spec Sun Sep 25 17:33:38 2011 @@ -2,7 +2,7 @@ # # Conditional build: %bcond_with xen # xen -%bcond_without xen_proxy # Xen proxy +%bcond_without xen_proxy # Xen proxy %bcond_without qemu # Qemu %bcond_without polkit # PolicyKit %bcond_with lokkit # Lokkit @@ -30,12 +30,11 @@ Release: 1 License: LGPL Group: Base/Kernel -URL: http://www.libvirt.org/ Source0: ftp://ftp.libvirt.org/libvirt/%{name}-%{version}.tar.gz # Source0-md5: b74df374b524d00a22a6c89cfc23099f Source1: %{name}.init -Patch0: gcrypt.patch -Patch1: %{name}-sasl.patch +Patch0: %{name}-sasl.patch +URL: http://www.libvirt.org/ %{?with_lokkit:BuildRequires: /usr/sbin/lokkit} BuildRequires: augeas-devel BuildRequires: autoconf @@ -68,6 +67,7 @@ BuildRequires: readline-devel BuildRequires: readline-devel BuildRequires: rpm-pythonprov +BuildRequires: rpmbuild(macros) >= 1.219 BuildRequires: sqlite3-devel BuildRequires: udev-devel >= 145 # For mount/umount in FS driver @@ -117,7 +117,7 @@ This package contains the static libraries needed for developing programs using the libvirt library. -%package -n python-%{name} +%package -n python-%{name} Summary: Python bindings to interact with virtualization capabilities Group: Development/Languages/Python Requires: %{name} = %{version}-%{release} @@ -152,10 +152,10 @@ %prep %setup -q -#%patch0 -p1 -%patch1 -p1 +%patch0 -p1 + # weird translations -rm -f po/{my,eu_ES}.{po,gmo} +%{__rm} po/{my,eu_ES}.{po,gmo} mv po/vi_VN.po po/vi.po mv po/vi_VN.gmo po/vi.gmo @@ -167,7 +167,6 @@ %{__autoconf} %{__automake} - %configure \ --disable-silent-rules \ --with-html-dir=%{_gtkdocdir} \ @@ -212,21 +211,27 @@ #install qemud/libvirtd.sysconf $RPM_BUILD_ROOT/etc/sysconfig/libvirtd install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/libvirtd +%py_comp $RPM_BUILD_ROOT%{py_sitedir} +%py_ocomp $RPM_BUILD_ROOT%{py_sitedir} +%py_postclean + %find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig %files -f %{name}.lang %defattr(644,root,root,755) %doc ChangeLog README TODO NEWS -%attr(755,root,root) %{_libdir}/%{name}*.so.* +%attr(755,root,root) %{_libdir}/libvirt.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libvirt.so.0 +%attr(755,root,root) %{_libdir}/libvirt-qemu.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libvirt-qemu.so.0 %attr(755,root,root) %{_libdir}/libvirt_lxc %attr(755,root,root) %{_libdir}/libvirt_iohelper -%{?with_polkit:%{_datadir}/polkit-1/actions/org.libvirt.unix.policy} %dir %{_datadir}/libvirt %dir %{_datadir}/libvirt/schemas %{_datadir}/libvirt/schemas/basictypes.rng @@ -246,28 +251,28 @@ %files devel %defattr(644,root,root,755) -%doc %{_docdir}/%{name}-%{version} -%doc %{_gtkdocdir}/%{name} -%dir %{_includedir}/%{name} -%{_includedir}/%{name}/*.h -%{_libdir}/%{name}*.so -%{_libdir}/%{name}*.la +%attr(755,root,root) %{_libdir}/libvirt.so +%attr(755,root,root) %{_libdir}/libvirt-qemu.so +%{_libdir}/libvirt.la +%{_libdir}/libvirt-qemu.la +%{_gtkdocdir}/%{name} +%{_includedir}/%{name} %{_pkgconfigdir}/%{name}.pc %files static %defattr(644,root,root,755) -%{_libdir}/%{name}.a -%{_libdir}/%{name}-qemu.a +%{_libdir}/libvirt.a +%{_libdir}/libvirt-qemu.a %files -n python-%{name} %defattr(644,root,root,755) %doc %{_docdir}/%{name}-python-%{version} -%{py_sitedir}/libvirt.py -%{py_sitedir}/libvirt_qemu.py -%{py_sitedir}/libvirtmod.la -%{py_sitedir}/libvirtmod_qemu.la %attr(755,root,root) %{py_sitedir}/libvirtmod.so %attr(755,root,root) %{py_sitedir}/libvirtmod_qemu.so +%{py_sitedir}/libvirt.py[co] +%{py_sitedir}/libvirt_qemu.py[co] +%{py_sitedir}/libvirtmod.la +%{py_sitedir}/libvirtmod_qemu.la %files utils %defattr(644,root,root,755) @@ -287,6 +292,7 @@ %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/libvirtd.uml %{_libdir}/libvirt_parthelper %{_libdir}/virt-aa-helper +%{?with_polkit:%{_datadir}/polkit-1/actions/org.libvirt.unix.policy} %{_mandir}/man1/virsh.1* %{_mandir}/man1/virt-xml-validate.1* %{_mandir}/man1/virt-pki-validate.1* @@ -303,6 +309,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.37 2011/09/25 15:33:38 qboosh +- removed outdated gcrypt patch +- moved polkit file to -utils +- python packaging fix + Revision 1.36 2011/09/24 21:12:23 arekm - up to 0.9.6 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libvirt/libvirt.spec?r1=1.36&r2=1.37&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
