[sane-frontends] clean up
Nils Philippsen
nphilipp at fedoraproject.org
Tue Apr 3 15:16:53 UTC 2012
commit 2c59f47530e4e6e2ac694ef7ba0503f7bd8a98f4
Author: Nils Philippsen <nils at redhat.com>
Date: Tue Apr 3 17:16:42 2012 +0200
clean up
sane-frontends.spec | 23 ++++++++++-------------
1 files changed, 10 insertions(+), 13 deletions(-)
---
diff --git a/sane-frontends.spec b/sane-frontends.spec
index f7734b5..82c5569 100644
--- a/sane-frontends.spec
+++ b/sane-frontends.spec
@@ -1,6 +1,6 @@
Name: sane-frontends
Version: 1.0.14
-Release: 13%{?dist}
+Release: 14%{?dist}
Summary: Graphical frontend to SANE
URL: http://www.sane-project.org
Source0: ftp://ftp.sane-project.org/pub/sane/%{name}-%{version}/%{name}-%{version}.tar.gz
@@ -8,12 +8,8 @@ Patch0: sane-frontends-1.0.14-array-out-of-bounds.patch
Patch1: sane-frontends-1.0.14-sane-backends-1.0.20.patch
License: GPLv2+
Group: Applications/System
-BuildRequires: gtk2-devel gimp-devel
+BuildRequires: gtk2-devel
BuildRequires: sane-backends-devel >= 1.0.19-15
-Requires: sane-backends
-Buildroot: %{_tmppath}/%{name}-root
-Obsoletes: sane <= 0:1.0.9
-Provides: sane = %{?epoch:%{epoch}:}%{version}-%{release}
%description
This packages includes the scanadf and xcam programs.
@@ -25,22 +21,17 @@ This packages includes the scanadf and xcam programs.
%build
%configure --with-gnu-ld --prefix=%{_prefix} --sysconfdir=%{_sysconfdir} --mandir=%{_mandir}
-make
+make %{?_smp_mflags}
%install
-rm -rf %buildroot
-%makeinstall
+make DESTDIR=%{buildroot} install
# Not xscanimage; use xsane instead.
rm -f %{buildroot}%{_bindir}/xscanimage
rm -f %{buildroot}%{_mandir}/man1/xscanimage*
rm -f %{buildroot}%{_datadir}/sane/sane-style.rc
-%clean
-rm -rf %buildroot
-
%files
-%defattr(-,root,root,755)
%doc AUTHORS COPYING README
%{_bindir}/*
%{_mandir}/man1/*
@@ -48,6 +39,12 @@ rm -rf %buildroot
# intended to be used from the command line
%changelog
+* Tue Apr 03 2012 Nils Philippsen <nils at redhat.com> - 1.0.14-14
+- clean up:
+ - don't BR: gimp-devel, R: sane-backends
+ - get rid of buildroot, %%makeinstall and %%clean section
+ - dont obsolete/provide "sane" (ancient)
+
* Tue Jan 10 2012 Nils Philippsen <nils at redhat.com> - 1.0.14-13
- rebuild for gcc 4.7
More information about the scm-commits
mailing list