rpms/xsane/F-10 .cvsignore, 1.17, 1.18 sources, 1.17, 1.18 xsane.spec, 1.58, 1.59

[Nils Philippsen]

Author: nphilipp

Update of /cvs/pkgs/rpms/xsane/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28538

Modified Files:
	.cvsignore sources xsane.spec 
Log Message:
version 0.996
don't use %makeinstall
use shipped xsane.xpm as application icon
BR: lcms-devel



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xsane/F-10/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	23 Nov 2007 11:03:41 -0000	1.17
+++ .cvsignore	20 Jan 2009 10:21:45 -0000	1.18
@@ -1 +1 @@
-xsane-0.995.tar.gz
+xsane-0.996.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xsane/F-10/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	23 Nov 2007 11:03:41 -0000	1.17
+++ sources	20 Jan 2009 10:21:45 -0000	1.18
@@ -1 +1 @@
-5aaedb75973c3b13b136edec714e3fe8  xsane-0.995.tar.gz
+7dcbcdf0e83322d7c0a543672d9ca2d8  xsane-0.996.tar.gz


Index: xsane.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xsane/F-10/xsane.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- xsane.spec	18 Jul 2008 14:13:01 -0000	1.58
+++ xsane.spec	20 Jan 2009 10:21:45 -0000	1.59
@@ -2,8 +2,8 @@
 
 Name: xsane
 Summary: X Window System front-end for the SANE scanner interface
-Version: 0.995
-Release: 5%{?dist}
+Version: 0.996
+Release: 2%{?dist}
 Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz
 Source1: xsane.desktop
 Source2: xsane.conf.in
@@ -14,7 +14,11 @@
 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
@@ -58,11 +62,12 @@
 
 %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}
@@ -95,6 +100,7 @@
 %{_datadir}/sane
 %dir %{_datadir}/applications
 %{_datadir}/applications/%{desktop_vendor}-xsane.desktop
+%{_datadir}/pixmaps/xsane.xpm
 
 %files gimp
 %defattr(-,root,root)
@@ -107,6 +113,14 @@
 %config(noreplace) %{_sysconfdir}/gimp/plugins.d/xsane.conf
 
 %changelog
+* Tue Jan 20 2009 Nils Philippsen <nphilipp at redhat.com> - 0.996-2
+- BR: lcms-devel
+
+* Sun Jan 18 2009 Nils Philippsen <nphilipp at redhat.com> - 0.996-1
+- version 0.996
+- don't use %%makeinstall
+- use shipped xsane.xpm as application icon
+
 * Fri Jul 18 2008 Nils Philippsen <nphilipp at redhat.com> - 0.995-5
 - fix fd leak prevention (#455450)