work around old %configure macro
This commit is contained in:
parent
9ba460e7c2
commit
6dc8a78efc
16
xsane.spec
16
xsane.spec
@ -3,10 +3,18 @@
|
|||||||
|
|
||||||
%global gimpplugindir %(gimptool --gimpplugindir)/plug-ins
|
%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
|
Name: xsane
|
||||||
Summary: X Window System front-end for the SANE scanner interface
|
Summary: X Window System front-end for the SANE scanner interface
|
||||||
Version: 0.997
|
Version: 0.997
|
||||||
Release: 6%{?dist}
|
Release: 7%{?dist}
|
||||||
Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz
|
Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz
|
||||||
Source1: xsane.desktop
|
Source1: xsane.desktop
|
||||||
# distro-specific: use "xdg-open" instead of "netscape" to launch help browser
|
# 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}\"'
|
CC='gcc -DXSANE_BUGTRACKER_URL=\"%{bugtracker_url}\"'
|
||||||
export CC
|
export CC
|
||||||
|
|
||||||
# needed for off-root building
|
|
||||||
%define _configure ../configure
|
|
||||||
|
|
||||||
pushd build-with-gimp
|
pushd build-with-gimp
|
||||||
%configure --enable-gimp
|
%configure --enable-gimp
|
||||||
make %{?_smp_mflags}
|
make %{?_smp_mflags}
|
||||||
@ -149,6 +154,9 @@ fi
|
|||||||
%{_datadir}/sane/xsane
|
%{_datadir}/sane/xsane
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Jun 28 2010 Nils Philippsen <nils@redhat.com> 0.997-7
|
||||||
|
- work around old %%configure macro
|
||||||
|
|
||||||
* Mon Jun 28 2010 Nils Philippsen <nils@redhat.com> 0.997-6
|
* Mon Jun 28 2010 Nils Philippsen <nils@redhat.com> 0.997-6
|
||||||
- don't crash if no files are selected (#608047)
|
- don't crash if no files are selected (#608047)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user