[condor/f15] 7.7.5
tstclair
tstclair at fedoraproject.org
Wed Mar 7 19:20:33 UTC 2012
commit d9b178d49c537abf1eb288531c0bf86e58cac21e
Author: Timothy St. Clair <tstclair at redhat.com>
Date: Wed Mar 7 13:15:51 2012 -0600
7.7.5
.gitignore | 1 +
condor.spec | 7 ++++---
condor_config.generic.patch | 2 +-
sources | 2 +-
4 files changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0746cad..786d240 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
.*.swp
/condor-7.7.3-c39a8b84-GIT.tar.gz
/condor-7.7.5-03a0f934-GIT.tar.gz
+/condor-7.7.5-e5e734c8-GIT.tar.gz
diff --git a/condor.spec b/condor.spec
index 325f0ce..d1f71eb 100644
--- a/condor.spec
+++ b/condor.spec
@@ -85,9 +85,9 @@ Source0: condor.tar.gz
#
# ecafed3e183e9fc6608dc9e55e4dd59b condor_src-7.7.1-all-all.tar.gz
# 6a7a42515d5ae6c8cb3c69492697e04f condor_src-7.7.3-all-all.tar.gz
-# d9e3e51f49835c6edbb511dce2232692 condor_src-7.7.5-all-all.tar.gz
+# e941854c58c885e898e33ca6a3ef683b condor_src-7.7.5-all-all.tar.gz
# Note: The md5sum of each generated tarball may be different
-Source0: condor-7.7.5-03a0f934-GIT.tar.gz
+Source0: condor-7.7.5-e5e734c8-GIT.tar.gz
Source1: generate-tarball.sh
%endif
@@ -559,7 +559,8 @@ install -Dp -m0755 %{buildroot}/etc/examples/condor.init %buildroot/%_initrddir/
%endif
# we must place the config examples in builddir so %doc can find them
-mv %{buildroot}/etc/examples %_builddir/%name-%tarball_version
+rm -rf %{buildroot}/etc/examples
+#%{_builddir}/%{name}-%{tarball_version}
# rsh is built if glexec is on. No. Clue. Why.
%if %glexec
diff --git a/condor_config.generic.patch b/condor_config.generic.patch
index c9f8db4..805c9b5 100644
--- a/condor_config.generic.patch
+++ b/condor_config.generic.patch
@@ -205,7 +205,7 @@ index a800f31..80ad566 100644
## Determine if the Negotiator will honor SlotWeight attributes, which
## may be used to give a slot greater weight when calculating usage.
#NEGOTIATOR_USE_SLOT_WEIGHTS = True
-+NEGOTIATOR_USE_SLOT_WEIGHTS = False
++NEGOTIATOR_USE_SLOT_WEIGHTS = True
## How often the Negotaitor starts a negotiation cycle, defined in
diff --git a/sources b/sources
index c01d25c..a160149 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-df2006f0b5fc2bed1a21b215124e5188 condor-7.7.5-03a0f934-GIT.tar.gz
+2512e5f91943a29f6ddf697adefd53da condor-7.7.5-e5e734c8-GIT.tar.gz
More information about the scm-commits
mailing list