commit 3omns for openSUSE:Factory
Hello community,
here is the log from the commit of package 3omns for openSUSE:Factory checked
in at 2017-09-13 22:33:19
Comparing /work/SRC/openSUSE:Factory/3omns (Old)
and /work/SRC/openSUSE:Factory/.3omns.new (New)
Package is "3omns"
Wed Sep 13 22:33:19 2017 rev:7 rq:523360 version:0.2
Changes:
--- /work/SRC/openSUSE:Factory/3omns/3omns.changes 2017-01-10
10:48:03.308689721 +0100
+++ /work/SRC/openSUSE:Factory/.3omns.new/3omns.changes 2017-09-13
22:33:26.449376130 +0200
@@ -1,0 +2,6 @@
+Mon Sep 11 12:01:30 UTC 2017 - jmate...@suse.com
+
+- lua53.patch : add support for Lua 5.3 (upstream commit 1524b7c)
+- change requirement to lua53
+
+---
New:
lua53.patch
Other differences:
--
++ 3omns.spec ++
--- /var/tmp/diff_new_pack.NvHwBt/_old 2017-09-13 22:33:26.985300684 +0200
+++ /var/tmp/diff_new_pack.NvHwBt/_new 2017-09-13 22:33:26.985300684 +0200
@@ -1,7 +1,7 @@
#
# spec file for package 3omns
#
-# 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
@@ -16,6 +16,12 @@
#
+%if 0%{?suse_version} > 1320
+%bcond_without lua53
+%else
+%bcond_with lua53
+%endif
+
Name: 3omns
Version:0.2
Release:0
@@ -26,6 +32,8 @@
Source:
https://github.com/chazomaticus/3omns/releases/download/%{version}/3omns-%{version}.tar.xz
# PATCH-FEATURE-UPSTREAM https://github.com/chazomaticus/3omns/pull/4
Patch0: appdata.patch
+# PATCH-FEATURE-UPSTREAM upgrade to Lua 5.3
https://github.com/chazomaticus/3omns/commit/1524b7c
+Patch1: lua53.patch
%if 0%{?suse_version}
BuildRequires: fdupes
BuildRequires: hicolor-icon-theme
@@ -42,8 +50,8 @@
BuildRequires: hicolor-icon-theme
BuildRequires: update-desktop-files
BuildRequires: xz
-%if 0%{?suse_version} > 1320
-BuildRequires: lua52-devel
+%if %{with lua53}
+BuildRequires: lua53-devel
%else
BuildRequires: lua-devel < 5.3
BuildRequires: lua-devel >= 5.2
@@ -61,6 +69,9 @@
%prep
%setup -q
%patch0 -p1
+%if %{with lua53}
+%patch1 -p1
+%endif
%build
autoreconf -fi
++ lua53.patch ++
>From 1524b7cc7b8e6e18cc1575118e87ea464d6ae494 Mon Sep 17 00:00:00 2001
From: Charles Lindsay
Date: Fri, 8 Jul 2016 21:38:59 -0700
Subject: [PATCH] Upgrade to Lua 5.3
It's been out for a while, might as well keep current.
The C code is pretty easy--unsigneds just become integers, no big whoop.
The lua code is a little trickier since every math operation has to
(gets to?) take the new integer type into account. I think I got it all
ok, might've even gotten a little pedantic in there... but if this isn't
the place for pedantry, what is?
---
configure.ac | 6 +++---
l3/l3.c| 2 +-
l3/level.c | 18 +-
l3/sync.c | 2 +-
res/base/bot.lua | 8
res/base/entities/bomn.lua | 4 ++--
res/base/entities/dude.lua | 8
res/base/generate.lua | 22 +++---
res/base/sprites/blast.lua | 4 ++--
9 files changed, 37 insertions(+), 37 deletions(-)
diff --git a/configure.ac b/configure.ac
index 1833c5b..941d132 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,9 +18,9 @@ PKG_CHECK_MODULES([SDL], [
SDL2_image >= 2.0.0
SDL2_ttf >= 2.0.12
])
-PKG_CHECK_MODULES([LUA], [lua5.2 >= 5.2.0], [], dnl Linux package name
- [PKG_CHECK_MODULES([LUA], [lua-5.2 >= 5.2.0], [], dnl BSD
- [PKG_CHECK_MODULES([LUA], [lua >= 5.2.0])] dnl OpenSUSE (et al.?)
+PKG_CHECK_MODULES([LUA], [lua5.3 >= 5.3.0], [], dnl Linux package name
+ [PKG_CHECK_MODULES([LUA], [lua-5.3 >= 5.3.0], [], dnl BSD
+ [PKG_CHECK_MODULES([LUA], [lua >= 5.3.0])] dnl OpenSUSE (et al.?)
)])
AC_CHECK_HEADERS([argp.h], [],
[AC_MSG_ERROR([cannot find required header argp.h])]
diff --git a/l3/l3.c b/l3/l3.c
index e540f09..9392b48 100644
--- a/l3/l3.c
+++ b/l3/l3.c
@@ -128,7 +128,7 @@ static void set_tile_images(lua_State *restrict l) {
b3_fatal("Missing global table %s", L3_TILE_IMAGES_NAME);
for(int i = 0; i < B3_TILE_COUNT; i++) {
-lua_pushunsigned(l, (lua_Unsigned)i);
+lua_pushinteger(l, (lua_Integer)i);
lua_gettable(l, -2);
b3_image **p_image = luaL_testudata(l, -1, IMAGE_METATABLE);
diff --git a/l3/level.c b/l3/level.c
index f566237..4f0ae97 100644
--- a/l3/level.c
+++ b/l3/level.c
@@ -40,7 +40,7 @@ l3_level *push_new_level(lua_State *restrict l) {
static int level_new(lua_State
commit 3omns for openSUSE:Factory
Hello community,
here is the log from the commit of package 3omns for openSUSE:Factory checked
in at 2016-07-16 22:13:11
Comparing /work/SRC/openSUSE:Factory/3omns (Old)
and /work/SRC/openSUSE:Factory/.3omns.new (New)
Package is "3omns"
Changes:
--- /work/SRC/openSUSE:Factory/3omns/3omns.changes 2016-01-28
17:23:47.0 +0100
+++ /work/SRC/openSUSE:Factory/.3omns.new/3omns.changes 2016-07-16
22:13:13.0 +0200
@@ -1,0 +2,5 @@
+Sun Jun 19 20:04:33 UTC 2016 - nemy...@opensuse.org
+
+- Remove check %if 0%{?suse_version}, because is only for openSUSE
+
+---
Other differences:
--
++ 3omns.spec ++
--- /var/tmp/diff_new_pack.DBZUZ6/_old 2016-07-16 22:13:14.0 +0200
+++ /var/tmp/diff_new_pack.DBZUZ6/_new 2016-07-16 22:13:14.0 +0200
@@ -26,23 +26,22 @@
# Downloaded from https://github.com/chazomaticus/3omns
# Packed as tar.bz2
Source0:%{name}-%{version}+git-ded6410.tar.bz2
-%if 0%{?suse_version}
-BuildRequires: fdupes
-BuildRequires: hicolor-icon-theme
-BuildRequires: update-desktop-files
-%endif
BuildRequires: asciidoc
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: bitstream-vera-fonts
BuildRequires: docbook-xsl-stylesheets
BuildRequires: docbook_5
+BuildRequires: fdupes
BuildRequires: glibc-devel
+BuildRequires: hicolor-icon-theme
BuildRequires: libxml2-devel
BuildRequires: libxslt-devel
+BuildRequires: update-desktop-files
%if 0%{?suse_version} > 1320
BuildRequires: lua52-devel
%else
+BuildRequires: lua-devel < 5.3
BuildRequires: lua-devel >= 5.2
%endif
BuildRequires: pkgconfig(SDL2_image)
@@ -71,10 +70,8 @@
rm -f %{buildroot}%{_datadir}/%{name}/ttf/Vera.ttf
ln -s ../../fonts/truetype/Vera.ttf
%{buildroot}%{_datadir}/%{name}/ttf/Vera.ttf
-%if 0%{?suse_version}
-%suse_update_desktop_file %{name}
-%fdupes -s %{buildroot}%{_prefix}
-%endif
+%suse_update_desktop_file %{name}
+%fdupes -s %{buildroot}%{_prefix}
%files
%defattr(-,root,root,-)
commit 3omns for openSUSE:Factory
Hello community,
here is the log from the commit of package 3omns for openSUSE:Factory checked
in at 2016-01-28 17:22:59
Comparing /work/SRC/openSUSE:Factory/3omns (Old)
and /work/SRC/openSUSE:Factory/.3omns.new (New)
Package is "3omns"
Changes:
--- /work/SRC/openSUSE:Factory/3omns/3omns.changes 2015-09-30
05:52:22.0 +0200
+++ /work/SRC/openSUSE:Factory/.3omns.new/3omns.changes 2016-01-28
17:23:47.0 +0100
@@ -1,0 +2,23 @@
+Sat Jan 23 11:29:00 UTC 2016 - nemy...@opensuse.org
+
+- Recreate tarball, new GitHub commit
+ Please look 'git log' and announce message:
+
+ * Add bot.lua to dist
+
+ * Fixed some bot AI bugs
+ * Revamped networking code to add reliability
+ * Added the -R command line option to print resources path
+
+- license update: GPL-3.0+ No indication that this is GPL-3.0 (only)
+- Add BuildRequires for bitstream-vera-fonts
+- Add Requires for bitstream-vera-fonts, thanks dstoecker
+- Replace bundled font with a symlink to an identical system font
+- Remove COPYING.font from Documentation
+
+---
+Fri Jan 1 12:04:44 UTC 2016 - r...@fthiessen.de
+
+- Fixed lua dependencies so it will also build on openSUSE <= 13.2
+
+---
Old:
3omns-0.1+git-21292f0.tar.bz2
New:
3omns-0.1+git-ded6410.tar.bz2
Other differences:
--
++ 3omns.spec ++
--- /var/tmp/diff_new_pack.pw09HU/_old 2016-01-28 17:23:48.0 +0100
+++ /var/tmp/diff_new_pack.pw09HU/_new 2016-01-28 17:23:48.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package 3omns
#
-# 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
@@ -20,12 +20,12 @@
Version:0.1
Release:0
Summary:Old-school Arcade-style Tile-based Bomb-dropping Deathmatch
Game
-License:GPL-3.0
+License:GPL-3.0+
Group: Amusements/Games/Action/Arcade
Url:https://chazomaticus.github.io/3omns/
# Downloaded from https://github.com/chazomaticus/3omns
# Packed as tar.bz2
-Source0:%{name}-%{version}+git-21292f0.tar.bz2
+Source0:%{name}-%{version}+git-ded6410.tar.bz2
%if 0%{?suse_version}
BuildRequires: fdupes
BuildRequires: hicolor-icon-theme
@@ -34,19 +34,21 @@
BuildRequires: asciidoc
BuildRequires: autoconf
BuildRequires: automake
+BuildRequires: bitstream-vera-fonts
BuildRequires: docbook-xsl-stylesheets
BuildRequires: docbook_5
BuildRequires: glibc-devel
BuildRequires: libxml2-devel
BuildRequires: libxslt-devel
-BuildRequires: pkgconfig(SDL2_image)
-BuildRequires: pkgconfig(SDL2_ttf)
%if 0%{?suse_version} > 1320
BuildRequires: lua52-devel
%else
-BuildRequires: pkgconfig(lua)
+BuildRequires: lua-devel >= 5.2
%endif
+BuildRequires: pkgconfig(SDL2_image)
+BuildRequires: pkgconfig(SDL2_ttf)
BuildRequires: pkgconfig(sdl2)
+Requires: bitstream-vera-fonts
%description
3omns is an old-school arcade-style tile-based bomb-dropping deathmatch game.
@@ -65,6 +67,10 @@
%install
%make_install
+# Use system fonts instead of bundling our own
+rm -f %{buildroot}%{_datadir}/%{name}/ttf/Vera.ttf
+ln -s ../../fonts/truetype/Vera.ttf
%{buildroot}%{_datadir}/%{name}/ttf/Vera.ttf
+
%if 0%{?suse_version}
%suse_update_desktop_file %{name}
%fdupes -s %{buildroot}%{_prefix}
@@ -72,7 +78,7 @@
%files
%defattr(-,root,root,-)
-%doc COPYING COPYING.font NEWS README
+%doc COPYING NEWS README
%{_bindir}/%{name}
%{_mandir}/man6/%{name}.6%{ext_man}
%{_datadir}/applications/%{name}.desktop
++ 3omns-0.1+git-21292f0.tar.bz2 -> 3omns-0.1+git-ded6410.tar.bz2 ++
commit 3omns for openSUSE:Factory
Hello community,
here is the log from the commit of package 3omns for openSUSE:Factory checked
in at 2015-09-30 05:52:16
Comparing /work/SRC/openSUSE:Factory/3omns (Old)
and /work/SRC/openSUSE:Factory/.3omns.new (New)
Package is "3omns"
Changes:
--- /work/SRC/openSUSE:Factory/3omns/3omns.changes 2015-08-01
11:39:01.0 +0200
+++ /work/SRC/openSUSE:Factory/.3omns.new/3omns.changes 2015-09-30
05:52:22.0 +0200
@@ -1,0 +2,6 @@
+Fri Sep 25 16:51:53 UTC 2015 - nemy...@opensuse.org
+
+- Recreate tarball, new GitHub commit
+ Please look 'git log'
+
+---
Old:
3omns-0.1+git-ffb111ac.tar.bz2
New:
3omns-0.1+git-21292f0.tar.bz2
Other differences:
--
++ 3omns.spec ++
--- /var/tmp/diff_new_pack.2iloFa/_old 2015-09-30 05:52:23.0 +0200
+++ /var/tmp/diff_new_pack.2iloFa/_new 2015-09-30 05:52:23.0 +0200
@@ -25,7 +25,7 @@
Url:https://chazomaticus.github.io/3omns/
# Downloaded from https://github.com/chazomaticus/3omns
# Packed as tar.bz2
-Source0:%{name}-%{version}+git-ffb111ac.tar.bz2
+Source0:%{name}-%{version}+git-21292f0.tar.bz2
%if 0%{?suse_version}
BuildRequires: fdupes
BuildRequires: hicolor-icon-theme
++ 3omns-0.1+git-ffb111ac.tar.bz2 -> 3omns-0.1+git-21292f0.tar.bz2 ++
10423 lines of diff (skipped)
commit 3omns for openSUSE:Factory
Hello community,
here is the log from the commit of package 3omns for openSUSE:Factory checked
in at 2015-08-01 11:38:59
Comparing /work/SRC/openSUSE:Factory/3omns (Old)
and /work/SRC/openSUSE:Factory/.3omns.new (New)
Package is 3omns
Changes:
--- /work/SRC/openSUSE:Factory/3omns/3omns.changes 2014-11-26
10:33:37.0 +0100
+++ /work/SRC/openSUSE:Factory/.3omns.new/3omns.changes 2015-08-01
11:39:01.0 +0200
@@ -1,0 +2,6 @@
+Thu Jul 30 10:54:23 UTC 2015 - dims...@opensuse.org
+
+- BuildRequire lua52-devel on openSUSE 13.2 (current Tumbleweed):
+ 3omns has not been ported to LUA 5.3 yet.
+
+---
Other differences:
--
++ 3omns.spec ++
--- /var/tmp/diff_new_pack.lRirIn/_old 2015-08-01 11:39:01.0 +0200
+++ /var/tmp/diff_new_pack.lRirIn/_new 2015-08-01 11:39:01.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package 3omns
#
-# Copyright (c) 2014 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
@@ -41,7 +41,11 @@
BuildRequires: libxslt-devel
BuildRequires: pkgconfig(SDL2_image)
BuildRequires: pkgconfig(SDL2_ttf)
+%if 0%{?suse_version} 1320
+BuildRequires: lua52-devel
+%else
BuildRequires: pkgconfig(lua)
+%endif
BuildRequires: pkgconfig(sdl2)
%description
