On Thu, Feb 12, 2009 at 12:39:00PM +0000, Richard W.M. Jones wrote:
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?
Yep, should apply them to CVS, since DV rebases the Fedora spec files to match when doing new release. Forthe NEWS file change though, you could just edit docs/news.xsl and change the XSL template to remove <xsl:output method="text" encoding="ISO-8859-1"/> In favour of <xsl:output method="text" encoding="UTF-8"/>
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
Daniel -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|