rpms/xsane
7
0
Fork 0
Code Issues Pull Requests Releases Activity

fix summaries and buildroot, don't remove buildroot on %%prep, mark dirs

Browse Source 
and config files, don't reference %%buildroot in %%build, use double-%%
    in changelog entries (#226658) Resolves: #226658
This commit is contained in:
Nils Philippsen 2007-03-30 15:30:59 +00:00
parent 1379b86264
commit 4a3ade2593
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
xsane.spec
View File

@ -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 @@ Patch2: xsane-0.92_gimp2.0.patch
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 @@ capture devices. XSane is written in GTK+ and provides control for
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 @@ interface, but it works as a GIMP plug-in. You must have GIMP
installed to use this package.
%prep
rm -rf %{buildroot}
%setup -q
%patch0 -p1 -b .htmlview
%patch1 -p1 -b .medium-definitions
@ -51,7 +50,7 @@ rm -rf %{buildroot}
%{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 @@ mv src/xsane src/xsane-gimp
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 @@ rm -rf %{buildroot}
%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 @@ if [ $1 = 0 ]; then
fi
%changelog
* Fri Mar 30 2007 Nils Philippsen <nphilipp@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@redhat.com> - 0.993-1
- version 0.993 (#230706)
@ -375,7 +379,7 @@ fi
* Mon Jul 26 1999 Tim Powers <timp@redhat.com>
- update to 0.30
- added %defattr
- added %%defattr
- built for 6.1
* Thu Apr 22 1999 Preston Brown <pbrown@redhat.com>