From e985dba1513c22599d096cb996339d4f9185e448 Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nphilipp@fedoraproject.org>
Date: Apr 24 2007 11:44:07 +0000
Subject: merge review (#226389):

- add version info to obsoletes/provides
- no config files in /usr
- use %%configure macro add dist tag Resolves: #226389

---

diff --git a/sane-frontends.spec b/sane-frontends.spec
index aba85be..fb1885d 100644
--- a/sane-frontends.spec
+++ b/sane-frontends.spec
@@ -1,6 +1,6 @@
 Name: sane-frontends
 Version: 1.0.14
-Release: 2
+Release: 3%{?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
@@ -11,8 +11,8 @@ BuildRequires: gtk2-devel gimp-devel libjpeg-devel
 BuildRequires: sane-backends-devel libieee1284-devel
 Requires:  sane-backends
 Buildroot: %{_tmppath}/%{name}-root
-Obsoletes: sane
-Provides: sane
+Obsoletes: sane <= 0:1.0.9
+Provides: sane = %{?epoch:%{epoch}:}%{version}-%{release}
 ExcludeArch: s390 s390x
 
 %description
@@ -23,8 +23,7 @@ This packages includes the scanadf and xcam programs.
 %patch0 -p1 -b .badcode
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" \
-./configure --with-gnu-ld --prefix=%{_prefix} --sysconfdir=%{_sysconfdir} --mandir=%{_mandir}
+%configure --with-gnu-ld --prefix=%{_prefix} --sysconfdir=%{_sysconfdir} --mandir=%{_mandir}
 make
 
 %install
@@ -40,11 +39,18 @@ rm -R $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,755)
 %{_bindir}/*
-%config(noreplace) %{_datadir}/sane/sane-style.rc
+%{_datadir}/sane/sane-style.rc
 %{_mandir}/man1/*
 
 
 %changelog
+* Tue Apr 24 2007 Nils Philippsen <nphilipp@redhat.com> 1.0.14-3
+- merge review (#226389):
+  - add version info to obsoletes/provides
+  - no config files in /usr
+  - use %%configure macro
+- add dist tag
+
 * Thu Mar 15 2007 Karsten Hopp <karsten@redhat.com> 1.0.14-2
 - rebuild with current gtk2 to add png support (#232013)