[xsane] version 0.999

Nils Philippsen nphilipp at fedoraproject.org
Tue Jun 4 15:52:55 UTC 2013


commit 59ce0c35328bc4d543f4d53263da47ee94042748
Author: Nils Philippsen <nils at redhat.com>
Date:   Tue Jun 4 17:51:13 2013 +0200

    version 0.999
    
    - remove obsolete patches
    - update/fix patch comments

 .gitignore                            |    2 +
 sources                               |    4 +-
 xsane-0.998-man.patch                 |   48 ----------------------------
 xsane-0.998-null-preview-crash.patch  |   44 --------------------------
 xsane-0.998-preview-window-size.patch |   56 ---------------------------------
 xsane.spec                            |   45 ++++++++++++--------------
 6 files changed, 24 insertions(+), 175 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e76ef0f..06c9305 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,5 @@ xsane-0.997-5-autoconf.patch.bz2
 /xsane-0.998.tar.gz
 /xsane-0.998-1-autoconf.patch.bz2
 /xsane-256x256.png
+/xsane-0.999-1-autoconf.patch.bz2
+/xsane-0.999.tar.gz
diff --git a/sources b/sources
index dbf79f9..5bbbd15 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-936f1cc76b37caa8f285e1e15ac7e0aa  xsane-0.998.tar.gz
-ccd4da2bfd19ba9e778a278ad6ca4472  xsane-0.998-1-autoconf.patch.bz2
 bd62603e67d7472b93cee42f57ae14b8  xsane-256x256.png
+837d97ed5f05054a1ba95b275fd08c13  xsane-0.999-1-autoconf.patch.bz2
+9927f21e1ab6ba96315e7f0e30746deb  xsane-0.999.tar.gz
diff --git a/xsane.spec b/xsane.spec
index eb4502d..11329c1 100644
--- a/xsane.spec
+++ b/xsane.spec
@@ -19,16 +19,18 @@
 
 Name: xsane
 Summary: X Window System front-end for the SANE scanner interface
-Version: 0.998
-Release: 21%{?dist}
+Version: 0.999
+Release: 1%{?dist}
 Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz
 Source1: xsane-256x256.png
-# distro-specific: use "xdg-open" instead of "netscape" to launch help browser
+# use "xdg-open" instead of "netscape" to launch help browser
+# submitted to upstream (Oliver Rauch) via email, 2013-06-04
 Patch0: xsane-0.995-xdg-open.patch
 # submitted to upstream (Oliver Rauch) via email, 2009-08-18
 Patch1: xsane-0.995-close-fds.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=504344
-# distro-specific, upstream won't accept it: "don't show license dialog"
+# distro-specific(?), upstream won't accept it: "don't show license dialog"
+# submitted to upstream (Oliver Rauch) anyway via email, 2013-06-04
 Patch2: xsane-0.996-no-eula.patch
 # enable off-root building
 # submitted to upstream (Oliver Rauch) via email, 2010-06-23
@@ -43,28 +45,19 @@ Patch5: xsane-0.997-ipv6.patch
 # fix from: https://bugs.launchpad.net/ubuntu/+source/xsane/+bug/370818
 # submitted to upstream (Oliver Rauch) via email, 2011-06-01
 Patch6: xsane-0.998-preview-selection.patch
-# build with libpng-1.5
+# fix building with libpng >= 1.5
 # submitted to upstream (Oliver Rauch) via email, 2011-11-21
 Patch7: xsane-0.998-libpng.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=795085
-# distro-specific: set program name/wmclass so GNOME shell picks appropriate
-# high resolution icon file
+# set program name/wmclass so GNOME shell picks appropriate high resolution
+# icon file
+# submitted to upstream (Oliver Rauch) via email, 2013-06-04
 Patch8: xsane-0.998-wmclass.patch
-# calculate minimum window size better for multi-head setups
-# submitted to upstream (Oliver Rauch) via email, 2012-09-03
-Patch9: xsane-0.998-preview-window-size.patch
-# correct some typos in the man page, original patch by John Bradshaw
-# submitted to upstream (Oliver Rauch) via email, 2012-09-03
-Patch10: xsane-0.998-man.patch
-# distro-specific: customize desktop file
-Patch11: xsane-0.998-desktop-file.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=693224
-# https://bugzilla.redhat.com/show_bug.cgi?id=963696
-# submitted to upstream (Oliver Rauch) via email, 2011-04-04 and (updated
-# patch) 2013-05-17
-Patch12: xsane-0.998-null-preview-crash.patch
+# partly distro-specific: customize desktop file
+# submitted to upstream (Oliver Rauch) via email, 2013-06-04
+Patch9: xsane-0.998-desktop-file.patch
 # autoconf-generated files
-Patch100: xsane-0.998-1-autoconf.patch.bz2
+Patch100: xsane-0.999-1-autoconf.patch.bz2
 License: GPLv2+
 URL: http://www.xsane.org/
 Group: Applications/Multimedia
@@ -124,10 +117,7 @@ done
 %patch6 -p1 -b .preview-selection.patch
 %patch7 -p1 -b .libpng
 %patch8 -p1 -b .wmclass
-%patch9 -p1 -b .preview-window-size
-%patch10 -p1 -b .man
-%patch11 -p1 -b .desktop-file
-%patch12 -p1 -b .null-preview-crash
+%patch9 -p1 -b .desktop-file
 
 %patch100 -p1 -b .autoconf
 
@@ -232,6 +222,11 @@ fi
 %{_datadir}/sane/xsane
 
 %changelog
+* Tue Jun 04 2013 Nils Philippsen <nils at redhat.com> - 0.999-1
+- version 0.999
+- remove obsolete patches
+- update/fix patch comments
+
 * Fri May 17 2013 Nils Philippsen <nils at redhat.com> - 0.998-21
 - don't dereference NULL preview objects when quitting (#963696)
 - fix vendor tag logic in a prettier way


More information about the scm-commits mailing list