OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libvirt?expand=0&rev=17

libvirt.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Sat Aug  9 01:10:52 MDT 2008 - jfehlig@novell.com
+
+- Adjustments to spec file
+  + Added /var/lib/libvirt directory
+  + Enabled LXC support if suse_version > 1100, fate #304001
+  + Cleaned up some rpmlint warnings
+
 -------------------------------------------------------------------
 Sun Jul  6 11:16:25 MDT 2008 - jfehlig@novell.com
 

libvirt.spec

@@ -2,29 +2,38 @@
 # spec file for package libvirt (Version 0.4.4)
 #
 # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
 #
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
 # norootforbuild
 
 %define with_xen     1
-%define with_polkit  0
+%define with_lxc     0
 # Xen is available only on i386 x86_64 ia64
 %ifnarch i386 i586 x86_64 ia64
 %define with_xen 0
 %endif
+%if 0%{?suse_version} > 1100
+%define with_lxc     1
+%endif
 
 Name:           libvirt
-BuildRequires:  bridge-utils cyrus-sasl-devel fdupes gettext gnutls-devel iptables libxml2-devel lvm2 ncurses-devel parted parted-devel pkg-config python-devel readline-devel util-linux xhtml-dtd
+BuildRequires:  PolicyKit-devel bridge-utils cyrus-sasl-devel dnsmasq fdupes gettext gnutls-devel iptables-devel libxml2-devel lvm2 ncurses-devel parted-devel pkg-config python-devel readline-devel util-linux xhtml-dtd
 %if %{with_xen}
 BuildRequires:  xen-devel
 %endif
 %if 0%{?suse_version} > 1030
-%define with_polkit 1
+BuildRequires:  libavahi-devel
-BuildRequires:  PolicyKit-devel dnsmasq libavahi-devel
 %else
 BuildRequires:  avahi-devel
 %endif
@@ -35,9 +44,8 @@ License:        LGPL v2.1 or later
 Group:          Development/Libraries/C and C++
 AutoReqProv:    yes
 Version:        0.4.4
-Release:        1
+Release:        14
 Summary:        A C toolkit to interract with the virtualization capabilities of Linux
-Requires:       libxml2
 Requires:       readline
 Requires:       ncurses
 Requires:       bridge-utils
@@ -46,10 +54,8 @@ Requires:       cyrus-sasl
 Requires:       lvm2
 Requires:       parted
 Recommends:     cyrus-sasl-digestmd5
-%if 0%{?suse_version} > 1030  
 Requires:       dnsmasq
 Requires:       PolicyKit >= 0.6
-%endif  
 Source0:        %{name}-%{version}.tar.bz2
 Source1:        libvirtd.init
 Patch0:         libvirtd-polkit.patch
@@ -150,13 +156,16 @@ rm po/no.*
 %if ! %{with_xen}
 %define _without_xen --without-xen
 %endif
+%if %{with_lxc}
+%define _with_lxc --with-lxc
+%endif
 autoreconf -f -i
 export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
 %configure %{?_without_xen} \
+           %{?_with_lxc} \
            --libexecdir=%{_libdir}/%{name} \
            --with-init-script=none \
-           --with-qemud-pid-file=%{_localstatedir}/run/libvirt_qemud.pid \
+           --with-remote-pid-file=%{_localstatedir}/run/libvirtd.pid \
-           --with-remote-file=%{_localstatedir}/run/libvirtd.pid \
            --with-storage-iscsi=no \
            --with-xen-proxy=no
 make DOCS_DIR=%{_docdir}/%{name}-python EXAMPLE_DIR=%{_docdir}/%{name}-python/examples HTML_DIR=%{_docdir}/%{name}
@@ -165,12 +174,13 @@ cd docs/examples ; make index.html ; cd ../..
 %install
 %makeinstall DOCS_DIR=%{_docdir}/%{name}-python EXAMPLE_DIR=%{_docdir}/%{name}-python/examples HTML_DIR=%{_docdir}/%{name}
 cp -a AUTHORS ChangeLog COPYING NEWS README TODO $RPM_BUILD_ROOT%{_docdir}/%{name}/
-# remove currently unsupported locale
+# remove currently unsupported locale(s)
 rm -rf $RPM_BUILD_ROOT/usr/share/locale/sr@latin
 # for now, do not install the default network definition
 rm -f $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/default.xml
 rm -f $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/autostart/default.xml
-mkdir -p $RPM_BUILD_ROOT/var/run/libvirtd
+mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/run/libvirt
+mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/lib/libvirt
 rm $RPM_BUILD_ROOT%{_docdir}/%{name}/{*.c,examples.x*}
 rm $RPM_BUILD_ROOT%{_libdir}/*.*a $RPM_BUILD_ROOT%{py_sitedir}/*.*a
 ln_dupes()
@@ -220,18 +230,21 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_mandir}/man1/virsh.1*
 %{_libdir}/*.so.*
 %dir %{_libdir}/%{name}
+%if 0%{?suse_version} > 1030
 %{_libdir}/%{name}/libvirt_parthelper
+%endif
 %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/
 %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
-%dir /var/run/libvirt/
+%dir /%{_localstatedir}/run/libvirt/
+%dir /%{_localstatedir}/lib/libvirt/
 %config /etc/init.d/libvirtd
 %{_sbindir}/rclibvirtd
 %config %{_sysconfdir}/libvirt/libvirtd.conf
 %config %{_sysconfdir}/libvirt/qemu.conf
 %config %{_sysconfdir}/sasl2/libvirt.conf
-%if %{with_polkit}
+%if 0%{?suse_version} > 1030
 %{_datadir}/PolicyKit/policy/libvirtd.policy
 %endif
 
@@ -255,6 +268,11 @@ rm -rf $RPM_BUILD_ROOT
 %{py_sitedir}/libvirtmod*
 
 %changelog
+* Sat Aug 09 2008 jfehlig@novell.com
+- Adjustments to spec file
+  + Added /var/lib/libvirt directory
+  + Enabled LXC support if suse_version > 1100, fate #304001
+  + Cleaned up some rpmlint warnings
 * Sun Jul 06 2008 jfehlig@novell.com
 - Updated to libvirt 0.4.4
   + Bug fixes: QEmu network serialization, internal memory allocation