[redland-bindings] fix build

Rex Dieter rdieter at fedoraproject.org
Tue Mar 26 12:06:54 UTC 2013


commit b98bb47b5d6a2d80e1a7a927199f48c77d130793
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Mar 26 07:05:56 2013 -0500

    fix build
    
    drop reference to old patch
    cleaner perl dep (drop old rhel macro hack)

 redland-bindings.spec |   13 +------------
 1 files changed, 1 insertions(+), 12 deletions(-)
---
diff --git a/redland-bindings.spec b/redland-bindings.spec
index 9b13596..84ac646 100644
--- a/redland-bindings.spec
+++ b/redland-bindings.spec
@@ -16,23 +16,13 @@ Group:          System Environment/Libraries
 License:        LGPLv2+ or GPLv2+ or ASL 2.0
 URL:            http://librdf.org/
 Source:         http://download.librdf.org/source/%{name}-%{version}.tar.gz
-Patch1:         ruby-1.9.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %define         redland_ver 1.0.15
 %define         redland_version %(pkg-config --modversion redland 2>/dev/null || echo %{redland_ver})
 
-%{expand:%%define rhelrel %(test -e /etc/redhat-release -a ! -e /etc/fedora-release && perl -p -e 's@\D+([0-9\.]+)\D+@$1@' /etc/redhat-release || echo 0)}
-%{expand:%%define rhel %(expr %{rhelrel} \> 0)}
-
-
-# CentOS has MakeMaker in base perl package
-%if %{rhel}
-%else
-BuildRequires:  perl-ExtUtils-MakeMaker
-%endif
-
 BuildRequires:  redland-devel >= %{redland_ver}
+BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  php-devel
 BuildRequires:  python2-devel
 BuildRequires:  ruby
@@ -83,7 +73,6 @@ an interface to Perl.
 %global php_apiver  %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)
 %{!?php_extdir: %{expand: %%global php_extdir %(php-config --extension-dir)}}
 
-
 %package -n     php-redland
 Summary:        PHP modules for the Redland RDF library
 Group:          Development/Languages


More information about the scm-commits mailing list