Hello community, here is the log from the commit of package vpcs for openSUSE:Factory checked in at 2020-06-11 14:52:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vpcs (Old) and /work/SRC/openSUSE:Factory/.vpcs.new.3606 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vpcs" Thu Jun 11 14:52:45 2020 rev:11 rq:813443 version:0.8 Changes: -------- --- /work/SRC/openSUSE:Factory/vpcs/vpcs.changes 2018-01-22 16:22:26.758911986 +0100 +++ /work/SRC/openSUSE:Factory/.vpcs.new.3606/vpcs.changes 2020-06-11 14:53:55.131135467 +0200 @@ -1,0 +2,14 @@ +Mon Jun 8 21:28:23 UTC 2020 - Martin Hauke <[email protected]> + +- Set CFLAGS+=-fcommon to workaround gcc10 errors (boo#1160244) + +------------------------------------------------------------------- +Wed Jun 3 16:30:53 UTC 2020 - Martin Hauke <[email protected]> + +- Specfile cleanup +- Add patch: + * 0001-revert-from-r124.patch + Fix bug "enter" is executed after the second typed character + See: https://github.com/GNS3/vpcs/issues/10 + +------------------------------------------------------------------- New: ---- 0001-revert-from-r124.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vpcs.spec ++++++ --- /var/tmp/diff_new_pack.ATWdZP/_old 2020-06-11 14:53:56.387139296 +0200 +++ /var/tmp/diff_new_pack.ATWdZP/_new 2020-06-11 14:53:56.391139309 +0200 @@ -1,7 +1,7 @@ # # spec file for package vpcs # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -22,12 +22,10 @@ Summary: Virtual PC Simulator License: BSD-2-Clause Group: System/Emulators/Other -Url: http://sourceforge.net/projects/vpcs/ +URL: https://sourceforge.net/projects/vpcs/ Source0: %{name}-%{version}-src.tbz Patch0: %{name}-0.8-no-static.patch -BuildRequires: gcc -BuildRequires: make -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Patch1: 0001-revert-from-r124.patch %description The VPCS can simulate up to 9 PCs. You can ping/traceroute them, or ping/traceroute @@ -43,25 +41,22 @@ the packets via udp. In the ether mode, via /dev/tap, not support on the Windows. %prep -%setup -q -n %{name}-%{version} -%patch0 -p1 +%autosetup -p1 %build cd src rm getopt.* -export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -fno-strict-aliasing" -make -f Makefile.linux CPUTYPE=%_target_cpu +export CFLAGS="%{optflags} -D_GNU_SOURCE -fno-strict-aliasing -fcommon" +%make_build -f Makefile.linux CPUTYPE=%_target_cpu %install -%__mkdir -p %buildroot/%_bindir -%__mkdir -p %buildroot/%_mandir/man1 -%__cp src/vpcs %buildroot/%_bindir/ -%__cp man/vpcs.1 %buildroot/%_mandir/man1/ +install -D -m0755 src/vpcs %{buildroot}%{_bindir}/vpcs +install -D -m0644 man/vpcs.1 %{buildroot}%{_mandir}/man1/vpcs.1 %files -%defattr(-,root,root) -%doc readme.txt COPYING -%_bindir/vpcs -%_mandir/man1/* +%license COPYING +%doc readme.txt +%{_bindir}/vpcs +%{_mandir}/man1/vpcs.1%{ext_man} %changelog ++++++ 0001-revert-from-r124.patch ++++++ >From 815da920f3a32e92ccfdfd4999fd0008f92320c6 Mon Sep 17 00:00:00 2001 From: mirnshi <mirnshi@285c826d-31ef-41a9-a5b6-d2a4949dcdf2> Date: Sun, 15 Nov 2015 13:50:11 +0000 Subject: [PATCH 1/2] "revert from r124" git-svn-id: https://svn.code.sf.net/p/vpcs/code/trunk@125 285c826d-31ef-41a9-a5b6-d2a4949dcdf2 --- src/readline.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/readline.c b/src/readline.c index 778371f..1bb22be 100644 --- a/src/readline.c +++ b/src/readline.c @@ -452,7 +452,6 @@ printf("\n%2.2x - %2.2x - %2.2x - %2.2x - %2.2x - %2.2x - %2.2x - %2.2x\n", rls->kbuffer[rls->pos] = kb[0]; rls->kbuffer[rls->pos + 1] = '\0'; vprint(rls->fdout, &kb[0], 1); - break; } rls->pos++; } while (kb[0] != CTRLP); -- 2.26.2
