- removed outdated gcrypt patch

- moved polkit file to -utils
- python packaging fix

Changed files:
    gcrypt.patch -> 1.2
    libvirt.spec -> 1.37

diff --git a/gcrypt.patch b/gcrypt.patch
deleted file mode 100644 (file)
index 7353e8b..0000000
--- a/gcrypt.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libvirt-0.8.0/src/Makefile.am.wiget        2010-04-26 01:15:52.502679268 +0200
-+++ libvirt-0.8.0/src/Makefile.am      2010-04-26 01:17:14.762667442 +0200
-@@ -380,7 +380,7 @@ libvirt_driver_la_SOURCES = $(DRIVER_SOU
- 
- libvirt_driver_la_CFLAGS = $(NUMACTL_CFLAGS)  \
-               -I@top_srcdir@/src/conf
--libvirt_driver_la_LDFLAGS = $(NUMACTL_LIBS)
-+libvirt_driver_la_LDFLAGS = $(NUMACTL_LIBS) $(GNUTLS_LIBS)
- 
- USED_SYM_FILES = libvirt_private.syms
- 

diff --git a/libvirt.spec b/libvirt.spec
index fa382d6379bd5baef4478ad1f0831ef9f98698bf..6baff894f0b760338d3afb8b7c2e104bd31274d8 100644 (file)
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -1,7 +1,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
@@ -29,12 +29,11 @@ Version:    0.9.6
 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
@@ -67,6 +66,7 @@ BuildRequires:        python-devel
 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
@@ -116,7 +116,7 @@ capabilities of recent versions of Linux.
 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}
@@ -151,10 +151,10 @@ This package contains tools for the libvirt library.
 
 %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
@@ -166,7 +166,6 @@ mv po/vi_VN.gmo po/vi.gmo
 %{__autoconf}
 %{__automake}
 
-
 %configure \
        --disable-silent-rules \
        --with-html-dir=%{_gtkdocdir} \
@@ -211,21 +210,27 @@ install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
 #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
@@ -245,28 +250,28 @@ rm -rf $RPM_BUILD_ROOT
 
 %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)
@@ -286,6 +291,7 @@ rm -rf $RPM_BUILD_ROOT
 %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*