[globus-gssapi-error/el5: 4/4] Update to Globus Toolkit 6.0
Mattias Ellert
ellert at fedoraproject.org
Tue Sep 16 08:05:51 UTC 2014
commit 405ce4d632e6e2c4b31547b23c80aa37d52b39c7
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date: Tue Sep 16 10:04:52 2014 +0200
Update to Globus Toolkit 6.0
- Drop GPT build system and GPT packaging metadata
globus-gssapi-error-doxygen.patch | 82 +++++++++++++++++++++++++++++
globus-gssapi-error.spec | 105 +++++++++++--------------------------
sources | 2 +-
3 files changed, 114 insertions(+), 75 deletions(-)
---
diff --git a/globus-gssapi-error-doxygen.patch b/globus-gssapi-error-doxygen.patch
new file mode 100644
index 0000000..5d6ca29
--- /dev/null
+++ b/globus-gssapi-error-doxygen.patch
@@ -0,0 +1,82 @@
+diff --git a/library/Makefile.am b/library/Makefile.am
+index 3406cf1..f4d1939 100644
+--- a/library/Makefile.am
++++ b/library/Makefile.am
+@@ -30,7 +30,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 3406cf1..f4d1939 100644
+--- a/library/Makefile.in
++++ b/library/Makefile.in
+@@ -30,7 +30,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_error_gssapi.c b/library/globus_error_gssapi.c
+index a3e9aab..556174f 100644
+--- a/library/globus_error_gssapi.c
++++ b/library/globus_error_gssapi.c
+@@ -17,10 +17,7 @@
+ #ifndef GLOBUS_DONT_DOCUMENT_INTERNAL
+ /**
+ * @file globus_error_gssapi.c
+- *
+- * $RCSfile$
+- * $Revision$
+- * $Date$
++ * @brief Globus Error GSS API
+ */
+ #endif
+
+diff --git a/library/globus_i_error_gssapi.c b/library/globus_i_error_gssapi.c
+index ecd07ef..b93d550 100644
+--- a/library/globus_i_error_gssapi.c
++++ b/library/globus_i_error_gssapi.c
+@@ -15,16 +15,12 @@
+ */
+
+ #ifndef GLOBUS_DONT_DOCUMENT_INTERNAL
++
+ /**
+ * @file globus_i_error_gssapi.c
+- * Globus Generic Error
+- *
+- * $RCSfile$
+- * $Revision$
+- * $Date $
++ * @brief Globus Generic Error
+ */
+
+-
+ #include "globus_i_error_gssapi.h"
+ #include <string.h>
+ #include "globus_gss_assist.h"
+diff --git a/library/globus_i_error_gssapi.h b/library/globus_i_error_gssapi.h
+index 96bfe95..688b59c 100644
+--- a/library/globus_i_error_gssapi.h
++++ b/library/globus_i_error_gssapi.h
+@@ -17,11 +17,7 @@
+ #ifndef GLOBUS_DONT_DOCUMENT_INTERNAL
+ /**
+ * @file globus_i_error_gssapi.h
+- * Globus Gssapi Error
+- *
+- * $RCSfile$
+- * $Revision$
+- * $Date $
++ * @brief Globus Gssapi Error
+ */
+
+ #include "globus_common.h"
diff --git a/globus-gssapi-error.spec b/globus-gssapi-error.spec
index cd52967..b26ec6a 100644
--- a/globus-gssapi-error.spec
+++ b/globus-gssapi-error.spec
@@ -1,62 +1,33 @@
-%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-gssapi-error
%global _name %(tr - _ <<< %{name})
-Version: 4.1
-Release: 13%{?dist}
+Version: 5.3
+Release: 1%{?dist}
Summary: Globus Toolkit - GSSAPI Error 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.0/packages/src/%{_name}-%{version}.tar.gz
+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)
-Requires: globus-common%{?_isa} >= 14
-Requires: globus-gss-assist%{?_isa} >= 8
-Requires: globus-gssapi-gsi%{?_isa} >= 9
-BuildRequires: grid-packaging-tools >= 3.4
-BuildRequires: globus-core >= 8
-BuildRequires: globus-common-devel >= 14
+BuildRequires: globus-common-devel >= 15
BuildRequires: globus-gss-assist-devel >= 8
BuildRequires: globus-gssapi-gsi-devel >= 9
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 - GSSAPI Error Library Development Files
Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: globus-common-devel%{?_isa} >= 14
+Requires: globus-common-devel%{?_isa} >= 15
Requires: globus-gss-assist-devel%{?_isa} >= 8
Requires: globus-gssapi-gsi-devel%{?_isa} >= 9
-Requires: globus-core%{?_isa} >= 8
%package doc
Summary: Globus Toolkit - GSSAPI Error Library Documentation Files
@@ -64,7 +35,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,16 @@ GSSAPI Error 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}
# Reduce overlinking
sed 's!CC -shared !CC \${wl}--as-needed -shared !g' -i libtool
@@ -120,32 +85,12 @@ 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
-
%clean
rm -rf %{buildroot}
@@ -153,17 +98,29 @@ rm -rf %{buildroot}
%postun -p /sbin/ldconfig
-%files -f package.filelist
-%dir %{_datadir}/globus/packages/%{_name}
+%files
+%{_libdir}/libglobus_gssapi_error.so.*
%dir %{_pkgdocdir}
+%doc %{_pkgdocdir}/GLOBUS_LICENSE
%doc %{_pkgdocdir}/README
-%files -f package-devel.filelist devel
+%files devel
+%{_includedir}/globus/*
+%{_libdir}/libglobus_gssapi_error.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> - 5.3-1
+- Update to Globus Toolkit 6.0
+- Drop GPT build system and GPT packaging metadata
+
* Sat Aug 16 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.1-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
diff --git a/sources b/sources
index 48c55b8..9abe222 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cb1a0b23c6230845d9ae52cb3cd2b0d9 globus_gssapi_error-4.1.tar.gz
+3574fc4a1ec0db0d8f32148ddc548af3 globus_gssapi_error-5.3.tar.gz
More information about the scm-commits
mailing list