rpms/condor/F-10 no_basename.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 condor.spec, 1.13, 1.14 generate-tarball.sh, 1.3, 1.4 sources, 1.6, 1.7
Matthew Farrellee
matt at fedoraproject.org
Thu May 21 17:48:03 UTC 2009
Author: matt
Update of /cvs/pkgs/rpms/condor/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17445
Modified Files:
.cvsignore condor.spec generate-tarball.sh sources
Added Files:
no_basename.patch
Log Message:
7.2.3, for scratch build
no_basename.patch:
--- NEW FILE no_basename.patch ---
diff --git a/src/condor_includes/basename.h b/src/condor_includes/basename.h
index 923cc73..028411d 100644
--- a/src/condor_includes/basename.h
+++ b/src/condor_includes/basename.h
@@ -64,18 +64,6 @@ char* condor_dirname( const char* path );
char* condor_url_dirname( const char* path );
/*
- DEPRECATED: because of non-const return value.
-
- A basename() function that is happy on both Unix and NT.
- It returns a pointer to the last element of the path it was given,
- or the whole string, if there are no directory delimiters. There's
- no memory allocated, overwritten or changed in anyway.
- PLEASE treat the return value as a _const_ char *!!! It's only
- declared char * to avoid conflict with the system basename() declaration.
-*/
-/* const*/ char* basename( const char* path );
-
-/*
DEPRECATED: just in case we need changes along the lines of
condor_basename() some time in the future.
diff --git a/src/condor_util_lib/basename.c b/src/condor_util_lib/basename.c
index 8e1777c..ef71545 100644
--- a/src/condor_util_lib/basename.c
+++ b/src/condor_util_lib/basename.c
@@ -127,23 +127,6 @@ condor_url_dirname(const char *path)
}
/*
- DEPRECATED: because of non-const return value.
-
- A basename() function that is happy on both Unix and NT.
- It returns a pointer to the last element of the path it was given,
- or the whole string, if there are no directory delimiters. There's
- no memory allocated, overwritten or changed in anyway.
- PLEASE treat the return value as a _const_ char *!!! It's only
- declared char * to avoid conflict with the system basename() declaration.
-*/
-#if 0
-/* const*/ char*
- basename( const char* path ) {
- return (char *)condor_basename( path );
-}
-#endif
-
-/*
DEPRECATED: just in case we need changes along the lines of
condor_basename() some time in the future.
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/condor/F-10/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore 24 Feb 2009 13:48:43 -0000 1.6
+++ .cvsignore 21 May 2009 17:47:32 -0000 1.7
@@ -1 +1 @@
-condor-7.2.1-133382-RH.tar.gz
+condor-7.2.3-151729-RH.tar.gz
Index: condor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/condor/F-10/condor.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- condor.spec 24 Feb 2009 13:48:43 -0000 1.13
+++ condor.spec 21 May 2009 17:47:32 -0000 1.14
@@ -1,6 +1,6 @@
Summary: Condor: High Throughput Computing
Name: condor
-Version: 7.2.1
+Version: 7.2.3
Release: 1%{?dist}
License: ASL 2.0
Group: Applications/System
@@ -20,13 +20,14 @@ URL: http://www.cs.wisc.edu/condor/
# a2dd96ea537b2c6d105b6c8dad563ddc condor_src-7.2.0-all-all.tar.gz
# edbac8267130ac0a0e016d0f113b4616 condor_src-7.2.1-all-all.tar.gz
# Note: The md5sum of each generated tarball may be different
-Source0: condor-7.2.1-133382-RH.tar.gz
+Source0: condor-7.2.3-151729-RH.tar.gz
Source1: generate-tarball.sh
Source2: NOTICE.txt
Patch0: condor_config.generic.patch
Patch1: stdsoap2.h.patch.patch
Patch3: chkconfig_off.patch
Patch4: no_rpmdb_query.patch
+Patch5: no_basename.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -111,6 +112,7 @@ cp %{SOURCE2} .
%patch1 -p1
%patch3 -p1
%patch4 -p1
+%patch5 -p1
# fix errant execute permissions
find src -perm /a+x -type f -name "*.[Cch]" -exec chmod a-x {} \;
@@ -452,7 +454,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
@@ -567,6 +569,9 @@ fi
%changelog
+* Wed May 20 2009 <matt at redhat> - 7.2.3-1
+- Upgraded to 7.2.3 release
+
* Mon Feb 23 2009 <matt at redhat> - 7.2.1-1
- Upgraded to 7.2.1 release
- Pruned changes accepted upstream from condor_config.generic.patch
Index: generate-tarball.sh
===================================================================
RCS file: /cvs/pkgs/rpms/condor/F-10/generate-tarball.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- generate-tarball.sh 7 Jan 2009 18:51:15 -0000 1.3
+++ generate-tarball.sh 21 May 2009 17:47:32 -0000 1.4
@@ -27,7 +27,6 @@ for f in \
src/condor_mail \
src/condor_vm-gahp/cygwin1.dll \
src/condor_vm-gahp/mkisofs.exe \
- config/CONDOR_TEST_LRG \
src/condor_tests/job_vmu_basic.sh \
src/condor_tests/job_vmu_cdrom.run \
src/condor_tests/job_vmu_cdrom.sh \
@@ -40,12 +39,9 @@ for f in \
src/condor_tests/x_vm_utils.pm \
src/condor_tests/x_param.vmware \
src/condor_tests/x_vmware_test_vm.cmd \
- src/condor_tests/x_vmware_test_vm.tar.gz \
src/condor_tests/x_vmware_configpostsrc \
- config/CONDOR_TEST_CNFDTL \
src/condor_tests/job_ligo_x86-64-chkpttst.cmd \
src/condor_tests/job_ligo_x86-64-chkpttst.run \
- src/condor_tests/x_job_ligo_x86-64-chkpttst.tar.gz \
src/condor_tests/job_quill_basic.cmd \
src/condor_tests/job_quill_basic.pl \
src/condor_tests/job_quill_basic.run \
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/condor/F-10/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources 24 Feb 2009 13:48:43 -0000 1.6
+++ sources 21 May 2009 17:47:32 -0000 1.7
@@ -1 +1 @@
-f7d83158bcee6a44fd4dbd9e9d8cb751 condor-7.2.1-133382-RH.tar.gz
+5b41a510e1902fc0b4c88be896503d28 condor-7.2.3-151729-RH.tar.gz
More information about the scm-commits
mailing list