[globus-common/el5: 5/5] Update to Globus Toolkit 6.0
Mattias Ellert
ellert at fedoraproject.org
Mon Sep 15 09:05:51 UTC 2014
commit 9fa14685534960334d5b5044f4e2d421d8cc0415
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date: Mon Sep 15 11:04:36 2014 +0200
Update to Globus Toolkit 6.0
- Drop GPT build system and GPT packaging metadata
- Enable checks
globus-common-doxygen.patch | 1279 +++++++++++++++++++++++++++++++++++++++++
globus-common-pkgconfig.patch | 14 +
globus-common.spec | 264 ++++-----
sources | 2 +-
4 files changed, 1398 insertions(+), 161 deletions(-)
---
diff --git a/globus-common-doxygen.patch b/globus-common-doxygen.patch
new file mode 100644
index 0000000..9e77fc6
--- /dev/null
+++ b/globus-common-doxygen.patch
@@ -0,0 +1,1279 @@
+diff --git a/library/Doxyfile.in b/library/Doxyfile.in
+index f3acd3d..91ea825 100644
+--- a/library/Doxyfile.in
++++ b/library/Doxyfile.in
+@@ -13,5 +13,5 @@ GENERATE_DEPRECATEDLIST= YES
+ INPUT = @top_srcdir@
+ RECURSIVE = YES
+ QUIET = YES
+-EXCLUDE_PATTERNS = version.h
+-PREDEFINED = DOXYGEN GLOBUS_DONT_DOCUMENT_INTERNAL
++EXCLUDE_PATTERNS = version.h test
++PREDEFINED = GLOBUS_DONT_DOCUMENT_INTERNAL DOXYGEN
+diff --git a/library/globus_args.h b/library/globus_args.h
+index d365c13..bf5281c 100644
+--- a/library/globus_args.h
++++ b/library/globus_args.h
+@@ -14,7 +14,10 @@
+ * limitations under the License.
+ */
+
+-/** @file globus_args.h Command-line Argument Parser */
++/**
++ * @file globus_args.h
++ * @brief Command-line Argument Parser
++ */
+
+ #ifndef GLOBUS_ARGS_H
+ #define GLOBUS_ARGS_H
+diff --git a/library/globus_callback.h b/library/globus_callback.h
+index 8d30bcb..74d1285 100644
+--- a/library/globus_callback.h
++++ b/library/globus_callback.h
+@@ -18,7 +18,8 @@
+ #define GLOBUS_CALLBACK_H
+
+ /**
+- * @file globus_callback.h Globus Callback API
++ * @file globus_callback.h
++ * @brief Globus Callback API
+ */
+
+ /**
+diff --git a/library/globus_common.h b/library/globus_common.h
+index ba0fe35..6d1d3e1 100644
+--- a/library/globus_common.h
++++ b/library/globus_common.h
+@@ -16,7 +16,8 @@
+ */
+
+ /**
+- * @file globus_common.h Headers common to all of Globus
++ * @file globus_common.h
++ * @brief Headers common to all of Globus
+ */
+
+ #if !defined(GLOBUS_INCLUDE_GLOBUS_COMMON_H)
+diff --git a/library/globus_common_include.h b/library/globus_common_include.h
+index 9d291d6..c489fcb 100644
+--- a/library/globus_common_include.h
++++ b/library/globus_common_include.h
+@@ -14,10 +14,11 @@
+ * limitations under the License.
+ */
+
+-/** @file globus_common_include.h Include System Headers */
+ /**
+- * Defines the macros and typedefs common to all globus_common
+- * components.
++ * @file globus_common_include.h
++ * @brief Include System Headers
++ *
++ * Defines the macros and typedefs common to all globus_common components.
+ */
+ #if !defined(GLOBUS_COMMON_INCLUDE_H)
+ #define GLOBUS_COMMON_INCLUDE_H 1
+diff --git a/library/globus_common_paths.c b/library/globus_common_paths.c
+index 253e4e3..dafdd32 100644
+--- a/library/globus_common_paths.c
++++ b/library/globus_common_paths.c
+@@ -14,7 +14,12 @@
+ * limitations under the License.
+ */
+
+-/** @file globus_common_paths.c Install and deploy path discovery functions */
++#ifndef GLOBUS_DONT_DOCUMENT_INTERNAL
++/**
++ * @file globus_common_paths.c
++ * @brief Install and deploy path discovery functions
++ */
++#endif /* GLOBUS_DONT_DOCUMENT_INTERNAL */
+
+ #include "globus_i_common_config.h"
+ #include "globus_common.h"
+diff --git a/library/globus_config.h b/library/globus_config.h
+index dcd5d76..090cc8d 100644
+--- a/library/globus_config.h
++++ b/library/globus_config.h
+@@ -14,7 +14,11 @@
+ * limitations under the License.
+ */
+
+-/** @file globus_config.h */
++/**
++ * @file globus_config.h
++ * @brief Globus Platform Configuration
++ */
++
+ #include <stdint.h>
+ #include <limits.h>
+
+diff --git a/library/globus_debug.h b/library/globus_debug.h
+index bad56c8..5339cdd 100644
+--- a/library/globus_debug.h
++++ b/library/globus_debug.h
+@@ -14,8 +14,11 @@
+ * limitations under the License.
+ */
+
++/**
++ * @file globus_debug.h
++ * @brief Debugging Routines
++ */
+
+-/** @file globus_debug.h Debugging Routines */
+ #ifndef GLOBUS_DEBUG_H
+ #define GLOBUS_DEBUG_H
+
+diff --git a/library/globus_error.h b/library/globus_error.h
+index c8a531c..5fbe513 100644
+--- a/library/globus_error.h
++++ b/library/globus_error.h
+@@ -14,7 +14,10 @@
+ * limitations under the License.
+ */
+
+-/** @file globus_error.h Globus Error Handling */
++/**
++ * @file globus_error.h
++ * @brief Globus Error Handling
++ */
+
+ #ifndef GLOBUS_ERROR_H
+ #define GLOBUS_ERROR_H
+diff --git a/library/globus_error_errno.c b/library/globus_error_errno.c
+index 85b52c3..70e4da2 100644
+--- a/library/globus_error_errno.c
++++ b/library/globus_error_errno.c
+@@ -17,12 +17,9 @@
+ #ifndef GLOBUS_DONT_DOCUMENT_INTERNAL
+ /**
+ * @file globus_error_errno.c
+- *
+- * $RCSfile$
+- * $Revision$
+- * $Date$
++ * @brief Globus Errno Error API
+ */
+-#endif
++#endif /* GLOBUS_DONT_DOCUMENT_INTERNAL */
+
+ #include "globus_error_errno.h"
+ #include "globus_i_error_generic.h"
+diff --git a/library/globus_error_errno.h b/library/globus_error_errno.h
+index 5653452..ba79dd7 100644
+--- a/library/globus_error_errno.h
++++ b/library/globus_error_errno.h
+@@ -14,7 +14,10 @@
+ * limitations under the License.
+ */
+
+-/** @file globus_error_errno.h */
++/**
++ * @file globus_error_errno.h
++ * @brief Globus Errno Error API
++ */
+
+ #ifndef GLOBUS_ERROR_ERRNO_H
+ #define GLOBUS_ERROR_ERRNO_H
+diff --git a/library/globus_error_generic.c b/library/globus_error_generic.c
+index 3a54b34..542b3c3 100644
+--- a/library/globus_error_generic.c
++++ b/library/globus_error_generic.c
+@@ -17,12 +17,9 @@
+ #ifndef GLOBUS_DONT_DOCUMENT_INTERNAL
+ /**
+ * @file globus_error_generic.c
+- *
+- * $RCSfile$
+- * $Revision$
+- * $Date$
++ * @brief Globus Error API
+ */
+-#endif
++#endif /* GLOBUS_DONT_DOCUMENT_INTERNAL */
+
+ #include "globus_object.h"
+ #include "globus_module.h"
+diff --git a/library/globus_error_generic.h b/library/globus_error_generic.h
+index 199c2b1..aef2d6a 100644
+--- a/library/globus_error_generic.h
++++ b/library/globus_error_generic.h
+@@ -14,7 +14,10 @@
+ * limitations under the License.
+ */
+
+-/** @file globus_error_generic.h Globus Error API */
++/**
++ * @file globus_error_generic.h
++ * @brief Globus Error API
++ */
+
+ #ifndef GLOBUS_ERROR_GENERIC_H
+ #define GLOBUS_ERROR_GENERIC_H
+diff --git a/library/globus_error_string.h b/library/globus_error_string.h
+index 7075eca..29f7c1d 100644
+--- a/library/globus_error_string.h
++++ b/library/globus_error_string.h
+@@ -13,7 +13,12 @@
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-/** @file globus_error_string.h Error Object Containing a String */
++
++/**
++ * @file globus_error_string.h
++ * @brief Error Object Containing a String
++ */
++
+ #ifndef GLOBUS_ERROR_STRING_H
+ #define GLOBUS_ERROR_STRING_H
+
+diff --git a/library/globus_extension.h b/library/globus_extension.h
+index 428b7e5..9b612e8 100644
+--- a/library/globus_extension.h
++++ b/library/globus_extension.h
+@@ -14,7 +14,11 @@
+ * limitations under the License.
+ */
+
+-/** @file globus_extension.h Globus Extension Modules */
++/**
++ * @file globus_extension.h
++ * @brief Globus Extension Modules
++ */
++
+ #ifndef GLOBUS_EXTENSION_H
+ #define GLOBUS_EXTENSION_H
+
+diff --git a/library/globus_fifo.h b/library/globus_fifo.h
+index 79b11e6..8c4203e 100644
+--- a/library/globus_fifo.h
++++ b/library/globus_fifo.h
+@@ -19,10 +19,10 @@
+
+ /**
+ * @file globus_fifo.h
++ * @brief Globus FIFO
+ *
+ * This file defines the globus_fifo_t type
+ * useful for queuing arbitrary data (via void-pointer)
+- *
+ */
+
+ /**
+diff --git a/library/globus_handle_table.c b/library/globus_handle_table.c
+index 30a0d8e..126bc52 100644
+--- a/library/globus_handle_table.c
++++ b/library/globus_handle_table.c
+@@ -14,7 +14,12 @@
+ * limitations under the License.
+ */
+
+-/** @file globus_handle_table.c A reference-counting handle table structure */
++#ifndef GLOBUS_DONT_DOCUMENT_INTERNAL
++/**
++ * @file globus_handle_table.c
++ * @brief A reference-counting handle table structure
++ */
++#endif /* GLOBUS_DONT_DOCUMENT_INTERNAL */
+
+ #include "globus_i_common_config.h"
+ #include "globus_handle_table.h"
+diff --git a/library/globus_handle_table.h b/library/globus_handle_table.h
+index be762e4..c89f340 100644
+--- a/library/globus_handle_table.h
++++ b/library/globus_handle_table.h
+@@ -14,7 +14,10 @@
+ * limitations under the License.
+ */
+
+-/** @file globus_handle_table.h Handle Table for Reference Counting Data */
++/**
++ * @file globus_handle_table.h
++ * @brief Handle Table for Reference Counting Data
++ */
+
+ /**
+ * @defgroup globus_handle_table Handle Table for Reference Counting Data
+diff --git a/library/globus_hashtable.h b/library/globus_hashtable.h
+index fa70d01..b9da631 100644
+--- a/library/globus_hashtable.h
++++ b/library/globus_hashtable.h
+@@ -14,8 +14,10 @@
+ * limitations under the License.
+ */
+
+-
+-/** @file globus_hashtable.h Hash Table */
++/**
++ * @file globus_hashtable.h
++ * @brief Hash Table
++ */
+
+ #ifndef GLOBUS_HASHTABLE_H
+ #define GLOBUS_HASHTABLE_H
+diff --git a/library/globus_i_error_errno.c b/library/globus_i_error_errno.c
+index ead362a..7db3af6 100644
+--- a/library/globus_i_error_errno.c
++++ b/library/globus_i_error_errno.c
+@@ -15,12 +15,12 @@
+ */
+
+ #ifndef GLOBUS_DONT_DOCUMENT_INTERNAL
++
+ /**
+ * @file globus_i_error_errno.c
+- * Globus Generic Error
++ * @brief Globus Generic Error
+ */
+
+-
+ #include "globus_error_errno.h"
+ #include "globus_libc.h"
+ #include "globus_object.h"
+diff --git a/library/globus_i_error_generic.c b/library/globus_i_error_generic.c
+index 4692dfd..a0720c8 100644
+--- a/library/globus_i_error_generic.c
++++ b/library/globus_i_error_generic.c
+@@ -15,16 +15,12 @@
+ */
+
+ #ifndef GLOBUS_DONT_DOCUMENT_INTERNAL
++
+ /**
+ * @file globus_i_error_generic.c
+- * Globus Generic Error
+- *
+- * $RCSfile$
+- * $Revision$
+- * $Date $
++ * @brief Globus Generic Error
+ */
+
+-
+ #include "globus_i_error_generic.h"
+ #include "globus_libc.h"
+ #include "globus_object.h"
+diff --git a/library/globus_i_error_generic.h b/library/globus_i_error_generic.h
+index e0a936c..29a7fee 100644
+--- a/library/globus_i_error_generic.h
++++ b/library/globus_i_error_generic.h
+@@ -19,7 +19,10 @@
+ #ifndef GLOBUS_I_ERROR_GENERIC_H
+ #define GLOBUS_I_ERROR_GENERIC_H
+
+-/** @file globus_i_error_generic.h Globus Generic Error */
++/**
++ * @file globus_i_error_generic.h
++ * @brief Globus Generic Error
++ */
+
+ #include "globus_common_include.h"
+
+diff --git a/library/globus_i_thread.h b/library/globus_i_thread.h
+index 22c0846..7ebd76e 100644
+--- a/library/globus_i_thread.h
++++ b/library/globus_i_thread.h
+@@ -14,7 +14,12 @@
+ * limitations under the License.
+ */
+
+-/** @file globus_i_thread.h Internal Macros for Globus threads library */
++#ifndef GLOBUS_DONT_DOCUMENT_INTERNAL
++
++/**
++ * @file globus_i_thread.h
++ * @brief Internal Macros for Globus threads library
++ */
+
+ #if !defined(GLOBUS_I_THREAD_H)
+ #define GLOBUS_I_THREAD_H 1
+@@ -91,3 +96,4 @@ int globus_i_thread_ignore_sigpipe(void);
+
+ #endif /* GLOBUS_INCLUDE_GLOBUS_I_THREAD */
+
++#endif /* GLOBUS_DONT_DOCUMENT_INTERNAL */
+diff --git a/library/globus_libc.c b/library/globus_libc.c
+index d967cd8..ecd1421 100644
+--- a/library/globus_libc.c
++++ b/library/globus_libc.c
+@@ -14,7 +14,12 @@
+ * limitations under the License.
+ */
+
+-/** @file globus_libc.c Thread-safe libc functions, largely obsolete */
++#ifndef GLOBUS_DONT_DOCUMENT_INTERNAL
++/**
++ * @file globus_libc.c
++ * @brief Thread-safe libc functions, largely obsolete
++ */
++#endif /* GLOBUS_DONT_DOCUMENT_INTERNAL */
+
+ /******************************************************************************
+ Include header files
+diff --git a/library/globus_libc.h b/library/globus_libc.h
+index 5a8cba4..b4386bd 100644
+--- a/library/globus_libc.h
++++ b/library/globus_libc.h
+@@ -14,7 +14,10 @@
+ * limitations under the License.
+ */
+
+-/** @file globus_libc.h Thread-safe libc macros, function prototypes */
++/**
++ * @file globus_libc.h
++ * @brief Thread-safe libc macros, function prototypes
++ */
+
+ #ifndef GLOBUS_LIBC_H
+ #define GLOBUS_LIBC_H 1
+diff --git a/library/globus_list.c b/library/globus_list.c
+index f8a62d5..2a49289 100644
+--- a/library/globus_list.c
++++ b/library/globus_list.c
+@@ -14,7 +14,12 @@
+ * limitations under the License.
+ */
+
+-/** @file globus_list.c Linked List Implementation */
++#ifndef GLOBUS_DONT_DOCUMENT_INTERNAL
++/**
++ * @file globus_list.c
++ * @brief Linked List Implementation
++ */
++#endif /* GLOBUS_DONT_DOCUMENT_INTERNAL */
+
+ #include "globus_common_include.h"
+ #include "globus_list.h"
+diff --git a/library/globus_list.h b/library/globus_list.h
+index 45890fd..f372313 100644
+--- a/library/globus_list.h
++++ b/library/globus_list.h
+@@ -14,7 +14,11 @@
+ * limitations under the License.
+ */
+
+-/** @file globus_list.h Linked List */
++/**
++ * @file globus_list.h
++ * @brief Linked List
++ */
++
+ /**
+ * @defgroup globus_list Linked List
+ * @ingroup globus_common
+diff --git a/library/globus_logging.h b/library/globus_logging.h
+index 127c27e..87cc859 100644
+--- a/library/globus_logging.h
++++ b/library/globus_logging.h
+@@ -14,7 +14,10 @@
+ * limitations under the License.
+ */
+
+-/** @file globus_logging.h Debug Logging */
++/**
++ * @file globus_logging.h
++ * @brief Debug Logging
++ */
+
+ #ifndef GLOBUS_LOGGING_H
+ #define GLOBUS_LOGGING_H 1
+diff --git a/library/globus_memory.c b/library/globus_memory.c
+index 5d26782..e5dbecc 100644
+--- a/library/globus_memory.c
++++ b/library/globus_memory.c
+@@ -14,7 +14,12 @@
+ * limitations under the License.
+ */
+
+-/** @file globus_memory.c Memory Pool Implementation */
++#ifndef GLOBUS_DONT_DOCUMENT_INTERNAL
++/**
++ * @file globus_memory.c
++ * @brief Memory Pool Implementation
++ */
++#endif /* GLOBUS_DONT_DOCUMENT_INTERNAL */
+
+ /******************************************************************************
+ Include header files
+diff --git a/library/globus_memory.h b/library/globus_memory.h
+index cbe99ef..2ac6958 100644
+--- a/library/globus_memory.h
++++ b/library/globus_memory.h
+@@ -14,7 +14,10 @@
+ * limitations under the License.
+ */
+
+-/** @file globus_memory.h Memory Pool */
++/**
++ * @file globus_memory.h
++ * @brief Memory Pool
++ */
+
+ #if !defined(GLOBUS_MEMORY_H)
+ #define GLOBUS_MEMORY_H
+diff --git a/library/globus_module.c b/library/globus_module.c
+index 42ccfc8..3ad314f 100644
+--- a/library/globus_module.c
++++ b/library/globus_module.c
+@@ -14,7 +14,12 @@
+ * limitations under the License.
+ */
+
+-/** @file globus_module.c Module Activation and Deactivation */
++#ifndef GLOBUS_DONT_DOCUMENT_INTERNAL
++/**
++ * @file globus_module.c
++ * @brief Module Activation and Deactivation
++ */
++#endif /* GLOBUS_DONT_DOCUMENT_INTERNAL */
+
+ /******************************************************************************
+ Include header files
+diff --git a/library/globus_module.h b/library/globus_module.h
+index 83ea8fc..563c08f 100644
+--- a/library/globus_module.h
++++ b/library/globus_module.h
+@@ -14,7 +14,10 @@
+ * limitations under the License.
+ */
+
+-/** @file globus_module.h Reference Counting Module Activation and Deactivation */
++/**
++ * @file globus_module.h
++ * @brief Reference Counting Module Activation and Deactivation
++ */
+
+ #if !defined(GLOBUS_MODULE_H)
+ #define GLOBUS_MODULE_H 1
+diff --git a/library/globus_object_cache.h b/library/globus_object_cache.h
+index 0324bfc..7c596ec 100644
+--- a/library/globus_object_cache.h
++++ b/library/globus_object_cache.h
+@@ -14,7 +14,10 @@
+ * limitations under the License.
+ */
+
+-/** @file globus_object_cache.h Object Cache */
++/**
++ * @file globus_object_cache.h
++ * @brief Object Cache
++ */
+
+ #ifndef GLOBUS_OBJECT_CACHE_H
+ #define GLOBUS_OBJECT_CACHE_H
+diff --git a/library/globus_options.h b/library/globus_options.h
+index ebf9d8b..2ba053a 100644
+--- a/library/globus_options.h
++++ b/library/globus_options.h
+@@ -14,7 +14,10 @@
+ * limitations under the License.
+ */
+
+-/** @file globus_options.h Command-Line Options Parser */
++/**
++ * @file globus_options.h
++ * @brief Command-Line Options Parser
++ */
+
+ #ifndef GLOBUS_OPTIONS_H
+ #define GLOBUS_OPTIONS_H 1
+diff --git a/library/globus_print.c b/library/globus_print.c
+index 6e29369..7522dc4 100644
+--- a/library/globus_print.c
++++ b/library/globus_print.c
+@@ -14,7 +14,12 @@
+ * limitations under the License.
+ */
+
+-/** @file globus_print.c Error- and status-reporting functions */
++#ifndef GLOBUS_DONT_DOCUMENT_INTERNAL
++
++/**
++ * @file globus_print.c
++ * @brief Error- and status-reporting functions
++ */
+
+ #include "globus_common_include.h"
+ #include "globus_print.h"
+@@ -287,3 +292,5 @@ globus_panic(
+ GLOBUS_DUMP_STACK();
+ abort();
+ }
++
++#endif /* GLOBUS_DONT_DOCUMENT_INTERNAL */
+diff --git a/library/globus_print.h b/library/globus_print.h
+index 0e196a8..15f92fb 100644
+--- a/library/globus_print.h
++++ b/library/globus_print.h
+@@ -14,7 +14,10 @@
+ * limitations under the License.
+ */
+
+-/** @file globus_print.h Error Message Printing */
++/**
++ * @file globus_print.h
++ * @brief Error Message Printing
++ */
+
+ #if !defined(GLOBUS_PRINT_H)
+ #define GLOBUS_PRINT_H 1
+diff --git a/library/globus_priority_q.h b/library/globus_priority_q.h
+index 5c4354d..001413f 100644
+--- a/library/globus_priority_q.h
++++ b/library/globus_priority_q.h
+@@ -14,7 +14,10 @@
+ * limitations under the License.
+ */
+
+-/** @file globus_priority_q.h Priority Queue */
++/**
++ * @file globus_priority_q.h
++ * @brief Priority Queue
++ */
+
+ #ifndef GLOBUS_PRIORITY_Q_H
+ #define GLOBUS_PRIORITY_Q_H
+diff --git a/library/globus_range_list.h b/library/globus_range_list.h
+index 78625da..bc2aae7 100644
+--- a/library/globus_range_list.h
++++ b/library/globus_range_list.h
+@@ -14,7 +14,10 @@
+ * limitations under the License.
+ */
+
+-/** @file globus_range_list.h Byte Range List */
++/**
++ * @file globus_range_list.h
++ * @brief Byte Range List
++ */
+
+ #ifndef GLOBUS_RANGE_LIST_H
+ #define GLOBUS_RANGE_LIST_H
+diff --git a/library/globus_release.h b/library/globus_release.h
+index 7888e78..a512456 100644
+--- a/library/globus_release.h
++++ b/library/globus_release.h
+@@ -14,7 +14,10 @@
+ * limitations under the License.
+ */
+
+-/** @file globus_release.h Relase Information */
++/**
++ * @file globus_release.h
++ * @brief Relase Information
++ */
+
+ #ifndef GLOBUS_RELEASE_H
+ #define GLOBUS_RELEASE_H
+diff --git a/library/globus_states.h b/library/globus_states.h
+index f26f0d2..304dec7 100644
+--- a/library/globus_states.h
++++ b/library/globus_states.h
+@@ -14,7 +14,10 @@
+ * limitations under the License.
+ */
+
+-/** @file globus_states.h State Machine */
++/**
++ * @file globus_states.h
++ * @brief State Machine
++ */
+
+ #if !defined(GLOBUS_STATES_H)
+ #define GLOBUS_STATES_H 1
+diff --git a/library/globus_strptime.h b/library/globus_strptime.h
+index c148bab..eac0c9d 100644
+--- a/library/globus_strptime.h
++++ b/library/globus_strptime.h
+@@ -14,7 +14,10 @@
+ * limitations under the License.
+ */
+
+-/** @file globus_strptime.h strptime */
++/**
++ * @file globus_strptime.h
++ * @brief strptime
++ */
+
+ #ifndef GLOBUS_STRPTIME_H
+ #define GLOBUS_STRPTIME_H 1
+diff --git a/library/globus_symboltable.h b/library/globus_symboltable.h
+index 0c3386e..a010efb 100644
+--- a/library/globus_symboltable.h
++++ b/library/globus_symboltable.h
+@@ -14,7 +14,10 @@
+ * limitations under the License.
+ */
+
+-/** @file globus_symboltable.h Lightweight Chaining Symboltable */
++/**
++ * @file globus_symboltable.h
++ * @brief Lightweight Chaining Symboltable
++ */
+
+ #ifndef GLOBUS_SYMBOLTABLE_H
+ #define GLOBUS_SYMBOLTABLE_H
+diff --git a/library/globus_thread.c b/library/globus_thread.c
+index 53df432..45b091a 100644
+--- a/library/globus_thread.c
++++ b/library/globus_thread.c
+@@ -14,14 +14,15 @@
+ * limitations under the License.
+ */
+
+-/*
+- * @file globus_thread.c Globus Threading Abstraction
+- *
+- * @details
++#ifndef GLOBUS_DONT_DOCUMENT_INTERNAL
++/**
++ * @file globus_thread.c
++ * @brief Globus Threading Abstraction
+ *
+ * Stubs for the Globus threads package, to be used when Globus has been
+ * configured not to use threads.
+ */
++#endif /* GLOBUS_DONT_DOCUMENT_INTERNAL */
+
+ #include "globus_i_common_config.h"
+ #include "globus_thread.h"
+diff --git a/library/globus_thread.h b/library/globus_thread.h
+index ae1b5f4..6e2933d 100644
+--- a/library/globus_thread.h
++++ b/library/globus_thread.h
+@@ -14,8 +14,9 @@
+ * limitations under the License.
+ */
+
+-/*
++/**
+ * @file globus_thread.h
++ * @brief Globus Threading Abstraction
+ *
+ * Globus threads package which can work with either pthreads or without
+ * threads, depending on runtime configuration
+diff --git a/library/globus_thread_common.c b/library/globus_thread_common.c
+index 8c934e5..73aa3ed 100644
+--- a/library/globus_thread_common.c
++++ b/library/globus_thread_common.c
+@@ -14,7 +14,12 @@
+ * limitations under the License.
+ */
+
+-/** @file globus_thread_common.c Thread Model-Indepent Functions */
++#ifndef GLOBUS_DONT_DOCUMENT_INTERNAL
++
++/**
++ * @file globus_thread_common.c
++ * @brief Thread Model-Indepent Functions
++ */
+
+ /******************************************************************************
+ Include header files
+@@ -471,4 +476,4 @@ globus_i_thread_ignore_sigpipe(void)
+
+ #endif
+
+-
++#endif /* GLOBUS_DONT_DOCUMENT_INTERNAL */
+diff --git a/library/globus_thread_common.h b/library/globus_thread_common.h
+index e8cbb27..36b5bc2 100644
+--- a/library/globus_thread_common.h
++++ b/library/globus_thread_common.h
+@@ -14,8 +14,9 @@
+ * limitations under the License.
+ */
+
+-/*
+- * @file globus_thread_common.h Common Thread Interface
++/**
++ * @file globus_thread_common.h
++ * @brief Common Thread Interface
+ */
+
+ #ifndef GLOBUS_THREAD_COMMON_H
+diff --git a/library/globus_thread_none.c b/library/globus_thread_none.c
+index 1d72b81..d4f60c9 100644
+--- a/library/globus_thread_none.c
++++ b/library/globus_thread_none.c
+@@ -14,7 +14,12 @@
+ * limitations under the License.
+ */
+
+-/** @file globus_thread_none.c Non-threaded stubs for the Globus Threads interface */
++#ifndef GLOBUS_DONT_DOCUMENT_INTERNAL
++/**
++ * @file globus_thread_none.c
++ * @brief Non-threaded stubs for the Globus Threads interface
++ */
++#endif /* GLOBUS_DONT_DOCUMENT_INTERNAL */
+
+ /******************************************************************************
+ Include header files
+diff --git a/library/globus_thread_pool.h b/library/globus_thread_pool.h
+index 00bb7d0..05cfb70 100644
+--- a/library/globus_thread_pool.h
++++ b/library/globus_thread_pool.h
+@@ -14,7 +14,10 @@
+ * limitations under the License.
+ */
+
+-/** @file globus_thread_pool.h Thread Pooling */
++/**
++ * @file globus_thread_pool.h
++ * @brief Thread Pooling
++ */
+
+ /**
+ * @defgroup globus_thread_pool Thread Pooling
+diff --git a/library/globus_thread_pthreads.c b/library/globus_thread_pthreads.c
+index 2f7979b..a9aeed3 100644
+--- a/library/globus_thread_pthreads.c
++++ b/library/globus_thread_pthreads.c
+@@ -14,7 +14,12 @@
+ * limitations under the License.
+ */
+
+-/** @file globus_thread_pthreads.c POSIX Threads Bindings */
++#ifndef GLOBUS_DONT_DOCUMENT_INTERNAL
++
++/**
++ * @file globus_thread_pthreads.c
++ * @brief POSIX Threads Bindings
++ */
+
+ #include "globus_i_common_config.h"
+ #include "globus_common.h"
+@@ -893,3 +898,5 @@ globus_l_pthread_get_impl(void)
+ return &globus_l_pthread_impl;
+ }
+ #endif /* _POSIX_THREADS */
++
++#endif /* GLOBUS_DONT_DOCUMENT_INTERNAL */
+diff --git a/library/globus_thread_rmutex.h b/library/globus_thread_rmutex.h
+index 410003c..5058d10 100644
+--- a/library/globus_thread_rmutex.h
++++ b/library/globus_thread_rmutex.h
+@@ -14,7 +14,10 @@
+ * limitations under the License.
+ */
+
+-/** @file globus_thread_rmutex.h Recursive Mutex */
++/**
++ * @file globus_thread_rmutex.h
++ * @brief Recursive Mutex
++ */
+
+ #ifndef GLOBUS_THREAD_RMUTEX_H
+ #define GLOBUS_THREAD_RMUTEX_H
+diff --git a/library/globus_thread_windows.c b/library/globus_thread_windows.c
+index af225b8..e6eede6 100644
+--- a/library/globus_thread_windows.c
++++ b/library/globus_thread_windows.c
+@@ -14,7 +14,12 @@
+ * limitations under the License.
+ */
+
+-/** @file globus_thread_windows.c Windows Threads Bindings */
++#ifndef GLOBUS_DONT_DOCUMENT_INTERNAL
++
++/**
++ * @file globus_thread_windows.c
++ * @brief Windows Threads Bindings
++ */
+
+ #include "globus_i_common_config.h"
+ #include "globus_thread.h"
+@@ -1016,3 +1021,4 @@ globus_l_winthread_get_impl(void)
+ return &globus_l_winthread_impl;
+ }
+
++#endif /* GLOBUS_DONT_DOCUMENT_INTERNAL */
+diff --git a/library/globus_tilde_expand.c b/library/globus_tilde_expand.c
+index a695926..96525d6 100644
+--- a/library/globus_tilde_expand.c
++++ b/library/globus_tilde_expand.c
+@@ -14,7 +14,12 @@
+ * limitations under the License.
+ */
+
+-/** @file globus_tilde_expand.c Expand ~ or ~user in path strings */
++#ifndef GLOBUS_DONT_DOCUMENT_INTERNAL
++/**
++ * @file globus_tilde_expand.c
++ * @brief Expand ~ or ~user in path strings
++ */
++#endif /* GLOBUS_DONT_DOCUMENT_INTERNAL */
+
+ /******************************************************************************
+ Include header files
+diff --git a/library/globus_tilde_expand.h b/library/globus_tilde_expand.h
+index ac4c6e1..e8c870f 100644
+--- a/library/globus_tilde_expand.h
++++ b/library/globus_tilde_expand.h
+@@ -14,7 +14,10 @@
+ * limitations under the License.
+ */
+
+-/** @file globus_tilde_expand.h Home Directory ~ expansion */
++/**
++ * @file globus_tilde_expand.h
++ * @brief Home Directory ~ expansion
++ */
+
+ #ifndef GLOBUS_TILDE_EXPAND_H
+ #define GLOBUS_TILDE_EXPAND_H 1
+diff --git a/library/globus_time.h b/library/globus_time.h
+index d45977c..4a362c8 100644
+--- a/library/globus_time.h
++++ b/library/globus_time.h
+@@ -14,7 +14,11 @@
+ * limitations under the License.
+ */
+
+-/** @file globus_time.h Time Types and Macros */
++/**
++ * @file globus_time.h
++ * @brief Time Types and Macros
++ */
++
+ #if !defined(GLOBUS_TIME_H)
+ #define GLOBUS_TIME_H
+
+diff --git a/library/globus_types.h b/library/globus_types.h
+index 3ada2c6..dae18a7 100644
+--- a/library/globus_types.h
++++ b/library/globus_types.h
+@@ -14,10 +14,13 @@
+ * limitations under the License.
+ */
+
+-/** @file globus_types.h Common Primitive Types
+- * Defines the macros and typedefs common to all globus_common
+- * components.
++/**
++ * @file globus_types.h
++ * @brief Common Primitive Types
++ *
++ * Defines the macros and typedefs common to all globus_common components.
+ */
++
+ #if !defined(GLOBUS_TYPES_H)
+ #define GLOBUS_TYPES_H 1
+
+diff --git a/library/globus_url.c b/library/globus_url.c
+index c286d3b..d4879c8 100644
+--- a/library/globus_url.c
++++ b/library/globus_url.c
+@@ -16,7 +16,8 @@
+
+ #ifndef GLOBUS_DONT_DOCUMENT_INTERNAL
+ /**
+- * @file globus_url.c Globus URL parsing utility functions
++ * @file globus_url.c
++ * @brief Globus URL parsing utility functions
+ *
+ * Parses URLs of the form
+ * @code
+@@ -27,7 +28,7 @@
+ * <scheme>://<scheme-specific-part>
+ * @endcode
+ */
+-#endif
++#endif /* GLOBUS_DONT_DOCUMENT_INTERNAL */
+
+ #include "globus_url.h"
+ #include "globus_libc.h"
+@@ -82,7 +83,7 @@ static int globusl_url_issafe(char x);
+ static int globusl_url_isextra(char x);
+ static int globusl_url_isscheme_special(char x);
+ static int globusl_url_isglob(char x);
+-#endif
++#endif /* GLOBUS_DONT_DOCUMENT_INTERNAL */
+
+ /**
+ * Parse a string containing a URL into a globus_url_t
+diff --git a/library/globus_url.h b/library/globus_url.h
+index 21695ab..8e09a1c 100644
+--- a/library/globus_url.h
++++ b/library/globus_url.h
+@@ -18,7 +18,8 @@
+ #define GLOBUS_URL_H
+
+ /**
+- * @file globus_url.h URL Parsing
++ * @file globus_url.h
++ * @brief URL Parsing
+ */
+
+ /**
+@@ -36,7 +37,7 @@ extern "C" {
+
+ /* Supported URL Schemes */
+ /**
+- * URL Schemes.
++ * @brief URL Schemes.
+ * @ingroup globus_url
+ *
+ * The Globus URL library supports a set of URL schemes (protocols). This
+@@ -76,7 +77,7 @@ typedef enum
+ */
+
+ /**
+- * Parsed URLs.
++ * @brief Parsed URLs.
+ * @ingroup globus_url
+ *
+ * This structure contains the fields which were parsed from an string
+diff --git a/library/globus_uuid.h b/library/globus_uuid.h
+index edc0d29..fc37adf 100644
+--- a/library/globus_uuid.h
++++ b/library/globus_uuid.h
+@@ -14,7 +14,11 @@
+ * limitations under the License.
+ */
+
+-/** @file globus_uuid.h Globus UUID Generator */
++/**
++ * @file globus_uuid.h
++ * @brief Globus UUID Generator
++ */
++
+ /**
+ * @defgroup globus_uuid Globus UUID Generator
+ * @ingroup globus_common
+diff --git a/test/error_test.c b/test/error_test.c
+index 714416a..c1ef28c 100644
+--- a/test/error_test.c
++++ b/test/error_test.c
+@@ -14,7 +14,10 @@
+ * limitations under the License.
+ */
+
+-/** @file error_test.c Error Object Tests */
++/**
++ * @file error_test.c
++ * @brief Error Object Tests
++ */
+
+ #include "globus_common.h"
+ #include "globus_test_tap.h"
+diff --git a/test/fifo_test.c b/test/fifo_test.c
+index 17b560f..57d5b46 100644
+--- a/test/fifo_test.c
++++ b/test/fifo_test.c
+@@ -15,9 +15,9 @@
+ */
+
+ /**
+- * @file fifo_test.c Test the globus_fifo_t implementation
++ * @file fifo_test.c
++ * @brief Test the globus_fifo_t implementation
+ * @author Michael Lebman
+- *
+ */
+
+ #include "globus_common.h"
+diff --git a/test/globus_test_tap.h b/test/globus_test_tap.h
+index 6585a65..74b20c1 100644
+--- a/test/globus_test_tap.h
++++ b/test/globus_test_tap.h
+@@ -1,7 +1,10 @@
+ #include <stdarg.h>
+ #include <stdio.h>
+
+-/** @file globus_test_tap.h Test Anything Protocol implementation */
++/**
++ * @file globus_test_tap.h
++ * @brief Test Anything Protocol implementation
++ */
+
+ static int total = 0;
+ static int failed = 0;
+diff --git a/test/globus_url_test.c b/test/globus_url_test.c
+index f49df42..2cd2835 100644
+--- a/test/globus_url_test.c
++++ b/test/globus_url_test.c
+@@ -14,7 +14,10 @@
+ * limitations under the License.
+ */
+
+-/** @file globus_url_test.c Tests for the Globus URL parser */
++/**
++ * @file globus_url_test.c
++ * @brief Tests for the Globus URL parser
++ */
+
+ #include "globus_common.h"
+ #include <stdio.h>
+diff --git a/test/handle_table_test.c b/test/handle_table_test.c
+index f8d6037..ca33fed 100644
+--- a/test/handle_table_test.c
++++ b/test/handle_table_test.c
+@@ -14,11 +14,10 @@
+ * limitations under the License.
+ */
+
+-/** @file handle_table_test.c
+- * Test the globus_handle_table_t data type
+- *
++/**
++ * @file handle_table_test.c
++ * @brief Test the globus_handle_table_t data type
+ * @author Michael Lebman
+- *
+ */
+
+ #include "globus_common.h"
+diff --git a/test/hash_test.c b/test/hash_test.c
+index ba54a1a..9b643c8 100644
+--- a/test/hash_test.c
++++ b/test/hash_test.c
+@@ -14,7 +14,10 @@
+ * limitations under the License.
+ */
+
+-/** @file hash_test.c Hashtable Test Cases*/
++/**
++ * @file hash_test.c
++ * @brief Hashtable Test Cases
++ */
+
+ #include "globus_common.h"
+ #include "globus_test_tap.h"
+diff --git a/test/list_test.c b/test/list_test.c
+index 13a34b6..63f511c 100755
+--- a/test/list_test.c
++++ b/test/list_test.c
+@@ -14,7 +14,11 @@
+ * limitations under the License.
+ */
+
+-/** @file list_test.c Globus List Test Cases*/
++/**
++ * @file list_test.c
++ * @brief Globus List Test Cases
++ */
++
+ #include "globus_common.h"
+ #include "globus_test_tap.h"
+
+diff --git a/test/memory_test.c b/test/memory_test.c
+index 88e7bfa..10e31df 100644
+--- a/test/memory_test.c
++++ b/test/memory_test.c
+@@ -14,7 +14,11 @@
+ * limitations under the License.
+ */
+
+-/** @file memory_test.c Test case for globus_memory_t */
++/**
++ * @file memory_test.c
++ * @brief Test case for globus_memory_t
++ */
++
+ #include "globus_common.h"
+ #include "globus_thread_common.h"
+
+diff --git a/test/module_test.c b/test/module_test.c
+index 72a711d..4505c71 100644
+--- a/test/module_test.c
++++ b/test/module_test.c
+@@ -14,7 +14,11 @@
+ * limitations under the License.
+ */
+
+-/** @file module_test.c Module Tests */
++/**
++ * @file module_test.c
++ * @brief Module Tests
++ */
++
+ #include "globus_common.h"
+ #include "globus_test_tap.h"
+
+diff --git a/test/off_t_test.c b/test/off_t_test.c
+index d8a1f99..42f0048 100644
+--- a/test/off_t_test.c
++++ b/test/off_t_test.c
+@@ -14,7 +14,11 @@
+ * limitations under the License.
+ */
+
+-/** @file off_t_test.c Test of globus_off_t */
++/**
++ * @file off_t_test.c
++ * @brief Test of globus_off_t
++ */
++
+ #include "globus_common.h"
+
+ /**
+diff --git a/test/strptime_test.c b/test/strptime_test.c
+index 4580a76..3afe65b 100644
+--- a/test/strptime_test.c
++++ b/test/strptime_test.c
+@@ -14,7 +14,10 @@
+ * limitations under the License.
+ */
+
+-/** @file strptime_test.c Test the functionality in globus_strptime.c */
++/**
++ * @file strptime_test.c
++ * @brief Test the functionality in globus_strptime.c
++ */
+
+ #include "globus_common.h"
+ #include "globus_test_tap.h"
+diff --git a/test/thread_test.c b/test/thread_test.c
+index 1b70150..c9ff65f 100644
+--- a/test/thread_test.c
++++ b/test/thread_test.c
+@@ -14,7 +14,10 @@
+ * limitations under the License.
+ */
+
+-/** @file thread_test.c Globus Thread Test */
++/**
++ * @file thread_test.c
++ * @brief Globus Thread Test
++ */
+
+ #include "globus_common.h"
+ #include "globus_test_tap.h"
+diff --git a/test/timedwait_test.c b/test/timedwait_test.c
+index 3b700d8..067277c 100644
+--- a/test/timedwait_test.c
++++ b/test/timedwait_test.c
+@@ -14,7 +14,11 @@
+ * limitations under the License.
+ */
+
+-/** @file timedwait_test.c globus_cond_timedwait() tests */
++/**
++ * @file timedwait_test.c
++ * @brief globus_cond_timedwait() tests
++ */
++
+ #include "globus_common.h"
+ #include "globus_test_tap.h"
+
+diff --git a/test/uuid_test.c b/test/uuid_test.c
+index aa7ae0d..883d693 100644
+--- a/test/uuid_test.c
++++ b/test/uuid_test.c
+@@ -14,7 +14,11 @@
+ * limitations under the License.
+ */
+
+-/** @file uuid_test.c UUID Test */
++/**
++ * @file uuid_test.c
++ * @brief UUID Test
++ */
++
+ #include "globus_common.h"
+ #include "globus_test_tap.h"
+
diff --git a/globus-common-pkgconfig.patch b/globus-common-pkgconfig.patch
new file mode 100644
index 0000000..6c42aae
--- /dev/null
+++ b/globus-common-pkgconfig.patch
@@ -0,0 +1,14 @@
+diff --git a/globus-common.pc.in b/globus-common.pc.in
+index 911e32a..ee9a90a 100644
+--- a/globus-common.pc.in
++++ b/globus-common.pc.in
+@@ -8,6 +8,6 @@ thread_models=@thread_models@
+ Name: globus-common
+ Description: Globus Toolkit - Common Library
+ Version: @PACKAGE_VERSION@
+-Libs: @LDFLAGS@ -L${libdir} -lglobus_common
+-Libs.private: @LIBS@
+-Cflags: @LARGEFILE_CFLAGS@ @CFLAGS@ -I${includedir}
++Libs: -L${libdir} -lglobus_common
++Libs.private: @LIBS@
++Cflags: @LARGEFILE_CFLAGS@ -I${includedir}
diff --git a/globus-common.spec b/globus-common.spec
index 4b95274..c0af7d1 100644
--- a/globus-common.spec
+++ b/globus-common.spec
@@ -1,112 +1,76 @@
-%ifarch aarch64 alpha ia64 %{power64} s390x sparc64 x86_64
-%global flavor gcc64
-%else
-%global flavor gcc32
-%endif
-
-%{!?perl_vendorlib: %global perl_vendorlib %(eval "`perl -V:installvendorlib`"; echo $installvendorlib)}
-
%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
Name: globus-common
%global _name %(tr - _ <<< %{name})
-Version: 14.10
-Release: 6%{?dist}
+Version: 15.25
+Release: 1%{?dist}
Summary: Globus Toolkit - Common Library
Group: System Environment/Libraries
License: ASL 2.0
URL: http://www.globus.org/
-Source: http://www.globus.org/ftppub/gt5/5.2/5.2.5/packages/src/%{_name}-%{version}.tar.gz
+Source: http://www.globus.org/ftppub/gt6/packages/%{_name}-%{version}.tar.gz
# README file
Source8: GLOBUS-CCOMMONLIB
+# Don't add CFLAGS and LDFLAGS to pkg-config files
+Patch0: %{name}-pkgconfig.patch
+# Doxygen fixes
+Patch1: %{name}-doxygen.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
# Obsolete dropped packages from Globus Toolkit 4.2.1
-Obsoletes: globus-data-conversion
-Obsoletes: globus-mp
-Obsoletes: globus-nexus
-Obsoletes: globus-duct-common
-Obsoletes: globus-duct-control
-Obsoletes: globus-duroc-common
-Obsoletes: globus-duroc-control
+Obsoletes: globus-data-conversion < 3
+Obsoletes: globus-mp < 3
+Obsoletes: globus-nexus < 7
+Obsoletes: globus-duct-common < 3
+Obsoletes: globus-duct-control < 3
+Obsoletes: globus-duroc-common < 3
+Obsoletes: globus-duroc-control < 3
# Obsolete dropped packages from Globus Toolkit 5.2.0
-Provides: globus-libtool = 2
-Provides: globus-libtool%{?_isa} = 2
Obsoletes: globus-libtool < 2
-Provides: globus-openssl = 6
-Provides: globus-openssl%{?_isa} = 6
Obsoletes: globus-openssl < 6
-Provides: globus-libxml2 = 2
-Provides: globus-libxml2%{?_isa} = 2
Obsoletes: globus-libxml2 < 2
-BuildRequires: grid-packaging-tools >= 3.4
-BuildRequires: globus-core >= 8
-%if %{?fedora}%{!?fedora:0} >= 4 || %{?rhel}%{!?rhel:0} >= 5
+# Obsolete dropped packages from Globus Toolkit 6.0
+Obsoletes: globus-rls-client < 6
+Obsoletes: globus-rls-client-progs < 6
+Obsoletes: globus-rls-server < 5
+BuildRequires: pkgconfig
BuildRequires: libtool-ltdl-devel
-%else
-BuildRequires: libtool
-%endif
BuildRequires: doxygen
-BuildRequires: graphviz
-%if "%{?rhel}" == "5"
-BuildRequires: graphviz-gd
-%endif
-BuildRequires: ghostscript
-BuildRequires: tex(latex)
-%if %{?fedora}%{!?fedora:0} >= 18 || %{?rhel}%{!?rhel:0} >= 7
-BuildRequires: tex(fullpage.sty)
-BuildRequires: tex(multirow.sty)
-BuildRequires: tex(sectsty.sty)
-BuildRequires: tex(tocloft.sty)
-BuildRequires: tex(xtab.sty)
-BuildRequires: tex-ec
-BuildRequires: tex-courier
-BuildRequires: tex-helvetic
-BuildRequires: tex-times
-BuildRequires: tex-symbol
-BuildRequires: tex-rsfs
-%endif
%package progs
Summary: Globus Toolkit - Common Library Programs
Group: Applications/Internet
-# Keep providing globus-common-setup until it is not needed
-Provides: %{name}-setup = 2.6
Requires: %{name}%{?_isa} = %{version}-%{release}
# Obsolete dropped packages from Globus Toolkit 5.2.0
-Provides: globus-openssl-progs = 6
-Provides: globus-openssl-progs%{?_isa} = 6
Obsoletes: globus-openssl-progs < 6
%package devel
Summary: Globus Toolkit - Common Library Development Files
Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: %{name}-progs%{?_isa} = %{version}-%{release}
-Requires: globus-core%{?_isa} >= 8
+Requires: pkgconfig
+Requires: libtool-ltdl-devel
# Obsolete dropped packages from Globus Toolkit 4.2.1
-Obsoletes: globus-data-conversion-devel
-Obsoletes: globus-mp-devel
-Obsoletes: globus-nexus-devel
-Obsoletes: globus-duct-common-devel
-Obsoletes: globus-duct-control-devel
-Obsoletes: globus-duroc-common-devel
-Obsoletes: globus-duroc-control-devel
+Obsoletes: globus-data-conversion-devel < 3
+Obsoletes: globus-mp-devel < 3
+Obsoletes: globus-nexus-devel < 7
+Obsoletes: globus-duct-common-devel < 3
+Obsoletes: globus-duct-control-devel < 3
+Obsoletes: globus-duroc-common-devel < 3
+Obsoletes: globus-duroc-control-devel < 3
# Obsolete dropped packages from Globus Toolkit 5.2.0
-Provides: globus-libtool-devel = 2
-Provides: globus-libtool-devel%{?_isa} = 2
-Provides: pkgconfig(globus-libtool) = 2
Obsoletes: globus-libtool-devel < 2
-Provides: globus-openssl-devel = 6
-Provides: globus-openssl-devel%{?_isa} = 6
-Provides: pkgconfig(globus-openssl) = 6
Obsoletes: globus-openssl-devel < 6
-Provides: globus-libxml2-devel = 2
-Provides: globus-libxml2-devel%{?_isa} = 2
-Provides: pkgconfig(globus-libxml2) = 2
Obsoletes: globus-libxml2-devel < 2
+# Obsolete dropped packages from Globus Toolkit 6.0
+Obsoletes: grid-packaging-tools < 3.7
+Provides: globus-core = 9
+Provides: globus-core%{?_isa} = 9
+Obsoletes: globus-core < 9
+Obsoletes: globus-rls-client-devel < 6
+Obsoletes: globus-rls-client-doc < 6
%package doc
Summary: Globus Toolkit - Common Library Documentation Files
@@ -114,7 +78,6 @@ Group: Documentation
%if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6
BuildArch: noarch
%endif
-Requires: %{name} = %{version}-%{release}
%description
The Globus Toolkit is an open source software toolkit used for building Grid
@@ -154,31 +117,19 @@ Common Library Documentation Files
%prep
%setup -q -n %{_name}-%{version}
-
-# custom perl requires that removes dependency on gpt perl modules
-cat << EOF > %{name}-req
-#!/bin/sh
-%{__perl_requires} $* |\
-sed -e '/perl(Grid::GPT::.*)/d'
-EOF
-%global __perl_requires %{_builddir}/%{_name}-%{version}/%{name}-req
-chmod +x %{__perl_requires}
+%patch0 -p1
+%patch1 -p1
%build
-# Remove files that should be replaced during bootstrap
-rm -f doxygen/Doxyfile*
-rm -f doxygen/Makefile.am
-rm -f pkgdata/Makefile.am
-rm -f globus_automake*
-rm -rf autom4te.cache
-
-unset GLOBUS_LOCATION
-unset GPT_LOCATION
-%{_datadir}/globus/globus-bootstrap.sh
-
-export GLOBUS_VERSION=5.2.5
-%configure --disable-static --with-flavor=%{flavor} \
- --enable-doxygen --with-docdir=%{_pkgdocdir} \
+# Reduce overlinking
+export LDFLAGS="-Wl,--as-needed -Wl,-z,defs %{?__global_ldflags}"
+
+export GLOBUS_VERSION=6.0
+%configure --disable-static \
+ --includedir='${prefix}/include/globus' \
+ --libexecdir='${datadir}/globus' \
+ --docdir=%{_pkgdocdir} \
+ --with-perlmoduledir=%{perl_vendorlib} \
--with-backward-compatibility-hack
# Reduce overlinking
@@ -190,67 +141,25 @@ make %{?_smp_mflags}
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
-GLOBUSPACKAGEDIR=%{buildroot}%{_datadir}/globus/packages
-
-# These scripts are intended to be sourced, not executed
-chmod 644 %{buildroot}%{_datadir}/globus/globus-args-parser-header
-chmod 644 %{buildroot}%{_datadir}/globus/globus-script-initializer
-chmod 644 %{buildroot}%{_datadir}/globus/globus-sh-tools.sh
-
# Remove libtool archives (.la files)
-find %{buildroot}%{_libdir} -name 'libglobus_common.la' -exec rm -v '{}' \;
-sed '/libglobus_common.la$/d' \
- -i $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist
-
-# This library is opened using lt_dlopenext, so the libtool archive
-# (.la file) can not be removed - fix the libdir and clear dependency_libs
-# ... and move it to the main package
-for lib in `find %{buildroot}%{_libdir} -name 'libglobus_thread_*.la'` ; do
- sed -e "s!^libdir=.*!libdir=\'%{_libdir}\'!" \
- -e "s!^dependency_libs=.*!dependency_libs=\'\'!" -i $lib
-done
-grep 'libglobus_thread_.*\.la$' \
- $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist \
- >> $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist
-sed '/libglobus_thread_.*\.la$/d' \
- -i $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist
-
-# Move globus-makefile-header to devel package
-grep globus-makefile-header $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_pgm.filelist \
- >> $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist
-sed /globus-makefile-header/d \
- -i $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_pgm.filelist
-
-# Move license file to main package
-grep GLOBUS_LICENSE $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
- >> $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist
-sed /GLOBUS_LICENSE/d -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist
-
-# Move client man pages to progs package
-grep '.[18]$' $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
- >> $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_pgm.filelist
-sed '/.[18]$/d' -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist
-
-# Remove directory man page
-rm -f %{buildroot}%{_mandir}/man3/*%{_name}-%{version}*
-sed /%{_name}-%{version}/d -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist
-
-# Remove deprecated.3 man page (too common name)
-rm -f %{buildroot}%{_mandir}/man3/deprecated.3
-sed -e '/deprecated\.3/d' -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist
+rm %{buildroot}%{_libdir}/*.la
# Install README file
install -m 644 -p %{SOURCE8} %{buildroot}%{_pkgdocdir}/README
-# Generate package filelists
-cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist \
- | sed s!^!%{_prefix}! > package.filelist
-cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_pgm.filelist \
- | sed -e s!^!%{_prefix}! -e 's!.*/man/.*!%doc &*!' > package-progs.filelist
-cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist \
- | sed s!^!%{_prefix}! > package-devel.filelist
-cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
- | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist
+# Remove environment scripts
+rm %{buildroot}%{_datadir}/globus-user-env.csh
+rm %{buildroot}%{_datadir}/globus-user-env.sh
+
+# Provide globus-core pkg-config file
+cat << EOF > %{buildroot}%{_libdir}/pkgconfig/globus-core.pc
+Name: globus-core
+Description: Globus Toolkit - Globus Core
+Version: 9
+EOF
+
+%check
+make check
%clean
rm -rf %{buildroot}
@@ -259,24 +168,59 @@ rm -rf %{buildroot}
%postun -p /sbin/ldconfig
-%files -f package.filelist
-%dir %{_datadir}/globus
-%dir %{_datadir}/globus/packages
-%dir %{_datadir}/globus/packages/%{_name}
+%files
+%{_libdir}/libglobus_common.so.*
+%{_libdir}/libglobus_memory_debug.so.*
+%{_libdir}/libglobus_thread_pthread.so
%dir %{perl_vendorlib}/Globus
%dir %{perl_vendorlib}/Globus/Core
+%{perl_vendorlib}/Globus/Core/Config.pm
+%{perl_vendorlib}/Globus/Core/Paths.pm
%dir %{_pkgdocdir}
+%doc %{_pkgdocdir}/GLOBUS_LICENSE
%doc %{_pkgdocdir}/README
-%files -f package-progs.filelist progs
-
-%files -f package-devel.filelist devel
+%files progs
+%{_bindir}/globus-domainname
+%{_bindir}/globus-hostname
+%{_bindir}/globus-sh-exec
+%{_bindir}/globus-version
+%{_sbindir}/globus-libc-hostname
+%{_sbindir}/globus-redia
+%dir %{_datadir}/globus
+%{_datadir}/globus/config.guess
+%{_datadir}/globus/globus-args-parser-header
+%{_datadir}/globus/globus-script-initializer*
+%{_datadir}/globus/globus-sh-tools.sh
+%{_datadir}/globus/globus-sh-tools-vars.sh
+%doc %{_mandir}/man1/globus-domainname.1*
+%doc %{_mandir}/man1/globus-hostname.1*
+%doc %{_mandir}/man1/globus-sh-exec.1*
+%doc %{_mandir}/man1/globus-version.1*
+
+%files devel
%dir %{_includedir}/globus
-
-%files -f package-doc.filelist doc
+%{_includedir}/globus/*
+%{_libdir}/libglobus_common.so
+%{_libdir}/libglobus_memory_debug.so
+%{_libdir}/pkgconfig/%{name}.pc
+%{_libdir}/pkgconfig/globus-core.pc
+%{_bindir}/globus-makefile-header
+%{_datadir}/globus/globus-vararg-enums-doxygen-filter.pl
+
+%files doc
+%doc %{_mandir}/man3/*
+%dir %{_pkgdocdir}
+%doc %{_pkgdocdir}/GLOBUS_LICENSE
%dir %{_pkgdocdir}/html
+%doc %{_pkgdocdir}/html/*
%changelog
+* Fri Sep 12 2014 Mattias Ellert <mattias.ellert at fysast.uu.se> - 15.25-1
+- Update to Globus Toolkit 6.0
+- Drop GPT build system and GPT packaging metadata
+- Enable checks
+
* Thu Aug 28 2014 Jitka Plesnikova <jplesnik at redhat.com> - 14.10-6
- Perl 5.20 rebuild
diff --git a/sources b/sources
index 98a6c7c..d523eba 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-31eb7a502c113af810b78ecd83e90ff1 globus_common-14.10.tar.gz
+bd821ab71969a2abcf5165ae47743f84 globus_common-15.25.tar.gz
More information about the scm-commits
mailing list