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-authz-callout-error.spec b/globus-authz-callout-error.spec index e688742..0591296 100644 --- a/globus-authz-callout-error.spec +++ b/globus-authz-callout-error.spec @@ -9,7 +9,7 @@ Name: globus-authz-callout-error %global _name %(tr - _ <<< %{name}) Version: 2.2 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Globus Toolkit - Globus authz error 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.1/packages/src/%{_name}-%{version}.tar.gz # README file Source8: GLOBUS-GSIC -# 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 @@ -92,16 +89,7 @@ Globus authz error library (used by globus authz callouts) 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 @@ -122,10 +110,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} @@ -169,6 +153,9 @@ rm -rf %{buildroot} %dir %{_pkgdocdir}/html %changelog +* Fri Oct 25 2013 Mattias Ellert - 2.2-8 +- Remove obsolete workaround for broken RHEL 5 epstopdf + * Sat Aug 03 2013 Fedora Release Engineering - 2.2-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild diff --git a/sources b/sources index cb7ad9f..f45568c 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -44ec158f5ca5f60310cca74a3aaaea2b epstopdf-2.9.5gw eb2a25d6be196ae9635f4397be79ffdb globus_authz_callout_error-2.2.tar.gz