[globus-callout/el5: 4/4] Update to Globus Toolkit 6.0
Mattias Ellert
ellert at fedoraproject.org
Mon Sep 15 12:47:35 UTC 2014
commit 23ddb6a0e6f905527b5396fe95d4956e2c5ffc1a
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date: Mon Sep 15 14:46:51 2014 +0200
Update to Globus Toolkit 6.0
- Drop GPT build system and GPT packaging metadata
- Enable checks
globus-callout-doxygen.patch | 146 ++++++++++++++++++++++++++++++++++++++++++
globus-callout-flavor.patch | 24 +++++++
globus-callout.spec | 112 +++++++++++---------------------
sources | 2 +-
4 files changed, 208 insertions(+), 76 deletions(-)
---
diff --git a/globus-callout-doxygen.patch b/globus-callout-doxygen.patch
new file mode 100644
index 0000000..7876a66
--- /dev/null
+++ b/globus-callout-doxygen.patch
@@ -0,0 +1,146 @@
+diff --git a/library/Doxyfile.in b/library/Doxyfile.in
+index 4af399c..33d00ee 100644
+--- a/library/Doxyfile.in
++++ b/library/Doxyfile.in
+@@ -13,4 +13,4 @@ GENERATE_DEPRECATEDLIST= NO
+ QUIET = YES
+ INPUT = @srcdir@
+ EXCLUDE_PATTERNS = version.h
+-PREDEFINED = DOXYGEN GLOBUS_DONT_DOCUMENT_INTERNAL
++PREDEFINED = GLOBUS_DONT_DOCUMENT_INTERNAL DOXYGEN
+diff --git a/library/Makefile.am b/library/Makefile.am
+index 2f03306..448fb6a 100644
+--- a/library/Makefile.am
++++ b/library/Makefile.am
+@@ -37,7 +37,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/library/Makefile.in b/library/Makefile.in
+index 2f03306..448fb6a 100644
+--- a/library/Makefile.in
++++ b/library/Makefile.in
+@@ -37,7 +37,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/library/globus_callout.c b/library/globus_callout.c
+index dc3e852..28a99d5 100644
+--- a/library/globus_callout.c
++++ b/library/globus_callout.c
+@@ -14,11 +14,13 @@
+ * limitations under the License.
+ */
+
++#ifndef GLOBUS_DONT_DOCUMENT_INTERNAL
+ /**
+ * @file globus_callout.c
+- * Globus Callout Infrastructure
++ * @brief Globus Callout Infrastructure
+ * @author Sam Meder
+ */
++#endif /* GLOBUS_DONT_DOCUMENT_INTERNAL */
+
+ #include "globus_common.h"
+ #include "globus_callout_constants.h"
+@@ -1057,4 +1059,4 @@ globus_l_callout_library_table_element_free(
+ return;
+ }
+
+-#endif
++#endif /* GLOBUS_DONT_DOCUMENT_INTERNAL */
+diff --git a/library/globus_callout.h b/library/globus_callout.h
+index d863d6e..23a883b 100644
+--- a/library/globus_callout.h
++++ b/library/globus_callout.h
+@@ -19,7 +19,7 @@
+
+ /**
+ * @file globus_callout.h
+- * Globus Callout Infrastructure
++ * @brief Globus Callout Infrastructure
+ * @author Sam Meder
+ */
+
+diff --git a/library/globus_callout_constants.h b/library/globus_callout_constants.h
+index bd0b293..f30a246 100644
+--- a/library/globus_callout_constants.h
++++ b/library/globus_callout_constants.h
+@@ -19,7 +19,7 @@
+
+ /**
+ * @file globus_callout_constants.h
+- * Globus Callout Infrastructure
++ * @brief Globus Callout Infrastructure
+ * @author Sam Meder
+ */
+
+diff --git a/library/globus_callout_error.c b/library/globus_callout_error.c
+index a8370bb..b44b5d8 100644
+--- a/library/globus_callout_error.c
++++ b/library/globus_callout_error.c
+@@ -14,17 +14,17 @@
+ * limitations under the License.
+ */
+
++#ifndef GLOBUS_DONT_DOCUMENT_INTERNAL
++
+ /**
+ * @file globus_callout_error.c
+- * Globus Callout Infrastructure
++ * @brief Globus Callout Infrastructure
+ * @author Sam Meder
+ */
+
+ #include "globus_callout_constants.h"
+ #include "globus_i_callout.h"
+
+-#ifndef GLOBUS_DONT_DOCUMENT_INTERNAL
+-
+ char *
+ globus_l_callout_error_strings[GLOBUS_CALLOUT_ERROR_LAST] =
+ {
+diff --git a/library/globus_i_callout.h b/library/globus_i_callout.h
+index 0aba545..9e7ca25 100644
+--- a/library/globus_i_callout.h
++++ b/library/globus_i_callout.h
+@@ -17,9 +17,11 @@
+ #ifndef _GLOBUS_I_CALLOUT_H_
+ #define _GLOBUS_I_CALLOUT_H_
+
++#ifndef GLOBUS_DONT_DOCUMENT_INTERNAL
++
+ /**
+ * @file globus_i_callout.h
+- * Globus Callout Infrastructure
++ * @brief Globus Callout Infrastructure
+ * @author Sam Meder
+ */
+
+@@ -204,7 +206,7 @@ globus_i_callout_error_chain_result(
+
+
+ /**
+- * Globus Callout Implementation
++ * @brief Globus Callout Implementation
+ * @ingroup globus_callout
+ * @internal
+ *
+@@ -228,4 +230,6 @@ typedef struct globus_i_callout_data_s
+ globus_bool_t mandatory;
+ } globus_i_callout_data_t;
+
+-#endif
++#endif /* GLOBUS_DONT_DOCUMENT_INTERNAL */
++
++#endif /* _GLOBUS_I_CALLOUT_H_ */
diff --git a/globus-callout-flavor.patch b/globus-callout-flavor.patch
new file mode 100644
index 0000000..10b08e3
--- /dev/null
+++ b/globus-callout-flavor.patch
@@ -0,0 +1,24 @@
+diff --git a/version.h.in b/version.h.in
+index 8b590f3..12d1e50 100644
+--- a/version.h.in
++++ b/version.h.in
+@@ -23,18 +23,4 @@ globus_version_t local_version =
+ @DIRT_BRANCH_ID@
+ };
+
+-#define bittostr(x) str(x)
+-#define str(x) #x
+-
+-#include <limits.h>
+-#include <stdint.h>
+-
+-#if LONG_MAX == INT32_MAX
+-#define FLAVOR_BITS 32
+-#elif LONG_MAX == INT64_MAX
+-#define FLAVOR_BITS 64
+-#else
+-#error "Unknown flavor bits"
+-#endif
+-
+-static const char flavor[] = "cc" bittostr(FLAVOR_BITS);
++static const char flavor[] = GLOBUS_FLAVOR_NAME;
diff --git a/globus-callout.spec b/globus-callout.spec
index 9f3dbc4..dfbc2b0 100644
--- a/globus-callout.spec
+++ b/globus-callout.spec
@@ -1,61 +1,32 @@
-%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-callout
%global _name %(tr - _ <<< %{name})
-Version: 2.4
-Release: 5%{?dist}
+Version: 3.12
+Release: 1%{?dist}
Summary: Globus Toolkit - Globus Callout 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
+# Use flavor name macro
+Patch0: %{name}-flavor.patch
+# Doxygen fixes
+Patch1: %{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
-%if %{?fedora}%{!?fedora:0} >= 4 || %{?rhel}%{!?rhel:0} >= 5
+BuildRequires: globus-common-devel >= 15
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 devel
Summary: Globus Toolkit - Globus Callout Library 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 Callout Library Documentation Files
@@ -63,7 +34,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
@@ -95,21 +65,17 @@ Globus Callout Library Documentation Files
%prep
%setup -q -n %{_name}-%{version}
+%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
+# 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
@@ -120,31 +86,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
-
-# Remove directory man page
-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 +102,30 @@ rm -rf %{buildroot}
%postun -p /sbin/ldconfig
-%files -f package.filelist
-%dir %{_datadir}/globus/packages/%{_name}
+%files
+%{_libdir}/libglobus_callout.so.*
%dir %{_pkgdocdir}
+%doc %{_pkgdocdir}/GLOBUS_LICENSE
%doc %{_pkgdocdir}/README
-%files -f package-devel.filelist devel
+%files devel
+%{_includedir}/globus/*
+%{_libdir}/libglobus_callout.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 <mattias.ellert at fysast.uu.se> - 3.12-1
+- Update to Globus Toolkit 6.0
+- Drop GPT build system and GPT packaging metadata
+- Enable checks
+
* Sat Aug 16 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
diff --git a/sources b/sources
index e628874..4c182fe 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e6e8c63598614bd1984b68e44ea7af82 globus_callout-2.4.tar.gz
+5d866c1d25f9e5f947cd357c27cf2c90 globus_callout-3.12.tar.gz
More information about the scm-commits
mailing list