rpms/condor/F-12 condor.spec,1.25,1.26

[matt]

Author: matt

Update of /cvs/pkgs/rpms/condor/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25149

Modified Files:
	condor.spec 
Log Message:
7.4.0-0.1


Index: condor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/condor/F-12/condor.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- condor.spec	4 Dec 2009 12:00:31 -0000	1.25
+++ condor.spec	4 Dec 2009 12:52:55 -0000	1.26
@@ -42,13 +42,14 @@ BuildRequires: postgresql-devel
 BuildRequires: openssl-devel
 BuildRequires: krb5-devel
 BuildRequires: gsoap-devel >= 2.7.12-1
+BuildRequires: libvirt-devel
 BuildRequires: bind-utils
 BuildRequires: m4
 BuildRequires: autoconf
-BuildRequires: classads-devel
+BuildRequires: classads-devel >= 1.0.4
 BuildRequires: libX11-devel
 
-Requires: gsoap >= 2.7.12-1
+Requires: gsoap >= 2.7.12
 Requires: mailx
 Requires: python >= 2.2
 
@@ -98,6 +99,17 @@ useful on systems where no device (e.g. 
 determine console idle time.
 
 
+%package vm-gahp
+Summary: Condor's VM Gahp
+Group: Applications/System
+Requires: %name = %version-%release
+
+%description vm-gahp
+The condor_vm-gahp enables the Virtual Machine Universe feature of
+Condor. The VM Universe uses libvirt to start and control VMs under
+Condor's Startd.
+
+
 %pre
 getent group condor >/dev/null || groupadd -r condor
 getent passwd condor >/dev/null || \
@@ -145,9 +157,11 @@ cd src
    --enable-kbdd \
    --disable-hibernation \
    --disable-lease-manager \
+   --disable-hdfs \
    --without-zlib \
    --with-openssl \
    --with-krb5 \
+   --with-libvirt \
    --with-postgresql \
    --with-gsoap \
    --with-classads \
@@ -422,7 +436,6 @@ rm -rf %{buildroot}
 %_libexecdir/condor/condor_rooster
 %_libexecdir/condor/condor_ssh_to_job_shell_setup
 %_libexecdir/condor/condor_ssh_to_job_sshd_setup
-%_libexecdir/condor/libvirt_simple_script.awk
 %_libexecdir/condor/power_state
 %_mandir/man1/condor_advertise.1.gz
 %_mandir/man1/condor_check_userlogs.1.gz
@@ -524,10 +537,7 @@ rm -rf %{buildroot}
 %_sbindir/condor_store_cred
 %_sbindir/condor_transferd
 %_sbindir/condor_updates_stats
-%_sbindir/condor_vm-gahp
 %_sbindir/amazon_gahp
-%_sbindir/condor_vm_vmware.pl
-%_sbindir/condor_vm_xen.sh
 %_sbindir/condor_gridmanager
 %config(noreplace) %_var/lib/condor/condor_config.local
 %defattr(-,condor,condor,-)
@@ -562,6 +572,15 @@ rm -rf %{buildroot}
 %_sbindir/condor_kbdd
 
 
+%files vm-gahp
+%defattr(-,root,root,-)
+%doc LICENSE-2.0.txt NOTICE.txt
+%_sbindir/condor_vm-gahp
+%_sbindir/condor_vm_vmware.pl
+%_sbindir/condor_vm_xen.sh
+%_libexecdir/condor/libvirt_simple_script.awk
+
+
 %post -n condor
 /sbin/chkconfig --add condor
 /sbin/ldconfig
@@ -597,6 +616,7 @@ fi
 - Added guess_version_from_release_dir.patch, for previous
 - Added fix_platform_check.patch
 - Use new --with-platform, to avoid modification of make_final_tarballs
+- Introduced vm-gahp package to hold libvirt deps
 
 * Fri Aug 28 2009  <matt at redhat> - 7.2.4-1
 - Upgrade to 7.2.4 release