rpms/sane-frontends/devel sane-frontends.spec,1.21,1.22

[fedora-cvs-commits at redhat.com]

Author: nphilipp

Update of /cvs/dist/rpms/sane-frontends/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19515

Modified Files:
	sane-frontends.spec 
Log Message:
merge review (#226389):
  - add version info to obsoletes/provides
  - no config files in /usr
  - use %%configure macro
add dist tag
Resolves: #226389



Index: sane-frontends.spec
===================================================================
RCS file: /cvs/dist/rpms/sane-frontends/devel/sane-frontends.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sane-frontends.spec	15 Mar 2007 11:58:31 -0000	1.21
+++ sane-frontends.spec	24 Apr 2007 11:44:07 -0000	1.22
@@ -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: 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 @@
 %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 @@
 %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 at 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 at redhat.com> 1.0.14-2
 - rebuild with current gtk2 to add png support (#232013)