rpms/condor/F-10 .cvsignore, 1.5, 1.6 condor.spec, 1.12, 1.13 condor_config.generic.patch, 1.2, 1.3 sources, 1.5, 1.6 DetectGCC.patch, 1.1, NONE

Matthew Farrellee matt at fedoraproject.org
Tue Feb 24 13:49:13 UTC 2009


Author: matt

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

Modified Files:
	.cvsignore condor.spec condor_config.generic.patch sources 
Removed Files:
	DetectGCC.patch 
Log Message:
7.2.1-1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/condor/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	7 Jan 2009 18:51:15 -0000	1.5
+++ .cvsignore	24 Feb 2009 13:48:43 -0000	1.6
@@ -1 +1 @@
-condor-7.2.0-121001-RH.tar.gz
+condor-7.2.1-133382-RH.tar.gz


Index: condor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/condor/F-10/condor.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- condor.spec	15 Jan 2009 04:59:14 -0000	1.12
+++ condor.spec	24 Feb 2009 13:48:43 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: Condor: High Throughput Computing
 Name: condor
-Version: 7.2.0
-Release: 3%{?dist}
+Version: 7.2.1
+Release: 1%{?dist}
 License: ASL 2.0
 Group: Applications/System
 URL: http://www.cs.wisc.edu/condor/
@@ -18,14 +18,15 @@
 #   5f326ad522b63eacf34c6c563cf46910  condor_src-7.0.4-all-all.tar.gz
 #   73323100c5b2259f3b9c042fa05451e0  condor_src-7.0.5-all-all.tar.gz
 #   a2dd96ea537b2c6d105b6c8dad563ddc  condor_src-7.2.0-all-all.tar.gz
+#   edbac8267130ac0a0e016d0f113b4616  condor_src-7.2.1-all-all.tar.gz
 # Note: The md5sum of each generated tarball may be different
-Source0: condor-7.2.0-121001-RH.tar.gz
+Source0: condor-7.2.1-133382-RH.tar.gz
 Source1: generate-tarball.sh
 Source2: NOTICE.txt
 Patch0: condor_config.generic.patch
 Patch1: stdsoap2.h.patch.patch
-Patch2: DetectGCC.patch
 Patch3: chkconfig_off.patch
+Patch4: no_rpmdb_query.patch
 
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -43,13 +44,8 @@
 BuildRequires: classads-devel
 BuildRequires: libX11-devel
 
-Requires: pcre
-Requires: postgresql-libs
-Requires: openssl
-Requires: krb5-libs
 Requires: gsoap >= 2.7.12-1
 Requires: mailx
-Requires: classads
 Requires: python >= 2.2
 
 Requires(pre): shadow-utils
@@ -113,8 +109,8 @@
 
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 # fix errant execute permissions
 find src -perm /a+x -type f -name "*.[Cch]" -exec chmod a-x {} \;
@@ -571,6 +567,12 @@
 
 
 %changelog
+* Mon Feb 23 2009  <matt at redhat> - 7.2.1-1
+- Upgraded to 7.2.1 release
+- Pruned changes accepted upstream from condor_config.generic.patch
+- Removed Requires in favor of automatic dependencies on SONAMEs
+- Added no_rmpdb_query.patch to avoid rpm -q during a build
+
 * Mon Jan 14 2009  <matt at redhat> - 7.2.0-3
 - Fixed regression: initscript was on by default, now off again
 

condor_config.generic.patch:

Index: condor_config.generic.patch
===================================================================
RCS file: /cvs/pkgs/rpms/condor/F-10/condor_config.generic.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- condor_config.generic.patch	7 Jan 2009 18:51:15 -0000	1.2
+++ condor_config.generic.patch	24 Feb 2009 13:48:43 -0000	1.3
@@ -43,18 +43,6 @@
  ##  Part 2:  Settings you may want to customize
  ##  Part 3:  Settings that control the policy of when condor will
  ##           start and stop jobs on your machines
