[globus-rsl/el5: 7/7] Remove obsolete workaround for broken RHEL 5 epstopdf
Mattias Ellert
ellert at fedoraproject.org
Thu Nov 7 10:35:44 UTC 2013
commit 7f8fec3308b905056d9eb44b887deb15c718ac58
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date: Thu Nov 7 11:35:04 2013 +0100
Remove obsolete workaround for broken RHEL 5 epstopdf
.gitignore | 1 -
globus-rsl.spec | 21 ++++-----------------
sources | 1 -
3 files changed, 4 insertions(+), 19 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 943fe53..f6a3a77 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-/epstopdf-2.9.5gw
/*.tar.gz
diff --git a/globus-rsl.spec b/globus-rsl.spec
index 10ceb97..92ce2c8 100644
--- a/globus-rsl.spec
+++ b/globus-rsl.spec
@@ -9,7 +9,7 @@
Name: globus-rsl
%global _name %(tr - _ <<< %{name})
Version: 9.1
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: Globus Toolkit - Resource Specification Language Library
Group: System Environment/Libraries
@@ -18,9 +18,6 @@ URL: http://www.globus.org/
Source: http://www.globus.org/ftppub/gt5/5.2/5.2.0/packages/src/%{_name}-%{version}.tar.gz
# README file
Source8: GLOBUS-GRAM5
-# This is a workaround for the broken epstopdf script in RHEL5
-# See: https://bugzilla.redhat.com/show_bug.cgi?id=450388
-Source9: epstopdf-2.9.5gw
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: globus-common%{?_isa} >= 14
@@ -101,16 +98,7 @@ Resource Specification Language Library Documentation Files
%prep
%setup -q -n %{_name}-%{version}
-%if "%{rhel}" == "5"
-mkdir bin
-install %{SOURCE9} bin/epstopdf
-%endif
-
%build
-%if "%{rhel}" == "5"
-export PATH=$PWD/bin:$PATH
-%endif
-
# Remove files that should be replaced during bootstrap
rm -f doxygen/Doxyfile*
rm -f doxygen/Makefile.am
@@ -131,10 +119,6 @@ sed 's!CC -shared !CC \${wl}--as-needed -shared !g' -i libtool
make %{?_smp_mflags}
%install
-%if "%{rhel}" == "5"
-export PATH=$PWD/bin:$PATH
-%endif
-
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
@@ -178,6 +162,9 @@ rm -rf %{buildroot}
%dir %{_pkgdocdir}/html
%changelog
+* Sat Oct 26 2013 Mattias Ellert <mattias.ellert at fysast.uu.se> - 9.1-9
+- Remove obsolete workaround for broken RHEL 5 epstopdf
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 9.1-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
diff --git a/sources b/sources
index 9f6c768..a6095cd 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-44ec158f5ca5f60310cca74a3aaaea2b epstopdf-2.9.5gw
7414daa265fe64f9d22a195c76717bcf globus_rsl-9.1.tar.gz
More information about the scm-commits
mailing list