From a0c4cd4a24e54fd0b6f5f1bae96706ff7a0f677c7f8728355eeb06c19d6cbb3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 18 Jan 2018 12:44:43 +0000 Subject: [PATCH 1/2] - Run spec-cleaner OBS-URL: https://build.opensuse.org/package/show/Base:System/rzsz?expand=0&rev=21 --- rzsz.changes | 5 +++++ rzsz.spec | 6 ++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/rzsz.changes b/rzsz.changes index 205aabb..4cc8a71 100644 --- a/rzsz.changes +++ b/rzsz.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jan 18 12:42:46 UTC 2018 - tchvatal@suse.com + +- Run spec-cleaner + ------------------------------------------------------------------- Sun Sep 3 18:57:20 UTC 2017 - benoit.monin@gmx.fr diff --git a/rzsz.spec b/rzsz.spec index cfe88e8..076ecbb 100644 --- a/rzsz.spec +++ b/rzsz.spec @@ -1,7 +1,7 @@ # # spec file for package rzsz # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -34,7 +34,6 @@ Patch8: lrzsz-0.12.20-null-pointer.patch BuildRequires: autoconf BuildRequires: automake Provides: lrzsz -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description rzsz allows you to use "sz filename" to send a file to your local @@ -64,7 +63,7 @@ autoreconf -fvi make %{?_smp_mflags} %install -make DESTDIR=%{buildroot} install %{?_smp_mflags} +%make_install %find_lang lrzsz # Fix various symlinks @@ -85,7 +84,6 @@ make vcheck -j1 %endif %files -f lrzsz.lang -%defattr(-,root,root) %{_mandir}/man1/* %doc README.* ABOUT-NLS AUTHORS COMPATABILITY COPYING ChangeLog NEWS THANKS TODO %{_bindir}/rb From e9ab340bae953fbee9bfc8453796c01167131d0a011e6d4dad0e213f28d5aed6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Monin?= Date: Sun, 21 Jan 2018 13:51:18 +0000 Subject: [PATCH 2/2] Accepting request 567975 from home:benoit_monin:branches:Base:System add lrzsz-0.12.20-fix-lsz-getopt.patch: fix for boo#1076576 OBS-URL: https://build.opensuse.org/request/show/567975 OBS-URL: https://build.opensuse.org/package/show/Base:System/rzsz?expand=0&rev=22 --- lrzsz-0.12.20-fix-lsz-getopt.patch | 11 +++++++++++ rzsz.changes | 5 +++++ rzsz.spec | 3 +++ 3 files changed, 19 insertions(+) create mode 100644 lrzsz-0.12.20-fix-lsz-getopt.patch diff --git a/lrzsz-0.12.20-fix-lsz-getopt.patch b/lrzsz-0.12.20-fix-lsz-getopt.patch new file mode 100644 index 0000000..0a23c97 --- /dev/null +++ b/lrzsz-0.12.20-fix-lsz-getopt.patch @@ -0,0 +1,11 @@ +--- lrzsz-0.12.20.orig/src/lsz.c ++++ lrzsz-0.12.20/src/lsz.c +@@ -349,7 +349,7 @@ main(int argc, char **argv) + Rxtimeout = 600; + + while ((c = getopt_long (argc, argv, +- "2+48abB:C:c:dfeEghHi:kL:l:m:M:NnOopRrqsSt:TUuvw:XYy", ++ "2+48abB:C:c:dfeEghHi:kL:l:m:M:NnOopRrqs:St:TUuvw:XYy", + long_options, (int *) 0))!=EOF) + { + unsigned long int tmp; diff --git a/rzsz.changes b/rzsz.changes index 4cc8a71..11b5244 100644 --- a/rzsz.changes +++ b/rzsz.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Jan 21 13:35:25 UTC 2018 - benoit.monin@gmx.fr + +- add lrzsz-0.12.20-fix-lsz-getopt.patch: fix for boo#1076576 + ------------------------------------------------------------------- Thu Jan 18 12:42:46 UTC 2018 - tchvatal@suse.com diff --git a/rzsz.spec b/rzsz.spec index 076ecbb..40b75b4 100644 --- a/rzsz.spec +++ b/rzsz.spec @@ -31,6 +31,8 @@ Patch5: lrzsz-implicit-decl.patch Patch6: lrzsz-0.12.20-automake-1.12.patch Patch7: lrzsz-0.12.20-automake-1.13.patch Patch8: lrzsz-0.12.20-null-pointer.patch +# PATCH-FIX-UPSTREAM fix getopt optstring boo#1076576 +Patch9: lrzsz-0.12.20-fix-lsz-getopt.patch BuildRequires: autoconf BuildRequires: automake Provides: lrzsz @@ -48,6 +50,7 @@ system. %patch6 -p1 %patch7 -p1 %patch8 -p1 +%patch9 -p1 # Missing file >> config.rpath