[packages/xsane] keep fedora comments in .patch not .spec
glen
glen at pld-linux.org
Tue Aug 26 11:50:00 CEST 2014
commit 941204886b01d2e0f74c2b6c78bc9642b3f12b69
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Tue Aug 26 12:49:42 2014 +0300
keep fedora comments in .patch not .spec
xsane-0.995-close-fds.patch | 3 +
xsane-0.995-xdg-open.patch | 4 ++
xsane-0.996-no-eula.patch | 5 ++
xsane-0.997-ipv6.patch | 3 +
xsane-0.997-off-root-build.patch | 4 ++
xsane-0.998-desktop-file.patch | 4 ++
xsane-0.998-libpng.patch | 4 ++
xsane-0.998-preview-selection.patch | 5 ++
xsane-0.998-wmclass.patch | 6 ++
xsane-0.999-coverity.patch | 5 ++
xsane-0.999-lcms2.patch | 3 +
xsane-0.999-man-page.patch | 4 ++
xsane-0.999-no-file-selected.patch | 5 ++
xsane-0.999-pdf-no-high-bpp.patch | 4 ++
xsane-0.999-signal-handling.patch | 4 ++
xsane-0.999-snprintf-update.patch | 4 ++
xsane.spec | 117 ++++++++++++------------------------
17 files changed, 106 insertions(+), 78 deletions(-)
---
diff --git a/xsane.spec b/xsane.spec
index 48ec79e..1c1c36f 100644
--- a/xsane.spec
+++ b/xsane.spec
@@ -6,71 +6,33 @@ Version: 0.999
Release: 3
License: GPL v2+
Group: X11/Applications/Graphics
-#Source0Download: http://www.xsane.org/cgi-bin/sitexplorer.cgi?/download/
+# Source0Download: http://www.xsane.org/cgi-bin/sitexplorer.cgi?/download/
Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz
# Source0-md5: 9927f21e1ab6ba96315e7f0e30746deb
Source1: %{name}.desktop
Source2: %{name}.png
# from Fedora
-# 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"
-# 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
-Patch3: xsane-0.997-off-root-build.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=608047
-# https://bugzilla.redhat.com/show_bug.cgi?id=621778
-# submitted to upstream (Oliver Rauch) via email, 2013-07-05
-Patch4: xsane-0.999-no-file-selected.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=198422
-# submitted to upstream (Oliver Rauch) via email, 2010-06-29
-Patch5: xsane-0.997-ipv6.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=624190
-# 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
-# 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
-# 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
-# partly distro-specific: customize desktop file
-# submitted to upstream (Oliver Rauch) via email, 2013-06-04
-Patch9: xsane-0.998-desktop-file.patch
-# man page: update command line options
-# submitted to upstream (Oliver Rauch) via email, 2013-07-08
-Patch10: xsane-0.999-man-page.patch
-# avoid producing PDFs with bpp > 8
-# submitted to upstream (Oliver Rauch) via email, 2013-09-09
-Patch11: xsane-0.999-pdf-no-high-bpp.patch
-# build against lcms 2.x
-# submitted to upstream (Oliver Rauch) via email, 2013-09-23
-Patch12: xsane-0.999-lcms2.patch
-# fix issues found during static analysis that don't require far-reaching
-# refactoring
-# submitted to upstream (Oliver Rauch) via email, 2014-04-02
-Patch13: xsane-0.999-coverity.patch
-# update lib/snprintf.c to the latest version from LPRng that has a Free license
-# submitted to upstream (Oliver Rauch) via email, 2014-05-29
-Patch14: xsane-0.999-snprintf-update.patch
-# fix signal handling (#1073698)
-# submitted to upstream (Oliver Rauch) via email, 2014-07-03
-Patch15: xsane-0.999-signal-handling.patch
-
+Patch0: %{name}-0.995-xdg-open.patch
+Patch1: %{name}-0.995-close-fds.patch
+Patch2: %{name}-0.996-no-eula.patch
+Patch3: %{name}-0.997-off-root-build.patch
+Patch4: %{name}-0.999-no-file-selected.patch
+Patch5: %{name}-0.997-ipv6.patch
+Patch6: %{name}-0.998-preview-selection.patch
+Patch7: %{name}-0.998-libpng.patch
+Patch8: %{name}-0.998-wmclass.patch
+Patch9: %{name}-0.998-desktop-file.patch
+Patch10: %{name}-0.999-man-page.patch
+Patch11: %{name}-0.999-pdf-no-high-bpp.patch
+Patch12: %{name}-0.999-lcms2.patch
+Patch13: %{name}-0.999-coverity.patch
+Patch14: %{name}-0.999-snprintf-update.patch
+Patch15: %{name}-0.999-signal-handling.patch
# PLD
-Patch50: %{name}-datadir.patch
-Patch51: %{name}-pl.po-update.patch
-Patch52: %{name}-poMakefile.patch
-Patch53: %{name}-build.patch
+Patch50: %{name}-datadir.patch
+Patch51: %{name}-pl.po-update.patch
+Patch52: %{name}-poMakefile.patch
+Patch53: %{name}-build.patch
URL: http://www.xsane.org/
BuildRequires: autoconf
BuildRequires: automake
@@ -98,22 +60,22 @@ do komunikacji ze skanerem.
%prep
%setup -q
-%patch0 -p1 -b .xdg-open
-%patch1 -p1 -b .close-fds
-%patch2 -p1 -b .no-eula
-%patch3 -p1 -b .off-root-build
-%patch4 -p1 -b .no-file-selected
-%patch5 -p1 -b .ipv6
-%patch6 -p1 -b .preview-selection.patch
-%patch7 -p1 -b .libpng
-%patch8 -p1 -b .wmclass
-%patch9 -p1 -b .desktop-file
-%patch10 -p1 -b .man-page
-%patch11 -p1 -b .pdf-no-high-bpp
-%patch12 -p1 -b .lcms2
-%patch13 -p1 -b .coverity
-%patch14 -p1 -b .snprintf-update
-%patch15 -p1 -b .signal-handling
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
+%patch14 -p1
+%patch15 -p1
%patch50 -p1
%patch51 -p1
@@ -129,7 +91,6 @@ mv -f po/{zh,zh_TW}.po
%{__aclocal} -I m4
%{__autoconf}
%configure
-
%{__make}
%install
@@ -139,8 +100,8 @@ install -d $RPM_BUILD_ROOT{%{_gimpplugindir},%{_desktopdir},%{_pixmapsdir}}
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
-install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
+cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
ln -sf %{_bindir}/xsane $RPM_BUILD_ROOT%{_gimpplugindir}/xsane
diff --git a/xsane-0.995-close-fds.patch b/xsane-0.995-close-fds.patch
index 917b075..eb1bfa5 100644
--- a/xsane-0.995-close-fds.patch
+++ b/xsane-0.995-close-fds.patch
@@ -1,3 +1,6 @@
+# from Fedora
+# submitted to upstream (Oliver Rauch) via email, 2009-08-18
+
From 6dee7eadd1b7352ec503ea04fa1639d4a93f370b Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils at redhat.com>
Date: Thu, 16 Aug 2012 11:18:31 +0200
diff --git a/xsane-0.995-xdg-open.patch b/xsane-0.995-xdg-open.patch
index c276938..2dbdad1 100644
--- a/xsane-0.995-xdg-open.patch
+++ b/xsane-0.995-xdg-open.patch
@@ -1,3 +1,7 @@
+# from Fedora
+# use "xdg-open" instead of "netscape" to launch help browser
+# submitted to upstream (Oliver Rauch) via email, 2013-06-04
+
From 813d7063e3d265ba7e625766a040b8ba9bb130a9 Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils at redhat.com>
Date: Thu, 16 Aug 2012 11:18:00 +0200
diff --git a/xsane-0.996-no-eula.patch b/xsane-0.996-no-eula.patch
index 66cd684..2ce7b17 100644
--- a/xsane-0.996-no-eula.patch
+++ b/xsane-0.996-no-eula.patch
@@ -1,3 +1,8 @@
+# from Fedora
+# https://bugzilla.redhat.com/show_bug.cgi?id=504344
+# distro-specific(?), upstream won't accept it: "don't show license dialog"
+# submitted to upstream (Oliver Rauch) anyway via email, 2013-06-04
+
From 7018206ea45db2e8bdfeb67d33f3387c9678a407 Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils at redhat.com>
Date: Thu, 16 Aug 2012 11:19:16 +0200
diff --git a/xsane-0.997-ipv6.patch b/xsane-0.997-ipv6.patch
index 43f7af6..d15615e 100644
--- a/xsane-0.997-ipv6.patch
+++ b/xsane-0.997-ipv6.patch
@@ -1,3 +1,6 @@
+# from Fedora
+# https://bugzilla.redhat.com/show_bug.cgi?id=198422
+# submitted to upstream (Oliver Rauch) via email, 2010-06-29
From a2ef22d59904d5e53c3d58093b561fa1ab7127a6 Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils at redhat.com>
Date: Thu, 16 Aug 2012 10:58:54 +0200
diff --git a/xsane-0.997-off-root-build.patch b/xsane-0.997-off-root-build.patch
index 02155f8..e486262 100644
--- a/xsane-0.997-off-root-build.patch
+++ b/xsane-0.997-off-root-build.patch
@@ -1,3 +1,7 @@
+# from Fedora
+# enable off-root building
+# submitted to upstream (Oliver Rauch) via email, 2010-06-23
+
From 7f43255972b741ff178f94233ffff67c9779c247 Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils at redhat.com>
Date: Thu, 16 Aug 2012 10:57:38 +0200
diff --git a/xsane-0.998-desktop-file.patch b/xsane-0.998-desktop-file.patch
index 396be67..b203b51 100644
--- a/xsane-0.998-desktop-file.patch
+++ b/xsane-0.998-desktop-file.patch
@@ -1,3 +1,7 @@
+# from Fedora
+# partly distro-specific: customize desktop file
+# submitted to upstream (Oliver Rauch) via email, 2013-06-04
+
From e3f3e266249f77ff655299daeab3128347d6cb17 Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils at redhat.com>
Date: Wed, 30 Jan 2013 15:59:40 +0100
diff --git a/xsane-0.998-libpng.patch b/xsane-0.998-libpng.patch
index c792c5a..0fbbeb3 100644
--- a/xsane-0.998-libpng.patch
+++ b/xsane-0.998-libpng.patch
@@ -1,3 +1,7 @@
+# from Fedora
+# fix building with libpng >= 1.5
+# submitted to upstream (Oliver Rauch) via email, 2011-11-21
+
From bd29bb933cf80f397dd28286635da2aec58e6e6c Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils at redhat.com>
Date: Thu, 16 Aug 2012 11:26:54 +0200
diff --git a/xsane-0.998-preview-selection.patch b/xsane-0.998-preview-selection.patch
index 2939818..f3a23b7 100644
--- a/xsane-0.998-preview-selection.patch
+++ b/xsane-0.998-preview-selection.patch
@@ -1,3 +1,8 @@
+# from Fedora
+# https://bugzilla.redhat.com/show_bug.cgi?id=624190
+# fix from: https://bugs.launchpad.net/ubuntu/+source/xsane/+bug/370818
+# submitted to upstream (Oliver Rauch) via email, 2011-06-01
+
From d8bf0d3f0af16e208b52084f19a9a1287acbcea0 Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils at redhat.com>
Date: Fri, 2 Sep 2011 11:56:26 +0200
diff --git a/xsane-0.998-wmclass.patch b/xsane-0.998-wmclass.patch
index 4fd84ba..0ca8156 100644
--- a/xsane-0.998-wmclass.patch
+++ b/xsane-0.998-wmclass.patch
@@ -1,3 +1,9 @@
+# from Fedora
+# https://bugzilla.redhat.com/show_bug.cgi?id=795085
+# set program name/wmclass so GNOME shell picks appropriate high resolution
+# icon file
+# submitted to upstream (Oliver Rauch) via email, 2013-06-04
+
From a0b23d7e1991b23e2b9ab78bf382c55b9e24cfb9 Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils at redhat.com>
Date: Fri, 25 May 2012 11:47:39 +0200
diff --git a/xsane-0.999-coverity.patch b/xsane-0.999-coverity.patch
index f6350fe..603504f 100644
--- a/xsane-0.999-coverity.patch
+++ b/xsane-0.999-coverity.patch
@@ -1,3 +1,8 @@
+# from Fedora
+# fix issues found during static analysis that don't require far-reaching
+# refactoring
+# submitted to upstream (Oliver Rauch) via email, 2014-04-02
+
From 9fe09c0e0746067f9e9774229b3d0beb35c5766b Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils at redhat.com>
Date: Wed, 2 Apr 2014 14:54:05 +0200
diff --git a/xsane-0.999-lcms2.patch b/xsane-0.999-lcms2.patch
index c3d696c..8634370 100644
--- a/xsane-0.999-lcms2.patch
+++ b/xsane-0.999-lcms2.patch
@@ -1,3 +1,6 @@
+# from Fedora
+# build against lcms 2.x
+# submitted to upstream (Oliver Rauch) via email, 2013-09-23
From 30af0e2edbf061b71bed9536d826894449f0390d Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils at redhat.com>
Date: Mon, 23 Sep 2013 16:11:31 +0200
diff --git a/xsane-0.999-man-page.patch b/xsane-0.999-man-page.patch
index 169dad3..69e191a 100644
--- a/xsane-0.999-man-page.patch
+++ b/xsane-0.999-man-page.patch
@@ -1,3 +1,7 @@
+# from Fedora
+# man page: update command line options
+# submitted to upstream (Oliver Rauch) via email, 2013-07-08
+
From 2dbbd80a5fb80741729c7cd5027af058b9c08c2c Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils at redhat.com>
Date: Mon, 8 Jul 2013 17:46:06 +0200
diff --git a/xsane-0.999-no-file-selected.patch b/xsane-0.999-no-file-selected.patch
index 5550c4c..867b5f0 100644
--- a/xsane-0.999-no-file-selected.patch
+++ b/xsane-0.999-no-file-selected.patch
@@ -1,3 +1,8 @@
+# from Fedora
+# https://bugzilla.redhat.com/show_bug.cgi?id=608047
+# https://bugzilla.redhat.com/show_bug.cgi?id=621778
+# submitted to upstream (Oliver Rauch) via email, 2013-07-05
+
From 2f7abcaa7ad39f118b2f49fdcba9c90b37b3d972 Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils at redhat.com>
Date: Fri, 5 Jul 2013 16:15:55 +0200
diff --git a/xsane-0.999-pdf-no-high-bpp.patch b/xsane-0.999-pdf-no-high-bpp.patch
index 10cdbea..af3bb40 100644
--- a/xsane-0.999-pdf-no-high-bpp.patch
+++ b/xsane-0.999-pdf-no-high-bpp.patch
@@ -1,3 +1,7 @@
+# from Fedora
+# avoid producing PDFs with bpp > 8
+# submitted to upstream (Oliver Rauch) via email, 2013-09-09
+
From c0686879ac66c1933aefbb62b69afb0c9a0db912 Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils at redhat.com>
Date: Mon, 9 Sep 2013 17:13:15 +0200
diff --git a/xsane-0.999-signal-handling.patch b/xsane-0.999-signal-handling.patch
index b9da71a..1e3caf4 100644
--- a/xsane-0.999-signal-handling.patch
+++ b/xsane-0.999-signal-handling.patch
@@ -1,3 +1,7 @@
+# from Fedora
+# fix signal handling (#1073698)
+# submitted to upstream (Oliver Rauch) via email, 2014-07-03
+
From 3b5d3b7e1f320b0bfbe48024a586c0a22375aa2d Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils at redhat.com>
Date: Thu, 3 Jul 2014 10:38:03 +0200
diff --git a/xsane-0.999-snprintf-update.patch b/xsane-0.999-snprintf-update.patch
index 20cf52c..2ff2b1e 100644
--- a/xsane-0.999-snprintf-update.patch
+++ b/xsane-0.999-snprintf-update.patch
@@ -1,3 +1,7 @@
+# from Fedora
+# update lib/snprintf.c to the latest version from LPRng that has a Free license
+# submitted to upstream (Oliver Rauch) via email, 2014-05-29
+
diff -up xsane-0.999/lib/snprintf.c.OLD xsane-0.999/lib/snprintf.c
--- xsane-0.999/lib/snprintf.c.OLD 2014-05-29 10:42:26.795419830 -0400
+++ xsane-0.999/lib/snprintf.c 2014-05-29 10:48:58.544431002 -0400
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xsane.git/commitdiff/941204886b01d2e0f74c2b6c78bc9642b3f12b69
More information about the pld-cvs-commit
mailing list