-@@ -21,11 +41,6 @@
- ##  various settings in here and possible ways to configure your
- ##  pool. 
- ##
--##  If you are installing Condor as root and then handing over the
--##  administration of this file to a person you do not trust with
--##  root access, please read the Installation chapter paying careful
--##  note to the condor_config.root entries.
--##
- ##  Unless otherwise specified, settings that are commented out show
- ##  the defaults that are used if you don't define a value.  Settings
- ##  that are defined here MUST BE DEFINED since they have no default
 @@ -47,18 +62,15 @@
  ##  #        #    #  #   #      #              #
  ##  #        #    #  #    #     #            #####
@@ -76,15 +64,6 @@
  
  ##  Where is the local condor directory for each host?  
  ##  This is where the local config file(s), logs and
-@@ -72,7 +84,7 @@ LOCAL_CONFIG_FILE	= $(LOCAL_DIR)/condor_config.local
- 
- ## If the local config file is not present, is it an error?
- ## WARNING: This is a potential security issue. 
--## If not specificed, te default is True
-+## If not specificed, the default is True
- #REQUIRE_LOCAL_CONFIG_FILE = TRUE
- 
- ##--------------------------------------------------------------------
 @@ -84,7 +96,7 @@ CONDOR_ADMIN		= condor-admin at your.domain
  
  ##  Full path to a mail delivery program that understands that "-s"
@@ -119,20 +98,6 @@
  #HOSTALLOW_WRITE = *.your.domain, your-friend's-machine.other.domain
  #HOSTDENY_WRITE = bad-machine.your.domain
  
-@@ -231,10 +243,9 @@ HOSTALLOW_NEGOTIATOR = $(CONDOR_HOST)
- HOSTALLOW_NEGOTIATOR_SCHEDD = $(CONDOR_HOST), $(FLOCK_NEGOTIATOR_HOSTS)
- 
- ##  Config access.  Machines listed here can use the condor_config_val
--##  tool to modify all daemon configurations except those specified in
--##  the condor_config.root file.  This level of host-wide access
--##  should only be granted with extreme caution.  By default, config
--##  access is denied from all hosts.
-+##  tool to modify all daemon configurations.  This level of host-wide
-+##  access should only be granted with extreme caution.  By default,
-+##  config access is denied from all hosts.
- #HOSTALLOW_CONFIG = trusted-host.your.domain
- 
- ##  Flocking Configs.  These are the real things that Condor looks at,
 @@ -872,9 +883,10 @@ SPOOL		= $(LOCAL_DIR)/spool
  EXECUTE		= $(LOCAL_DIR)/execute
  BIN		= $(RELEASE_DIR)/bin
@@ -155,15 +120,6 @@
  
  ##  JAVA_CLASSPATH_ARGUMENT describes the command-line parameter
  ##  used to introduce a new classpath:
-@@ -2299,7 +2311,7 @@ LeaseManager			= $(SBIN)/condor_lease_manager
- # Turn on the lease manager
- #DAEMON_LIST			= $(DAEMON_LIST), LeaseManager
- 
--# The identification and location of the quill daemon for local clients.
-+# The identification and location of the lease manager for local clients.
- LeaseManger_ADDRESS_FILE	= $(LOG)/.lease_manager_address
- 
- ## LeaseManager startup arguments
 diff --git a/src/condor_examples/customize b/src/condor_examples/customize
 index b1c5710..cb2dea1 100644
 --- a/src/condor_examples/customize


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/condor/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	7 Jan 2009 18:51:15 -0000	1.5
+++ sources	24 Feb 2009 13:48:43 -0000	1.6
@@ -1 +1 @@
-e84581852745cc46b25a7e9b28e2046f  condor-7.2.0-121001-RH.tar.gz
+f7d83158bcee6a44fd4dbd9e9d8cb751  condor-7.2.1-133382-RH.tar.gz


--- DetectGCC.patch DELETED ---




More information about the scm-commits mailing list