OK, so I left out the change to init. Attached is the final patch,
which I've committed to Rawhide. Are we still copying these changes
into the specfile that we ship in the libvirt tarball?
Rich.
--
Richard Jones, Emerging Technologies, Red Hat http://et.redhat.com/~rjones
virt-df lists disk usage of guests without needing to install any
software inside the virtual machine. Supports Linux and Windows.
http://et.redhat.com/~rjones/virt-df/
Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- libvirt.spec 6 Feb 2009 19:28:20 -0000 1.109
+++ libvirt.spec 12 Feb 2009 12:35:17 -0000 1.110
@@ -47,7 +47,7 @@
Summary: Library providing a simple API virtualization
Name: libvirt
Version: 0.6.0
-Release: 2%{?dist}%{?extra_release}
+Release: 3%{?dist}%{?extra_release}
License: LGPLv2+
Group: Development/Libraries
Source: libvirt-%{version}.tar.gz
@@ -56,7 +56,6 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
URL: http://libvirt.org/
BuildRequires: python python-devel
-Requires: libxml2
Requires: readline
Requires: ncurses
Requires: dnsmasq
@@ -140,7 +139,8 @@
BuildRequires: parted-devel
# For QEMU/LXC numa info
BuildRequires: numactl-devel
-Obsoletes: libvir
+Obsoletes: libvir <= 0.2
+Provides: libvir = %{version}-%{release}
# Fedora build root suckage
BuildRequires: gawk
@@ -152,12 +152,13 @@
%package devel
Summary: Libraries, includes, etc. to compile with the libvirt library
Group: Development/Libraries
-Requires: libvirt = %{version}
+Requires: libvirt = %{version}-%{release}
Requires: pkgconfig
%if %{with_xen}
Requires: xen-devel
%endif
-Obsoletes: libvir-devel
+Obsoletes: libvir-devel <= 0.2
+Provides: libvir-devel = %{version}-%{release}
%description devel
Includes and documentations for the C library providing an API to use
@@ -167,8 +168,9 @@
%package python
Summary: Python bindings for the libvirt library
Group: Development/Libraries
-Requires: libvirt = %{version}
-Obsoletes: libvir-python
+Requires: libvirt = %{version}-%{release}
+Obsoletes: libvir-python <= 0.2
+Provides: libvir-python = %{version}-%{release}
%description python
The libvirt-python package contains a module that permits applications
@@ -182,6 +184,9 @@
%patch1 -p1
%patch2 -p1
+mv NEWS NEWS.old
+iconv -f ISO-8859-1 -t UTF-8 < NEWS.old > NEWS
+
%build
%if ! %{with_xen}
%define _without_xen --without-xen
@@ -249,7 +254,7 @@
make %{?_smp_mflags}
%install
-rm -fr %{buildroot}
+rm -rf %{buildroot}
%makeinstall
(cd docs/examples ; make clean ; rm -rf .deps Makefile Makefile.in)
@@ -291,6 +296,10 @@
rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu.conf
%endif
+%if %{with_libvirtd}
+chmod 0644 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/libvirtd
+%endif
+
%clean
rm -fr %{buildroot}
@@ -324,8 +333,7 @@
fi
%endif
-%postun
-/sbin/ldconfig
+%postun -p /sbin/ldconfig
%files -f %{name}.lang
%defattr(-, root, root)
@@ -463,6 +471,9 @@
%endif
%changelog
+* Wed Feb 11 2009 Richard W.M. Jones <[email protected]> - 0.6.0-3.fc11
+- Multiple fixes to remove rpmlint warnings/errors (rhbz #226055)
+
* Fri Feb 6 2009 Daniel P. Berrange <[email protected]> - 0.6.0-2.fc11
- Fix libvirtd --timeout usage
- Fix RPC call problems and QEMU startup handling (rhbz #484414)
@@ -531,7 +542,7 @@
* Wed Jun 4 2008 Mark McLoughlin <[email protected]> - 0.4.2-6.fc10
- Disable lokkit support again (#449996, #447633)
-- Ensure %{fedora} is evaluated correctly
+- Ensure %-fedora is evaluated correctly
* Thu May 15 2008 Daniel P. Berrange <[email protected]> - 0.4.2-5.fc10
- Rebuild with policy enabled (rhbz #446616)
@@ -716,7 +727,7 @@
- it's pkgconfig not pgkconfig !
* Mon Nov 6 2006 Daniel Veillard <[email protected]> 0.1.8-2
-- fixing spec file, added %dist, -devel requires pkgconfig and xen-devel
+- fixing spec file, added %-dist, -devel requires pkgconfig and xen-devel
- Resolves: rhbz#202320
* Mon Oct 16 2006 Daniel Veillard <[email protected]> 0.1.8-1
--
Libvir-list mailing list
[email protected]
https://www.redhat.com/mailman/listinfo/libvir-list
