rpms/condor/devel no_basename.patch,NONE,1.1 condor.spec,1.15,1.16

[Matthew Farrellee]

Author: matt

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

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

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: condor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/condor/devel/condor.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- condor.spec	24 Feb 2009 14:52:24 -0000	1.15
+++ condor.spec	24 Feb 2009 16:34:47 -0000	1.16
@@ -27,6 +27,7 @@
 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 @@
 %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 {} \;