[globus-gram-job-manager-sge/el5] Specfile clean-up
Mattias Ellert
ellert at fedoraproject.org
Thu Dec 20 13:16:12 UTC 2012
commit f7fc4a35902263bb8ee50b85fbd40e50918c73a8
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date: Fri Dec 14 19:39:42 2012 +0100
Specfile clean-up
globus-gram-job-manager-sge.spec | 31 ++++++++++++++++++++-----------
1 files changed, 20 insertions(+), 11 deletions(-)
---
diff --git a/globus-gram-job-manager-sge.spec b/globus-gram-job-manager-sge.spec
index c16ea1f..44a5939 100644
--- a/globus-gram-job-manager-sge.spec
+++ b/globus-gram-job-manager-sge.spec
@@ -9,7 +9,7 @@
Name: globus-gram-job-manager-sge
%global _name %(tr - _ <<< %{name})
Version: 1.5
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Globus Toolkit - Grid Engine Job Manager Support
Group: Applications/Internet
@@ -27,7 +27,14 @@ Requires: globus-common-progs >= 14
Requires: globus-gatekeeper >= 9
Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
Requires: %{name}-setup
+%if "%{?rhel}" == "6"
+# gridengine is not available for EPEL 6 ppc64
+%ifnarch ppc64
Requires: gridengine
+%endif
+%else
+Requires: gridengine
+%endif
Provides: globus-gram-job-manager-setup-sge = 2.6
Obsoletes: globus-gram-job-manager-setup-sge < 2.6
Obsoletes: globus-gram-job-manager-setup-sge-doc < 2.6
@@ -131,15 +138,15 @@ sed 's!CC -shared !CC \${wl}--as-needed -shared !g' -i libtool
make %{?_smp_mflags}
%install
-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
# This library is opened using lt_dlopenext, so the libtool archive
# (.la file) can not be removed - fix the libdir and clear dependency_libs
# ... and move it to the main package
-for lib in `find $RPM_BUILD_ROOT%{_libdir} -name 'lib*.la'` ; do
+for lib in `find %{buildroot}%{_libdir} -name 'lib*.la'` ; do
sed -e "s!^libdir=.*!libdir=\'%{_libdir}\'!" \
-e "s!^dependency_libs=.*!dependency_libs=\'\'!" -i $lib
done
@@ -148,15 +155,14 @@ grep 'lib.*\.la$' $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist \
sed '/lib.*\.la$/d' -i $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist
# Remove jobmanager-sge from install dir - leave it for admin configuration
-rm $RPM_BUILD_ROOT/etc/grid-services/jobmanager-sge
+rm %{buildroot}/etc/grid-services/jobmanager-sge
# 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
# Devel package is redundant
-rm $RPM_BUILD_ROOT%{_libdir}/libglobus_seg_sge.so
-rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/globus-gram-job-manager-sge.pc
+rm %{buildroot}%{_libdir}/libglobus_seg_sge.so
+rm %{buildroot}%{_libdir}/pkgconfig/globus-gram-job-manager-sge.pc
rm $GLOBUSPACKAGEDIR/%{_name}/%{flavor}_dev.filelist
rm $GLOBUSPACKAGEDIR/%{_name}/pkg_data_%{flavor}_dev.gpt
@@ -173,7 +179,7 @@ cat $GLOBUSPACKAGEDIR/%{_name}/noflavor_doc.filelist \
| sed 's!^!%doc %{_prefix}!' > package.filelist
%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
%preun setup-poll
if [ $1 -eq 0 ]; then
@@ -214,6 +220,9 @@ fi
%config(noreplace) %{_sysconfdir}/globus/scheduler-event-generator/available/sge
%changelog
+* Thu Dec 06 2012 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.5-2
+- Specfile clean-up
+
* Sat Apr 28 2012 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.5-1
- Update to Globus Toolkit 5.2.1
- Drop patch globus-gram-job-manager-sge-desc.patch (fixed upstream)
More information about the scm-commits
mailing list