rpms/condor/F-11 log_lock_run.patch,NONE,1.1 condor.spec,1.21,1.22

Matthew Farrellee matt at fedoraproject.org
Fri May 22 15:53:08 UTC 2009


Author: matt

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

Modified Files:
	condor.spec 
Added Files:
	log_lock_run.patch 
Log Message:
resolve 502175 and karma complaint

log_lock_run.patch:

--- NEW FILE log_lock_run.patch ---
diff --git a/src/condor_examples/condor_config.generic b/src/condor_examples/con
index 352f685..3f80b62 100644
--- a/src/condor_examples/condor_config.generic
+++ b/src/condor_examples/condor_config.generic
@@ -378,7 +378,7 @@
 ##  condor account, it's probably condor.  Otherwise, it's whatever
 ##  you've set in the CONDOR_IDS environment variable.  See the Admin
 ##  manual for details on this.
-LOCK		= $(LOG)
+LOCK		= /var/lock/condor
 
 ##  If you don't use a fully qualified name in your /etc/hosts file
 ##  (or NIS, etc.) for either your official hostname or as an alias,
@@ -878,15 +878,16 @@
 ######################################################################
 
 ##  Pathnames
-LOG		= $(LOCAL_DIR)/log
+LOG		= /var/log/condor
 SPOOL		= $(LOCAL_DIR)/spool
 EXECUTE		= $(LOCAL_DIR)/execute
 BIN		= $(RELEASE_DIR)/bin
 LIB		= $(RELEASE_DIR)/lib
 INCLUDE		= $(RELEASE_DIR)/include/condor
 SBIN		= $(RELEASE_DIR)/sbin
 LIBEXEC		= $(RELEASE_DIR)/libexec/condor
 SHARE		= $(RELEASE_DIR)/share/condor
+RUN		= /var/run/condor
 
 ## If you leave HISTORY undefined (comment it out), no history file
 ## will be created. 
@@ -1559,7 +1560,7 @@
 #     UNIX); the name will be something like:
 #         \\.\pipe\condor_procd
 #
-PROCD_ADDRESS = $(LOCK)/procd_pipe
+PROCD_ADDRESS = $(RUN)/procd_pipe
 
 # The procd currently uses a very simplistic logging system. Since this
 # log will not be rotated like other Condor logs, it is only recommended


Index: condor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/condor/F-11/condor.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- condor.spec	21 May 2009 17:18:33 -0000	1.21
+++ condor.spec	22 May 2009 15:52:38 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: Condor: High Throughput Computing
 Name: condor
 Version: 7.2.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: ASL 2.0
 Group: Applications/System
 URL: http://www.cs.wisc.edu/condor/
@@ -28,6 +28,7 @@ Patch1: stdsoap2.h.patch.patch
 Patch3: chkconfig_off.patch
 Patch4: no_rpmdb_query.patch
 Patch5: no_basename.patch
+Patch6: log_lock_run.patch
 
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -113,6 +114,7 @@ cp %{SOURCE2} .
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 # fix errant execute permissions
 find src -perm /a+x -type f -name "*.[Cch]" -exec chmod a-x {} \;
@@ -359,7 +361,9 @@ populate %_datadir/condor $PREFIX/lib/*
 populate %_datadir/condor/sql $PREFIX/sql/*
 populate %_libexecdir/condor $PREFIX/libexec/*
 populate %_var/lib/condor $PREFIX/local_dir/*
-
+mkdir -p -m0755 "%{buildroot}"/%_var/run/condor
+mkdir -p -m0755 "%{buildroot}"/%_var/log/condor
+mkdir -p -m0755 "%{buildroot}"/%_var/lock/condor
 
 # install the lsb init script
 install -Dp -m0755 $PREFIX/etc/examples/condor.init %buildroot/%_initrddir/condor
@@ -517,8 +521,10 @@ rm -rf %{buildroot}
 %defattr(-,condor,condor,-)
 %dir %_var/lib/condor/
 %dir %_var/lib/condor/execute/
-%dir %_var/lib/condor/log/
+%dir %_var/lib/log/condor/
 %dir %_var/lib/condor/spool/
+%dir %_var/lib/lock/condor/
+%dir %_var/lib/run/condor/
 
 
 #%files static
@@ -549,7 +555,7 @@ rm -rf %{buildroot}
 /sbin/ldconfig
 test -x /usr/sbin/selinuxenabled && /usr/sbin/selinuxenabled
 if [ $? = 0 ]; then
-   semanage fcontext -a -t unconfined_execmem_exec_t %_sbindir/condor_startd 
+   semanage fcontext -a -t unconfined_execmem_exec_t %_sbindir/condor_startd 2>&1| grep -v "already defined"
    restorecon  %_sbindir/condor_startd
 fi
 
@@ -569,8 +575,12 @@ fi
 
 
 %changelog
+* Fri May 22 2009  <matt at redhat> - 7.2.3-2
+- Updated for new log, lock, run locations (BZ502175)
+- Filtered out innocuous semanage message
+
 * Wed May 20 2009  <matt at redhat> - 7.2.3-1
-- Upgraded to 7.2.3 release
+- Upgraded to 7.2.3 release (BZ501692)
 
 * Mon Feb 25 2009  <matt at redhat> - 7.2.1-1
 - Upgraded to 7.2.1 release




More information about the fedora-extras-commits mailing list