[globus-gram-job-manager-callout-error/el5: 4/4] Update to Globus Toolkit 6.0

Mattias Ellert ellert at fedoraproject.org
Thu Sep 18 16:13:09 UTC 2014 

commit 66625b253ebcdfe9b2900421effb9ef806e68226
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Thu Sep 18 18:12:16 2014 +0200

    Update to Globus Toolkit 6.0
    
    - Drop GPT build system and GPT packaging metadata

 ...us-gram-job-manager-callout-error-doxygen.patch |   32 +++++++
 globus-gram-job-manager-callout-error.spec         |   99 ++++++-------------
 sources                                            |    2 +-
 3 files changed, 64 insertions(+), 69 deletions(-)
---
diff --git a/globus-gram-job-manager-callout-error-doxygen.patch b/globus-gram-job-manager-callout-error-doxygen.patch
new file mode 100644
index 0000000..6607b6e
--- /dev/null
+++ b/globus-gram-job-manager-callout-error-doxygen.patch
@@ -0,0 +1,32 @@
+diff --git a/globus_gram_jobmanager_callout_error.h b/globus_gram_jobmanager_callout_error.h
+index b02d0fa..393bb53 100644
+--- a/globus_gram_jobmanager_callout_error.h
++++ b/globus_gram_jobmanager_callout_error.h
+@@ -16,6 +16,7 @@
+ 
+ /**
+  * @file globus_gram_jobmanager_callout_error.h
++ * @brief Globus GRAM Job Manager Callout Error
+  * @author Sam Meder
+  */
+ 
+diff --git a/globus_i_gram_jobmanager_callout_error.c b/globus_i_gram_jobmanager_callout_error.c
+index 530275f..13c44e9 100644
+--- a/globus_i_gram_jobmanager_callout_error.c
++++ b/globus_i_gram_jobmanager_callout_error.c
+@@ -15,13 +15,11 @@
+  */
+ 
+ #ifndef GLOBUS_DONT_DOCUMENT_INTERNAL
++
+ /**
+  * @file globus_gram_jobmanager_callout_error.c
++ * @brief Globus GRAM Job Manager Callout Error
+  * @author Sam Meder
+- *
+- * $RCSfile$
+- * $Revision$
+- * $Date$
+  */
+ 
+ #include "globus_gram_jobmanager_callout_error.h"
diff --git a/globus-gram-job-manager-callout-error.spec b/globus-gram-job-manager-callout-error.spec
index 05a624f..3c7667c 100644
--- a/globus-gram-job-manager-callout-error.spec
+++ b/globus-gram-job-manager-callout-error.spec
@@ -1,56 +1,29 @@
-%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-gram-job-manager-callout-error
 %global _name %(tr - _ <<< %{name})
-Version:	2.1
-Release:	12%{?dist}
+Version:	3.4
+Release:	1%{?dist}
 Summary:	Globus Toolkit - Globus GRAM Jobmanager Callout Errors
 
 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-GRAM5
+#		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
 
 %package devel
 Summary:	Globus Toolkit - Globus GRAM Jobmanager Callout Errors 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 GRAM Jobmanager Callout Errors Documentation Files
@@ -58,7 +31,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 +61,16 @@ Globus GRAM Jobmanager Callout Errors 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,28 +81,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
+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}
 
@@ -143,17 +94,29 @@ rm -rf %{buildroot}
 
 %postun -p /sbin/ldconfig
 
-%files -f package.filelist
-%dir %{_datadir}/globus/packages/%{_name}
+%files
+%{_libdir}/libglobus_gram_job_manager_callout_error.so.*
 %dir %{_pkgdocdir}
+%doc %{_pkgdocdir}/GLOBUS_LICENSE
 %doc %{_pkgdocdir}/README
 
-%files -f package-devel.filelist devel
+%files devel
+%{_includedir}/globus/*
+%{_libdir}/libglobus_gram_job_manager_callout_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> - 3.4-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> - 2.1-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
diff --git a/sources b/sources
index c4dca8d..beb1965 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ecd3bbbb97fb618b93f9ee57caa4c7ad  globus_gram_job_manager_callout_error-2.1.tar.gz
+743d2ded13d1beca3d9eb23825eb5cbe  globus_gram_job_manager_callout_error-3.4.tar.gz

More information about the scm-commits mailing list