From c958b82770f49c4b285eefa8ce6410dfbe36912c Mon Sep 17 00:00:00 2001
From: matt <matt@fedoraproject.org>
Date: Jan 05 2010 17:59:06 +0000
Subject: 7.4.1-1


---

diff --git a/.cvsignore b/.cvsignore
index 57354f8..f7e6aaf 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-condor-7.4.0-193173-RH.tar.gz
+condor-7.4.1-204351-RH.tar.gz
diff --git a/condor.spec b/condor.spec
index 68ded99..285f8f1 100644
--- a/condor.spec
+++ b/condor.spec
@@ -1,6 +1,6 @@
 Summary: Condor: High Throughput Computing
 Name: condor
-Version: 7.4.0
+Version: 7.4.1
 Release: 1%{?dist}
 License: ASL 2.0
 Group: Applications/System
@@ -21,16 +21,15 @@ URL: http://www.cs.wisc.edu/condor/
 #   edbac8267130ac0a0e016d0f113b4616  condor_src-7.2.1-all-all.tar.gz
 #   6d9b0ef74d575623af11e396fa274174  condor_src-7.2.4-all-all.tar.gz
 #   ee72b65fad02d21af0dc8f1aa5872110  condor_src-7.4.0-all-all.tar.gz
+#   d4deeabbbce65980c085d8bea4c1018a  condor_src-7.4.1-all-all.tar.gz
 # Note: The md5sum of each generated tarball may be different
-Source0: condor-7.4.0-193173-RH.tar.gz
+Source0: condor-7.4.1-204351-RH.tar.gz
 Source1: generate-tarball.sh
 Patch0: condor_config.generic.patch
 Patch1: stdsoap2.h.patch.patch
 Patch3: chkconfig_off.patch
 Patch6: log_lock_run.patch
 Patch7: only_dynamic_unstripped.patch
-Patch8: guess_version_from_release_dir.patch
-Patch9: fix_platform_check.patch
 
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -126,8 +125,6 @@ exit 0
 %patch3 -p1
 %patch6 -p1
 %patch7 -p1
-%patch8 -p1
-%patch9 -p1
 
 # fix errant execute permissions
 find src -perm /a+x -type f -name "*.[Cch]" -exec chmod a-x {} \;
@@ -606,6 +603,11 @@ fi
 
 
 %changelog
+* Tue Jan  5 2010  <matt@redhat> - 7.4.1-1
+- Upgrade to 7.4.1 release
+- Upstreamed: guess_version_from_release_dir, fix_platform_check
+- Security update (BZ549577)
+
 * Fri Dec  4 2009  <matt@redhat> - 7.4.0-1
 - Upgrade to 7.4.0 release
 - Fixed POSTIN error (BZ540439)
diff --git a/fix_platform_check.patch b/fix_platform_check.patch
deleted file mode 100644
index 7e62d16..0000000
--- a/fix_platform_check.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- condor-7.4.0/src/configure.ac	2009-10-28 11:05:25.000000000 -0400
-+++ condor-7.4.0mf/src/configure.ac	2009-12-04 06:22:47.000000000 -0500
-@@ -608,7 +608,7 @@
- AC_SUBST(_cv_kernel_rev,$_cv_kernel_rev)
- 
- AC_MSG_CHECKING([platform name])
--AC_MSG_RESULT([$_platform])
-+AC_MSG_RESULT([$_cv_platform])
- AC_SUBST(_cv_platform,$_cv_platform)
- 
- # check out the libc
diff --git a/guess_version_from_release_dir.patch b/guess_version_from_release_dir.patch
deleted file mode 100644
index 99ad6aa..0000000
--- a/guess_version_from_release_dir.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- condor-7.4.0/src/condor_scripts/make_final_tarballs	2009-10-28 11:05:25.000000000 -0400
-+++ condor-7.4.0mf/src/condor_scripts/make_final_tarballs	2009-12-04 06:19:34.000000000 -0500
-@@ -111,10 +111,12 @@
- } else {
-     # If we weren't told on the command line, use the condor_master
-     # binary with -version to find the version string.
--    if( -f "strip_dir/sbin/condor_master" ) {
--        $vers_string=`./strip_dir/sbin/condor_master -version`;
-+    if( -f "release_dir/sbin/condor_master" ) {
-+        $vers_string=`./release_dir/sbin/condor_master -version`;
-     } elsif ( -f "static_dir/sbin/condor_master" ) {
-         $vers_string=`./static_dir/sbin/condor_master -version`;
-+    } elsif ( -f "strip_dir/sbin/condor_master" ) {
-+        $vers_string=`./strip_dir/sbin/condor_master -version`;
-     } else {
- 	die "ERROR: can't find a condor_version, and no -v specified";
-     }
diff --git a/sources b/sources
index 3dc887f..df34722 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cd4fcdd518227fcc8782a02de500f39b  condor-7.4.0-193173-RH.tar.gz
+492bc41c46c262dcf17769e84b4ad8ad  condor-7.4.1-204351-RH.tar.gz