rpms/condor/F-9 better-analyze-everywhere.patch, NONE, 1.1 condor_config.generic.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 condor.spec, 1.3, 1.4 generate-tarball.sh, 1.1, 1.2 sources, 1.2, 1.3 f9_gcc_detection.patch, 1.1, NONE f9_glibc_detection.patch, 1.1, NONE isolate-gsoap-linking.patch, 1.1, NONE lsb_init.patch, 1.2, NONE
Matthew Farrellee (matt)
fedora-extras-commits at redhat.com
Wed Jun 11 13:37:20 UTC 2008
- Previous message (by thread): rpms/bogofilter/F-7 .cvsignore, 1.5, 1.6 bogofilter.spec, 1.4, 1.5 sources, 1.5, 1.6
- Next message (by thread): rpms/m2crypto/devel m2crypto-0.18.2-inspect.patch, 1.1, 1.2 m2crypto.spec, 1.42, 1.43
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: matt
Update of /cvs/pkgs/rpms/condor/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14080
Modified Files:
.cvsignore condor.spec generate-tarball.sh sources
Added Files:
better-analyze-everywhere.patch condor_config.generic.patch
Removed Files:
f9_gcc_detection.patch f9_glibc_detection.patch
isolate-gsoap-linking.patch lsb_init.patch
Log Message:
Update to 7.0.2 source
better-analyze-everywhere.patch:
--- NEW FILE better-analyze-everywhere.patch ---
diff --git a/src/aclocal.m4 b/src/aclocal.m4
index 24542d2..3fb2c83 100644
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -243,6 +243,38 @@ AC_DEFUN([MF_LIB_CHECK],
CFLAGS="$_cflags_save"])
[cv_ext_]m4_tolower($1)[=yes])])
+#
+## THIS SHOULD WORK, BUT DOESN'T! FOR SOME REASON AC_CHECK_HEADER DOES
+## NOT BEHAVE LIKE AC_CHECK_LIB
+#
+# MF_HEADER_CHECK(name,
+# header)
+#
+# This is a useful function that can be provided as a test to
+# CHECK_EXTERNAL. It checks for a header file to determine if the
+# external is available.
+#
+# Arguments:
+# * name: The externals name
+# * header: A header file to test for,
+# e.g. [classad/classad_distribution.h]
+#
+# Results:
+# * cv_ext_<name> set to yes, if the header is found
+# no, otherwise
+#
+# Note: This function uses _dir if it is set. It should be set to a
+# path that includes a lib/ and include/ directory.
+#
+AC_DEFUN([MF_HEADER_CHECK],
+ [_cflags_save="$CFLAGS"
+ AS_IF([test "x$_dir" != x],
+ [CFLAGS="$CFLAGS -I$_dir/include"])
+ AC_CHECK_HEADER([$2],
+ [cv_ext_]m4_tolower($1)[=yes],
+ [cv_ext_]m4_tolower($1)[=no
+ CFLAGS="$_cflags_save"
+ AC_MSG_WARN([$1: could not find $2])])])
#######################################################################
# CONDOR_EXTERNAL_VERSION written by Derek Wright
diff --git a/src/configure.ac b/src/configure.ac
index d20ca4d..599e277 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -2392,7 +2392,10 @@ CHECK_EXTERNAL([zlib], [1.2.3], [$_cv_zlib_requirement],
[use zlib (provides compression support)],
MF_LIB_CHECK([zlib], [[z deflate]]))
-CHECK_EXTERNAL([classads], [1.0rc5], [soft])
+CHECK_EXTERNAL([classads], [1.0rc5], [soft],
+ [use new ClassAds (provides -better-analyze and more)],
+ # This REALLY should test for headers, like most checks...
+ MF_LIB_CHECK([classads], [[classad cclassad_create]]))
CHECK_EXTERNAL([srb], [3.2.1], [soft])
condor_config.generic.patch:
--- NEW FILE condor_config.generic.patch ---
diff --git a/src/condor_examples/condor_config.generic b/src/condor_examples/condor_config.generic
index 81af317..a8a8335 100644
--- a/src/condor_examples/condor_config.generic
+++ b/src/condor_examples/condor_config.generic
@@ -58,12 +58,12 @@ CONDOR_HOST = central-manager-hostname.your.domain
## Pathnames:
##--------------------------------------------------------------------
## Where have you installed the bin, sbin and lib condor directories?
-RELEASE_DIR = /usr/local/condor
+RELEASE_DIR = /usr
## Where is the local condor directory for each host?
## This is where the local config file(s), logs and
## spool/execute directories are located
-LOCAL_DIR = $(TILDE)
+LOCAL_DIR = /var/lib/condor
#LOCAL_DIR = $(RELEASE_DIR)/hosts/$(HOSTNAME)
## Where is the machine-specific local config file for each host?
@@ -859,10 +859,10 @@ LOG = $(LOCAL_DIR)/log
SPOOL = $(LOCAL_DIR)/spool
EXECUTE = $(LOCAL_DIR)/execute
BIN = $(RELEASE_DIR)/bin
-LIB = $(RELEASE_DIR)/lib
-INCLUDE = $(RELEASE_DIR)/include
+LIB = $(RELEASE_DIR)/share/condor
+INCLUDE = $(RELEASE_DIR)/include/condor
SBIN = $(RELEASE_DIR)/sbin
-LIBEXEC = $(RELEASE_DIR)/libexec
+LIBEXEC = $(RELEASE_DIR)/libexec/condor
## If you leave HISTORY undefined (comment it out), no history file
## will be created.
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/condor/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 11 Feb 2008 19:57:27 -0000 1.2
+++ .cvsignore 11 Jun 2008 13:36:39 -0000 1.3
@@ -1 +1 @@
-condor-7.0.0-72173-1-RH.tar.gz
+condor-7.0.2-89891-RH.tar.gz
Index: condor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/condor/F-9/condor.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- condor.spec 8 Apr 2008 04:14:43 -0000 1.3
+++ condor.spec 11 Jun 2008 13:36:39 -0000 1.4
@@ -1,7 +1,7 @@
Summary: Condor: High Throughput Computing
Name: condor
-Version: 7.0.0
-Release: 8%{?dist}
+Version: 7.0.2
+Release: 1%{?dist}
License: ASL 2.0
Group: Applications/System
URL: http://www.cs.wisc.edu/condor/
@@ -11,16 +11,15 @@
# click-through license. Once you have downloaded the source from:
# http://parrot.cs.wisc.edu/v7.0.license.html
# you should process it with generate-tarball.sh:
-# ./generate-tarball.sh 7.0.0
+# ./generate-tarball.sh 7.0.2
# MD5Sum of upstream source:
# 06eec3ae274b66d233ad050a047f3c91 condor_src-7.0.0-all-all.tar.gz
+# b08743cfa2e87adbcda042896e8ef537 condor_src-7.0.2-all-all.tar.gz
# Note: The md5sum of each generated tarball may be different
-Source0: condor-7.0.0-72173-1-RH.tar.gz
+Source0: condor-7.0.2-89891-RH.tar.gz
Source1: generate-tarball.sh
-Patch0: lsb_init.patch
-Patch1: f9_gcc_detection.patch
-Patch2: f9_glibc_detection.patch
-Patch3: isolate-gsoap-linking.patch
+Patch0: condor_config.generic.patch
+Patch1: better-analyze-everywhere.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -36,6 +35,7 @@
BuildRequires: bind-utils
BuildRequires: m4
BuildRequires: autoconf
+BuildRequires: classads-devel
Requires: pcre
Requires: postgresql-libs
@@ -43,6 +43,7 @@
Requires: krb5-libs
Requires: gsoap >= 2.7.10-2
Requires: mailx
+Requires: classads
Requires(pre): shadow-utils
@@ -86,22 +87,15 @@
%prep
%setup -q -n %{name}-%{version}
+
%patch0 -p1
%patch1 -p1
-%patch2 -p1
-%patch3 -p1
# fix errant execute permissions
find src -perm /a+x -type f -name "*.[Cch]" -exec chmod a-x {} \;
%build
-# site.def still lives, unfortunately, so we need to update it properly
-sed -e "s:^#define Top .*:#define Top $PWD/..:" \
- $PWD/config/site.def \
- > $PWD/config/site.def-
-mv $PWD/config/site.def- $PWD/config/site.def
-
# set USE_OLD_IMAKE to anything so condor_imake will use the system
# installed imake instead of building its own
USE_OLD_IMAKE=YES
@@ -113,11 +107,11 @@
%define optflags %(rpm --eval '%%optflags' | sed 's|-O2||g')
cd src
-# Must regenerate configure script from configure.ac because of F9 GCC
-# Detection and F9 GLIBC Detection patches
-autoheader && autoconf
-%configure --with-proper \
- --without-full-port \
+./build_init
+%configure --enable-proper \
+ --disable-full-port \
+ --disable-gcc-version-check \
+ --disable-glibc-version-check \
--disable-static \
--disable-rpm \
--without-zlib \
@@ -125,6 +119,7 @@
--with-krb5 \
--with-postgresql \
--with-gsoap \
+ --with-classads \
--with-man=$PWD/../externals/bundles/man/current
# SMP_NUM_JOBS must be set properly to pass -j to make
@@ -148,8 +143,8 @@
# make public creates release tarballs which we will install
cd public/v7.0
-gzip -cd condor-7.0.0-*-dynamic-unstripped.tar.gz | tar x
-cd condor-7.0.0
+gzip -cd condor-%{version}-*-dynamic-unstripped.tar.gz | tar x
+cd condor-%{version}
PREFIX=%{buildroot}/install
mkdir -p $PREFIX
./condor_configure --install \
@@ -159,15 +154,12 @@
# condor_configure does not write a perfect config file, and it throws
# in some absolute paths, so we need to fix it up a bit
-sed -e "s:^RELEASE_DIR.*=.*:RELEASE_DIR = /usr:" \
- -e "s:^LOCAL_CONFIG_FILE.*=.*:LOCAL_CONFIG_FILE = /var/lib/condor/condor_config.local:" \
- -e "s:^LOCAL_DIR.*=.*:LOCAL_DIR = /var/lib/condor:" \
- -e "s:^LIB\W.*=.*:LIB = \$(RELEASE_DIR)/share/condor:" \
- -e "s:^INCLUDE.*=.*:INCLUDE = \$(RELEASE_DIR)/include/condor:" \
+sed -e "s:^LOCAL_CONFIG_FILE.*=.*:LOCAL_CONFIG_FILE = /var/lib/condor/condor_config.local:" \
-e "s:^LIBEXEC.*=.*:LIBEXEC = \$(RELEASE_DIR)/libexec/condor:" \
-e "s:^PERIODIC_EXPR_INTERVAL.*=.*:PERIODIC_EXPR_INTERVAL = 15:" \
-e "s:^UID_DOMAIN.*=.*:UID_DOMAIN = \$(FULL_HOSTNAME):" \
-e "s:^FILESYSTEM_DOMAIN.*=.*:FILESYSTEM_DOMAIN = \$(FULL_HOSTNAME):" \
+ -e "s:^HOSTALLOW_WRITE =.*:HOSTALLOW_WRITE = \$(FULL_HOSTNAME):" \
$PREFIX/etc/condor_config \
> $PREFIX/etc/condor_config-
mv $PREFIX/etc/condor_config- $PREFIX/etc/condor_config
@@ -179,6 +171,8 @@
-e "s:^CONDOR_ADMIN.*=.*:CONDOR_ADMIN = condor at localhost:" \
-e "s:^COLLECTOR_NAME.*=.*:COLLECTOR_NAME = Personal Condor:" \
-e "s:^CONDOR_IDS.*=.*:#CONDOR_IDS = NO_DEFAULT:" \
+ -e "s:^UID_DOMAIN.*=.*:#UID_DOMAIN =:" \
+ -e "s:^FILESYSTEM_DOMAIN.*=.*:#FILESYSTEM_DOMAIN =:" \
$PREFIX/local_dir/condor_config.local \
> $PREFIX/local_dir/condor_config.local-
mv $PREFIX/local_dir/condor_config.local- $PREFIX/local_dir/condor_config.local
@@ -223,7 +217,7 @@
populate %_var/lib/condor $PREFIX/local_dir/*
# install the lsb init script
-install -Dp -m0755 ../../../condor.init %buildroot/%_initrddir/condor
+install -Dp -m0755 $PREFIX/etc/examples/condor.init %buildroot/%_initrddir/condor
# we must place the config examples in builddir so %doc can find them
mv $PREFIX/etc/examples %_builddir/%name-%version
@@ -264,6 +258,7 @@
%_datadir/condor/webservice/condorDbmsd.wsdl
%_datadir/condor/webservice/condorDcskel.wsdl
%_datadir/condor/webservice/condorEventd.wsdl
+%_datadir/condor/webservice/condorGridmanager.wsdl
%_datadir/condor/webservice/condorHad.wsdl
%_datadir/condor/webservice/condorMaster.wsdl
%_datadir/condor/webservice/condorNegotiator.wsdl
@@ -277,15 +272,27 @@
%_libexecdir/condor/condor_chirp
%_libexecdir/condor/condor_ssh
%_libexecdir/condor/sshd.sh
+%_libexecdir/condor/condor_ckpt_probe
+%_libexecdir/condor/gridftp_wrapper.sh
%_mandir/man1/condor_advertise.1.gz
%_mandir/man1/condor_checkpoint.1.gz
+%_mandir/man1/condor_check_userlogs.1.gz
+%_mandir/man1/condor_chirp.1.gz
+%_mandir/man1/condor_cod.1.gz
+%_mandir/man1/condor_cold_start.1.gz
+%_mandir/man1/condor_cold_stop.1.gz
%_mandir/man1/condor_compile.1.gz
+%_mandir/man1/condor_config_bind.1.gz
+%_mandir/man1/condor_convert_history.1.gz
%_mandir/man1/condor_configure.1.gz
%_mandir/man1/condor_config_val.1.gz
+%_mandir/man1/condor_dagman.1.gz
+%_mandir/man1/condor_fetchlog.1.gz
%_mandir/man1/condor_findhost.1.gz
%_mandir/man1/condor_glidein.1.gz
%_mandir/man1/condor_history.1.gz
%_mandir/man1/condor_hold.1.gz
+%_mandir/man1/condor_load_history.1.gz
%_mandir/man1/condor_master.1.gz
%_mandir/man1/condor_master_off.1.gz
%_mandir/man1/condor_off.1.gz
@@ -306,13 +313,17 @@
%_mandir/man1/condor_store_cred.1.gz
%_mandir/man1/condor_submit.1.gz
%_mandir/man1/condor_submit_dag.1.gz
+%_mandir/man1/condor_transfer_data.1.gz
%_mandir/man1/condor_updates_stats.1.gz
%_mandir/man1/condor_userlog.1.gz
%_mandir/man1/condor_userprio.1.gz
%_mandir/man1/condor_vacate.1.gz
%_mandir/man1/condor_vacate_job.1.gz
+%_mandir/man1/condor_version.1.gz
+%_mandir/man1/condor_wait.1.gz
# bin/condor is a link for checkpoint, reschedule, vacate
%_bindir/condor
+%_bindir/condor_glidein
%_bindir/condor_load_history
%_bindir/condor_submit_dag
%_bindir/condor_checkpoint
@@ -395,6 +406,10 @@
%_sbindir/filelock_midwife
%_sbindir/filelock_undertaker
%_sbindir/install_release
+%_sbindir/condor_gridmanager
+%_sbindir/grid_monitor.sh
+%_sbindir/gt4_gahp
+%_sbindir/unicore_gahp
# sbin/uniq_pid_command is a link for uniq_pid_midwife/undertaker
%_sbindir/uniq_pid_midwife
%_sbindir/uniq_pid_undertaker
@@ -443,6 +458,12 @@
%changelog
+* Tue Jun 10 2008 <mfarrellee at redhat> - 7.0.2-1
+- Updated to 7.0.2 source
+- Updated config, specifically HOSTALLOW_WRITE, for Personal Condor setup
+- Added condor_config.generic, better-analyze-everywhere patch
+- Added classads dependency for -better-analyze
+
* Mon Apr 7 2008 <mfarrellee at redhat> - 7.0.0-8
- Modified init script to be off by default, resolves bz441279
Index: generate-tarball.sh
===================================================================
RCS file: /cvs/pkgs/rpms/condor/F-9/generate-tarball.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- generate-tarball.sh 11 Feb 2008 19:57:27 -0000 1.1
+++ generate-tarball.sh 11 Jun 2008 13:36:39 -0000 1.2
@@ -12,7 +12,7 @@
echo "...extracting $input"
tar xzf $input
-cd condor_src-$1
+cd condor-$1
if [ ! -f BUILD-ID ] ; then
build="UNKNOWN"
@@ -32,7 +32,6 @@
echo "...creating condor-$1-$build-RH.tar.gz"
cd ..
-mv condor_src-$1 condor-$1
tar czfsp condor-$1-$build-RH.tar.gz condor-$1
echo "...cleaning up"
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/condor/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 11 Feb 2008 19:57:27 -0000 1.2
+++ sources 11 Jun 2008 13:36:39 -0000 1.3
@@ -1 +1 @@
-03d18e28ce41e5ada437ca3e1713b237 condor-7.0.0-72173-1-RH.tar.gz
+ed525a4464cb5e260eab359b16d19006 condor-7.0.2-89891-RH.tar.gz
--- f9_gcc_detection.patch DELETED ---
--- f9_glibc_detection.patch DELETED ---
--- isolate-gsoap-linking.patch DELETED ---
--- lsb_init.patch DELETED ---
- Previous message (by thread): rpms/bogofilter/F-7 .cvsignore, 1.5, 1.6 bogofilter.spec, 1.4, 1.5 sources, 1.5, 1.6
- Next message (by thread): rpms/m2crypto/devel m2crypto-0.18.2-inspect.patch, 1.1, 1.2 m2crypto.spec, 1.42, 1.43
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list