diff --git a/.cvsignore b/.cvsignore index 293abd5..dc4ae20 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xsane-0.995.tar.gz +xsane-0.996.tar.gz diff --git a/sources b/sources index 1f290a3..dfc4a71 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5aaedb75973c3b13b136edec714e3fe8 xsane-0.995.tar.gz +7dcbcdf0e83322d7c0a543672d9ca2d8 xsane-0.996.tar.gz diff --git a/xsane.spec b/xsane.spec index 35ac309..70d612a 100644 --- a/xsane.spec +++ b/xsane.spec @@ -2,18 +2,23 @@ Name: xsane Summary: X Window System front-end for the SANE scanner interface -Version: 0.995 -Release: 3%{?dist} +Version: 0.996 +Release: 2%{?dist} Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz Source1: xsane.desktop Source2: xsane.conf.in Patch0: xsane-0.995-xdg-open.patch Patch1: xsane-0.995-eula-license-size.patch +Patch2: xsane-0.995-close-fds.patch License: GPLv2+ URL: http://www.xsane.org/ Group: Applications/Multimedia Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%__id_u -n) -BuildRequires: sane-backends-devel gimp-devel libpng-devel libjpeg-devel +BuildRequires: gimp-devel +BuildRequires: lcms-devel +BuildRequires: libjpeg-devel +BuildRequires: libpng-devel +BuildRequires: sane-backends-devel BuildRequires: desktop-file-utils >= 0.2.92 BuildRequires: libtiff-devel BuildRequires: gettext-devel @@ -41,6 +46,7 @@ installed to use this package. %setup -q %patch0 -p1 -b .xdg-open %patch1 -p1 -b .eula-license-size +%patch2 -p1 -b .close-fds %build %configure --enable-gimp @@ -56,11 +62,12 @@ make LDFLAGS= %install rm -rf %{buildroot} -%makeinstall +make DESTDIR=%{buildroot} install install src/xsane-gimp %{buildroot}%{_bindir} -mkdir %{buildroot}%{_datadir}/applications +# use our own desktop file +rm %{buildroot}%{_datadir}/applications/xsane.desktop desktop-file-install --vendor %{desktop_vendor} \ --dir %{buildroot}%{_datadir}/applications \ %{SOURCE1} @@ -93,6 +100,7 @@ fi %{_datadir}/sane %dir %{_datadir}/applications %{_datadir}/applications/%{desktop_vendor}-xsane.desktop +%{_datadir}/pixmaps/xsane.xpm %files gimp %defattr(-,root,root) @@ -105,6 +113,20 @@ fi %config(noreplace) %{_sysconfdir}/gimp/plugins.d/xsane.conf %changelog +* Tue Jan 20 2009 Nils Philippsen - 0.996-2 +- BR: lcms-devel + +* Sun Jan 18 2009 Nils Philippsen - 0.996-1 +- version 0.996 +- don't use %%makeinstall +- use shipped xsane.xpm as application icon + +* Fri Jul 18 2008 Nils Philippsen - 0.995-5 +- fix fd leak prevention (#455450) + +* Tue Jul 15 2008 Nils Philippsen - 0.995-4 +- don't leak file descriptors to help browser process (#455450) + * Tue Feb 19 2008 Fedora Release Engineering - 0.995-3 - Autorebuild for GCC 4.3