git://git.onelab.eu
/
libvirt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pour netcf in the mix
[libvirt.git]
/
libvirt.spec
diff --git
a/libvirt.spec
b/libvirt.spec
index
4cf97ac
..
e54b59a
100644
(file)
--- a/
libvirt.spec
+++ b/
libvirt.spec
@@
-3,6
+3,7
@@
%define mainstream_version 1.2.1
%define module_version_varname mainstream_version
%define taglevel 0
%define mainstream_version 1.2.1
%define module_version_varname mainstream_version
%define taglevel 0
+%define packager PlanetLab/OneLab
#libvirt-RPMFLAGS := --without storage-disk --without storage-iscsi --without storage-scsi \
## --without storage-fs --without storage-lvm \
#libvirt-RPMFLAGS := --without storage-disk --without storage-iscsi --without storage-scsi \
## --without storage-fs --without storage-lvm \
@@
-17,8
+18,6
@@
%define _without_polkit true
%define _without_sasl true
%define _without_audit true
%define _without_polkit true
%define _without_sasl true
%define _without_audit true
-#interface requires netcf
-#%define _without_netcf true
%define _without_avahi true
%define _without_sanlock true
%define _without_xen true
%define _without_avahi true
%define _without_sanlock true
%define _without_xen true
@@
-28,7
+27,7
@@
%define _without_esx true
%define _without_libxl true
%define _without_vbox true
%define _without_esx true
%define _without_libxl true
%define _without_vbox true
-
+%define _without_uml true
#turn this off even on f18 as an attempt to get back /proc/meminfo
%define _without_fuse true
#turn this off even on f18 as an attempt to get back /proc/meminfo
%define _without_fuse true
@@
-273,11
+272,6
@@
%define with_hal 0%{!?_without_hal:%{server_drivers}}
%endif
%define with_hal 0%{!?_without_hal:%{server_drivers}}
%endif
-# interface requires netcf
-%if ! 0%{?with_netcf}
- %define with_interface 0
-%endif
-
# Enable yajl library for JSON mode with QEMU
%if 0%{?fedora} >= 13 || 0%{?rhel} >= 6
%define with_yajl 0%{!?_without_yajl:%{server_drivers}}
# Enable yajl library for JSON mode with QEMU
%if 0%{?fedora} >= 13 || 0%{?rhel} >= 6
%define with_yajl 0%{!?_without_yajl:%{server_drivers}}
@@
-449,7
+443,9
@@
Requires: libvirt-daemon-driver-vbox = %{version}-%{release}
Requires: libvirt-daemon-driver-nwfilter = %{version}-%{release}
%endif
Requires: libvirt-daemon-driver-nwfilter = %{version}-%{release}
%endif
+ %if %{with_interface}
Requires: libvirt-daemon-driver-interface = %{version}-%{release}
Requires: libvirt-daemon-driver-interface = %{version}-%{release}
+ %endif
Requires: libvirt-daemon-driver-secret = %{version}-%{release}
Requires: libvirt-daemon-driver-storage = %{version}-%{release}
Requires: libvirt-daemon-driver-network = %{version}-%{release}
Requires: libvirt-daemon-driver-secret = %{version}-%{release}
Requires: libvirt-daemon-driver-storage = %{version}-%{release}
Requires: libvirt-daemon-driver-network = %{version}-%{release}
@@
-743,6
+739,7
@@
Summary: Default configuration files for the libvirtd daemon
Group: Development/Libraries
Requires: libvirt-daemon = %{version}-%{release}
Group: Development/Libraries
Requires: libvirt-daemon = %{version}-%{release}
+Requires: libvirt-daemon-driver-network = %{version}-%{release}
%description daemon-config-network
Default configuration files for setting up NAT based networking
%description daemon-config-network
Default configuration files for setting up NAT based networking
@@
-1542,6
+1539,12
@@
rm -f $RPM_BUILD_ROOT%{_prefix}/lib/sysctl.d/libvirtd.conf
rm -fr %{buildroot}
%check
rm -fr %{buildroot}
%check
+# PlanetLab build
+# do not run tests, this is mainstream business, and more importantly
+# our own setup is ti build inside a container already and we've seen
+# occasional red herrings because of that
+exit
+#
cd tests
make
# These tests don't current work in a mock build root
cd tests
make
# These tests don't current work in a mock build root