[libvirt] [PATCH 00/14] Clean up spec files mess
Hey, I get treated like a war criminal when I make a change in the Fedora spec file and don't send it upstream, yet there are a whole heap of changes which haven't been pushed upstream ... only one of which is mine ... two changes less than DV himself :-) The following series of patches pulls in the changes from Fedora which make sense. Some of them I'm not 100% sure of: - defaulting to policy kit - is there some reason we don't want that upstream? - The python cruft thing, not sure its needed - Converting NEWS to UTF-8 could probably be done upstream - Requiring libselinux is dubious, doesn't autorequires handle that? My final contention is that maintaining these spec files in the upstream repo actually makes it harder to maintain the Fedora spec file and helps nobody. Because of half-assed attempts to keep the two in sync, I ended up having to fix a bunch of stuff and re-instate another bunch of stuff in Fedora: - Enable netcf support - Pass --with-qemu-user=qemu etc. to configure - Move various requires to the libvirt-client sub-package - Sync some trivial cleanups from upstream spec file - Remove explicit libxml2 requires, again - Build with --without-capng if capng support is disabled - Remove explicit dir creating in makeinstall, replaced by attr in files - Set perms on /var/{run,lib,cache}/libvirt/qemu I really think we should kill these off and just point people at the Fedora spec file if they're looking for a reference spec file. I need some very strong rationale before I ever go wasting my time (2 hours) on this again. Cheers, Mark.
Fedora CVS changelog is "Fix libcap-ng-devel require, Daniel" --- libvirt.spec.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 918d64c..8f118f7 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -178,7 +178,7 @@ BuildRequires: parted-devel BuildRequires: numactl-devel %endif %if %{with_capng} -BuildRequires: capng-devel >= 0.5.0 +BuildRequires: libcap-ng-devel >= 0.5.0 %endif %if %{with_phyp} BuildRequires: libssh-devel >= 0.3.1 -- 1.6.2.5
* libvirt.spec: pass --without-capng if appropriate --- libvirt.spec.in | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 8f118f7..2cc1639 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -318,6 +318,10 @@ of recent versions of Linux (and other OSes). %define _without_numactl --without-numactl %endif +%if ! %{with_capng} +%define _without_capng --without-capng +%endif + %configure %{?_without_xen} \ %{?_without_qemu} \ %{?_without_openvz} \ @@ -337,6 +341,7 @@ of recent versions of Linux (and other OSes). %{?_without_storage_iscsi} \ %{?_without_storage_disk} \ %{?_without_numactl} \ + %{?_without_capng} \ --with-qemu-user=%{qemu_user} \ --with-qemu-group=%{qemu_group} \ --with-init-script=redhat \ -- 1.6.2.5
Added by DV with: * Fri Apr 24 2009 Daniel Veillard <veillard@redhat.com> - 0.6.3-1.fc12 - release of 0.6.3 - VirtualBox driver --- libvirt.spec.in | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 2cc1639..d5bd268 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -5,6 +5,7 @@ %define with_qemu 0%{!?_without_qemu:1} %define with_openvz 0%{!?_without_openvz:1} %define with_lxc 0%{!?_without_lxc:1} +%define with_vbox 0%{!?_without_vbox:1} %define with_sasl 0%{!?_without_sasl:1} %define with_avahi 0%{!?_without_avahi:1} # default to off @@ -258,6 +259,10 @@ of recent versions of Linux (and other OSes). %define _without_lxc --without-lxc %endif +%if ! %{with_vbox} +%define _without_vbox --without-vbox +%endif + %if ! %{with_sasl} %define _without_sasl --without-sasl %endif @@ -326,6 +331,7 @@ of recent versions of Linux (and other OSes). %{?_without_qemu} \ %{?_without_openvz} \ %{?_without_lxc} \ + %{?_without_vbox} \ %{?_without_sasl} \ %{?_without_avahi} \ %{?_without_polkit} \ -- 1.6.2.5
Unless there's some reason we shouldn't --- libvirt.spec.in | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index d5bd268..18c87a2 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -8,8 +8,7 @@ %define with_vbox 0%{!?_without_vbox:1} %define with_sasl 0%{!?_without_sasl:1} %define with_avahi 0%{!?_without_avahi:1} -# default to off -%define with_polkit 0%{!?_without_polkit:0} +%define with_polkit 0%{!?_without_polkit:1} %define with_python 0%{!?_without_python:1} %define with_libvirtd 0%{!?_without_libvirtd:1} %define with_uml 0%{!?_without_uml:1} -- 1.6.2.5
Disabled on < f12 for now until netcf is in Fedora updates BuildRequires netcf if enabled, pass --without-netcf if its disabled * libvirt.spec.in: enabled netcf by default --- libvirt.spec.in | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 18c87a2..547d8e8 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -23,6 +23,7 @@ %define with_numactl 0%{!?_without_numactl:1} # default to off %define with_capng 0%{!?_without_capng:0} +%define with_netcf 0%{!?_without_netcf:1} # Xen is available only on i386 x86_64 ia64 %ifnarch i386 i586 i686 x86_64 ia64 @@ -49,6 +50,10 @@ %endif %if 0%{?fedora} >= 12 +%define with_netcf 0%{!?_without_netcf:1} +%endif + +%if 0%{?fedora} >= 12 %define qemu_user qemu %define qemu_group qemu %else @@ -183,6 +188,9 @@ BuildRequires: libcap-ng-devel >= 0.5.0 %if %{with_phyp} BuildRequires: libssh-devel >= 0.3.1 %endif +%if %{with_netcf} +BuildRequires: netcf-devel +%endif # Fedora build root suckage BuildRequires: gawk @@ -326,6 +334,10 @@ of recent versions of Linux (and other OSes). %define _without_capng --without-capng %endif +%if ! %{with_netcf} +%define _without_netcf --without-netcf +%endif + %configure %{?_without_xen} \ %{?_without_qemu} \ %{?_without_openvz} \ @@ -347,6 +359,7 @@ of recent versions of Linux (and other OSes). %{?_without_storage_disk} \ %{?_without_numactl} \ %{?_without_capng} \ + %{?_without_netcf} \ --with-qemu-user=%{qemu_user} \ --with-qemu-group=%{qemu_group} \ --with-init-script=redhat \ -- 1.6.2.5
It's not needed at build time Removed in Fedora by: * Fri Jun 5 2009 Mark McLoughlin <markmc@redhat.com> - 0.6.4-2.fc12 - Remove the qemu BuildRequires --- libvirt.spec.in | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 547d8e8..532a98f 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -144,9 +144,6 @@ BuildRequires: avahi-devel BuildRequires: libselinux-devel BuildRequires: dnsmasq BuildRequires: bridge-utils -%if %{with_qemu} -BuildRequires: qemu -%endif %if %{with_sasl} BuildRequires: cyrus-sasl-devel %endif -- 1.6.2.5
danpb's fix for: https://bugzilla.redhat.com/483442 --- libvirt.spec.in | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 532a98f..9a1dfd9 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -492,6 +492,7 @@ fi %if %{with_network} %dir %{_localstatedir}/run/libvirt/network/ %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/network/ +%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/iptables/ %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/iptables/filter/ %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/iptables/nat/ %endif @@ -510,6 +511,7 @@ fi %{_datadir}/PolicyKit/policy/org.libvirt.unix.policy %endif +%dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/ %if %{with_qemu} %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/qemu/ %endif -- 1.6.2.5
Added by DV in Fedora, no changelog as to why, but guessing that rpmbuild barfed because these files were created at build time? --- libvirt.spec.in | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 9a1dfd9..dadc851 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -372,6 +372,8 @@ rm -fr %{buildroot} (cd docs/examples/python ; rm -rf .deps Makefile Makefile.in) (cd examples/hellolibvirt ; make clean ; rm -rf .deps .libs Makefile Makefile.in) (cd examples/domain-events/events-c ; make clean ;rm -rf .deps .libs Makefile Makefile.in) +(cd python/tests ; rm -f *.py?) + rm -f $RPM_BUILD_ROOT%{_libdir}/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/*.a rm -f $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/*.la -- 1.6.2.5
Originally done by rjones as part of this package review: https://bugzilla.redhat.com/226055 --- libvirt.spec.in | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index dadc851..dcedbe0 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -200,7 +200,6 @@ the libvirtd server exporting the virtualization support. %package client Summary: client side library and utilities of the libvirt library Group: Development/Libraries -Requires: libxml2 Requires: readline Requires: ncurses # So remote clients can access libvirt over SSH tunnel -- 1.6.2.5
Added by Rich Jones for this rpmlint warning: libvirt.x86_64: W: file-not-utf8 /usr/share/doc/libvirt-0.6.0/NEWS See: https://bugzilla.redhat.com/226055 --- libvirt.spec.in | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index dcedbe0..2645a22 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -245,6 +245,9 @@ of recent versions of Linux (and other OSes). %prep %setup -q +mv NEWS NEWS.old +iconv -f ISO-8859-1 -t UTF-8 < NEWS.old > NEWS + %build %if ! %{with_xen} %define _without_xen --without-xen -- 1.6.2.5
On Tue, Jul 28, 2009 at 07:44:13PM +0100, Mark McLoughlin wrote:
Added by Rich Jones for this rpmlint warning:
libvirt.x86_64: W: file-not-utf8 /usr/share/doc/libvirt-0.6.0/NEWS
See:
https://bugzilla.redhat.com/226055 --- libvirt.spec.in | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/libvirt.spec.in b/libvirt.spec.in index dcedbe0..2645a22 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -245,6 +245,9 @@ of recent versions of Linux (and other OSes). %prep %setup -q
+mv NEWS NEWS.old +iconv -f ISO-8859-1 -t UTF-8 < NEWS.old > NEWS + %build %if ! %{with_xen} %define _without_xen --without-xen -- 1.6.2.5
The proper fix is actually to change docs/news.xsl top level <xsl:output method="text" encoding="ISO-8859-1"/> into <xsl:output method="text" encoding="UTF8"/> but that work at release time not at packaging time which is why the change was made in the rpm (or how doing things at the distro level is the wrong place to fix things). I will fix that in time for 0.7.0, Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel@veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/
On Tue, 2009-07-28 at 21:45 +0200, Daniel Veillard wrote:
The proper fix is actually to change docs/news.xsl top level <xsl:output method="text" encoding="ISO-8859-1"/> into <xsl:output method="text" encoding="UTF8"/>
Okay, pushing the attached patch Cheers, Mark.
Changed by Rich Jones, presumably for this: libvirt.x86_64: W: one-line-command-in-%postun /sbin/ldconfig see: https://bugzilla.redhat.com/226055 --- libvirt.spec.in | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 2645a22..448e760 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -441,8 +441,7 @@ if [ $1 = 0 ]; then fi %endif -%postun -/sbin/ldconfig +%postun -p /sbin/ldconfig %files %defattr(-, root, root) -- 1.6.2.5
Changed by Rich Jones for: libvirt.x86_64: E: executable-marked-as-config-file /etc/sysconfig/libvirtd See: https://bugzilla.redhat.com/226055 --- libvirt.spec.in | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 448e760..c3896a9 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -408,6 +408,10 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/libvirt-python-%{version} 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} -- 1.6.2.5
Added by Cole Robinson: * Mon Mar 9 2009 Cole Robinson <crobinso@redhat.com> - 0.6.1-3.fc11 - Add Requires: libselinux Not sure why --- libvirt.spec.in | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index c3896a9..12f7453 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -125,6 +125,8 @@ Requires: iscsi-initiator-utils # For disk driver Requires: parted %endif +# For svirt support +Requires: libselinux %if %{with_xen} BuildRequires: xen-devel %endif -- 1.6.2.5
On Tue, Jul 28, 2009 at 07:44:16PM +0100, Mark McLoughlin wrote:
Added by Cole Robinson:
* Mon Mar 9 2009 Cole Robinson <crobinso@redhat.com> - 0.6.1-3.fc11 - Add Requires: libselinux
Not sure why
Need to be dropped both side, Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel@veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/
Maintaining a spec file is hard, and it's extremely distribution specific Keeping it (mostly) in sync with an upstream spec file makes things harder and more error prone Unless we have some really strong desire by users to keep this, I suggest that we delete them and point people at the Fedora spec files as a good reference --- .gitignore | 2 - .hgignore | 2 - Makefile.am | 2 - autobuild.sh | 14 - configure.in | 2 +- libvirt.spec.in | 875 ----------------------------------------------- mingw32-libvirt.spec.in | 129 ------- 7 files changed, 1 insertions(+), 1025 deletions(-) delete mode 100644 libvirt.spec.in delete mode 100644 mingw32-libvirt.spec.in diff --git a/.gitignore b/.gitignore index 17c3975..c6131af 100644 --- a/.gitignore +++ b/.gitignore @@ -25,10 +25,8 @@ cscope.out libtool libvirt-*.tar.gz libvirt.pc -libvirt.spec ltconfig ltmain.sh -mingw32-libvirt.spec mkinstalldirs results.log stamp-h diff --git a/.hgignore b/.hgignore index 47252d7..39a0835 100644 --- a/.hgignore +++ b/.hgignore @@ -138,7 +138,6 @@ include/libvirt/Makefile.in libtool libvirt-*.tar.gz libvirt.pc -libvirt.spec ltconfig ltmain.sh m4/Makefile @@ -178,7 +177,6 @@ m4/ulonglong.m4 m4/wchar_t.m4 m4/wint_t.m4 m4/xsize.m4 -mingw32-libvirt.spec mkinstalldirs po/*.gmo po/Makefile diff --git a/Makefile.am b/Makefile.am index beddca7..548cf20 100644 --- a/Makefile.am +++ b/Makefile.am @@ -10,8 +10,6 @@ ACLOCAL_AMFLAGS = -I m4 -I gnulib/m4 EXTRA_DIST = \ ChangeLog-old \ - libvirt.spec libvirt.spec.in \ - mingw32-libvirt.spec.in \ libvirt.pc libvirt.pc.in \ $(man_MANS) autobuild.sh \ .x-sc_avoid_if_before_free \ diff --git a/autobuild.sh b/autobuild.sh index 769b730..1096317 100755 --- a/autobuild.sh +++ b/autobuild.sh @@ -49,13 +49,6 @@ else EXTRA_RELEASE=".$USER$NOW" fi -if [ -f /usr/bin/rpmbuild ]; then - rpmbuild --nodeps \ - --define "extra_release $EXTRA_RELEASE" \ - --define "_sourcedir `pwd`" \ - -ba --clean libvirt.spec -fi - if [ -x /usr/bin/i686-pc-mingw32-gcc ]; then make distclean @@ -86,11 +79,4 @@ if [ -x /usr/bin/i686-pc-mingw32-gcc ]; then #set -o pipefail #make check 2>&1 | tee "$RESULTS" - - if [ -f /usr/bin/rpmbuild ]; then - rpmbuild --nodeps \ - --define "extra_release $EXTRA_RELEASE" \ - --define "_sourcedir `pwd`" \ - -ba --clean mingw32-libvirt.spec - fi fi diff --git a/configure.in b/configure.in index b905b23..bc5fa3c 100644 --- a/configure.in +++ b/configure.in @@ -1537,7 +1537,7 @@ AC_OUTPUT(Makefile src/Makefile include/Makefile docs/Makefile \ docs/schemas/Makefile \ gnulib/lib/Makefile \ gnulib/tests/Makefile \ - libvirt.pc libvirt.spec mingw32-libvirt.spec \ + libvirt.pc \ po/Makefile.in \ include/libvirt/Makefile include/libvirt/libvirt.h \ python/Makefile python/tests/Makefile \ diff --git a/libvirt.spec.in b/libvirt.spec.in deleted file mode 100644 index 12f7453..0000000 --- a/libvirt.spec.in +++ /dev/null @@ -1,875 +0,0 @@ -# -*- rpm-spec -*- - -%define with_xen 0%{!?_without_xen:1} -%define with_xen_proxy 0%{!?_without_xen_proxy:1} -%define with_qemu 0%{!?_without_qemu:1} -%define with_openvz 0%{!?_without_openvz:1} -%define with_lxc 0%{!?_without_lxc:1} -%define with_vbox 0%{!?_without_vbox:1} -%define with_sasl 0%{!?_without_sasl:1} -%define with_avahi 0%{!?_without_avahi:1} -%define with_polkit 0%{!?_without_polkit:1} -%define with_python 0%{!?_without_python:1} -%define with_libvirtd 0%{!?_without_libvirtd:1} -%define with_uml 0%{!?_without_uml:1} -%define with_one 0%{!?_without_one:1} -# default to off -%define with_phyp 0%{!?_without_phyp:0} -%define with_network 0%{!?_without_network:1} -%define with_storage_fs 0%{!?_without_storage_fs:1} -%define with_storage_lvm 0%{!?_without_storage_lvm:1} -%define with_storage_iscsi 0%{!?_without_storage_iscsi:1} -%define with_storage_disk 0%{!?_without_storage_disk:1} -%define with_numactl 0%{!?_without_numactl:1} -# default to off -%define with_capng 0%{!?_without_capng:0} -%define with_netcf 0%{!?_without_netcf:1} - -# Xen is available only on i386 x86_64 ia64 -%ifnarch i386 i586 i686 x86_64 ia64 -%define with_xen 0 -%endif - -%if ! %{with_xen} -%define with_xen_proxy 0 -%endif - -%if 0%{?fedora} -%ifarch ppc64 -%define with_qemu 0 -%endif -%endif - -%if 0%{?fedora} >= 8 -%define with_polkit 0%{!?_without_polkit:1} -%define with_xen_proxy 0 -%endif - -%if 0%{?fedora} >= 12 -%define with_capng 0%{!?_without_capng:1} -%endif - -%if 0%{?fedora} >= 12 -%define with_netcf 0%{!?_without_netcf:1} -%endif - -%if 0%{?fedora} >= 12 -%define qemu_user qemu -%define qemu_group qemu -%else -%define qemu_user root -%define qemu_group root -%endif - -# -# If building on RHEL switch on the specific support -# -%if 0%{?fedora} -%define with_rhel5 0 -%else -%define with_rhel5 1 -%define with_polkit 0 -%define with_one 0 -%endif - - -Summary: Library providing a simple API virtualization -Name: libvirt -Version: @VERSION@ -Release: 1%{?dist}%{?extra_release} -License: LGPLv2+ -Group: Development/Libraries -Source: libvirt-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -URL: http://libvirt.org/ -BuildRequires: python python-devel - -# The client side, i.e. shared libs and virsh are in a subpackage -Requires: libvirt-client = %{version}-%{release} - -Requires: dnsmasq -Requires: bridge-utils -Requires: iptables -# needed for device enumeration -Requires: hal -%if %{with_polkit} -Requires: PolicyKit >= 0.6 -%endif -%if %{with_storage_fs} -# For mount/umount in FS driver -BuildRequires: util-linux -# For showmount in FS driver (netfs discovery) -BuildRequires: nfs-utils -Requires: nfs-utils -# For glusterfs -Requires: glusterfs-client >= 2.0.1 -%endif -%if %{with_qemu} -# From QEMU RPMs -Requires: /usr/bin/qemu-img -%else -%if %{with_xen} -# From Xen RPMs -Requires: /usr/sbin/qcow-create -%endif -%endif -%if %{with_storage_lvm} -# For LVM drivers -Requires: lvm2 -%endif -%if %{with_storage_iscsi} -# For ISCSI driver -Requires: iscsi-initiator-utils -%endif -%if %{with_storage_disk} -# For disk driver -Requires: parted -%endif -# For svirt support -Requires: libselinux -%if %{with_xen} -BuildRequires: xen-devel -%endif -%if %{with_one} -BuildRequires: xmlrpc-c-devel >= 1.14.0 -%endif -BuildRequires: libxml2-devel -BuildRequires: xhtml1-dtds -BuildRequires: readline-devel -BuildRequires: ncurses-devel -BuildRequires: gettext -BuildRequires: gnutls-devel -BuildRequires: hal-devel -%if %{with_avahi} -BuildRequires: avahi-devel -%endif -BuildRequires: libselinux-devel -BuildRequires: dnsmasq -BuildRequires: bridge-utils -%if %{with_sasl} -BuildRequires: cyrus-sasl-devel -%endif -%if %{with_polkit} -BuildRequires: PolicyKit-devel >= 0.6 -%endif -%if %{with_storage_fs} -# For mount/umount in FS driver -BuildRequires: util-linux -%endif -%if %{with_qemu} -# From QEMU RPMs -BuildRequires: /usr/bin/qemu-img -%else -%if %{with_xen} -# From Xen RPMs -BuildRequires: /usr/sbin/qcow-create -%endif -%endif -%if %{with_storage_lvm} -# For LVM drivers -BuildRequires: lvm2 -%endif -%if %{with_storage_iscsi} -# For ISCSI driver -BuildRequires: iscsi-initiator-utils -%endif -%if %{with_storage_disk} -# For disk driver -BuildRequires: parted-devel -%endif -%if %{with_numactl} -# For QEMU/LXC numa info -BuildRequires: numactl-devel -%endif -%if %{with_capng} -BuildRequires: libcap-ng-devel >= 0.5.0 -%endif -%if %{with_phyp} -BuildRequires: libssh-devel >= 0.3.1 -%endif -%if %{with_netcf} -BuildRequires: netcf-devel -%endif - -# Fedora build root suckage -BuildRequires: gawk - -%description -Libvirt is a C toolkit to interact with the virtualization capabilities -of recent versions of Linux (and other OSes). The main package includes -the libvirtd server exporting the virtualization support. - -%package client -Summary: client side library and utilities of the libvirt library -Group: Development/Libraries -Requires: readline -Requires: ncurses -# So remote clients can access libvirt over SSH tunnel -# (client invokes 'nc' against the UNIX socket on the server) -Requires: nc -%if %{with_sasl} -Requires: cyrus-sasl -# Not technically required, but makes 'out-of-box' config -# work correctly & doesn't have onerous dependencies -Requires: cyrus-sasl-md5 -%endif - -%description client -Shared libraries and client binaries needed to access to the -virtualization capabilities of recent versions of Linux (and other OSes). - -%package devel -Summary: Libraries, includes, etc. to compile with the libvirt library -Group: Development/Libraries -Requires: libvirt = %{version}-%{release} -Requires: pkgconfig -%if %{with_xen} -Requires: xen-devel -%endif - -%description devel -Includes and documentations for the C library providing an API to use -the virtualization capabilities of recent versions of Linux (and other OSes). - -%if %{with_python} -%package python -Summary: Python bindings for the libvirt library -Group: Development/Libraries -Requires: libvirt = %{version}-%{release} - -%description python -The libvirt-python package contains a module that permits applications -written in the Python programming language to use the interface -supplied by the libvirt library to use the virtualization capabilities -of recent versions of Linux (and other OSes). -%endif - -%prep -%setup -q - -mv NEWS NEWS.old -iconv -f ISO-8859-1 -t UTF-8 < NEWS.old > NEWS - -%build -%if ! %{with_xen} -%define _without_xen --without-xen -%endif - -%if ! %{with_qemu} -%define _without_qemu --without-qemu -%endif - -%if ! %{with_openvz} -%define _without_openvz --without-openvz -%endif - -%if ! %{with_lxc} -%define _without_lxc --without-lxc -%endif - -%if ! %{with_vbox} -%define _without_vbox --without-vbox -%endif - -%if ! %{with_sasl} -%define _without_sasl --without-sasl -%endif - -%if ! %{with_avahi} -%define _without_avahi --without-avahi -%endif - -%if ! %{with_phyp} -%define _without_phyp --without-phyp -%endif - -%if ! %{with_polkit} -%define _without_polkit --without-polkit -%endif - -%if ! %{with_python} -%define _without_python --without-python -%endif - -%if ! %{with_libvirtd} -%define _without_libvirtd --without-libvirtd -%endif - -%if ! %{with_uml} -%define _without_uml --without-uml -%endif - -%if ! %{with_one} -%define _without_one --without-one -%endif - -%if %{with_rhel5} -%define _with_rhel5_api --with-rhel5-api -%endif - -%if ! %{with_network} -%define _without_network --without-network -%endif - -%if ! %{with_storage_fs} -%define _without_storage_fs --without-storage-fs -%endif - -%if ! %{with_storage_lvm} -%define _without_storage_lvm --without-storage-lvm -%endif - -%if ! %{with_storage_iscsi} -%define _without_storage_iscsi --without-storage-iscsi -%endif - -%if ! %{with_storage_disk} -%define _without_storage_disk --without-storage-disk -%endif - -%if ! %{with_numactl} -%define _without_numactl --without-numactl -%endif - -%if ! %{with_capng} -%define _without_capng --without-capng -%endif - -%if ! %{with_netcf} -%define _without_netcf --without-netcf -%endif - -%configure %{?_without_xen} \ - %{?_without_qemu} \ - %{?_without_openvz} \ - %{?_without_lxc} \ - %{?_without_vbox} \ - %{?_without_sasl} \ - %{?_without_avahi} \ - %{?_without_polkit} \ - %{?_without_python} \ - %{?_without_libvirtd} \ - %{?_without_uml} \ - %{?_without_one} \ - %{?_without_phyp} \ - %{?_without_network} \ - %{?_with_rhel5_api} \ - %{?_without_storage_fs} \ - %{?_without_storage_lvm} \ - %{?_without_storage_iscsi} \ - %{?_without_storage_disk} \ - %{?_without_numactl} \ - %{?_without_capng} \ - %{?_without_netcf} \ - --with-qemu-user=%{qemu_user} \ - --with-qemu-group=%{qemu_group} \ - --with-init-script=redhat \ - --with-remote-pid-file=%{_localstatedir}/run/libvirtd.pid -make %{?_smp_mflags} -gzip -9 ChangeLog - -%install -rm -fr %{buildroot} - -%makeinstall -(cd docs/examples ; make clean ; rm -rf .deps Makefile Makefile.in) -(cd docs/examples/python ; rm -rf .deps Makefile Makefile.in) -(cd examples/hellolibvirt ; make clean ; rm -rf .deps .libs Makefile Makefile.in) -(cd examples/domain-events/events-c ; make clean ;rm -rf .deps .libs Makefile Makefile.in) -(cd python/tests ; rm -f *.py?) - -rm -f $RPM_BUILD_ROOT%{_libdir}/*.la -rm -f $RPM_BUILD_ROOT%{_libdir}/*.a -rm -f $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/*.la -rm -f $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/*.a - -%if %{with_qemu} -# We don't want to install /etc/libvirt/qemu/networks in the main %files list -# because if the admin wants to delete the default network completely, we don't -# want to end up re-incarnating it on every RPM upgrade. -install -d -m 0755 $RPM_BUILD_ROOT%{_datadir}/libvirt/networks/ -cp $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/default.xml \ - $RPM_BUILD_ROOT%{_datadir}/libvirt/networks/default.xml -rm -f $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/default.xml -rm -f $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/autostart/default.xml -# Strip auto-generated UUID - we need it generated per-install -sed -i -e "/<uuid>/d" $RPM_BUILD_ROOT%{_datadir}/libvirt/networks/default.xml -%else -rm -f $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/default.xml -rm -f $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/autostart/default.xml -rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/libvirtd_qemu.aug -rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug -%endif -%find_lang %{name} - -%if ! %{with_python} -rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/libvirt-python-%{version} -%endif - -%if ! %{with_qemu} -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} - -%post -/sbin/ldconfig - -%if %{with_libvirtd} -%if %{with_qemu} -# We want to install the default network for initial RPM installs -# or on the first upgrade from a non-network aware libvirt only. -# We check this by looking to see if the daemon is already installed -/sbin/chkconfig --list libvirtd 1>/dev/null 2>&1 -if [ $? != 0 -a ! -f %{_sysconfdir}/libvirt/qemu/networks/default.xml ] -then - UUID=`/usr/bin/uuidgen` - sed -e "s,</name>,</name>\n <uuid>$UUID</uuid>," \ - < %{_datadir}/libvirt/networks/default.xml \ - > %{_sysconfdir}/libvirt/qemu/networks/default.xml - ln -s ../default.xml %{_sysconfdir}/libvirt/qemu/networks/autostart/default.xml -fi -%endif - -/sbin/chkconfig --add libvirtd -%endif - -%preun -%if %{with_libvirtd} -if [ $1 = 0 ]; then - /sbin/service libvirtd stop 1>/dev/null 2>&1 - /sbin/chkconfig --del libvirtd -fi -%endif - -%postun -p /sbin/ldconfig - -%files -%defattr(-, root, root) - -%doc AUTHORS ChangeLog.gz NEWS README COPYING.LIB TODO -%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/ - -%if %{with_qemu} -%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/ -%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/networks/ -%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/networks/autostart -%endif - -%if %{with_libvirtd} -%{_sysconfdir}/rc.d/init.d/libvirtd -%config(noreplace) %{_sysconfdir}/sysconfig/libvirtd -%config(noreplace) %{_sysconfdir}/libvirt/libvirtd.conf -%config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd -%endif - -%if %{with_qemu} -%config(noreplace) %{_sysconfdir}/libvirt/qemu.conf -%endif - -%if %{with_qemu} -%dir %{_datadir}/libvirt/ -%dir %{_datadir}/libvirt/networks/ -%{_datadir}/libvirt/networks/default.xml -%endif - -%dir %{_localstatedir}/run/libvirt/ - -%dir %{_localstatedir}/lib/libvirt/ -%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/images/ -%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/boot/ -%dir %attr(0700, root, root) %{_localstatedir}/cache/libvirt/ - -%if %{with_qemu} -%dir %attr(0700, %{qemu_user}, %{qemu_group}) %{_localstatedir}/run/libvirt/qemu/ -%dir %attr(0700, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/ -%dir %attr(0700, %{qemu_user}, %{qemu_group}) %{_localstatedir}/cache/libvirt/qemu/ -%endif -%if %{with_lxc} -%dir %{_localstatedir}/run/libvirt/lxc/ -%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/lxc/ -%endif -%if %{with_uml} -%dir %{_localstatedir}/run/libvirt/uml/ -%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/uml/ -%endif -%if %{with_network} -%dir %{_localstatedir}/run/libvirt/network/ -%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/network/ -%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/iptables/ -%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/iptables/filter/ -%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/iptables/nat/ -%endif - -%if %{with_qemu} -%{_datadir}/augeas/lenses/libvirtd_qemu.aug -%{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug -%endif - -%if %{with_libvirtd} -%{_datadir}/augeas/lenses/libvirtd.aug -%{_datadir}/augeas/lenses/tests/test_libvirtd.aug -%endif - -%if %{with_polkit} -%{_datadir}/PolicyKit/policy/org.libvirt.unix.policy -%endif - -%dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/ -%if %{with_qemu} -%dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/qemu/ -%endif - -%if %{with_xen_proxy} -%attr(4755, root, root) %{_libexecdir}/libvirt_proxy -%endif - -%if %{with_lxc} -%attr(0755, root, root) %{_libexecdir}/libvirt_lxc -%endif - -%if %{with_libvirtd} -%attr(0755, root, root) %{_libexecdir}/libvirt_parthelper -%attr(0755, root, root) %{_sbindir}/libvirtd -%endif - -%doc docs/*.xml - -%files client -f %{name}.lang -%defattr(-, root, root) -%doc AUTHORS ChangeLog.gz NEWS README COPYING.LIB TODO - -%{_mandir}/man1/virsh.1* -%{_mandir}/man1/virt-xml-validate.1* -%{_bindir}/virsh -%{_bindir}/virt-xml-validate -%{_libdir}/lib*.so.* - -%dir %{_datadir}/libvirt/ -%dir %{_datadir}/libvirt/schemas/ - -%{_datadir}/libvirt/schemas/domain.rng -%{_datadir}/libvirt/schemas/network.rng -%{_datadir}/libvirt/schemas/storagepool.rng -%{_datadir}/libvirt/schemas/storagevol.rng -%{_datadir}/libvirt/schemas/nodedev.rng -%{_datadir}/libvirt/schemas/capability.rng -%{_datadir}/libvirt/schemas/interface.rng - -%if %{with_sasl} -%config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf -%endif - -%files devel -%defattr(-, root, root) - -%{_libdir}/lib*.so -%dir %{_includedir}/libvirt -%{_includedir}/libvirt/*.h -%{_libdir}/pkgconfig/libvirt.pc -%dir %{_datadir}/gtk-doc/html/libvirt/ -%doc %{_datadir}/gtk-doc/html/libvirt/*.devhelp -%doc %{_datadir}/gtk-doc/html/libvirt/*.html -%doc %{_datadir}/gtk-doc/html/libvirt/*.png -%doc %{_datadir}/gtk-doc/html/libvirt/*.css - -%doc docs/*.html docs/html docs/*.gif -%doc docs/examples -%doc docs/libvirt-api.xml -%doc examples - -%if %{with_python} -%files python -%defattr(-, root, root) - -%doc AUTHORS NEWS README COPYING.LIB -%{_libdir}/python*/site-packages/libvirt.py* -%{_libdir}/python*/site-packages/libvirtmod* -%doc python/tests/*.py -%doc python/TODO -%doc python/libvirtclass.txt -%doc docs/examples/python -%endif - -%changelog -* Fri Jul 3 2009 Daniel Veillard <veillard@redhat.com> - 0.6.5-1 -- release of 0.6.5 - -* Fri May 29 2009 Daniel Veillard <veillard@redhat.com> - 0.6.4-1 -- release of 0.6.4 -- various new APIs - -* Fri Apr 24 2009 Daniel Veillard <veillard@redhat.com> - 0.6.3-1 -- release of 0.6.3 -- VirtualBox driver - -* Fri Apr 3 2009 Daniel Veillard <veillard@redhat.com> - 0.6.2-1 -- release of 0.6.2 - -* Fri Mar 4 2009 Daniel Veillard <veillard@redhat.com> - 0.6.1-1 -- release of 0.6.1 - -* Sat Jan 31 2009 Daniel Veillard <veillard@redhat.com> - 0.6.0-1 -- release of 0.6.0 - -* Tue Nov 25 2008 Daniel Veillard <veillard@redhat.com> - 0.5.0-1 -- release of 0.5.0 - -* Tue Sep 23 2008 Daniel Veillard <veillard@redhat.com> - 0.4.6-1 -- release of 0.4.6 - -* Mon Sep 8 2008 Daniel Veillard <veillard@redhat.com> - 0.4.5-1 -- release of 0.4.5 - -* Wed Jun 25 2008 Daniel Veillard <veillard@redhat.com> - 0.4.4-1 -- release of 0.4.4 -- mostly a few bug fixes from 0.4.3 - -* Thu Jun 12 2008 Daniel Veillard <veillard@redhat.com> - 0.4.3-1 -- release of 0.4.3 -- lots of bug fixes and small improvements - -* Tue Apr 8 2008 Daniel Veillard <veillard@redhat.com> - 0.4.2-1 -- release of 0.4.2 -- lots of bug fixes and small improvements - -* Mon Mar 3 2008 Daniel Veillard <veillard@redhat.com> - 0.4.1-1 -- Release of 0.4.1 -- Storage APIs -- xenner support -- lots of assorted improvements, bugfixes and cleanups -- documentation and localization improvements - -* Tue Dec 18 2007 Daniel Veillard <veillard@redhat.com> - 0.4.0-1 -- Release of 0.4.0 -- SASL based authentication -- PolicyKit authentication -- improved NUMA and statistics support -- lots of assorted improvements, bugfixes and cleanups -- documentation and localization improvements - -* Sun Sep 30 2007 Daniel Veillard <veillard@redhat.com> - 0.3.3-1 -- Release of 0.3.3 -- Avahi support -- NUMA support -- lots of assorted improvements, bugfixes and cleanups -- documentation and localization improvements - -* Tue Aug 21 2007 Daniel Veillard <veillard@redhat.com> - 0.3.2-1 -- Release of 0.3.2 -- API for domains migration -- APIs for collecting statistics on disks and interfaces -- lots of assorted bugfixes and cleanups -- documentation and localization improvements - -* Tue Jul 24 2007 Daniel Veillard <veillard@redhat.com> - 0.3.1-1 -- Release of 0.3.1 -- localtime clock support -- PS/2 and USB input devices -- lots of assorted bugfixes and cleanups -- documentation and localization improvements - -* Mon Jul 9 2007 Daniel Veillard <veillard@redhat.com> - 0.3.0-1 -- Release of 0.3.0 -- Secure remote access support -- unification of daemons -- lots of assorted bugfixes and cleanups -- documentation and localization improvements - -* Fri Jun 8 2007 Daniel Veillard <veillard@redhat.com> - 0.2.3-1 -- Release of 0.2.3 -- lot of assorted bugfixes and cleanups -- support for Xen-3.1 -- new scheduler API - -* Tue Apr 17 2007 Daniel Veillard <veillard@redhat.com> - 0.2.2-1 -- Release of 0.2.2 -- lot of assorted bugfixes and cleanups -- preparing for Xen-3.0.5 - -* Thu Mar 22 2007 Jeremy Katz <katzj@redhat.com> - 0.2.1-2.fc7 -- don't require xen; we don't need the daemon and can control non-xen now -- fix scriptlet error (need to own more directories) -- update description text - -* Fri Mar 16 2007 Daniel Veillard <veillard@redhat.com> - 0.2.1-1 -- Release of 0.2.1 -- lot of bug and portability fixes -- Add support for network autostart and init scripts -- New API to detect the virtualization capabilities of a host -- Documentation updates - -* Fri Feb 23 2007 Daniel P. Berrange <berrange@redhat.com> - 0.2.0-4.fc7 -- Fix loading of guest & network configs - -* Fri Feb 16 2007 Daniel P. Berrange <berrange@redhat.com> - 0.2.0-3.fc7 -- Disable kqemu support since its not in Fedora qemu binary -- Fix for -vnc arg syntax change in 0.9.0 QEMU - -* Thu Feb 15 2007 Daniel P. Berrange <berrange@redhat.com> - 0.2.0-2.fc7 -- Fixed path to qemu daemon for autostart -- Fixed generation of <features> block in XML -- Pre-create config directory at startup - -* Wed Feb 14 2007 Daniel Veillard <veillard@redhat.com> 0.2.0-1.fc7 -- support for KVM and QEmu -- support for network configuration -- assorted fixes - -* Mon Jan 22 2007 Daniel Veillard <veillard@redhat.com> 0.1.11-1.fc7 -- finish inactive Xen domains support -- memory leak fix -- RelaxNG schemas for XML configs - -* Wed Dec 20 2006 Daniel Veillard <veillard@redhat.com> 0.1.10-1.fc7 -- support for inactive Xen domains -- improved support for Xen display and vnc -- a few bug fixes -- localization updates - -* Thu Dec 7 2006 Jeremy Katz <katzj@redhat.com> - 0.1.9-2 -- rebuild against python 2.5 - -* Wed Nov 29 2006 Daniel Veillard <veillard@redhat.com> 0.1.9-1 -- better error reporting -- python bindings fixes and extensions -- add support for shareable drives -- add support for non-bridge style networking -- hot plug device support -- added support for inactive domains -- API to dump core of domains -- various bug fixes, cleanups and improvements -- updated the localization - -* Tue Nov 7 2006 Daniel Veillard <veillard@redhat.com> 0.1.8-3 -- it's pkgconfig not pgkconfig ! - -* Mon Nov 6 2006 Daniel Veillard <veillard@redhat.com> 0.1.8-2 -- fixing spec file, added %dist, -devel requires pkgconfig and xen-devel -- Resolves: rhbz#202320 - -* Mon Oct 16 2006 Daniel Veillard <veillard@redhat.com> 0.1.8-1 -- fix missing page size detection code for ia64 -- fix mlock size when getting domain info list from hypervisor -- vcpu number initialization -- don't label crashed domains as shut off -- fix virsh man page -- blktapdd support for alternate drivers like blktap -- memory leak fixes (xend interface and XML parsing) -- compile fix -- mlock/munlock size fixes - -* Fri Sep 22 2006 Daniel Veillard <veillard@redhat.com> 0.1.7-1 -- Fix bug when running against xen-3.0.3 hypercalls -- Fix memory bug when getting vcpus info from xend - -* Fri Sep 22 2006 Daniel Veillard <veillard@redhat.com> 0.1.6-1 -- Support for localization -- Support for new Xen-3.0.3 cdrom and disk configuration -- Support for setting VNC port -- Fix bug when running against xen-3.0.2 hypercalls -- Fix reconnection problem when talking directly to http xend - -* Tue Sep 5 2006 Jeremy Katz <katzj@redhat.com> - 0.1.5-3 -- patch from danpb to support new-format cd devices for HVM guests - -* Tue Sep 5 2006 Daniel Veillard <veillard@redhat.com> 0.1.5-2 -- reactivating ia64 support - -* Tue Sep 5 2006 Daniel Veillard <veillard@redhat.com> 0.1.5-1 -- new release -- bug fixes -- support for new hypervisor calls -- early code for config files and defined domains - -* Mon Sep 4 2006 Daniel Berrange <berrange@redhat.com> - 0.1.4-5 -- add patch to address dom0_ops API breakage in Xen 3.0.3 tree - -* Mon Aug 28 2006 Jeremy Katz <katzj@redhat.com> - 0.1.4-4 -- add patch to support paravirt framebuffer in Xen - -* Mon Aug 21 2006 Daniel Veillard <veillard@redhat.com> 0.1.4-3 -- another patch to fix network handling in non-HVM guests - -* Thu Aug 17 2006 Daniel Veillard <veillard@redhat.com> 0.1.4-2 -- patch to fix virParseUUID() - -* Wed Aug 16 2006 Daniel Veillard <veillard@redhat.com> 0.1.4-1 -- vCPUs and affinity support -- more complete XML, console and boot options -- specific features support -- enforced read-only connections -- various improvements, bug fixes - -* Wed Aug 2 2006 Jeremy Katz <katzj@redhat.com> - 0.1.3-6 -- add patch from pvetere to allow getting uuid from libvirt - -* Wed Aug 2 2006 Jeremy Katz <katzj@redhat.com> - 0.1.3-5 -- build on ia64 now - -* Thu Jul 27 2006 Jeremy Katz <katzj@redhat.com> - 0.1.3-4 -- don't BR xen, we just need xen-devel - -* Thu Jul 27 2006 Daniel Veillard <veillard@redhat.com> 0.1.3-3 -- need rebuild since libxenstore is now versionned - -* Mon Jul 24 2006 Mark McLoughlin <markmc@redhat.com> - 0.1.3-2 -- Add BuildRequires: xen-devel - -* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 0.1.3-1.1 -- rebuild - -* Tue Jul 11 2006 Daniel Veillard <veillard@redhat.com> 0.1.3-1 -- support for HVM Xen guests -- various bugfixes - -* Mon Jul 3 2006 Daniel Veillard <veillard@redhat.com> 0.1.2-1 -- added a proxy mechanism for read only access using httpu -- fixed header includes paths - -* Wed Jun 21 2006 Daniel Veillard <veillard@redhat.com> 0.1.1-1 -- extend and cleanup the driver infrastructure and code -- python examples -- extend uuid support -- bug fixes, buffer handling cleanups -- support for new Xen hypervisor API -- test driver for unit testing -- virsh --conect argument - -* Mon Apr 10 2006 Daniel Veillard <veillard@redhat.com> 0.1.0-1 -- various fixes -- new APIs: for Node information and Reboot -- virsh improvements and extensions -- documentation updates and man page -- enhancement and fixes of the XML description format - -* Tue Feb 28 2006 Daniel Veillard <veillard@redhat.com> 0.0.6-1 -- added error handling APIs -- small bug fixes -- improve python bindings -- augment documentation and regression tests - -* Thu Feb 23 2006 Daniel Veillard <veillard@redhat.com> 0.0.5-1 -- new domain creation API -- new UUID based APIs -- more tests, documentation, devhelp -- bug fixes - -* Fri Feb 10 2006 Daniel Veillard <veillard@redhat.com> 0.0.4-1 -- fixes some problems in 0.0.3 due to the change of names - -* Wed Feb 8 2006 Daniel Veillard <veillard@redhat.com> 0.0.3-1 -- changed library name to libvirt from libvir, complete and test the python - bindings - -* Sun Jan 29 2006 Daniel Veillard <veillard@redhat.com> 0.0.2-1 -- upstream release of 0.0.2, use xend, save and restore added, python bindings - fixed - -* Wed Nov 2 2005 Daniel Veillard <veillard@redhat.com> 0.0.1-1 -- created diff --git a/mingw32-libvirt.spec.in b/mingw32-libvirt.spec.in deleted file mode 100644 index f383475..0000000 --- a/mingw32-libvirt.spec.in +++ /dev/null @@ -1,129 +0,0 @@ -%define __strip %{_mingw32_strip} -%define __objdump %{_mingw32_objdump} -%define _use_internal_dependency_generator 0 -%define __find_requires %{_mingw32_findrequires} -%define __find_provides %{_mingw32_findprovides} - -Name: mingw32-libvirt -Version: @VERSION@ -Release: 3%{?dist}%{?extra_release} -Summary: MinGW Windows libvirt virtualization library - -License: LGPLv2+ -Group: Development/Libraries -URL: http://libvirt.org/ -Source0: ftp://libvirt.org/libvirt/libvirt-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: mingw32-filesystem >= 23 -BuildRequires: mingw32-gcc -BuildRequires: mingw32-binutils -BuildRequires: mingw32-libgpg-error -BuildRequires: mingw32-libgcrypt -BuildRequires: mingw32-gnutls -BuildRequires: mingw32-gettext -BuildRequires: mingw32-libxml2 -BuildRequires: mingw32-portablexdr -BuildRequires: pkgconfig -# Need native version for msgfmt -BuildRequires: gettext - -BuildArch: noarch - - -%description -MinGW Windows libvirt virtualization library. - - -%prep -%setup -q -n libvirt-%{version} - - -%build -# XXX enable SASL in future -%{_mingw32_configure} \ - --without-sasl \ - --without-avahi \ - --without-polkit \ - --without-python \ - --without-xen \ - --without-qemu \ - --without-lxc \ - --without-uml \ - --without-vbox \ - --without-openvz \ - --without-one \ - --without-phyp \ - --without-esx \ - --without-libvirtd -make - - -%install -rm -rf $RPM_BUILD_ROOT - -make DESTDIR=$RPM_BUILD_ROOT install - -rm -rf $RPM_BUILD_ROOT%{_mingw32_sysconfdir}/libvirt -rm -rf $RPM_BUILD_ROOT%{_mingw32_datadir}/doc/* -rm -rf $RPM_BUILD_ROOT%{_mingw32_datadir}/gtk-doc/* - -rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libvirt.a - - -%clean -rm -rf $RPM_BUILD_ROOT - - -%files -%defattr(-,root,root) -%{_mingw32_bindir}/libvirt-0.dll -%{_mingw32_bindir}/virsh.exe -%{_mingw32_bindir}/virt-xml-validate - -%{_mingw32_libdir}/libvirt.dll.a -%{_mingw32_libdir}/libvirt.la -%{_mingw32_libdir}/pkgconfig/libvirt.pc - -%dir %{_mingw32_datadir}/libvirt/ -%dir %{_mingw32_datadir}/libvirt/schemas/ -%{_mingw32_datadir}/libvirt/schemas/domain.rng -%{_mingw32_datadir}/libvirt/schemas/network.rng -%{_mingw32_datadir}/libvirt/schemas/storagepool.rng -%{_mingw32_datadir}/libvirt/schemas/storagevol.rng -%{_mingw32_datadir}/libvirt/schemas/nodedev.rng -%{_mingw32_datadir}/libvirt/schemas/capability.rng -%{_mingw32_datadir}/libvirt/schemas/interface.rng - -%{_mingw32_datadir}/locale/*/LC_MESSAGES/libvirt.mo - -%dir %{_mingw32_includedir}/libvirt -%{_mingw32_includedir}/libvirt/libvirt.h -%{_mingw32_includedir}/libvirt/virterror.h - -%{_mingw32_mandir}/man1/virsh.1* -%{_mingw32_mandir}/man1/virt-xml-validate.1* - - -%changelog -* Thu Sep 25 2008 Richard Jones <rjones@redhat.com> - 0.4.6-3 -- BuildArch should be noarch - -* Wed Sep 24 2008 Richard W.M. Jones <rjones@redhat.com> - 0.4.6-2 -- Whitespace removal. - -* Wed Sep 24 2008 Richard W.M. Jones <rjones@redhat.com> - 0.4.6-1 -- New upstream release 0.4.6. -- Rename mingw -> mingw32. - -* Mon Sep 22 2008 Daniel P. Berrange <berrange@redhat.com> - 0.4.5-4%{?extra_release} -- Import crash fix from rawhide - -* Thu Sep 11 2008 Daniel P. Berrange <berrange@redhat.com> - 0.4.5-3%{?extra_release} -- Add dep on gettext & pkgconfig - -* Wed Sep 10 2008 Richard W.M. Jones <rjones@redhat.com> - 0.4.5-2 -- Remove static lib. - -* Tue Sep 2 2008 Daniel P. Berrange <berrange@redhat.com> - 0.4.4-1 -- Initial RPM release, largely based on earlier work from several sources. -- 1.6.2.5
On Tue, Jul 28, 2009 at 07:44:17PM +0100, Mark McLoughlin wrote:
Maintaining a spec file is hard, and it's extremely distribution specific
Keeping it (mostly) in sync with an upstream spec file makes things harder and more error prone
Unless we have some really strong desire by users to keep this, I suggest that we delete them and point people at the Fedora spec files as a good reference
NACK, this is used for automated testing, and my own manual build testing. 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 :|
On Tue, Jul 28, 2009 at 07:44:17PM +0100, Mark McLoughlin wrote:
Maintaining a spec file is hard, and it's extremely distribution specific
Only because the people want it to be that way, 10 years of rpmfind and following various attempts at unification fail prove to me the problem is mostly political, not that much technical. Just look at the history of rpmlint and how it's embedded in all rpm distros with tweaks, but still it's everywhere. Let's agree to disagree and let me keep thing working as I would like, thanks. Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel@veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/
Mark McLoughlin wrote:
Hey, I get treated like a war criminal when I make a change in the Fedora spec file and don't send it upstream, yet there are a whole heap of changes which haven't been pushed upstream ... only one of which is mine ... two changes less than DV himself :-)
The following series of patches pulls in the changes from Fedora which make sense. Some of them I'm not 100% sure of:
- defaulting to policy kit - is there some reason we don't want that upstream? - The python cruft thing, not sure its needed - Converting NEWS to UTF-8 could probably be done upstream - Requiring libselinux is dubious, doesn't autorequires handle that?
That's my fault. I added that to the fedora spec in the F11 time frame. On a fresh rawhide install, libvirt wouldn't start because libselinux wasn't pulled in. I later realized that my install was just hosed in some manner, but I had already pushed the spec file change. So that dependency can probably be dropped. - Cole
On Tue, Jul 28, 2009 at 07:44:03PM +0100, Mark McLoughlin wrote:
I get treated like a war criminal when I make a change in the Fedora spec file and don't send it upstream, yet there are a whole heap of changes which haven't been pushed upstream ... only one of which is mine ... two changes less than DV himself :-)
[...]
My final contention is that maintaining these spec files in the upstream repo actually makes it harder to maintain the Fedora spec file and helps nobody. Because of half-assed attempts to keep
It was working for me, and helping me. I used to simply copy the libvirt.spec file from my build when pushing, until Fedora starting to give problems like awk being needed in the requires to build and other stuff. It used to be *very* convenient.
the two in sync, I ended up having to fix a bunch of stuff and re-instate another bunch of stuff in Fedora:
- Enable netcf support - Pass --with-qemu-user=qemu etc. to configure - Move various requires to the libvirt-client sub-package - Sync some trivial cleanups from upstream spec file - Remove explicit libxml2 requires, again - Build with --without-capng if capng support is disabled - Remove explicit dir creating in makeinstall, replaced by attr in files - Set perms on /var/{run,lib,cache}/libvirt/qemu
I really think we should kill these off and just point people at the Fedora spec file if they're looking for a reference spec file.
I need some very strong rationale before I ever go wasting my time (2 hours) on this again.
Very simple. I hadn't time to properly fix the spec file in fedora yesterday because of the "urgent" pressure to push something for the F12 deadline. I would have in a large part finished the cleanup by time of the 0.7.0 release, that was on my TODO list. You arrived in the middle of the battle, heh wrong time. I want "./configure --prefix=/usr ; make rpm" to work, it's so strong that if you complain about wasted time I would ask you to just let me fix things. If you feel you are wasting time please just don't do it, that simple, but I want my process to still work and push signed RPMs as part of the release process, please don't break it ! thanks, Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel@veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/
On Tue, Jul 28, 2009 at 07:44:03PM +0100, Mark McLoughlin wrote:
The following series of patches pulls in the changes from Fedora which make sense. Some of them I'm not 100% sure of:
- defaulting to policy kit - is there some reason we don't want that upstream?
I'm not sure either
- The python cruft thing, not sure its needed
That's something I added while I was fighting with the build yesterday %{version} and $(VERSION) were diverging leading to some nasty side %effect I forgot to remove it there after. You landed in a Work In Progress ...
- Converting NEWS to UTF-8 could probably be done upstream
Fix is trivial in news.xsl, yes
- Requiring libselinux is dubious, doesn't autorequires handle that?
Yeah that should probably be dropped. All other patches should be fine, except removal of spec file. If you don't do this I will. thanks ! Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel@veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/
Since python-devel requires python Pointed out by Itamar Reis Peixoto --- libvirt.spec.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 976ef8f..6228d0b 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -82,7 +82,7 @@ Group: Development/Libraries Source: libvirt-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root URL: http://libvirt.org/ -BuildRequires: python python-devel +BuildRequires: python-devel # The client side, i.e. shared libs and virsh are in a subpackage Requires: libvirt-client = %{version}-%{release} -- 1.6.2.5
participants (4)
-
Cole Robinson -
Daniel P. Berrange -
Daniel Veillard -
Mark McLoughlin