[packages/ncurses/df-dev] use patchset to handle patches from sources file

glen glen at pld-linux.org
Mon Jan 4 09:31:39 CET 2016


commit 86de2207e7e2c27f42f633625fbdb9265f5eddf5
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Mon Jan 4 10:30:42 2016 +0200

    use patchset to handle patches from sources file

 ncurses.spec | 47 +++++------------------------------------------
 sources      | 14 ++++++++++++++
 2 files changed, 19 insertions(+), 42 deletions(-)
---
diff --git a/ncurses.spec b/ncurses.spec
index e63ed8a..7200444 100644
--- a/ncurses.spec
+++ b/ncurses.spec
@@ -28,34 +28,7 @@ Source0:	ftp://dickey.his.com/ncurses/%{name}-%{basever}.tar.gz
 # Source0-md5:	ee13d052e1ead260d7c28071f46eefb1
 Source1:	http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5:	3b05ee835dc20c306e9af2a9d3fbf1f1
-Patch0:		ftp://dickey.his.com/ncurses/6.0/%{name}-%{basever}-20150810.patch.gz
-# Patch0-md5:	2addb3f87c533dc7c7c52afaf62abc79
-Patch1:		ftp://dickey.his.com/ncurses/6.0/%{name}-%{basever}-20150815.patch.gz
-# Patch1-md5:	4db32fa467507f087c4d54f12770e399
-Patch2:		ftp://dickey.his.com/ncurses/6.0/%{name}-%{basever}-20150822.patch.gz
-# Patch2-md5:	b591a06ea10fe00b320e9b5aecf939ec
-Patch3:		ftp://dickey.his.com/ncurses/6.0/%{name}-%{basever}-20150905.patch.gz
-# Patch3-md5:	9f12c80f9b99afab25f0ebbb3ada3d05
-Patch4:		ftp://dickey.his.com/ncurses/6.0/%{name}-%{basever}-20150912.patch.gz
-# Patch4-md5:	f11c2a5381ac75ddd1afd4a5cc6baa60
-Patch5:		ftp://dickey.his.com/ncurses/6.0/%{name}-%{basever}-20150919.patch.gz
-# Patch5-md5:	c25d0b997c37395b243da3ee68013471
-Patch6:		ftp://dickey.his.com/ncurses/6.0/%{name}-%{basever}-20150926.patch.gz
-# Patch6-md5:	e9059272b061ddd78d0e27fc84b3e9da
-Patch7:		ftp://dickey.his.com/ncurses/6.0/%{name}-%{basever}-20151010.patch.gz
-# Patch7-md5:	eaee1c3b67f2189921efd7d336d412f1
-Patch8:		ftp://dickey.his.com/ncurses/6.0/%{name}-%{basever}-20151017.patch.gz
-# Patch8-md5:	746bb7a761dcf895a08871285b96f769
-Patch9:		ftp://dickey.his.com/ncurses/6.0/%{name}-%{basever}-20151024.patch.gz
-# Patch9-md5:	d86fd80f87f12951dadf3a9abc834397
-Patch10:	ftp://dickey.his.com/ncurses/6.0/%{name}-%{basever}-20151101.patch.gz
-# Patch10-md5:	ad7fd777cbd6860ee8072334b2ed253f
-Patch11:	ftp://dickey.his.com/ncurses/6.0/%{name}-%{basever}-20151107.patch.gz
-# Patch11-md5:	1fffd21c5dc95acbe7c750d88ab9e5b9
-Patch12:	ftp://dickey.his.com/ncurses/6.0/%{name}-%{basever}-20151121.patch.gz
-# Patch12-md5:	d0cd4fc89d80cc6dde53bfecccc99e91
-Patch13:	ftp://dickey.his.com/ncurses/6.0/%{name}-%{basever}-20151128.patch.gz
-# Patch13-md5:	7cec35c9fe1d5e67f766e18b06b952d3
+%patchset_source -f ftp://dickey.his.com/ncurses/%{basever}/ -s sources
 Patch100:	%{name}-screen_hpa_fix.patch
 Patch101:	%{name}-xterm_hpa_fix.patch
 Patch102:	%{name}-meta.patch
@@ -67,6 +40,7 @@ Patch107:	%{name}-no-rain-demo.patch
 Patch108:	%{name}-fix-nonunicode-breakage.patch
 URL:		http://dickey.his.com/ncurses/ncurses.html
 BuildRequires:	automake
+BuildRequires:	rpmbuild(macros) >= 1.683
 %if %{with ada}
 BuildRequires:	gcc-ada
 # gnat bug: https://bugzilla.redhat.com/show_bug.cgi?id=613407
@@ -336,20 +310,9 @@ tworzenia aplikacji używających ncurses w języku Ada95.
 %prep
 %setup -qc
 mv %{name}-%{basever}/* .
-%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
+
+# official patches
+%patchset_patch -s sources -p1
 
 %patch100 -p1
 %patch101 -p1
diff --git a/sources b/sources
new file mode 100644
index 0000000..f4e6800
--- /dev/null
+++ b/sources
@@ -0,0 +1,14 @@
+2addb3f87c533dc7c7c52afaf62abc79  ncurses-6.0-20150810.patch.gz
+4db32fa467507f087c4d54f12770e399  ncurses-6.0-20150815.patch.gz
+b591a06ea10fe00b320e9b5aecf939ec  ncurses-6.0-20150822.patch.gz
+9f12c80f9b99afab25f0ebbb3ada3d05  ncurses-6.0-20150905.patch.gz
+f11c2a5381ac75ddd1afd4a5cc6baa60  ncurses-6.0-20150912.patch.gz
+c25d0b997c37395b243da3ee68013471  ncurses-6.0-20150919.patch.gz
+e9059272b061ddd78d0e27fc84b3e9da  ncurses-6.0-20150926.patch.gz
+eaee1c3b67f2189921efd7d336d412f1  ncurses-6.0-20151010.patch.gz
+746bb7a761dcf895a08871285b96f769  ncurses-6.0-20151017.patch.gz
+d86fd80f87f12951dadf3a9abc834397  ncurses-6.0-20151024.patch.gz
+ad7fd777cbd6860ee8072334b2ed253f  ncurses-6.0-20151101.patch.gz
+1fffd21c5dc95acbe7c750d88ab9e5b9  ncurses-6.0-20151107.patch.gz
+d0cd4fc89d80cc6dde53bfecccc99e91  ncurses-6.0-20151121.patch.gz
+7cec35c9fe1d5e67f766e18b06b952d3  ncurses-6.0-20151128.patch.gz
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ncurses.git/commitdiff/86de2207e7e2c27f42f633625fbdb9265f5eddf5



More information about the pld-cvs-commit mailing list