keep fedora comments in .patch not .spec

diff --git a/xsane-0.995-close-fds.patch b/xsane-0.995-close-fds.patch
index 917b075b34f5450192c01e39a1e5492eeffa20c3..eb1bfa5fab751f37ff2ea756a67a3f9ecd5b195d 100644 (file)
--- 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@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 c27693878a9649540724dcb80c3c92bcced80565..2dbdad188b3204a5eeec1c42f074d80a7f8e76d1 100644 (file)
--- 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@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 66cd68429685ab24bfe85e7cce725615dc3de4c0..2ce7b17610d7f8a46dd21d24bfa01dd04323cc71 100644 (file)
--- 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@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 43f7af6d191444c6a3e339d38c0f43633ba03d1a..d15615e9e2da8b7b816b574a5df9a5514c1d5c02 100644 (file)
--- 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@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 02155f8f860b0761493e46ea9482287567646256..e486262a4469422b347f2f3edfecf3fe369118b9 100644 (file)
--- 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@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 396be67169ee677f8502d73d37117910accd64aa..b203b51ad7aab36250d1ebf7866d552f81c02ccb 100644 (file)
--- 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@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 c792c5a1880cd1c87161aea8c721cfa8588c13ac..0fbbeb37a117d7e2e2f06d520d94228d97020674 100644 (file)
--- 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@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 29398181901e2ffc629e17ce96f1e7917e988bdf..f3a23b749526ed12d12d71169f303217b3ff3d2d 100644 (file)
--- 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@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 4fd84ba0b09631707b6a7baaa0319d5aa2bf80c6..0ca81565194ad96b0a49d311b68cad2947c36012 100644 (file)
--- 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@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 f6350fe985f0c60d81378644bc760769d0dd84e2..603504f7dfd9eb3ac4667871dd50b957bfb9b9c0 100644 (file)
--- 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@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 c3d696c28ecfb6f80d76a21f75dd24a8fa9708d1..86343703a41ec08dbaea74f12dbc934b5191c132 100644 (file)
--- 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@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 169dad3e318c7e0b737c2f2c2252702cb4a45b67..69e191ad72eb45db9e640e517762cef7f9b81d32 100644 (file)
--- 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@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 5550c4c08ae8365546670f544bba1fbdd32c30b5..867b5f03f6feca7cd43eca5e792d72d5a923ed49 100644 (file)
--- 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@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 10cdbea343199cff132e6bb918d5f8d629ddc54f..af3bb405b4013035c6f707f1775fc3a59f47f5b5 100644 (file)
--- 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@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 b9da71a1ed164b2e4645a32dce4654283908995c..1e3caf4ef2125c8ea7b35176a4644bde1a4d1955 100644 (file)
--- 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@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 20cf52c1ed27770f1792ba07590216b9713cb7db..2ff2b1ea298840f70c9f4c2e777d3834a8587c75 100644 (file)
--- 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

diff --git a/xsane.spec b/xsane.spec
index 48ec79e2643aa6935d9f5248312cae9026beabf7..1c1c36fbc9ac7819d5a59e236f31c57f023a5cd3 100644 (file)
--- 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