From 9400f5a3ce01c0fb36ab9b44242ffd7f4556b18b Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Mon, 28 Jun 2010 13:05:49 +0000 Subject: [PATCH] work around old %configure macro --- xsane.spec | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/xsane.spec b/xsane.spec index a8f8d96..4b564cf 100644 --- a/xsane.spec +++ b/xsane.spec @@ -3,10 +3,18 @@ %global gimpplugindir %(gimptool --gimpplugindir)/plug-ins +# work around old %%configure macro +%if ! (0%{?rhel} > 6 || 0%{?fedora} > 12) +%global configure %(echo '%configure' | sed 's+\./configure+%%{_configure}+g') +%endif + +# needed for off-root building +%global _configure ../configure + Name: xsane Summary: X Window System front-end for the SANE scanner interface Version: 0.997 -Release: 6%{?dist} +Release: 7%{?dist} Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz Source1: xsane.desktop # distro-specific: use "xdg-open" instead of "netscape" to launch help browser @@ -90,9 +98,6 @@ mkdir build-without-gimp CC='gcc -DXSANE_BUGTRACKER_URL=\"%{bugtracker_url}\"' export CC -# needed for off-root building -%define _configure ../configure - pushd build-with-gimp %configure --enable-gimp make %{?_smp_mflags} @@ -149,6 +154,9 @@ fi %{_datadir}/sane/xsane %changelog +* Mon Jun 28 2010 Nils Philippsen 0.997-7 +- work around old %%configure macro + * Mon Jun 28 2010 Nils Philippsen 0.997-6 - don't crash if no files are selected (#608047)