rpms/condor/F-9 no_rpmdb_query.patch, NONE, 1.1 condor.spec, 1.20, 1.21

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


Author: matt

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

Modified Files:
	condor.spec 
Added Files:
	no_rpmdb_query.patch 
Log Message:
7.2.1-1

no_rpmdb_query.patch:

--- NEW FILE no_rpmdb_query.patch ---
--- condor-7.2.1/src/configure.ac	2009-02-24 07:06:37.000000000 -0600
+++ condor-7.2.1mf/src/configure.ac	2009-02-24 07:05:46.000000000 -0600
@@ -262,7 +262,7 @@
 	;;
      # Handle post-FC releases more robustly
      * )
-        _cv_linux_distro=`$RPMQUERY -q --queryformat "F%{VERSION}" fedora-release`
+        _cv_linux_distro=F`cat /etc/fedora-release|$PERL -ne '/.* (.*) \((.*)\)/;print $1;'`
 	;;
     esac
   elif test -f "/etc/redhat-release" ; then


Index: condor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/condor/F-9/condor.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- condor.spec	24 Feb 2009 03:02:47 -0000	1.20
+++ condor.spec	24 Feb 2009 13:14:43 -0000	1.21
@@ -27,6 +27,7 @@
 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)
 
@@ -111,6 +112,7 @@
 %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 +573,7 @@
 - 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




More information about the fedora-extras-commits mailing list