Hello community, here is the log from the commit of package armagetron for openSUSE:Factory checked in at 2017-05-09 18:03:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/armagetron (Old) and /work/SRC/openSUSE:Factory/.armagetron.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "armagetron" Tue May 9 18:03:35 2017 rev:31 rq:493448 version:0.2.8.3.3 Changes: -------- --- /work/SRC/openSUSE:Factory/armagetron/armagetron.changes 2016-10-10 16:24:43.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.armagetron.new/armagetron.changes 2017-05-09 18:03:38.504722873 +0200 @@ -1,0 +2,10 @@ +Sat May 6 09:25:02 UTC 2017 - meiss...@suse.com + +- armagetron-fix-build.patch: do not integer compare a pointer against an integer + +------------------------------------------------------------------- +Sat May 6 09:19:41 UTC 2017 - meiss...@suse.com + +- renamed: armagetron_add.tar.gz -> armagetron_add.tar.bz2 + +------------------------------------------------------------------- Old: ---- armagetron_add.tar.gz New: ---- armagetron-fix-build.patch armagetron_add.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ armagetron.spec ++++++ --- /var/tmp/diff_new_pack.WZXioj/_old 2017-05-09 18:03:40.472444811 +0200 +++ /var/tmp/diff_new_pack.WZXioj/_new 2017-05-09 18:03:40.476444246 +0200 @@ -1,7 +1,7 @@ # # spec file for package armagetron # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 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 @@ -24,21 +24,22 @@ Group: Amusements/Games/Action/Arcade Url: http://armagetronad.sourceforge.net Source: http://sourceforge.net/projects/armagetronad/files/stable/%{version}/armagetronad-%{version}.src.tar.bz2 -Source1: armagetron_add.tar.gz +Source1: armagetron_add.tar.bz2 # PATCH-FIX-OPENSUSE bmwiedemann -- fix build-compare Patch0: reproducible.patch # PATCH-FIX-UPSTREAM https://bugs.launchpad.net/armagetronad/+bug/1596771 -- fix nullpointer dereferenceing which leads into segfault Patch1: fix-segv.patch +Patch2: armagetron-fix-build.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: gcc-c++ -BuildRequires: pkgconfig(sdl) -BuildRequires: pkgconfig(SDL_mixer) -BuildRequires: pkgconfig(SDL_image) -BuildRequires: pkgconfig(glu) BuildRequires: libpng-devel BuildRequires: libxml2-devel BuildRequires: update-desktop-files +BuildRequires: pkgconfig(SDL_image) +BuildRequires: pkgconfig(SDL_mixer) +BuildRequires: pkgconfig(glu) +BuildRequires: pkgconfig(sdl) %if 0%{?suse_version} > 1315 BuildRequires: llvm-clang %endif @@ -57,6 +58,7 @@ %setup -q -a 1 -n armagetronad-%{version} %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build autoreconf -fi ++++++ armagetron-fix-build.patch ++++++ Index: armagetronad-0.2.8.3.3/src/network/nNetObject.cpp =================================================================== --- armagetronad-0.2.8.3.3.orig/src/network/nNetObject.cpp +++ armagetronad-0.2.8.3.3/src/network/nNetObject.cpp @@ -1530,7 +1530,7 @@ void nNetObject::SyncAll(){ // con << sn_SyncRequestedObject.Len() << "/" << sn_netObjects.Len() << "\n"; int currentSync = sn_SyncRequestedObject.Len()-1; - while(sn_Connections[user].socket>0 && + while(sn_Connections[user].socket && sn_Connections[user].bandwidthControl_.CanSend() && sn_Connections[user].ackPending<sn_maxNoAck && currentSync >= 0){ Index: armagetronad-0.2.8.3.3/src/tools/tResourceManager.cpp =================================================================== --- armagetronad-0.2.8.3.3.orig/src/tools/tResourceManager.cpp +++ armagetronad-0.2.8.3.3/src/tools/tResourceManager.cpp @@ -44,7 +44,7 @@ static int myHTTPFetch(const char *URI, } fd = fopen(savepath, "w"); - if (fd < 0) { + if (fd == NULL) { xmlNanoHTTPClose(ctxt); con << tOutput( "$resource_no_write", savepath ); return 3; ++++++ armagetron_add.tar.gz -> armagetron_add.tar.bz2 ++++++ ++++ no output (probably identical)
