[globus-scheduler-event-generator/el5: 2/2] Update to Globus Toolkit 5.2.3

[Mattias Ellert]

commit 310a404516f5e4452d906dedc6818a916aeefa8b
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Fri Dec 14 16:59:05 2012 +0100

    Update to Globus Toolkit 5.2.3

 globus-scheduler-event-generator.spec |   44 ++++++++++++++++++++++----------
 sources                               |    2 +-
 2 files changed, 31 insertions(+), 15 deletions(-)
---
diff --git a/globus-scheduler-event-generator.spec b/globus-scheduler-event-generator.spec
index 0491d75..a03b2cc 100644
--- a/globus-scheduler-event-generator.spec
+++ b/globus-scheduler-event-generator.spec
@@ -8,14 +8,14 @@
 
 Name:		globus-scheduler-event-generator
 %global _name %(tr - _ <<< %{name})
-Version:	4.6
-Release:	2%{?dist}
+Version:	4.7
+Release:	1%{?dist}
 Summary:	Globus Toolkit - Scheduler Event Generator
 
 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/gt5/5.2/5.2.3/packages/src/%{_name}-%{version}.tar.gz
 Source1:	%{name}
 #		README file
 Source8:	GLOBUS-GRAM5
@@ -48,6 +48,19 @@ BuildRequires:	tex(latex)
 %else
 BuildRequires:	tetex-latex
 %endif
+%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 progs
 Summary:	Globus Toolkit - Scheduler Event Generator Programs
@@ -56,6 +69,7 @@ Requires:	%{name}%{?_isa} = %{version}-%{release}
 Requires:	globus-common%{?_isa} >= 14
 Requires:	globus-xio-gsi-driver%{?_isa} >= 2
 Requires:	globus-xio%{?_isa} >= 3
+Requires:	globus-common-progs >= 14
 Requires(post):		chkconfig
 Requires(preun):	chkconfig
 Requires(preun):	initscripts
@@ -154,13 +168,13 @@ make %{?_smp_mflags}
 export PATH=$PWD/bin:$PATH
 %endif
 
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
 
-GLOBUSPACKAGEDIR=$RPM_BUILD_ROOT%{_datadir}/globus/packages
+GLOBUSPACKAGEDIR=%{buildroot}%{_datadir}/globus/packages
 
 # Remove libtool archives (.la files)
-find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la' -exec rm -v '{}' \;
+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
@@ -169,21 +183,20 @@ grep GLOBUS_LICENSE $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
 sed /GLOBUS_LICENSE/d -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist
 
 # Remove unwanted documentation (needed for RHEL4)
-rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*_%{_name}-%{version}_*.3
+rm -f %{buildroot}%{_mandir}/man3/*_%{_name}-%{version}_*.3
 sed -e '/_%{_name}-%{version}_.*\.3/d' \
   -i $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist
 
 # Remove start-up scripts
-rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/init.d
+rm -rf %{buildroot}%{_sysconfdir}/init.d
 sed '/init\.d/d' -i $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_pgm.filelist
 
 # Install start-up scripts
-mkdir -p $RPM_BUILD_ROOT%{_initddir}
-install -p %{SOURCE1} $RPM_BUILD_ROOT%{_initddir}
+mkdir -p %{buildroot}%{_initddir}
+install -p %{SOURCE1} %{buildroot}%{_initddir}
 
 # Install README file
-install -m 644 -p %{SOURCE8} \
-  $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/README
+install -m 644 -p %{SOURCE8} %{buildroot}%{_docdir}/%{name}-%{version}/README
 
 # Generate package filelists
 cat $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_rtl.filelist \
@@ -199,7 +212,7 @@ cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
   | sed -e 's!/man/.*!&*!' -e 's!^!%doc %{_prefix}!' > package-doc.filelist
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post -p /sbin/ldconfig
 
@@ -239,6 +252,9 @@ fi
 %dir %{_docdir}/%{name}-%{version}/html
 
 %changelog
+* Thu Dec 06 2012 Mattias Ellert <mattias.ellert at fysast.uu.se> - 4.7-1
+- Update to Globus Toolkit 5.2.3
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index 91d7623..d76f31a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 44ec158f5ca5f60310cca74a3aaaea2b  epstopdf-2.9.5gw
-a333a6d4c8d1c459762b8f255569ae97  globus_scheduler_event_generator-4.6.tar.gz
+40099d6e5ae29d8be62a5ba2ea2a0695  globus_scheduler_event_generator-4.7.tar.gz