[globus-gram-protocol/el5: 7/7] Remove obsolete workaround for broken RHEL 5 epstopdf
Mattias Ellert
ellert at fedoraproject.org
Thu Nov 7 10:40:54 UTC 2013
commit 6355b51f85a922e189cfe8eb87f63fb6530e2a7f
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date: Thu Nov 7 11:40:13 2013 +0100
Remove obsolete workaround for broken RHEL 5 epstopdf
.gitignore | 1 -
globus-gram-protocol.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-gram-protocol.spec b/globus-gram-protocol.spec
index d3770a9..d8f98c5 100644
--- a/globus-gram-protocol.spec
+++ b/globus-gram-protocol.spec
@@ -11,7 +11,7 @@
Name: globus-gram-protocol
%global _name %(tr - _ <<< %{name})
Version: 11.3
-Release: 10%{?dist}
+Release: 11%{?dist}
Summary: Globus Toolkit - GRAM Protocol Library
Group: System Environment/Libraries
@@ -20,9 +20,6 @@ URL: http://www.globus.org/
Source: http://www.globus.org/ftppub/gt5/5.2/5.2.1/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
@@ -106,16 +103,7 @@ GRAM Protocol 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
@@ -136,10 +124,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}
@@ -192,6 +176,9 @@ rm -rf %{buildroot}
%dir %{_pkgdocdir}/perl/Globus/GRAM
%changelog
+* Sat Oct 26 2013 Mattias Ellert <mattias.ellert at fysast.uu.se> - 11.3-11
+- Remove obsolete workaround for broken RHEL 5 epstopdf
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 11.3-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
diff --git a/sources b/sources
index e07f1fa..a9a5da7 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-44ec158f5ca5f60310cca74a3aaaea2b epstopdf-2.9.5gw
7ddb40bce59f2c9e56eaaac009ad4200 globus_gram_protocol-11.3.tar.gz
More information about the scm-commits
mailing list