From 947e1fd34d3d1b955d8739efbc9f10a3e0e1712f Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Nov 14 2014 18:28:41 +0000 Subject: GT6 update - Drop patch globus-gss-assist-doxygen.patch (fixed upstream) --- diff --git a/globus-gss-assist-doxygen.patch b/globus-gss-assist-doxygen.patch deleted file mode 100644 index b260378..0000000 --- a/globus-gss-assist-doxygen.patch +++ /dev/null @@ -1,304 +0,0 @@ -diff --git a/accept.c b/accept.c -index 99a61b2..a67079d 100644 ---- a/accept.c -+++ b/accept.c -@@ -14,11 +14,13 @@ - * limitations under the License. - */ - -+#ifndef GLOBUS_DONT_DOCUMENT_INTERNAL - /** -- * @file gss_assist/source/accept.c -+ * @file accept.c - * @brief GSSAPI Accept Function Implementations - * @author Sam Lang, Sam Meder - */ -+#endif - - #include "globus_i_gss_assist.h" - #include "gssapi.h" -diff --git a/acquire.c b/acquire.c -index 322dd59..10bef91 100644 ---- a/acquire.c -+++ b/acquire.c -@@ -14,10 +14,12 @@ - * limitations under the License. - */ - -+#ifndef GLOBUS_DONT_DOCUMENT_INTERNAL - /** -- * @file gss_assist/source/acquire.c -+ * @file acquire.c - * @author Sam Lang, Sam Meder - */ -+#endif - - #include "globus_i_gss_assist.h" - #include "gssapi.h" -diff --git a/display.c b/display.c -index 7496617..5247039 100644 ---- a/display.c -+++ b/display.c -@@ -14,10 +14,12 @@ - * limitations under the License. - */ - -+#ifndef GLOBUS_DONT_DOCUMENT_INTERNAL - /** -- * @file gss_assist/source/display.c -+ * @file display.c - * @author Sam Lang, Sam Meder - */ -+#endif - - #include "gssapi.h" - #include "globus_i_gss_assist.h" -diff --git a/export_sec_context.c b/export_sec_context.c -index a3d301d..cf765cf 100644 ---- a/export_sec_context.c -+++ b/export_sec_context.c -@@ -14,10 +14,12 @@ - * limitations under the License. - */ - -+#ifndef GLOBUS_DONT_DOCUMENT_INTERNAL - /** -- * @file gss_assist/source/export_sec_context.c -+ * @file export_sec_context.c - * @author Sam Lang, Sam Meder - */ -+#endif - - #include "gssapi.h" - #include "globus_i_gss_assist.h" -diff --git a/globus_gss_assist_error.c b/globus_gss_assist_error.c -index 6df014c..5bb12f5 100644 ---- a/globus_gss_assist_error.c -+++ b/globus_gss_assist_error.c -@@ -14,8 +14,10 @@ - * limitations under the License. - */ - -+#ifndef GLOBUS_DONT_DOCUMENT_INTERNAL -+ - /** -- * @file gss_assist/source/globus_gss_assist_error.c -+ * @file globus_gss_assist_error.c - * @brief GSS Assist Error Handling - * @author Sam Lang, Sam Meder - */ -@@ -24,7 +26,6 @@ - #include "globus_i_gss_assist.h" - #include "globus_gss_assist_constants.h" - --#ifndef GLOBUS_DONT_DOCUMENT_INTERNAL - char * - globus_l_gsi_gss_assist_error_strings[GLOBUS_GSI_GSS_ASSIST_ERROR_LAST] = - { -diff --git a/globus_gss_assist_module.c b/globus_gss_assist_module.c -index d7229ee..f23d823 100644 ---- a/globus_gss_assist_module.c -+++ b/globus_gss_assist_module.c -@@ -14,8 +14,10 @@ - * limitations under the License. - */ - -+#ifndef GLOBUS_DONT_DOCUMENT_INTERNAL -+ - /** -- * @file gss_assist/source/globus_gss_assist_module.c -+ * @file globus_gss_assist_module.c - * @brief GSS Assist Module Descriptor - * @author Sam Lang, Sam Meder - */ -@@ -26,7 +28,6 @@ - #include "version.h" - #include - --#ifndef GLOBUS_DONT_DOCUMENT_INTERNAL - static int globus_l_gsi_gss_assist_activate(void); - static int globus_l_gsi_gss_assist_deactivate(void); - -@@ -123,4 +124,4 @@ globus_l_gsi_gss_assist_deactivate(void) - } - /* globus_l_gsi_gss_assist_deactivate() */ - --#endif -+#endif /* GLOBUS_DONT_DOCUMENT_INTERNAL */ -diff --git a/gridmap.c b/gridmap.c -index 5907f32..f964e7f 100644 ---- a/gridmap.c -+++ b/gridmap.c -@@ -14,10 +14,12 @@ - * limitations under the License. - */ - -+#ifndef GLOBUS_DONT_DOCUMENT_INTERNAL - /** -- * @file gss_assist/source/gridmap.c -+ * @file gridmap.c - * @brief GSS Assist Gridmap Functions - */ -+#endif - - #include "globus_i_gss_assist.h" - #include "globus_gsi_system_config.h" -diff --git a/hostname.c b/hostname.c -index f10d8fc..fa3cd68 100644 ---- a/hostname.c -+++ b/hostname.c -@@ -14,10 +14,12 @@ - * limitations under the License. - */ - -+#ifndef GLOBUS_DONT_DOCUMENT_INTERNAL - /** -- * @file gss_assist/source/hostname.c -+ * @file hostname.c - * @author Sam Meder - */ -+#endif - - #include "globus_i_gss_assist.h" - -diff --git a/import_sec_context.c b/import_sec_context.c -index 9736cfe..744e81d 100644 ---- a/import_sec_context.c -+++ b/import_sec_context.c -@@ -14,10 +14,12 @@ - * limitations under the License. - */ - -+#ifndef GLOBUS_DONT_DOCUMENT_INTERNAL - /** -- * @file gss_assist/source/import_sec_context.c -+ * @file import_sec_context.c - * @author Sam Lang, Sam Meder - */ -+#endif - - #include "globus_i_gss_assist.h" - #include "gssapi.h" -diff --git a/init.c b/init.c -index 5cf2731..3becef4 100644 ---- a/init.c -+++ b/init.c -@@ -14,10 +14,12 @@ - * limitations under the License. - */ - -+#ifndef GLOBUS_DONT_DOCUMENT_INTERNAL - /** -- * @file gss_assist/source/init.c -+ * @file init.c - * @author Sam Lang, Sam Meder - */ -+#endif - - #include "globus_i_gss_assist.h" - #include "gssapi.h" -diff --git a/set_sec_context_opts.c b/set_sec_context_opts.c -index cfab3d8..3200807 100644 ---- a/set_sec_context_opts.c -+++ b/set_sec_context_opts.c -@@ -14,10 +14,12 @@ - * limitations under the License. - */ - -+#ifndef GLOBUS_DONT_DOCUMENT_INTERNAL - /** -- * @file gss_assist/source/set_sec_context_opts.c -+ * @file set_sec_context_opts.c - * @author Sam Lang, Sam Meder - */ -+#endif - - #include "globus_i_gss_assist.h" - #include "gssapi.h" -diff --git a/test/tokens_bsd.c b/test/tokens_bsd.c -index ee619f8..08c9be8 100644 ---- a/test/tokens_bsd.c -+++ b/test/tokens_bsd.c -@@ -14,10 +14,12 @@ - * limitations under the License. - */ - -+#ifndef GLOBUS_DONT_DOCUMENT_INTERNAL - /** -- * @file gss_assist/source/tokens_f.c -+ * @file tokens_bsd.c - * @author Sam Lang, Sam Meder - */ -+#endif - - #include "globus_common.h" - #include "globus_i_gss_assist.h" -diff --git a/test/tokens_bsd.h b/test/tokens_bsd.h -index b5a1a85..c77a25f 100644 ---- a/test/tokens_bsd.h -+++ b/test/tokens_bsd.h -@@ -15,7 +15,7 @@ - */ - - /** -- * @file gss_assist/source/tokens_f.c -+ * @file tokens_bsd.h - * @author Sam Lang, Sam Meder - */ - -diff --git a/tokens_f.c b/tokens_f.c -index 3f3d693..d4b0294 100644 ---- a/tokens_f.c -+++ b/tokens_f.c -@@ -14,10 +14,12 @@ - * limitations under the License. - */ - -+#ifndef GLOBUS_DONT_DOCUMENT_INTERNAL - /** -- * @file gss_assist/source/tokens_f.c -+ * @file tokens_f.c - * @author Sam Lang, Sam Meder - */ -+#endif - - #include "globus_i_gss_assist.h" - #include -diff --git a/unwrap.c b/unwrap.c -index 62a8768..79a3d61 100644 ---- a/unwrap.c -+++ b/unwrap.c -@@ -14,11 +14,13 @@ - * limitations under the License. - */ - -+#ifndef GLOBUS_DONT_DOCUMENT_INTERNAL - /** -- * @file gss_assist/source/unwrap.c -+ * @file unwrap.c - * @brief Unwrap Tokens - * @author Sam Lang, Sam Meder - */ -+#endif - - #include "globus_i_gss_assist.h" - #include "gssapi.h" -diff --git a/wrap.c b/wrap.c -index 0360430..e0dd8ad 100644 ---- a/wrap.c -+++ b/wrap.c -@@ -14,11 +14,13 @@ - * limitations under the License. - */ - -+#ifndef GLOBUS_DONT_DOCUMENT_INTERNAL - /** -- * @file gss_assist/source/wrap.c -+ * @file wrap.c - * @brief Wrap GSSAPI buffers - * @author Sam Lang, Sam Meder - */ -+#endif - - #include "globus_i_gss_assist.h" - #include "gssapi.h" diff --git a/globus-gss-assist.spec b/globus-gss-assist.spec index 69902f9..a06eb14 100644 --- a/globus-gss-assist.spec +++ b/globus-gss-assist.spec @@ -2,7 +2,7 @@ Name: globus-gss-assist %global _name %(tr - _ <<< %{name}) -Version: 10.12 +Version: 10.13 Release: 1%{?dist} Summary: Globus Toolkit - GSSAPI Assist library @@ -12,8 +12,6 @@ URL: http://www.globus.org/ Source: http://www.globus.org/ftppub/gt6/packages/%{_name}-%{version}.tar.gz # README file Source8: GLOBUS-GSIC -# Doxygen fixes -Patch0: %{name}-doxygen.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: globus-common-devel >= 15 @@ -90,7 +88,6 @@ GSSAPI Assist library Documentation Files %prep %setup -q -n %{_name}-%{version} -%patch0 -p1 %build # Reduce overlinking @@ -117,7 +114,7 @@ rm %{buildroot}%{_libdir}/*.la install -m 644 -p %{SOURCE8} %{buildroot}%{_pkgdocdir}/README %check -make %{?_smp_mflags} check +make %{?_smp_mflags} check VERBOSE=1 %clean rm -rf %{buildroot} @@ -155,6 +152,10 @@ rm -rf %{buildroot} %doc %{_pkgdocdir}/html/* %changelog +* Thu Nov 13 2014 Mattias Ellert - 10.13-1 +- GT6 update +- Drop patch globus-gss-assist-doxygen.patch (fixed upstream) + * Mon Oct 27 2014 Mattias Ellert - 10.12-1 - GT6 update - Update patch globus-gss-assist-doxygen.patch diff --git a/sources b/sources index 72275e1..57734c5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -05d7e1d4af07828c5858f977ab3a889c globus_gss_assist-10.12.tar.gz +0e589f0420c4f3725c9c0c2056ed262c globus_gss_assist-10.13.tar.gz