From 0a7514beda52954369949b53c6204ddf2c4765ba Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Sep 16 2014 08:00:59 +0000 Subject: Update to Globus Toolkit 6.0 - Drop GPT build system and GPT packaging metadata - Enable checks --- diff --git a/globus-xio-doxygen.patch b/globus-xio-doxygen.patch new file mode 100644 index 0000000..b1eca4c --- /dev/null +++ b/globus-xio-doxygen.patch @@ -0,0 +1,312 @@ +diff --git a/Doxyfile.in b/Doxyfile.in +index 672c8a5..44586b4 100644 +--- a/Doxyfile.in ++++ b/Doxyfile.in +@@ -14,5 +14,5 @@ RECURSIVE = YES + QUIET = YES + INPUT = @top_srcdir@ + INPUT_FILTER = @top_srcdir@/globus-vararg-enums-doxygen-filter.pl +-EXCLUDE_PATTERNS = version.h +-PREDEFINED = GLOBUS_DONT_DOCUMENT_INTERNAL ++EXCLUDE_PATTERNS = version.h test ++PREDEFINED = GLOBUS_DONT_DOCUMENT_INTERNAL DOXYGEN +diff --git a/builtins/file/globus_xio_file_driver.h b/builtins/file/globus_xio_file_driver.h +index 792115a..98b8a95 100644 +--- a/builtins/file/globus_xio_file_driver.h ++++ b/builtins/file/globus_xio_file_driver.h +@@ -17,7 +17,8 @@ + #ifndef GLOBUS_XIO_FILE_DRIVER_H + #define GLOBUS_XIO_FILE_DRIVER_H + /** +- * @file globus_xio_file_driver.h XIO File Driver ++ * @file globus_xio_file_driver.h ++ * @brief XIO File Driver + */ + #include "globus_xio_system.h" + +diff --git a/builtins/http/globus_i_xio_http.h b/builtins/http/globus_i_xio_http.h +index 8dcf678..b4e3968 100644 +--- a/builtins/http/globus_i_xio_http.h ++++ b/builtins/http/globus_i_xio_http.h +@@ -14,7 +14,13 @@ + * limitations under the License. + */ + +-/** @file globus_i_xio_http.h XIO HTTP Driver Internals */ ++#ifndef GLOBUS_DONT_DOCUMENT_INTERNAL ++ ++/** ++ * @file globus_i_xio_http.h ++ * @brief XIO HTTP Driver Internals ++ */ ++ + #ifndef GLOBUS_I_XIO_HTTP_H + #define GLOBUS_I_XIO_HTTP_H 1 + +@@ -22,8 +28,6 @@ + #include "globus_xio_driver.h" + #include "globus_xio_http.h" + +-#ifndef GLOBUS_DONT_DOCUMENT_INTERNAL +- + enum { GLOBUS_XIO_HTTP_CHUNK_SIZE = 4000 }; + + typedef enum +@@ -831,6 +835,6 @@ GlobusXIODeclareModule(http); + __LINE__, \ + "Persistent connection dropped") + +-#endif /* GLOBUS_DONT_DOCUMENT_INTERNAL */ +- + #endif /* GLOBUS_I_XIO_HTTP_H */ ++ ++#endif /* GLOBUS_DONT_DOCUMENT_INTERNAL */ +diff --git a/builtins/http/globus_i_xio_http_responses.h b/builtins/http/globus_i_xio_http_responses.h +index b559a43..ee0a8f2 100644 +--- a/builtins/http/globus_i_xio_http_responses.h ++++ b/builtins/http/globus_i_xio_http_responses.h +@@ -14,7 +14,13 @@ + * limitations under the License. + */ + +-/** @file globus_i_xio_http_responses.h HTTP Response Codes */ ++#ifndef GLOBUS_DONT_DOCUMENT_INTERNAL ++ ++/** ++ * @file globus_i_xio_http_responses.h ++ * @brief HTTP Response Codes ++ */ ++ + static + const char * + globus_l_http_descriptions[] = { +@@ -59,3 +65,5 @@ globus_l_http_descriptions[] = { + "504", "Gateway Time-out", + "505", "HTTP Version not supported" + }; ++ ++#endif /* GLOBUS_DONT_DOCUMENT_INTERNAL */ +diff --git a/builtins/http/globus_xio_http.c b/builtins/http/globus_xio_http.c +index 36fa75d..057f2a9 100644 +--- a/builtins/http/globus_xio_http.c ++++ b/builtins/http/globus_xio_http.c +@@ -23,6 +23,7 @@ + #ifndef GLOBUS_DONT_DOCUMENT_INTERNAL + /** + * @file globus_xio_http.c ++ * @brief Globus XIO HTTP Driver + */ + + /** +diff --git a/builtins/http/globus_xio_http.h b/builtins/http/globus_xio_http.h +index 18d12b2..58fa716 100644 +--- a/builtins/http/globus_xio_http.h ++++ b/builtins/http/globus_xio_http.h +@@ -18,7 +18,8 @@ + #define GLOBUS_XIO_DRIVER_HTTP_H 1 + + /** +- * @file globus_xio_http.h Globus XIO HTTP Driver Header ++ * @file globus_xio_http.h ++ * @brief Globus XIO HTTP Driver Header + */ + #include "globus_xio.h" + +@@ -121,7 +122,7 @@ extern "C" { + */ + + /** +- * HTTP Header ++ * @brief HTTP Header + * @ingroup globus_xio_http_driver + */ + typedef struct +diff --git a/builtins/mode_e/globus_xio_mode_e_driver.h b/builtins/mode_e/globus_xio_mode_e_driver.h +index 053a28e..8fb8daf 100644 +--- a/builtins/mode_e/globus_xio_mode_e_driver.h ++++ b/builtins/mode_e/globus_xio_mode_e_driver.h +@@ -18,7 +18,8 @@ + #define GLOBUS_XIO_MODE_E_DRIVER_H + + /** +- * @file globus_xio_mode_e_driver.h XIO MODE_E Driver ++ * @file globus_xio_mode_e_driver.h ++ * @brief XIO MODE_E Driver + */ + + #include "globus_common.h" +diff --git a/builtins/ordering/globus_xio_ordering_driver.h b/builtins/ordering/globus_xio_ordering_driver.h +index c8c704e..d29a25a 100644 +--- a/builtins/ordering/globus_xio_ordering_driver.h ++++ b/builtins/ordering/globus_xio_ordering_driver.h +@@ -18,7 +18,8 @@ + #define GLOBUS_XIO_ORDERING_DRIVER_H + + /** +- * @file globus_xio_ordering_driver.h XIO ORDERING Driver ++ * @file globus_xio_ordering_driver.h ++ * @brief XIO ORDERING Driver + */ + + #include "globus_common.h" +diff --git a/builtins/tcp/globus_xio_tcp_driver.h b/builtins/tcp/globus_xio_tcp_driver.h +index 4184d36..257ab83 100644 +--- a/builtins/tcp/globus_xio_tcp_driver.h ++++ b/builtins/tcp/globus_xio_tcp_driver.h +@@ -17,7 +17,8 @@ + #ifndef GLOBUS_XIO_TCP_DRIVER_INCLUDE + #define GLOBUS_XIO_TCP_DRIVER_INCLUDE + /** +- * @file globus_xio_tcp_driver.h Header file for XIO TCP Driver ++ * @file globus_xio_tcp_driver.h ++ * @brief Header file for XIO TCP Driver + */ + #include "globus_xio_system.h" + +diff --git a/builtins/telnet/globus_xio_telnet.h b/builtins/telnet/globus_xio_telnet.h +index 3f03a90..95b9951 100644 +--- a/builtins/telnet/globus_xio_telnet.h ++++ b/builtins/telnet/globus_xio_telnet.h +@@ -14,7 +14,11 @@ + * limitations under the License. + */ + +-/** @file globus_xio_telnet.h XIO Telnet Driver */ ++/** ++ * @file globus_xio_telnet.h ++ * @brief XIO Telnet Driver ++ */ ++ + #if !defined GLOBUS_XIO_TELNET_H + #define GLOBUS_XIO_TELNET_H 1 + +diff --git a/builtins/udp/globus_xio_udp_driver.h b/builtins/udp/globus_xio_udp_driver.h +index 4ac8706..c25849c 100644 +--- a/builtins/udp/globus_xio_udp_driver.h ++++ b/builtins/udp/globus_xio_udp_driver.h +@@ -17,7 +17,8 @@ + #ifndef GLOBUS_XIO_UDP_DRIVER_H + #define GLOBUS_XIO_UDP_DRIVER_H + /** +- * @file globus_xio_udp_driver.h XIO UDP Driver ++ * @file globus_xio_udp_driver.h ++ * @brief XIO UDP Driver + */ + + #include "globus_xio_system.h" +diff --git a/globus_i_xio.h b/globus_i_xio.h +index 0ffef8f..7295f52 100644 +--- a/globus_i_xio.h ++++ b/globus_i_xio.h +@@ -14,6 +14,8 @@ + * limitations under the License. + */ + ++#ifndef GLOBUS_DONT_DOCUMENT_INTERNAL ++ + #if !defined(GLOBUS_I_XIO_H) + #define GLOBUS_I_XIO_H 1 + +@@ -526,8 +528,10 @@ typedef struct globus_i_xio_op_entry_s + #define _op_server_timeout_cb type_u.server_s.timeout_cb + + /** +- * Information about the what thread is being blocked by a callback. In the +- * non-threaded case, this will be the callback_depth, otherwise the thread_id ++ * @brief Information about the what thread is being blocked by a callback. ++ * ++ * In the non-threaded case, this will be the callback_depth, otherwise ++ * the thread_id + */ + typedef union + { +@@ -912,3 +916,5 @@ extern globus_mutex_t globus_i_xio_mutex; + extern globus_cond_t globus_i_xio_cond; + + #endif /* GLOBUS_I_XIO_H */ ++ ++#endif /* GLOBUS_DONT_DOCUMENT_INTERNAL */ +diff --git a/test/http_get_test.c b/test/http_get_test.c +index 2a9d7ee..bbc4915 100644 +--- a/test/http_get_test.c ++++ b/test/http_get_test.c +@@ -15,7 +15,8 @@ + */ + + /** +- * @file http_get_test.c HTTP Get Test ++ * @file http_get_test.c ++ * @brief HTTP Get Test + * + * Test that clients can receive HTTP message bodies. + * +diff --git a/test/http_header_test.c b/test/http_header_test.c +index 63af4bd..d658ebd 100644 +--- a/test/http_header_test.c ++++ b/test/http_header_test.c +@@ -15,7 +15,8 @@ + */ + + /** +- * @file http_header_test.c HTTP Header test ++ * @file http_header_test.c ++ * @brief HTTP Header test + * + * Test that clients can send arbitrary HTTP headers to servers, and servers + * can send arbitrary HTTP headers to clients. +diff --git a/test/http_pingpong_test.c b/test/http_pingpong_test.c +index 8adce08..86906d4 100644 +--- a/test/http_pingpong_test.c ++++ b/test/http_pingpong_test.c +@@ -15,7 +15,8 @@ + */ + + /** +- * @file http_post_test.c HTTP Echo Test ++ * @file http_post_test.c ++ * @brief HTTP Echo Test + * + * Test that clients can send and receive HTTP message bodies. + * +diff --git a/test/http_post_test.c b/test/http_post_test.c +index 1eea09d..b67299b 100644 +--- a/test/http_post_test.c ++++ b/test/http_post_test.c +@@ -15,7 +15,8 @@ + */ + + /** +- * @file http_post_test.c HTTP Echo Test ++ * @file http_post_test.c ++ * @brief HTTP Echo Test + * + * Test that clients can send and receive HTTP message bodies. + * +diff --git a/test/http_put_test.c b/test/http_put_test.c +index 23d6f7b..7a4468e 100644 +--- a/test/http_put_test.c ++++ b/test/http_put_test.c +@@ -15,7 +15,8 @@ + */ + + /** +- * @file http_put_test.c HTTP Put Test ++ * @file http_put_test.c ++ * @brief HTTP Put Test + * + * Test that clients can send HTTP message bodies. + * +diff --git a/test/http_throughput_test.c b/test/http_throughput_test.c +index deb27a0..354f89c 100644 +--- a/test/http_throughput_test.c ++++ b/test/http_throughput_test.c +@@ -15,7 +15,8 @@ + */ + + /** +- * @file http_post_test.c HTTP Echo Test ++ * @file http_post_test.c ++ * @brief HTTP Echo Test + * + * Test that clients can send and receive HTTP message bodies. + * diff --git a/globus-xio.spec b/globus-xio.spec index 0f4d17c..1f9bb1c 100644 --- a/globus-xio.spec +++ b/globus-xio.spec @@ -1,56 +1,31 @@ -%ifarch aarch64 alpha ia64 %{power64} s390x sparc64 x86_64 -%global flavor gcc64 -%else -%global flavor gcc32 -%endif - %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} Name: globus-xio %global _name %(tr - _ <<< %{name}) -Version: 3.6 -Release: 5%{?dist} +Version: 4.14 +Release: 1%{?dist} Summary: Globus Toolkit - Globus XIO Framework 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-XIO +# Doxygen fixes +Patch0: %{name}-doxygen.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: globus-common%{?_isa} >= 14 -BuildRequires: grid-packaging-tools >= 3.4 -BuildRequires: globus-core >= 8 -BuildRequires: globus-common-devel >= 14 +BuildRequires: globus-common-devel >= 15 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 +# Additional requirements for make check +BuildRequires: perl(Test::More) %package devel Summary: Globus Toolkit - Globus XIO Framework Development Files Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: globus-common-devel%{?_isa} >= 14 -Requires: globus-core%{?_isa} >= 8 +Requires: globus-common-devel%{?_isa} >= 15 %package doc Summary: Globus Toolkit - Globus XIO Framework Documentation Files @@ -58,7 +33,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 @@ -89,21 +63,16 @@ Globus XIO Framework Documentation Files %prep %setup -q -n %{_name}-%{version} +%patch0 -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 +# Reduce overlinking +export LDFLAGS="-Wl,--as-needed -Wl,-z,defs %{?__global_ldflags}" -%configure --disable-static --with-flavor=%{flavor} \ - --enable-doxygen --with-docdir=%{_pkgdocdir} +%configure --disable-static \ + --includedir='${prefix}/include/globus' \ + --libexecdir='${datadir}/globus' \ + --docdir=%{_pkgdocdir} # Reduce overlinking sed 's!CC -shared !CC \${wl}--as-needed -shared !g' -i libtool @@ -114,37 +83,14 @@ make %{?_smp_mflags} rm -rf %{buildroot} make install DESTDIR=%{buildroot} -GLOBUSPACKAGEDIR=%{buildroot}%{_datadir}/globus/packages - # Remove libtool archives (.la files) -find %{buildroot}%{_libdir} -name 'lib*.la' -exec rm -v '{}' \; -sed '/lib.*\.la$/d' -i $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.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 - -# Fix doxygen glitches -for f in %{buildroot}%{_mandir}/man3/globus_xio_driver.3 \ - %{buildroot}%{_mandir}/man3/GLOBUS_XIO_API_ASSIST.3 ; do - sed 's/P\.RS/P\n.RS/' -i $f -done - -# Remove directory man pages -rm -f %{buildroot}%{_mandir}/man3/*%{_name}-%{version}* -sed /%{_name}-%{version}/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}_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 +%check +make check %clean rm -rf %{buildroot} @@ -153,17 +99,30 @@ rm -rf %{buildroot} %postun -p /sbin/ldconfig -%files -f package.filelist -%dir %{_datadir}/globus/packages/%{_name} +%files +%{_libdir}/libglobus_xio.so.* %dir %{_pkgdocdir} +%doc %{_pkgdocdir}/GLOBUS_LICENSE %doc %{_pkgdocdir}/README -%files -f package-devel.filelist devel +%files devel +%{_includedir}/globus/* +%{_libdir}/libglobus_xio.so +%{_libdir}/pkgconfig/%{name}.pc -%files -f package-doc.filelist doc +%files doc +%doc %{_mandir}/man3/* +%dir %{_pkgdocdir} +%doc %{_pkgdocdir}/GLOBUS_LICENSE %dir %{_pkgdocdir}/html +%doc %{_pkgdocdir}/html/* %changelog +* Fri Sep 12 2014 Mattias Ellert - 4.14-1 +- Update to Globus Toolkit 6.0 +- Drop GPT build system and GPT packaging metadata +- Enable checks + * Sat Aug 16 2014 Fedora Release Engineering - 3.6-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild diff --git a/sources b/sources index 85a7cf0..86cef1e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d938d7a76b2e69b2db1de652c75d4d6a globus_xio-3.6.tar.gz +6be15c38bae4aba0245aabadb671ae1a globus_xio-4.14.tar.gz