From 998306af002f53c2c7cb44619027e69a4d9c5e2c5bb4299b86f3c1fb3950d1ac Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 23 Sep 2014 21:12:22 +0000 Subject: [PATCH 1/4] Drop gpg-offline OBS-URL: https://build.opensuse.org/package/show/X11:Utilities/putty?expand=0&rev=13 --- putty-0.63.tar.gz.sig | Bin 0 -> 152 bytes putty.changes | 6 ++++++ putty.spec | 11 +++++------ 3 files changed, 11 insertions(+), 6 deletions(-) create mode 100644 putty-0.63.tar.gz.sig diff --git a/putty-0.63.tar.gz.sig b/putty-0.63.tar.gz.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..cd59b03867c406a080928b180088870fa14f8a55a995d9f0be110598076b956b GIT binary patch literal 152 zcmV;J0B8S+0F?s;08#-l?(aFwz_c8$DFFgUPy_#1^Ill-{PZ^M;bEML3&#g~5bXd@26%1QEHcz2$0Y#hBC!0mD?>pc_q&+y($=uv%&dO|1L G`^!+8(@h-! literal 0 HcmV?d00001 diff --git a/putty.changes b/putty.changes index 45cf925..aab06bf 100644 --- a/putty.changes +++ b/putty.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Sep 23 15:43:40 UTC 2014 - jengelh@inai.de + +- Drop gpg-offline build-time requirement; this is now handled by + the local source validator + ------------------------------------------------------------------- Wed Aug 7 09:28:25 UTC 2013 - jengelh@inai.de diff --git a/putty.spec b/putty.spec index 64b19aa..767a809 100644 --- a/putty.spec +++ b/putty.spec @@ -1,7 +1,7 @@ # # spec file for package putty # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,13 +26,11 @@ Url: http://www.chiark.greenend.org.uk/~sgtatham/putty/ Source: http://the.earth.li/~sgtatham/putty/latest/%name-%version.tar.gz Source2: http://the.earth.li/~sgtatham/putty/latest/%name-%version.tar.gz.RSA +Source3: %name-%version.tar.gz.sig Patch1: 0001-Revert-the-default-for-font-bolding-style.patch Patch2: putty-03-config.diff Patch3: putty-04-nodate.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?suse_version} >= 1230 -BuildRequires: gpg-offline -%endif BuildRequires: gtk2-devel BuildRequires: krb5-devel Conflicts: pssh @@ -43,8 +41,9 @@ for the SSH, Telnet, rlogin, and raw TCP computing protocols and as a serial console client. %prep -cp %_sourcedir/%name-%version.tar.gz.RSA %_sourcedir/%name-%version.tar.gz.sig -%{?gpg_verify: %gpg_verify %_sourcedir/%name-%version.tar.gz.sig} +# Copied S2 to S3 because the validator(s) want a known extension like .sig or +# .asc. Now ensure that they are still the same, or else fail the build. +cmp "%{SOURCE2}" "%{SOURCE3}" %setup -q %patch -P 1 -P 2 -P 3 -p1 From 42ef2e4114aa2ae3de2fa6615bf17dbae55770a049eb62c328e51004fad6846b Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 29 Sep 2014 08:30:06 +0000 Subject: [PATCH 2/4] Ship keyring file OBS-URL: https://build.opensuse.org/package/show/X11:Utilities/putty?expand=0&rev=14 --- putty.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/putty.spec b/putty.spec index 767a809..5408aae 100644 --- a/putty.spec +++ b/putty.spec @@ -27,6 +27,7 @@ Url: http://www.chiark.greenend.org.uk/~sgtatham/putty/ Source: http://the.earth.li/~sgtatham/putty/latest/%name-%version.tar.gz Source2: http://the.earth.li/~sgtatham/putty/latest/%name-%version.tar.gz.RSA Source3: %name-%version.tar.gz.sig +Source4: %name.keyring Patch1: 0001-Revert-the-default-for-font-bolding-style.patch Patch2: putty-03-config.diff Patch3: putty-04-nodate.diff From b963092e5afd945bae1380fccfaabde0344d7ceeaaa2305cc57d3574b0ade37e Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 29 Sep 2014 10:01:06 +0000 Subject: [PATCH 3/4] OBS-URL: https://build.opensuse.org/package/show/X11:Utilities/putty?expand=0&rev=15 --- putty-0.63.tar.gz.sig | Bin 152 -> 0 bytes putty.spec | 1 - 2 files changed, 1 deletion(-) delete mode 100644 putty-0.63.tar.gz.sig diff --git a/putty-0.63.tar.gz.sig b/putty-0.63.tar.gz.sig deleted file mode 100644 index cd59b03867c406a080928b180088870fa14f8a55a995d9f0be110598076b956b..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 152 zcmV;J0B8S+0F?s;08#-l?(aFwz_c8$DFFgUPy_#1^Ill-{PZ^M;bEML3&#g~5bXd@26%1QEHcz2$0Y#hBC!0mD?>pc_q&+y($=uv%&dO|1L G`^!+8(@h-! diff --git a/putty.spec b/putty.spec index 5408aae..f8eb318 100644 --- a/putty.spec +++ b/putty.spec @@ -26,7 +26,6 @@ Url: http://www.chiark.greenend.org.uk/~sgtatham/putty/ Source: http://the.earth.li/~sgtatham/putty/latest/%name-%version.tar.gz Source2: http://the.earth.li/~sgtatham/putty/latest/%name-%version.tar.gz.RSA -Source3: %name-%version.tar.gz.sig Source4: %name.keyring Patch1: 0001-Revert-the-default-for-font-bolding-style.patch Patch2: putty-03-config.diff From 5c453aebf937fecb6558233b66c4c3aa8bcfdf199bb51709d46e01c30f362961 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 29 Sep 2014 11:04:46 +0000 Subject: [PATCH 4/4] OBS-URL: https://build.opensuse.org/package/show/X11:Utilities/putty?expand=0&rev=16 --- putty.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/putty.spec b/putty.spec index f8eb318..fdc6ae4 100644 --- a/putty.spec +++ b/putty.spec @@ -41,9 +41,6 @@ for the SSH, Telnet, rlogin, and raw TCP computing protocols and as a serial console client. %prep -# Copied S2 to S3 because the validator(s) want a known extension like .sig or -# .asc. Now ensure that they are still the same, or else fail the build. -cmp "%{SOURCE2}" "%{SOURCE3}" %setup -q %patch -P 1 -P 2 -P 3 -p1