rpms/xsane/F-13 xsane.spec,1.80,1.81
Nils Philippsen
nphilipp at fedoraproject.org
Mon Jun 28 13:05:46 UTC 2010
Author: nphilipp
Update of /cvs/pkgs/rpms/xsane/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv14144
Modified Files:
xsane.spec
Log Message:
work around old %configure macro
Index: xsane.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xsane/F-13/xsane.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- xsane.spec 28 Jun 2010 09:10:17 -0000 1.80
+++ xsane.spec 28 Jun 2010 13:05:45 -0000 1.81
@@ -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)
More information about the scm-commits
mailing list