rpms/xsane/FC-6 .cvsignore, 1.14, 1.15 sources, 1.14, 1.15 xsane.spec, 1.42, 1.43

[fedora-cvs-commits at redhat.com]

Author: nphilipp

Update of /cvs/dist/rpms/xsane/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv24429

Modified Files:
	.cvsignore sources xsane.spec 
Log Message:
version 0.994 (#235038)
fix summaries and buildroot, don't remove buildroot on %prep, mark dirs and config files, don't reference %buildroot in %build, use double-% in changelog entries (#226658)
Resolves: #226658, #235038



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xsane/FC-6/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	28 Aug 2006 07:06:05 -0000	1.14
+++ .cvsignore	3 Apr 2007 15:56:33 -0000	1.15
@@ -1 +1 @@
-xsane-0.991.tar.gz
+xsane-0.994.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xsane/FC-6/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	28 Aug 2006 07:06:05 -0000	1.14
+++ sources	3 Apr 2007 15:56:33 -0000	1.15
@@ -1 +1 @@
-cded872f2e7041f4a0f2dc4f0bbc5a77  xsane-0.991.tar.gz
+7d02656026797a46a84bda63006f5668  xsane-0.994.tar.gz


Index: xsane.spec
===================================================================
RCS file: /cvs/dist/rpms/xsane/FC-6/xsane.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- xsane.spec	25 Oct 2006 06:37:14 -0000	1.42
+++ xsane.spec	3 Apr 2007 15:56:33 -0000	1.43
@@ -1,9 +1,9 @@
 %define desktop_vendor fedora
 
 Name: xsane
-Summary: An X Window System front-end for the SANE scanner interface.
-Version: 0.991
-Release: 4%{?dist}
+Summary: X Window System front-end for the SANE scanner interface
+Version: 0.994
+Release: 1%{?dist}
 Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz
 Source1: xsane.desktop
 Source2: xsane.conf.in
@@ -13,7 +13,7 @@
 License: GPL
 URL: http://www.xsane.org/
 Group: Applications/Multimedia
-Buildroot: %{_tmppath}/%{name}-buildroot
+Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%__id_u -n)
 BuildRequires: sane-backends-devel gimp-devel libpng-devel libjpeg-devel
 BuildRequires: desktop-file-utils >= 0.2.92
 BuildRequires: libtiff-devel
@@ -30,7 +30,7 @@
 performing the scan and then manipulating the captured image.
 
 %package gimp
-Summary: A GIMP plug-in which provides the SANE scanner interface.
+Summary: GIMP plug-in providing the SANE scanner interface
 Group: Applications/Multimedia
 Requires(post): gimp >= 2:2.2.12-4
 Requires(preun): gimp >= 2:2.2.12-4
@@ -41,7 +41,6 @@
 installed to use this package.
 
 %prep
-rm -rf %{buildroot}
 %setup -q
 %patch0 -p1 -b .htmlview
 %patch1 -p1 -b .medium-definitions
@@ -51,7 +50,7 @@
 %{expand:%%define optflags %{optflags} -DGIMP_ENABLE_COMPAT_CRUFT=1}
 aclocal -I m4
 autoconf
-%configure --with-install-root=%{buildroot}
+%configure
 make LDFLAGS=
 
 mv src/xsane src/xsane-gimp
@@ -59,7 +58,7 @@
 sed -e 's|@BINDIR@|%{_bindir}|g' < "%{SOURCE2}" > xsane.conf
 
 make clean
-%configure --with-install-root=%{buildroot} --disable-gimp
+%configure --disable-gimp
 make LDFLAGS=
 
 %install
@@ -100,9 +99,9 @@
 %dir %{_datadir}/sane
 %dir %{_datadir}/sane/xsane
 %{_datadir}/sane/xsane/*eula*
-%{_sysconfdir}/gimp
-%{_sysconfdir}/gimp/plugins.d
-%config %{_sysconfdir}/gimp/plugins.d/xsane.conf
+%dir %{_sysconfdir}/gimp
+%dir %{_sysconfdir}/gimp/plugins.d
+%config(noreplace) %{_sysconfdir}/gimp/plugins.d/xsane.conf
 
 %post gimp
 if [ -x "%{_sbindir}/gimp-plugin-mgr" ]; then
@@ -117,6 +116,17 @@
 fi
 
 %changelog
+* Tue Apr 03 2007 Nils Philippsen <nphilipp at redhat.com> - 0.994-1
+- version 0.994 (#235038)
+
+* Fri Mar 30 2007 Nils Philippsen <nphilipp at redhat.com> - 0.993-2
+- fix summaries and buildroot, don't remove buildroot on %%prep, mark dirs and
+  config files, don't reference %%buildroot in %%build, use double-%% in
+  changelog entries (#226658)
+
+* Fri Mar 02 2007 Nils Philippsen <nphilipp at redhat.com> - 0.993-1
+- version 0.993 (#230706)
+
 * Wed Oct 25 2006 Nils Philippsen <nphilipp at redhat.com> - 0.991-4
 - fix typo in scriptlet (#212063)
 
@@ -372,7 +382,7 @@
 
 * Mon Jul 26 1999 Tim Powers <timp at redhat.com>
 - update to 0.30
-- added %defattr
+- added %%defattr
 - built for 6.1
 
 * Thu Apr 22 1999 Preston Brown <pbrown at redhat.com>