[globus-gram-protocol/el5: 5/5] Update to Globus Toolkit 6.0
Mattias Ellert
ellert at fedoraproject.org
Thu Sep 18 15:34:35 UTC 2014
commit c8d4091db3a81e4458c285bc5221b3a621265f11
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date: Thu Sep 18 17:33:55 2014 +0200
Update to Globus Toolkit 6.0
- Drop GPT build system and GPT packaging metadata
- Enable checks
globus-gram-protocol-doxygen.patch | 186 ++++++++++++++++++++++++++++++++++++
globus-gram-protocol.spec | 128 +++++++++----------------
sources | 2 +-
3 files changed, 234 insertions(+), 82 deletions(-)
---
diff --git a/globus-gram-protocol-doxygen.patch b/globus-gram-protocol-doxygen.patch
new file mode 100644
index 0000000..34ebfc0
--- /dev/null
+++ b/globus-gram-protocol-doxygen.patch
@@ -0,0 +1,186 @@
+diff --git a/Makefile.am b/Makefile.am
+index ca116ac..6bb69e2 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -59,7 +59,7 @@ all-local: $(DOC_STAMPS)
+ install-data-local: $(DOC_STAMPS)
+ if test -d doc/man/man3; then \
+ install -d -m 755 $(DESTDIR)$(mandir)/man3; \
+- $(INSTALL) -m 644 doc/man/man3/globus*.3 $(DESTDIR)$(mandir)/man3 ; \
++ $(INSTALL) -m 644 doc/man/man3/[Gg][Ll][Oo][Bb][Uu][Ss]*.3 $(DESTDIR)$(mandir)/man3 ; \
+ fi
+ if test -d doc/html; then \
+ for dir in `(cd doc; find html -type d)`; do \
+diff --git a/Makefile.in b/Makefile.in
+index ca116ac..6bb69e2 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -59,7 +59,7 @@ all-local: $(DOC_STAMPS)
+ install-data-local: $(DOC_STAMPS)
+ if test -d doc/man/man3; then \
+ install -d -m 755 $(DESTDIR)$(mandir)/man3; \
+- $(INSTALL) -m 644 doc/man/man3/globus*.3 $(DESTDIR)$(mandir)/man3 ; \
++ $(INSTALL) -m 644 doc/man/man3/[Gg][Ll][Oo][Bb][Uu][Ss]*.3 $(DESTDIR)$(mandir)/man3 ; \
+ fi
+ if test -d doc/html; then \
+ for dir in `(cd doc; find html -type d)`; do \
+diff --git a/globus_gram_protocol.c b/globus_gram_protocol.c
+index a8e7d99..5857fc9 100644
+--- a/globus_gram_protocol.c
++++ b/globus_gram_protocol.c
+@@ -14,9 +14,13 @@
+ * limitations under the License.
+ */
+
++#ifndef GLOBUS_DONT_DOCUMENT_INTERNAL
+ /**
+- * @file globus_gram_protocol.c GRAM Protocol
++ * @file globus_gram_protocol.c
++ * @brief GRAM Protocol
+ */
++#endif /* GLOBUS_DONT_DOCUMENT_INTERNAL */
++
+ #include "globus_i_gram_protocol.h"
+ #include "version.h"
+
+diff --git a/globus_gram_protocol.h b/globus_gram_protocol.h
+index f197b4f..272a21d 100644
+--- a/globus_gram_protocol.h
++++ b/globus_gram_protocol.h
+@@ -18,8 +18,10 @@
+ #define GLOBUS_GRAM_PROTOCOL_H
+
+ /**
+- * @file globus_gram_protocol.h GRAM Protocol API
++ * @file globus_gram_protocol.h
++ * @brief GRAM Protocol API
+ */
++
+ #ifndef GLOBUS_GLOBAL_DOCUMENT_SET
+ /**
+ * @mainpage Globus GRAM Protocol
+diff --git a/globus_gram_protocol_error.c b/globus_gram_protocol_error.c
+index d065851..28c7bb2 100644
+--- a/globus_gram_protocol_error.c
++++ b/globus_gram_protocol_error.c
+@@ -18,9 +18,13 @@
+ #include "globus_i_gram_protocol.h"
+ #include "globus_gram_protocol_constants.h"
+
++#ifndef GLOBUS_DONT_DOCUMENT_INTERNAL
+ /**
+- * @file globus_gram_protocol_error.c GRAM Protocol Error Strings
++ * @file globus_gram_protocol_error.c
++ * @brief GRAM Protocol Error Strings
+ */
++#endif /* GLOBUS_DONT_DOCUMENT_INTERNAL */
++
+ /**
+ * @defgroup globus_gram_protocol_error_messages Error Messages
+ * @ingroup globus_gram_protocol_functions
+diff --git a/globus_gram_protocol_frame.c b/globus_gram_protocol_frame.c
+index ff21a33..64addfa 100644
+--- a/globus_gram_protocol_frame.c
++++ b/globus_gram_protocol_frame.c
+@@ -14,14 +14,16 @@
+ * limitations under the License.
+ */
+
++#ifndef GLOBUS_DONT_DOCUMENT_INTERNAL
++
+ /**
+- * @file globus_gram_protocol_frame.c Message Framing
++ * @file globus_gram_protocol_frame.c
++ * @brief Message Framing
+ */
+
+ #include "globus_i_gram_protocol.h"
+ #include <string.h>
+
+-#ifndef GLOBUS_DONT_DOCUMENT_INTERNAL
+ static
+ char *
+ globus_l_gram_protocol_lookup_reason(
+diff --git a/globus_gram_protocol_io.c b/globus_gram_protocol_io.c
+index 90ac87d..8b3cfeb 100644
+--- a/globus_gram_protocol_io.c
++++ b/globus_gram_protocol_io.c
+@@ -14,15 +14,17 @@
+ * limitations under the License.
+ */
+
++#ifndef GLOBUS_DONT_DOCUMENT_INTERNAL
++
+ /**
+- * @file globus_gram_protocol_io.c I/O Functions
++ * @file globus_gram_protocol_io.c
++ * @brief I/O Functions
+ */
++
+ #include "globus_i_gram_protocol.h"
+
+ #include <string.h>
+
+-#ifndef DOXYGEN
+-
+ static int
+ globus_l_gram_protocol_setup_accept_attr(
+ globus_io_attr_t * attr,
+diff --git a/globus_gram_protocol_pack.c b/globus_gram_protocol_pack.c
+index a5c1f86..9a009c1 100644
+--- a/globus_gram_protocol_pack.c
++++ b/globus_gram_protocol_pack.c
+@@ -14,13 +14,15 @@
+ * limitations under the License.
+ */
+
++#ifndef GLOBUS_DONT_DOCUMENT_INTERNAL
++
+ /**
+- * @file globus_gram_protocol_pack.c Message Packing
++ * @file globus_gram_protocol_pack.c
++ * @brief Message Packing
+ */
+ #include "globus_i_gram_protocol.h"
+ #include <string.h>
+
+-#ifndef GLOBUS_DONT_DOCUMENT_INTERNAL
+ static
+ globus_size_t
+ globus_l_gram_protocol_quote_string(
+diff --git a/globus_i_gram_protocol.h b/globus_i_gram_protocol.h
+index 4caee30..7d4e9b1 100644
+--- a/globus_i_gram_protocol.h
++++ b/globus_i_gram_protocol.h
+@@ -14,8 +14,10 @@
+ * limitations under the License.
+ */
+
++#ifndef GLOBUS_DONT_DOCUMENT_INTERNAL
++
+ /**
+- * @file globus_i_gram_protocol.h GRAM Protocol Internals
++ * @file globus_i_gram_protocol.h
+ * @brief GRAM Protocol Internals
+ */
+
+@@ -171,3 +173,5 @@ extern globus_thread_key_t globus_i_gram_protocol_error_key;
+ #ifdef __cplusplus
+ }
+ #endif
++
++#endif /* GLOBUS_DONT_DOCUMENT_INTERNAL */
+diff --git a/scripts/create_protocol_constants.pl b/scripts/create_protocol_constants.pl
+index d5090d2..6eaf749 100644
+--- a/scripts/create_protocol_constants.pl
++++ b/scripts/create_protocol_constants.pl
+@@ -188,7 +188,8 @@ sub write_c_header
+ */
+
+ /**
+- * \@file globus_gram_protocol_constants.h Protocol Constants
++ * \@file globus_gram_protocol_constants.h
++ * \@brief Protocol Constants
+ */
+ #ifndef GLOBUS_GRAM_PROTOCOL_CONSTANTS_H
+ #define GLOBUS_GRAM_PROTOCOL_CONSTANTS_H
diff --git a/globus-gram-protocol.spec b/globus-gram-protocol.spec
index cfb2f37..aad41f3 100644
--- a/globus-gram-protocol.spec
+++ b/globus-gram-protocol.spec
@@ -1,69 +1,38 @@
-%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-gram-protocol
%global _name %(tr - _ <<< %{name})
-Version: 11.3
-Release: 15%{?dist}
+Version: 12.10
+Release: 1%{?dist}
Summary: Globus Toolkit - GRAM Protocol 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.1/packages/src/%{_name}-%{version}.tar.gz
+Source: http://www.globus.org/ftppub/gt6/packages/%{_name}-%{version}.tar.gz
# README file
Source8: GLOBUS-GRAM5
+# Doxygen fixes
+Patch0: %{name}-doxygen.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: globus-common%{?_isa} >= 14
-Requires: globus-gss-assist%{?_isa} >= 8
-Requires: globus-gssapi-gsi%{?_isa} >= 10
-Requires: globus-io%{?_isa} >= 8
Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
-BuildRequires: grid-packaging-tools >= 3.4
-BuildRequires: globus-core >= 8
-BuildRequires: globus-common-devel >= 14
-BuildRequires: globus-gss-assist-devel >= 8
-BuildRequires: globus-gssapi-gsi-devel >= 10
+BuildRequires: globus-common-devel >= 15
BuildRequires: globus-io-devel >= 8
-BuildRequires: globus-common-doc >= 14
+BuildRequires: globus-gssapi-gsi-devel >= 10
+BuildRequires: globus-gss-assist-devel >= 8
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: openssl
%package devel
Summary: Globus Toolkit - GRAM Protocol Library Development Files
Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: globus-common-devel%{?_isa} >= 14
-Requires: globus-gss-assist-devel%{?_isa} >= 8
-Requires: globus-gssapi-gsi-devel%{?_isa} >= 10
+Requires: globus-common-devel%{?_isa} >= 15
Requires: globus-io-devel%{?_isa} >= 8
-Requires: globus-core%{?_isa} >= 8
+Requires: globus-gssapi-gsi-devel%{?_isa} >= 10
+Requires: globus-gss-assist-devel%{?_isa} >= 8
%package doc
Summary: Globus Toolkit - GRAM Protocol Library Documentation Files
@@ -71,7 +40,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
@@ -102,21 +70,17 @@ GRAM Protocol Library 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} \
+ --with-perlmoduledir=%{perl_vendorlib}
# Reduce overlinking
sed 's!CC -shared !CC \${wl}--as-needed -shared !g' -i libtool
@@ -127,31 +91,14 @@ make %{?_smp_mflags}
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
-GLOBUSPACKAGEDIR=%{buildroot}%{_datadir}/globus/packages
-
-# This script is intended to be sourced, not executed
-chmod 644 %{buildroot}%{_datadir}/globus/globus-gram-protocol-constants.sh
-
# 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
+rm %{buildroot}%{_libdir}/*.la
# Install README file
install -m 644 -p %{SOURCE8} %{buildroot}%{_pkgdocdir}/README
-# Generate package filelists
-cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist \
- $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_pgm.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}
@@ -160,22 +107,41 @@ rm -rf %{buildroot}
%postun -p /sbin/ldconfig
-%files -f package.filelist
-%dir %{_datadir}/globus/packages/%{_name}
+%files
+%{_libdir}/libglobus_gram_protocol.so.*
%dir %{perl_vendorlib}/Globus
%dir %{perl_vendorlib}/Globus/GRAM
+%{perl_vendorlib}/Globus/GRAM/Error.pm
+%{perl_vendorlib}/Globus/GRAM/JobSignal.pm
+%{perl_vendorlib}/Globus/GRAM/JobState.pm
+%dir %{_datadir}/globus
+%{_datadir}/globus/globus-gram-protocol-constants.sh
%dir %{_pkgdocdir}
+%doc %{_pkgdocdir}/GLOBUS_LICENSE
%doc %{_pkgdocdir}/README
-%files -f package-devel.filelist devel
+%files devel
+%{_includedir}/globus/*
+%{_libdir}/libglobus_gram_protocol.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/*
%dir %{_pkgdocdir}/perl
%dir %{_pkgdocdir}/perl/Globus
%dir %{_pkgdocdir}/perl/Globus/GRAM
+%doc %{_pkgdocdir}/perl/Globus/GRAM/*
%changelog
+* Fri Sep 12 2014 Mattias Ellert <mattias.ellert at fysast.uu.se> - 12.10-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> - 11.3-15
- Perl 5.20 rebuild
diff --git a/sources b/sources
index a9a5da7..a9cccb4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7ddb40bce59f2c9e56eaaac009ad4200 globus_gram_protocol-11.3.tar.gz
+d00184c19ae5af4aa23132c854487daf globus_gram_protocol-12.10.tar.gz
More information about the scm-commits
mailing list