rpms/xsane/devel xsane.spec,1.44,1.45
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Mar 30 15:31:01 UTC 2007
Author: nphilipp
Update of /cvs/dist/rpms/xsane/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18398
Modified Files:
xsane.spec
Log Message:
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
Index: xsane.spec
===================================================================
RCS file: /cvs/dist/rpms/xsane/devel/xsane.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- xsane.spec 2 Mar 2007 14:19:13 -0000 1.44
+++ xsane.spec 30 Mar 2007 15:30:59 -0000 1.45
@@ -1,9 +1,9 @@
%define desktop_vendor fedora
Name: xsane
-Summary: An X Window System front-end for the SANE scanner interface.
+Summary: X Window System front-end for the SANE scanner interface
Version: 0.993
-Release: 1%{?dist}
+Release: 2%{?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,11 @@
fi
%changelog
+* 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)
@@ -375,7 +379,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>
More information about the fedora-cvs-commits
mailing list