rpms/condor/devel log_lock_run.patch, NONE, 1.1 condor.spec, 1.23, 1.24

[matt]

Author: matt

Update of /cvs/pkgs/rpms/condor/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22530

Modified Files:
	condor.spec 
Added Files:
	log_lock_run.patch 
Log Message:
7.2.4-1, updated to be like f10 and f11

log_lock_run.patch:
 condor_config.generic |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

--- 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/devel/condor.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- condor.spec	28 Aug 2009 17:38:49 -0000	1.23
+++ condor.spec	28 Aug 2009 18:02:12 -0000	1.24
@@ -29,6 +29,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)
 
@@ -114,6 +115,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 {} \;
@@ -360,7 +362,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
@@ -455,7 +459,7 @@ rm -rf %{buildroot}
 %_bindir/condor_transfer_data
 %_bindir/condor_check_userlogs
 %_bindir/condor_q
-%_bindir/condor_transferer
+%_sbindir/condor_transferer
 %_bindir/condor_cod
 %_bindir/condor_qedit
 %_bindir/condor_userlog
@@ -518,8 +522,10 @@ rm -rf %{buildroot}
 %defattr(-,condor,condor,-)
 %dir %_var/lib/condor/
 %dir %_var/lib/condor/execute/
-%dir %_var/lib/condor/log/
+%dir %_var/log/condor/
 %dir %_var/lib/condor/spool/
+%dir %_var/lock/condor/
+%dir %_var/run/condor/
 
 
 #%files static
@@ -550,7 +556,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
 
@@ -573,6 +579,8 @@ fi
 * Fri Aug 28 2009  <matt at redhat> - 7.2.4-1
 - Upgrade to 7.2.4 release
 - Removed gcc44_const.patch, accepted upstream
+- New log, lock, run locations (BZ502175)
+- Filtered innocuous semanage message
 
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 7.2.1-3
 - rebuilt with new openssl