rpms/xsane/devel xsane.spec,1.82,1.83

[Nils Philippsen]

Author: nphilipp

Update of /cvs/pkgs/rpms/xsane/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv13941

Modified Files:
	xsane.spec 
Log Message:
work around old %configure macro


Index: xsane.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xsane/devel/xsane.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- xsane.spec	28 Jun 2010 09:08:55 -0000	1.82
+++ xsane.spec	28 Jun 2010 13:05:12 -0000	1.83
@@ -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 <nils at redhat.com> 0.997-7
+- work around old %%configure macro
+
 * Mon Jun 28 2010 Nils Philippsen <nils at redhat.com> 0.997-6
 - don't crash if no files are selected (#608047)