commit armagetron for openSUSE:Factory
Hello community,
here is the log from the commit of package armagetron for openSUSE:Factory
checked in at 2020-03-27 22:01:39
Comparing /work/SRC/openSUSE:Factory/armagetron (Old)
and /work/SRC/openSUSE:Factory/.armagetron.new.3160 (New)
Package is "armagetron"
Fri Mar 27 22:01:39 2020 rev:34 rq:789071 version:0.2.8.3.5
Changes:
--- /work/SRC/openSUSE:Factory/armagetron/armagetron.changes2019-07-24
20:36:01.606570850 +0200
+++ /work/SRC/openSUSE:Factory/.armagetron.new.3160/armagetron.changes
2020-03-27 22:01:44.198947685 +0100
@@ -1,0 +2,6 @@
+Fri Mar 27 13:25:57 UTC 2020 - Christophe Giboudeaux
+
+- Update to 0.2.8.3.5. No changelog.
+- Drop fix-segv.patch. Merged upstream.
+
+---
Old:
armagetronad-0.2.8.3.4.src.tar.bz2
fix-segv.patch
New:
armagetronad-0.2.8.3.5.src.tar.bz2
Other differences:
--
++ armagetron.spec ++
--- /var/tmp/diff_new_pack.hEoVBB/_old 2020-03-27 22:01:44.990948145 +0100
+++ /var/tmp/diff_new_pack.hEoVBB/_new 2020-03-27 22:01:44.994948148 +0100
@@ -1,7 +1,7 @@
#
# spec file for package armagetron
#
-# Copyright (c) 2019 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
@@ -17,7 +17,7 @@
Name: armagetron
-Version:0.2.8.3.4
+Version:0.2.8.3.5
Release:0
Summary:OpenGL Game Similar to the Film Tron
License:GPL-2.0-or-later
@@ -27,8 +27,6 @@
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
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: gcc-c++
@@ -53,7 +51,6 @@
%prep
%setup -q -a 1 -n armagetronad-%{version}
%patch0 -p1
-%patch1 -p1
%build
autoreconf -fi
++ armagetronad-0.2.8.3.4.src.tar.bz2 -> armagetronad-0.2.8.3.5.src.tar.bz2
++
26423 lines of diff (skipped)
commit armagetron for openSUSE:Factory
Hello community,
here is the log from the commit of package armagetron for openSUSE:Factory
checked in at 2019-07-24 20:35:59
Comparing /work/SRC/openSUSE:Factory/armagetron (Old)
and /work/SRC/openSUSE:Factory/.armagetron.new.4126 (New)
Package is "armagetron"
Wed Jul 24 20:35:59 2019 rev:33 rq:718120 version:0.2.8.3.4
Changes:
--- /work/SRC/openSUSE:Factory/armagetron/armagetron.changes2018-04-19
15:28:40.253062582 +0200
+++ /work/SRC/openSUSE:Factory/.armagetron.new.4126/armagetron.changes
2019-07-24 20:36:01.606570850 +0200
@@ -1,0 +2,7 @@
+Wed Jul 24 07:10:21 UTC 2019 - Luigi Baldoni
+
+- Disable LTO to fix Factory build
+- Enable PIE
+- Spec cleanup
+
+---
Other differences:
--
++ armagetron.spec ++
--- /var/tmp/diff_new_pack.BqS635/_old 2019-07-24 20:36:03.070570689 +0200
+++ /var/tmp/diff_new_pack.BqS635/_new 2019-07-24 20:36:03.114570684 +0200
@@ -1,7 +1,7 @@
#
# spec file for package armagetron
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 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
@@ -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/
#
@@ -20,10 +20,10 @@
Version:0.2.8.3.4
Release:0
Summary:OpenGL Game Similar to the Film Tron
-License:GPL-2.0+
+License:GPL-2.0-or-later
Group: Amusements/Games/Action/Arcade
-Url:http://armagetronad.sourceforge.net
-Source:
http://sourceforge.net/projects/armagetronad/files/stable/%{version}/armagetronad-%{version}.src.tar.bz2
+URL:http://armagetronad.sourceforge.net
+Source:
https://sourceforge.net/projects/armagetronad/files/stable/%{version}/armagetronad-%{version}.src.tar.bz2
Source1:armagetron_add.tar.bz2
# PATCH-FIX-OPENSUSE bmwiedemann -- fix build-compare
Patch0: reproducible.patch
@@ -34,16 +34,13 @@
BuildRequires: gcc-c++
BuildRequires: libpng-devel
BuildRequires: libxml2-devel
+BuildRequires: llvm-clang
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
Requires(post): coreutils
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
In this game, race against other players on a permanently moving
@@ -60,15 +57,15 @@
%build
autoreconf -fi
-tmpflags="%{optflags}"
-%if 0%{?suse_version} > 1315
+# clang does not support lto yet
+%define _lto_cflags %{nil}
+tmpflags="%{optflags} -fPIE -pie"
export CC=clang
export CXX=clang++
# bypass boo#927268 for PowerPC clang
%ifarch ppc64 ppc64le
tmpflags=${tmpflags/-fstack-protector-strong}
%endif
-%endif
%configure \
--enable-music \
--enable-glout \
@@ -103,7 +100,7 @@
%suse_update_desktop_file Armagetron Game ArcadeGame
%files
-%defattr(-,root,root)
+%license COPYING
%doc README armagetron_doc/*
%doc %{_docdir}/%{name}/README.SUSE
%config %{_sysconfdir}/armagetronad
commit armagetron for openSUSE:Factory
Hello community,
here is the log from the commit of package armagetron for openSUSE:Factory
checked in at 2018-04-19 15:28:36
Comparing /work/SRC/openSUSE:Factory/armagetron (Old)
and /work/SRC/openSUSE:Factory/.armagetron.new (New)
Package is "armagetron"
Thu Apr 19 15:28:36 2018 rev:32 rq:594547 version:0.2.8.3.4
Changes:
--- /work/SRC/openSUSE:Factory/armagetron/armagetron.changes2017-05-09
18:03:38.504722873 +0200
+++ /work/SRC/openSUSE:Factory/.armagetron.new/armagetron.changes
2018-04-19 15:28:40.253062582 +0200
@@ -1,0 +2,7 @@
+Sat Apr 7 16:17:12 UTC 2018 - wba...@tmo.at
+
+- Update to version 0.2.8.3.4:
+ * Two issues that surfaced when compiling with gcc 6 were fixed
+- Drop armagetron-fix-build.patch, merged upstream
+
+---
Old:
armagetron-fix-build.patch
armagetronad-0.2.8.3.3.src.tar.bz2
New:
armagetronad-0.2.8.3.4.src.tar.bz2
Other differences:
--
++ armagetron.spec ++
--- /var/tmp/diff_new_pack.ILSWHj/_old 2018-04-19 15:28:41.109027591 +0200
+++ /var/tmp/diff_new_pack.ILSWHj/_new 2018-04-19 15:28:41.113027428 +0200
@@ -17,7 +17,7 @@
Name: armagetron
-Version:0.2.8.3.3
+Version:0.2.8.3.4
Release:0
Summary:OpenGL Game Similar to the Film Tron
License:GPL-2.0+
@@ -29,7 +29,6 @@
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++
@@ -58,7 +57,6 @@
%setup -q -a 1 -n armagetronad-%{version}
%patch0 -p1
%patch1 -p1
-%patch2 -p1
%build
autoreconf -fi
++ armagetronad-0.2.8.3.3.src.tar.bz2 -> armagetronad-0.2.8.3.4.src.tar.bz2
++
15788 lines of diff (skipped)
commit armagetron for openSUSE:Factory
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.changes2016-10-10
16:24:43.0 +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= 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)
commit armagetron for openSUSE:Factory
Hello community,
here is the log from the commit of package armagetron for openSUSE:Factory
checked in at 2016-10-10 16:24:20
Comparing /work/SRC/openSUSE:Factory/armagetron (Old)
and /work/SRC/openSUSE:Factory/.armagetron.new (New)
Package is "armagetron"
Changes:
--- /work/SRC/openSUSE:Factory/armagetron/armagetron.changes2016-08-05
18:18:07.0 +0200
+++ /work/SRC/openSUSE:Factory/.armagetron.new/armagetron.changes
2016-10-10 16:24:43.0 +0200
@@ -1,0 +2,8 @@
+Thu Oct 6 15:20:22 UTC 2016 - kiel...@gmail.com
+
+- Some cleanup:
+ * removed BuildRequires: kdelibs3-devel (fixes build for
+openSUSE Leap 42.1 and Leap 42.2).
+ * added some BuildRequires.
+
+---
Other differences:
--
++ armagetron.spec ++
--- /var/tmp/diff_new_pack.se6UfO/_old 2016-10-10 16:24:46.0 +0200
+++ /var/tmp/diff_new_pack.se6UfO/_new 2016-10-10 16:24:46.0 +0200
@@ -29,11 +29,16 @@
Patch0: reproducible.patch
# PATCH-FIX-UPSTREAM https://bugs.launchpad.net/armagetronad/+bug/1596771 --
fix nullpointer dereferenceing which leads into segfault
Patch1: fix-segv.patch
-BuildRequires: SDL_image-devel
-BuildRequires: SDL_mixer-devel
-BuildRequires: kdelibs3-devel
-BuildRequires: pkgconfig
+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
%if 0%{?suse_version} > 1315
BuildRequires: llvm-clang
%endif
@@ -66,6 +71,7 @@
%endif
%configure \
--enable-music \
+ --enable-glout \
--disable-desktop \
--disable-uninstall \
--disable-dependency-tracking \
@@ -88,7 +94,8 @@
ln -s %{_datadir}/pixmaps/%{name}.png
%{buildroot}%{_datadir}/armagetronad/desktop/icons/large/armagetronad.png
popd
# some cleanups
-chmod 644 %{buildroot}%{_sysconfdir}/armagetronad/rc.config
+rm %{buildroot}%{_sysconfdir}/armagetronad/rc.config
+rm %{buildroot}%{_sysconfdir}/armagetronad/settings_dedicated.cfg
rm %{buildroot}%{_datadir}/armagetronad/language/update.py
rm %{buildroot}%{_datadir}/armagetronad/scripts/relocate
rm %{buildroot}%{_datadir}/armagetronad/desktop/*.desktop
commit armagetron for openSUSE:Factory
Hello community,
here is the log from the commit of package armagetron for openSUSE:Factory
checked in at 2016-08-05 18:18:05
Comparing /work/SRC/openSUSE:Factory/armagetron (Old)
and /work/SRC/openSUSE:Factory/.armagetron.new (New)
Package is "armagetron"
Changes:
--- /work/SRC/openSUSE:Factory/armagetron/armagetron.changes2016-08-03
11:43:28.0 +0200
+++ /work/SRC/openSUSE:Factory/.armagetron.new/armagetron.changes
2016-08-05 18:18:07.0 +0200
@@ -1,0 +2,5 @@
+Thu Aug 4 16:27:44 UTC 2016 - norm...@linux.vnet.ibm.com
+
+- bypass boo#927268 for PowerPC clang failing if fstack-protector
+
+---
Other differences:
--
++ armagetron.spec ++
--- /var/tmp/diff_new_pack.aQGxy9/_old 2016-08-05 18:18:08.0 +0200
+++ /var/tmp/diff_new_pack.aQGxy9/_new 2016-08-05 18:18:08.0 +0200
@@ -55,9 +55,14 @@
%build
autoreconf -fi
+tmpflags="%{optflags}"
%if 0%{?suse_version} > 1315
export CC=clang
export CXX=clang++
+# bypass boo#927268 for PowerPC clang
+%ifarch ppc64 ppc64le
+tmpflags=${tmpflags/-fstack-protector-strong}
+%endif
%endif
%configure \
--enable-music \
@@ -65,7 +70,8 @@
--disable-uninstall \
--disable-dependency-tracking \
--disable-games \
- --docdir=%{_docdir}
+ --docdir=%{_docdir} \
+ CXXFLAGS="${tmpflags}"
make %{?_smp_mflags}
%install
commit armagetron for openSUSE:Factory
Hello community,
here is the log from the commit of package armagetron for openSUSE:Factory
checked in at 2016-08-03 11:43:24
Comparing /work/SRC/openSUSE:Factory/armagetron (Old)
and /work/SRC/openSUSE:Factory/.armagetron.new (New)
Package is "armagetron"
Changes:
--- /work/SRC/openSUSE:Factory/armagetron/armagetron.changes2016-07-01
09:59:46.0 +0200
+++ /work/SRC/openSUSE:Factory/.armagetron.new/armagetron.changes
2016-08-03 11:43:28.0 +0200
@@ -1,0 +2,5 @@
+Wed Jun 29 12:35:21 UTC 2016 - jeng...@inai.de
+
+- Replace ancient package names
+
+---
Other differences:
--
++ armagetron.spec ++
--- /var/tmp/diff_new_pack.sxcYMU/_old 2016-08-03 11:43:31.0 +0200
+++ /var/tmp/diff_new_pack.sxcYMU/_new 2016-08-03 11:43:31.0 +0200
@@ -37,8 +37,7 @@
%if 0%{?suse_version} > 1315
BuildRequires: llvm-clang
%endif
-Requires(post): fileutils
-Requires(post): sh-utils
+Requires(post): coreutils
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
commit armagetron for openSUSE:Factory
Hello community,
here is the log from the commit of package armagetron for openSUSE:Factory
checked in at 2016-07-01 09:59:42
Comparing /work/SRC/openSUSE:Factory/armagetron (Old)
and /work/SRC/openSUSE:Factory/.armagetron.new (New)
Package is "armagetron"
Changes:
--- /work/SRC/openSUSE:Factory/armagetron/armagetron.changes2016-04-22
16:24:40.0 +0200
+++ /work/SRC/openSUSE:Factory/.armagetron.new/armagetron.changes
2016-07-01 09:59:46.0 +0200
@@ -1,0 +2,7 @@
+Tue Jun 28 02:15:35 UTC 2016 - r...@fthiessen.de
+
+- Fixed build on Tumbleweed
+- Some cleanup
+- Added fix-segv.patch to fix segfault after starting a new game
+
+---
New:
fix-segv.patch
Other differences:
--
++ armagetron.spec ++
--- /var/tmp/diff_new_pack.8fzcGm/_old 2016-07-01 09:59:47.0 +0200
+++ /var/tmp/diff_new_pack.8fzcGm/_new 2016-07-01 09:59:47.0 +0200
@@ -17,21 +17,28 @@
Name: armagetron
-BuildRequires: SDL_image-devel
-BuildRequires: SDL_mixer-devel
-BuildRequires: kdelibs3-devel
-BuildRequires: pkgconfig(glu)
-PreReq: sh-utils fileutils
-Summary:OpenGL Game Similar to the Film Tron
-License:GPL-2.0+
-Group: Amusements/Games
Version:0.2.8.3.3
Release:0
+Summary:OpenGL Game Similar to the Film Tron
+License:GPL-2.0+
+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
# 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
+BuildRequires: SDL_image-devel
+BuildRequires: SDL_mixer-devel
+BuildRequires: kdelibs3-devel
+BuildRequires: pkgconfig
+BuildRequires: pkgconfig(glu)
+%if 0%{?suse_version} > 1315
+BuildRequires: llvm-clang
+%endif
+Requires(post): fileutils
+Requires(post): sh-utils
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -42,15 +49,17 @@
to try to make your enemies hit the walls, while you avoid doing the
same. Unlike glTron, this program does not require 3D hardware support.
-
-
%prep
-%setup -q -a 1 -n armagetronad-%version
+%setup -q -a 1 -n armagetronad-%{version}
%patch0 -p1
+%patch1 -p1
%build
autoreconf -fi
-export CFLAGS="%{optflags}" CXXFLAGS="%{optflags}"
+%if 0%{?suse_version} > 1315
+export CC=clang
+export CXX=clang++
+%endif
%configure \
--enable-music \
--disable-desktop \
@@ -62,13 +71,14 @@
%install
# the uninstall_location trick was copied from Fedora. Thanks for debugging it
:)
-make DESTDIR=%buildroot install uninstall_location=foobar
+make DESTDIR=%{buildroot} install uninstall_location=foobar
mkdir -p %{buildroot}%{_datadir}/applications/
install armagetron_add/*.desktop %{buildroot}%{_datadir}/applications/
mkdir -p %{buildroot}%{_datadir}/appdata
-install armagetron_add/Armagetron.appdata.xml %{buildroot}%{_datadir}/appdata/
+install -m644 armagetron_add/Armagetron.appdata.xml
%{buildroot}%{_datadir}/appdata/
mkdir -p %{buildroot}%{_datadir}/pixmaps/
-pushd %buildroot
+install -Dm644 armagetron_add/README.SuSE
%{buildroot}%{_docdir}/%{name}/README.SUSE
+pushd %{buildroot}
mv %{buildroot}%{_datadir}/armagetronad/desktop/icons/large/armagetronad.png
%{buildroot}%{_datadir}/pixmaps/%{name}.png
ln -s %{_datadir}/pixmaps/%{name}.png
%{buildroot}%{_datadir}/armagetronad/desktop/icons/large/armagetronad.png
popd
@@ -82,7 +92,8 @@
%files
%defattr(-,root,root)
-%doc README armagetron_add/README.SuSE armagetron_doc/*
+%doc README armagetron_doc/*
+%doc %{_docdir}/%{name}/README.SUSE
%config %{_sysconfdir}/armagetronad
%{_bindir}/armagetronad
%{_datadir}/armagetronad
++ fix-segv.patch ++
diff -Nur armagetronad-0.2.8.3.3/src/tron/gCycle.cpp new/src/tron/gCycle.cpp
--- armagetronad-0.2.8.3.3/src/tron/gCycle.cpp 2015-01-29 23:53:54.0
+0100
+++ new/src/tron/gCycle.cpp 2016-06-28 05:31:18.514409180 +0200
@@ -2712,7 +2712,7 @@
gCycleChatBot & bot = gCycleChatBot::Get( this );
bot.Activate( currentTime );
}
-else if ( &(*chatBot_) )
+else if ( chatBot_.get() )
{
chatBot_->nextChatAI_ = 0;
}
commit armagetron for openSUSE:Factory
Hello community,
here is the log from the commit of package armagetron for openSUSE:Factory
checked in at 2016-04-22 16:24:39
Comparing /work/SRC/openSUSE:Factory/armagetron (Old)
and /work/SRC/openSUSE:Factory/.armagetron.new (New)
Package is "armagetron"
Changes:
--- /work/SRC/openSUSE:Factory/armagetron/armagetron.changes2015-03-30
19:34:04.0 +0200
+++ /work/SRC/openSUSE:Factory/.armagetron.new/armagetron.changes
2016-04-22 16:24:40.0 +0200
@@ -1,0 +2,5 @@
+Wed Apr 6 06:52:47 UTC 2016 - bwiedem...@suse.com
+
+- Add reproducible.patch to fix build-compare
+
+---
New:
reproducible.patch
Other differences:
--
++ armagetron.spec ++
--- /var/tmp/diff_new_pack.v0JCRv/_old 2016-04-22 16:24:41.0 +0200
+++ /var/tmp/diff_new_pack.v0JCRv/_new 2016-04-22 16:24:41.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package armagetron
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 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
@@ -30,6 +30,8 @@
Url:http://armagetronad.sourceforge.net
Source:
http://sourceforge.net/projects/armagetronad/files/stable/%{version}/armagetronad-%{version}.src.tar.bz2
Source1:armagetron_add.tar.gz
+# PATCH-FIX-OPENSUSE bmwiedemann -- fix build-compare
+Patch0: reproducible.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -44,6 +46,7 @@
%prep
%setup -q -a 1 -n armagetronad-%version
+%patch0 -p1
%build
autoreconf -fi
++ reproducible.patch ++
Index: armagetronad-0.2.8.3.3/src/doc/html.m4.in
===
--- armagetronad-0.2.8.3.3.orig/src/doc/html.m4.in
+++ armagetronad-0.2.8.3.3/src/doc/html.m4.in
@@ -6,7 +6,7 @@ define(HEADSTART,dnl
changequote([,])dnl
-
+
$1)dnl
Index: armagetronad-0.2.8.3.3/src/doc/net/sig.m4
===
--- armagetronad-0.2.8.3.3.orig/src/doc/net/sig.m4
+++ armagetronad-0.2.8.3.3/src/doc/net/sig.m4
@@ -3,7 +3,7 @@
Manuel Moos(MAILMANGLE( z-man, users, sf.net )).
-Last modification: esyscmd(date)
+Last modification: esyscmd(date -r index.html.m4)
commit armagetron for openSUSE:Factory
binEo9znvvSTB.bin Description: Binary data
commit armagetron for openSUSE:Factory
Hello community,
here is the log from the commit of package armagetron for openSUSE:Factory
checked in at 2015-03-18 13:08:37
Comparing /work/SRC/openSUSE:Factory/armagetron (Old)
and /work/SRC/openSUSE:Factory/.armagetron.new (New)
Package is "armagetron"
Changes:
--- /work/SRC/openSUSE:Factory/armagetron/armagetron.changes2012-09-23
19:30:39.0 +0200
+++ /work/SRC/openSUSE:Factory/.armagetron.new/armagetron.changes
2015-03-18 13:08:38.0 +0100
@@ -1,0 +2,8 @@
+Tue Mar 17 12:52:09 UTC 2015 - dims...@opensuse.org
+
+- Change the file system layout: have the icon in /usr/share/pixmap
+ as being the REAL file instead of being the symlink. This works
+ around a current flaw in appstream-builder, which does not follow
+ symlinks when extracting/finding icons.
+
+---
Other differences:
--
++ armagetron.spec ++
--- /var/tmp/diff_new_pack.mHXPPW/_old 2015-03-18 13:08:39.0 +0100
+++ /var/tmp/diff_new_pack.mHXPPW/_new 2015-03-18 13:08:39.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package armagetron
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 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
@@ -70,7 +70,8 @@
install armagetron_add/*.desktop %{buildroot}%{_datadir}/applications/
mkdir -p %{buildroot}%{_datadir}/pixmaps/
pushd %buildroot
-ln -s %{_datadir}/armagetronad/desktop/icons/large/armagetronad.png
usr/share/pixmaps/%{name}.png
+mv %{buildroot}%{_datadir}/armagetronad/desktop/icons/large/armagetronad.png
%{buildroot}%{_datadir}/pixmaps/%{name}.png
+ln -s %{_datadir}/pixmaps/%{name}.png
%{buildroot}%{_datadir}/armagetronad/desktop/icons/large/armagetronad.png
popd
# some cleanups
chmod 644 %{buildroot}%{_sysconfdir}/armagetronad/rc.config
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit armagetron for openSUSE:Factory
Hello community, here is the log from the commit of package armagetron for openSUSE:Factory checked in at 2012-09-23 19:30:37 Comparing /work/SRC/openSUSE:Factory/armagetron (Old) and /work/SRC/openSUSE:Factory/.armagetron.new (New) Package is "armagetron", Maintainer is "p...@suse.com" Changes: --- /work/SRC/openSUSE:Factory/armagetron/armagetron.changes2012-03-20 11:25:22.0 +0100 +++ /work/SRC/openSUSE:Factory/.armagetron.new/armagetron.changes 2012-09-23 19:30:39.0 +0200 @@ -1,0 +2,5 @@ +Tue Sep 18 12:22:27 UTC 2012 - co...@suse.com + +- add explicit buildrequire for pkgconfig(glu) + +--- Other differences: -- ++ armagetron.spec ++ --- /var/tmp/diff_new_pack.VZUNWT/_old 2012-09-23 19:30:42.0 +0200 +++ /var/tmp/diff_new_pack.VZUNWT/_new 2012-09-23 19:30:42.0 +0200 @@ -20,6 +20,7 @@ BuildRequires: SDL_image-devel BuildRequires: SDL_mixer-devel BuildRequires: kdelibs3-devel +BuildRequires: pkgconfig(glu) PreReq: sh-utils fileutils Summary:OpenGL Game Similar to the Film Tron License:GPL-2.0+ -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit armagetron for openSUSE:Factory
Hello community,
here is the log from the commit of package armagetron for openSUSE:Factory
checked in at 2012-03-20 11:25:18
Comparing /work/SRC/openSUSE:Factory/armagetron (Old)
and /work/SRC/openSUSE:Factory/.armagetron.new (New)
Package is "armagetron", Maintainer is "p...@suse.com"
Changes:
--- /work/SRC/openSUSE:Factory/armagetron/armagetron.changes2011-09-26
10:29:04.0 +0200
+++ /work/SRC/openSUSE:Factory/.armagetron.new/armagetron.changes
2012-03-20 11:25:22.0 +0100
@@ -1,0 +2,13 @@
+Thu Mar 15 22:53:39 UTC 2012 - dims...@opensuse.org
+
+- Update to version 0.2.8.3.2:
+ + Various security and bug fixes
+ + For a full list of changes see NEWS file.
+- Drop patches that have been fixed upstream:
+ + armagetronad-0.2.8.2.1-no_type_punning.patch
+ + armagetronad-0.2.8.2.1-string_const.patch
+ + armagetronad-missing_headers.patch
+ + gcc46_add_default_ctors.patch
+- Add armagetron-configure.patch: Change detection of libpng.
+
+---
Old:
armagetronad-0.2.8.2.1-no_type_punning.patch
armagetronad-0.2.8.2.1-string_const.patch
armagetronad-0.2.8.2.1.tar.bz2
armagetronad-missing_headers.patch
gcc46_add_default_ctors.patch
New:
armagetron-configure.patch
armagetronad-0.2.8.3.2.src.tar.bz2
Other differences:
--
++ armagetron.spec ++
--- /var/tmp/diff_new_pack.PgqLzl/_old 2012-03-20 11:25:24.0 +0100
+++ /var/tmp/diff_new_pack.PgqLzl/_new 2012-03-20 11:25:24.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package armagetron
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 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
@@ -16,23 +16,20 @@
#
-
Name: armagetron
-BuildRequires: SDL_image-devel SDL_mixer-devel kdelibs3-devel
+BuildRequires: SDL_image-devel
+BuildRequires: SDL_mixer-devel
+BuildRequires: kdelibs3-devel
PreReq: sh-utils fileutils
Summary:OpenGL Game Similar to the Film Tron
-Version:0.2.8.2.1
-Release:12
License:GPL-2.0+
Group: Amusements/Games
+Version:0.2.8.3.2
+Release:0
Url:http://armagetronad.sourceforge.net
-Source: %{name}ad-%{version}.tar.bz2
+Source: %{name}ad-%{version}.src.tar.bz2
Source1:armagetron_add.tar.gz
-Patch1: armagetronad-missing_headers.patch
-Patch4: gcc46_add_default_ctors.patch
-#backports from 0.2.8.3
-Patch2: armagetronad-0.2.8.2.1-no_type_punning.patch
-Patch3: armagetronad-0.2.8.2.1-string_const.patch
+Patch0: armagetron-configure.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -47,12 +44,14 @@
%prep
%setup -q -a 1 -n armagetronad-%version
-%patch1
-%patch2
-%patch3
-%patch4
+%patch0 -p1
+#patch1
+#patch2
+#patch3
+#patch4
%build
+autoreconf -fi
export CFLAGS="%{optflags}" CXXFLAGS="%{optflags}"
%configure \
--enable-music \
++ armagetron-configure.patch ++
Index: armagetronad-0.2.8.3.2/configure.ac
===
--- armagetronad-0.2.8.3.2.orig/configure.ac
+++ armagetronad-0.2.8.3.2/configure.ac
@@ -731,7 +731,7 @@ fi
CPPFLAGS="$CPPFLAGS `libpng-config --cflags`"
LIBS="$LIBS $PNGLIBS"
-AC_CHECK_FUNC(png_check_sig,
+AC_CHECK_FUNC(png_sig_cmp,
,
AC_MSG_ERROR([You need libpng to compile Armagetron.]))
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit armagetron for openSUSE:Factory
Hello community,
here is the log from the commit of package armagetron for openSUSE:Factory
checked in at 2011-12-06 17:58:59
Comparing /work/SRC/openSUSE:Factory/armagetron (Old)
and /work/SRC/openSUSE:Factory/.armagetron.new (New)
Package is "armagetron", Maintainer is "p...@suse.com"
Changes:
Other differences:
--
++ armagetron.spec ++
--- /var/tmp/diff_new_pack.uX17CJ/_old 2011-12-06 17:59:33.0 +0100
+++ /var/tmp/diff_new_pack.uX17CJ/_new 2011-12-06 17:59:33.0 +0100
@@ -23,7 +23,7 @@
Summary:OpenGL Game Similar to the Film Tron
Version:0.2.8.2.1
Release:12
-License:GPL v2 or later
+License:GPL-2.0+
Group: Amusements/Games
Url:http://armagetronad.sourceforge.net
Source: %{name}ad-%{version}.tar.bz2
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit armagetron for openSUSE:Factory
Hello community,
here is the log from the commit of package armagetron for openSUSE:Factory
checked in at Mon Sep 26 10:29:06 CEST 2011.
--- armagetron/armagetron.changes 2011-05-09 13:54:46.0 +0200
+++ /mounts/work_src_done/STABLE/armagetron/armagetron.changes 2011-09-17
14:15:07.0 +0200
@@ -1,0 +2,6 @@
+Sat Sep 17 12:15:05 UTC 2011 - jeng...@medozas.de
+
+- Remove redundant tags/sections from specfile
+- Use %_smp_mflags for parallel build
+
+---
calling whatdependson for head-i586
Other differences:
--
++ armagetron.spec ++
--- /var/tmp/diff_new_pack.3ZbHuM/_old 2011-09-26 10:29:02.0 +0200
+++ /var/tmp/diff_new_pack.3ZbHuM/_new 2011-09-26 10:29:02.0 +0200
@@ -15,7 +15,6 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
Name: armagetron
@@ -62,7 +61,7 @@
--disable-dependency-tracking \
--disable-games \
--docdir=%{_docdir}
-make
+make %{?_smp_mflags}
%install
# the uninstall_location trick was copied from Fedora. Thanks for debugging it
:)
@@ -98,7 +97,4 @@
fi
fi
-%clean
-rm -rf %{buildroot}
-
%changelog
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit armagetron for openSUSE:Factory
Hello community,
here is the log from the commit of package armagetron for openSUSE:Factory
checked in at Thu May 12 08:40:11 CEST 2011.
--- armagetron/armagetron.changes 2009-07-10 22:47:02.0 +0200
+++ /mounts/work_src_done/STABLE/armagetron/armagetron.changes 2011-05-09
13:54:46.0 +0200
@@ -1,0 +2,5 @@
+Mon May 9 11:54:38 UTC 2011 - cgiboude...@gmx.com
+
+- Add gcc46_add_default_ctors.patch
+
+---
calling whatdependson for head-i586
New:
gcc46_add_default_ctors.patch
Other differences:
--
++ armagetron.spec ++
--- /var/tmp/diff_new_pack.kMQ0K9/_old 2011-05-12 08:38:54.0 +0200
+++ /var/tmp/diff_new_pack.kMQ0K9/_new 2011-05-12 08:38:54.0 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package armagetron (Version 0.2.8.2.1)
+# spec file for package armagetron
#
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 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
@@ -23,13 +23,14 @@
PreReq: sh-utils fileutils
Summary:OpenGL Game Similar to the Film Tron
Version:0.2.8.2.1
-Release:2
+Release:12
License:GPL v2 or later
Group: Amusements/Games
Url:http://armagetronad.sourceforge.net
Source: %{name}ad-%{version}.tar.bz2
Source1:armagetron_add.tar.gz
Patch1: armagetronad-missing_headers.patch
+Patch4: gcc46_add_default_ctors.patch
#backports from 0.2.8.3
Patch2: armagetronad-0.2.8.2.1-no_type_punning.patch
Patch3: armagetronad-0.2.8.2.1-string_const.patch
@@ -50,6 +51,7 @@
%patch1
%patch2
%patch3
+%patch4
%build
export CFLAGS="%{optflags}" CXXFLAGS="%{optflags}"
++ gcc46_add_default_ctors.patch ++
--- src/tools/tDirectories.h2011-05-09 12:09:05.717372144 +0200
+++ src/tools/tDirectories.h2011-05-09 12:14:28.192786036 +0200
@@ -55,6 +55,9 @@
class tPathResource: public tPath {
public:
+tPathResource()
+{
+}
tString GetWritePath(const char *filename) const;
tString GetIncluded() const; //!< returns the path to the included
resources
private:
--- src/tools/tDirectories.cpp 2011-05-09 12:08:56.011780938 +0200
+++ src/tools/tDirectories.cpp 2011-05-09 12:13:33.905073680 +0200
@@ -469,6 +469,9 @@
class tPathConfig: public tPath
{
public:
+tPathConfig()
+{
+}
private:
void Paths ( tArray< tString >& paths ) const
{
@@ -500,6 +503,9 @@
class tPathData: public tPath
{
public:
+tPathData()
+{
+}
private:
void Paths ( tArray< tString >& paths ) const
{
@@ -521,6 +527,9 @@
class tPathVar: public tPath
{
public:
+tPathVar()
+{
+}
private:
void Paths ( tArray< tString >& paths ) const
{
@@ -547,6 +556,9 @@
class tPathScreenshot: public tPath
{
public:
+tPathScreenshot()
+{
+}
private:
void Paths ( tArray< tString >& paths ) const
{
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
