[condor/f15/master] Added condor-qmf package

[matt]

commit adb4cd67ee60c3dd118b8933c5492b66ab2bc92b
Author: Matthew Farrellee <matt at redhat.com>
Date:   Thu May 5 09:12:40 2011 -0500

    Added condor-qmf package

 condor.spec |   58 +++++++++++++++++++++++++++++-----------------------------
 1 files changed, 29 insertions(+), 29 deletions(-)
---
diff --git a/condor.spec b/condor.spec
index 2e4b808..193b890 100644
--- a/condor.spec
+++ b/condor.spec
@@ -55,7 +55,7 @@ BuildRequires: wso2-wsf-cpp-devel
 BuildRequires: wso2-axis2-devel
 BuildRequires: /usr/include/curl/curl.h
 BuildRequires: /usr/include/expat.h
-#BuildRequires: qpid-qmf-devel
+BuildRequires: qpid-qmf-devel
 #BuildRequires: %_includedir/libdeltacloud/libdeltacloud.h
 
 #Requires: gsoap >= 2.7.12
@@ -97,17 +97,17 @@ completion.
 #Headers and libraries for interacting with Condor and its components.
 
 
-#%package qmf
-#Summary: Condor QMF components
-#Group: Applications/System
-#Requires: %name = %version-%release
-##Requires: qmf >= %{qmf_version}
-#Requires: python-qmf >= 0.7.946106
-#Requires: condor-classads = %{version}-%{release}
-#Obsoletes: condor-qmf-plugins
-#
-#%description qmf
-#Components to connect Condor to the QMF management bus.
+%package qmf
+Summary: Condor QMF components
+Group: Applications/System
+Requires: %name = %version-%release
+#Requires: qmf >= %{qmf_version}
+Requires: python-qmf >= 0.7.946106
+Requires: condor-classads = %{version}-%{release}
+Obsoletes: condor-qmf-plugins
+
+%description qmf
+Components to connect Condor to the QMF management bus.
 
 
 %package aviary
@@ -292,7 +292,7 @@ mkdir -m0755 %{buildroot}/%{_sysconfdir}/condor/config.d
 cp %{buildroot}/etc/examples/condor_config.local %{buildroot}/%{_sysconfdir}/condor/config.d/00personal_condor.config
 
 # Install condor-qmf's base plugin configuration
-#populate %_sysconfdir/condor/config.d %{buildroot}/etc/examples/60condor-qmf.config
+populate %_sysconfdir/condor/config.d %{buildroot}/etc/examples/60condor-qmf.config
 # Install condor-aviary's base plugin configuration
 populate %_sysconfdir/condor/config.d %{buildroot}/etc/examples/61aviary.config
 
@@ -547,20 +547,20 @@ rm -rf %{buildroot}
 #%_usrsrc/chirp/chirp_protocol.h
 
 
-#%files qmf
-#%defattr(-,root,root,-)
-#%doc LICENSE-2.0.txt NOTICE.txt
-#%_sysconfdir/condor/config.d/60condor-qmf.config
-#%dir %_libdir/condor/plugins
-#%_libdir/condor/plugins/MgmtCollectorPlugin-plugin.so
-#%_libdir/condor/plugins/MgmtMasterPlugin-plugin.so
-#%_libdir/condor/plugins/MgmtNegotiatorPlugin-plugin.so
-#%_libdir/condor/plugins/MgmtScheddPlugin-plugin.so
-#%_libdir/condor/plugins/MgmtStartdPlugin-plugin.so
-#%_bindir/get_trigger_data
-#%_sbindir/condor_trigger_config
-#%_sbindir/condor_triggerd
-#%_sbindir/condor_job_server
+%files qmf
+%defattr(-,root,root,-)
+%doc LICENSE-2.0.txt NOTICE.txt
+%_sysconfdir/condor/config.d/60condor-qmf.config
+%dir %_libdir/condor/plugins
+%_libdir/condor/plugins/MgmtCollectorPlugin-plugin.so
+%_libdir/condor/plugins/MgmtMasterPlugin-plugin.so
+%_libdir/condor/plugins/MgmtNegotiatorPlugin-plugin.so
+%_libdir/condor/plugins/MgmtScheddPlugin-plugin.so
+%_libdir/condor/plugins/MgmtStartdPlugin-plugin.so
+%_bindir/get_trigger_data
+%_sbindir/condor_trigger_config
+%_sbindir/condor_triggerd
+%_sbindir/condor_job_server
 
 
 %files aviary
@@ -677,13 +677,13 @@ fi
 /sbin/ldconfig
 
 # Queue -
-# - Introduced condor-qmf, package of the mgmt/qmf contrib
 # - Introduced deltacloud-gahp
 
 %changelog
-* Thu Apr 28 2011 <matt at redhat> - 7.6.1-0.1
+* Thu May  5 2011 <matt at redhat> - 7.6.1-0.1
 - Upgrade to 7.6.0 release, pre-release of 7.6.1 at 27972e8
 - Upstreamed patch: log_lock_run.patch
+- Introduced condor-qmf, package of the mgmt/qmf contrib
 - Introduced condor-classads to obsolete classads
 - Introduced condor-aviary, package of the aviary contrib
 - Transitioned from LOCAL_CONFIG_FILE to LOCAL_CONFIG_DIR