commit 0ad for openSUSE:Factory

2019-12-21 Thread root
Hello community,

here is the log from the commit of package 0ad for openSUSE:Factory checked in 
at 2019-12-21 12:32:54

Comparing /work/SRC/openSUSE:Factory/0ad (Old)
 and  /work/SRC/openSUSE:Factory/.0ad.new.6675 (New)


Package is "0ad"

Sat Dec 21 12:32:54 2019 rev:11 rq:758479 version:0.0.23b

Changes:

--- /work/SRC/openSUSE:Factory/0ad/0ad.changes  2019-05-22 15:40:20.418446639 
+0200
+++ /work/SRC/openSUSE:Factory/.0ad.new.6675/0ad.changes2019-12-21 
12:33:35.859426472 +0100
@@ -1,0 +2,5 @@
+Fri Dec 20 10:14:09 UTC 2019 - Dominique Leuenberger 
+
+- Disable LTO on i586.
+
+---



Other differences:
--
++ 0ad.spec ++
--- /var/tmp/diff_new_pack.fzLoaB/_old  2019-12-21 12:33:36.855426946 +0100
+++ /var/tmp/diff_new_pack.fzLoaB/_new  2019-12-21 12:33:36.859426948 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package 0ad
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -29,7 +29,7 @@
 Summary:A real-time strategy game of ancient warfare
 License:GPL-2.0-or-later AND LGPL-3.0-or-later AND CC-BY-SA-3.0 AND 
MIT AND ISC AND MPL-2.0 AND BSD-3-Clause
 Group:  Amusements/Games/Strategy/Real Time
-Url:https://play0ad.com/
+URL:https://play0ad.com/
 #Source: 
http://sourceforge.net/projects/zero-ad/files/releases/%{name}-%{version}-alpha-unix-build.tar.xz
 # SF is repeatedly not up to date. Let's use their site
 Source: 
https://releases.wildfiregames.com/%{name}-%{version}-alpha-unix-build.tar.xz
@@ -75,6 +75,9 @@
 %setup -q -n %{name}-%{version}-alpha
 
 %build
+%ifarch %ix86
+%define _lto_cflags %{nil}
+%endif
 export CFLAGS="%{optflags}"
 # bundled Collada uses CCFLAGS
 export CCFLAGS="%{optflags}"




commit 0ad for openSUSE:Factory

2019-05-22 Thread root
Hello community,

here is the log from the commit of package 0ad for openSUSE:Factory checked in 
at 2019-05-22 15:40:01

Comparing /work/SRC/openSUSE:Factory/0ad (Old)
 and  /work/SRC/openSUSE:Factory/.0ad.new.5148 (New)


Package is "0ad"

Wed May 22 15:40:01 2019 rev:10 rq:704652 version:0.0.23b

Changes:

--- /work/SRC/openSUSE:Factory/0ad/0ad.changes  2019-04-14 12:23:09.135813672 
+0200
+++ /work/SRC/openSUSE:Factory/.0ad.new.5148/0ad.changes2019-05-22 
15:40:20.418446639 +0200
@@ -1,0 +2,5 @@
+Mon May 20 12:12:08 UTC 2019 - Guillaume GARDET 
+
+- Add _constraints to avoid build failures due to OOM
+
+---

New:

  _constraints



Other differences:
--
++ _constraints ++


  

  6


  3500

  




commit 0ad for openSUSE:Factory

2019-04-14 Thread root
Hello community,

here is the log from the commit of package 0ad for openSUSE:Factory checked in 
at 2019-04-14 12:23:08

Comparing /work/SRC/openSUSE:Factory/0ad (Old)
 and  /work/SRC/openSUSE:Factory/.0ad.new.27019 (New)


Package is "0ad"

Sun Apr 14 12:23:08 2019 rev:9 rq:693727 version:0.0.23b

Changes:

--- /work/SRC/openSUSE:Factory/0ad/0ad.changes  2018-12-28 12:35:20.699962512 
+0100
+++ /work/SRC/openSUSE:Factory/.0ad.new.27019/0ad.changes   2019-04-14 
12:23:09.135813672 +0200
@@ -1,0 +2,9 @@
+Tue Apr  9 20:22:42 UTC 2019 - Stefan Brüns 
+
+- Spec file cleanup:
+  * Use https for Url and Source tags
+  * Remove defattr
+  * Remove __DATE__ mangling, handled by GCC + SOURCE_DATE_EPOCH
+  * Remove support for Leap 42.x, unresolvable anyway
+
+---



Other differences:
--
++ 0ad.spec ++
--- /var/tmp/diff_new_pack.u0MsCH/_old  2019-04-14 12:23:10.067814789 +0200
+++ /var/tmp/diff_new_pack.u0MsCH/_new  2019-04-14 12:23:10.071814794 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package 0ad
 #
-# Copyright (c) 2018 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
@@ -29,20 +29,15 @@
 Summary:A real-time strategy game of ancient warfare
 License:GPL-2.0-or-later AND LGPL-3.0-or-later AND CC-BY-SA-3.0 AND 
MIT AND ISC AND MPL-2.0 AND BSD-3-Clause
 Group:  Amusements/Games/Strategy/Real Time
-Url:http://play0ad.com/
+Url:https://play0ad.com/
 #Source: 
http://sourceforge.net/projects/zero-ad/files/releases/%{name}-%{version}-alpha-unix-build.tar.xz
 # SF is repeatedly not up to date. Let's use their site
-Source: 
http://releases.wildfiregames.com/%{name}-%{version}-alpha-unix-build.tar.xz
-Source99:   %{name}.changes
+Source: 
https://releases.wildfiregames.com/%{name}-%{version}-alpha-unix-build.tar.xz
 BuildRequires:  cmake
 BuildRequires:  gcc-c++
 BuildRequires:  libXcursor-devel
-%if 0%{?suse_version} >= 1330
 BuildRequires:  libboost_filesystem-devel
 BuildRequires:  libboost_system-devel
-%else
-BuildRequires:  boost-devel
-%endif
 BuildRequires:  libjpeg-devel
 BuildRequires:  libminiupnpc-devel
 BuildRequires:  libpng-devel
@@ -79,12 +74,6 @@
 %prep
 %setup -q -n %{name}-%{version}-alpha
 
-# Fix usage of __DATE__ and __TIME__ macros
-modified="$(sed -n '/^/n;s/ - .*$//;p;q' "%{SOURCE99}")"
-DATE="\"$(date -d "${modified}" "+%%b %%e %%Y")\""
-TIME="\"$(date -d "${modified}" "+%%T")\""
-find . "(" -name '*.[ch]' -o -name '*.cpp' ")" -exec sed -i 
"s/__DATE__/${DATE}/g;s/__TIME__/${TIME}/g" \{\} +
-
 %build
 export CFLAGS="%{optflags}"
 # bundled Collada uses CCFLAGS
@@ -124,7 +113,6 @@
 mkdir -p %{buildroot}%{_datadir}/%{name}
 
 %files
-%defattr(-,root,root)
 %doc README.txt
 %license LICENSE.txt license_gpl-2.0.txt license_lgpl-2.1.txt license_mit.txt
 %{_bindir}/0ad




commit 0ad for openSUSE:Factory

2018-12-28 Thread root
Hello community,

here is the log from the commit of package 0ad for openSUSE:Factory checked in 
at 2018-12-28 12:35:02

Comparing /work/SRC/openSUSE:Factory/0ad (Old)
 and  /work/SRC/openSUSE:Factory/.0ad.new.28833 (New)


Package is "0ad"

Fri Dec 28 12:35:02 2018 rev:8 rq:661488 version:0.0.23b

Changes:

--- /work/SRC/openSUSE:Factory/0ad/0ad.changes  2018-05-29 16:48:22.504428243 
+0200
+++ /work/SRC/openSUSE:Factory/.0ad.new.28833/0ad.changes   2018-12-28 
12:35:20.699962512 +0100
@@ -1,0 +2,6 @@
+Tue Dec 25 12:18:12 UTC 2018 - Michael Vetter 
+
+- Update to 0.0.23b:
+  See https://play0ad.com/re-release-of-0-a-d-alpha-23-ken-wood/
+
+---

Old:

  0ad-0.0.23-alpha-unix-build.tar.xz

New:

  0ad-0.0.23b-alpha-unix-build.tar.xz



Other differences:
--
++ 0ad.spec ++
--- /var/tmp/diff_new_pack.ttuWJW/_old  2018-12-28 12:35:21.615961871 +0100
+++ /var/tmp/diff_new_pack.ttuWJW/_new  2018-12-28 12:35:21.615961871 +0100
@@ -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/
 #
 
 
@@ -24,13 +24,15 @@
 %endif
 
 Name:   0ad
-Version:0.0.23
+Version:0.0.23b
 Release:0
 Summary:A real-time strategy game of ancient warfare
-License:GPL-2.0+ and LGPL-3.0+ and CC-BY-SA-3.0 and MIT and ISC and 
MPL-2.0 and BSD-3-Clause
+License:GPL-2.0-or-later AND LGPL-3.0-or-later AND CC-BY-SA-3.0 AND 
MIT AND ISC AND MPL-2.0 AND BSD-3-Clause
 Group:  Amusements/Games/Strategy/Real Time
 Url:http://play0ad.com/
-Source: 
http://sourceforge.net/projects/zero-ad/files/releases/%{name}-%{version}-alpha-unix-build.tar.xz
+#Source: 
http://sourceforge.net/projects/zero-ad/files/releases/%{name}-%{version}-alpha-unix-build.tar.xz
+# SF is repeatedly not up to date. Let's use their site
+Source: 
http://releases.wildfiregames.com/%{name}-%{version}-alpha-unix-build.tar.xz
 Source99:   %{name}.changes
 BuildRequires:  cmake
 BuildRequires:  gcc-c++
@@ -57,7 +59,7 @@
 BuildRequires:  pkgconfig(icu-i18n)
 BuildRequires:  pkgconfig(libcurl)
 BuildRequires:  pkgconfig(libenet)
-BuildRequires:  pkgconfig(libsodium)
+BuildRequires:  pkgconfig(libsodium) >= 1.0.13
 BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  pkgconfig(mozjs-38)
 BuildRequires:  pkgconfig(openal)

++ 0ad-0.0.23-alpha-unix-build.tar.xz -> 
0ad-0.0.23b-alpha-unix-build.tar.xz ++
/work/SRC/openSUSE:Factory/0ad/0ad-0.0.23-alpha-unix-build.tar.xz 
/work/SRC/openSUSE:Factory/.0ad.new.28833/0ad-0.0.23b-alpha-unix-build.tar.xz 
differ: char 27, line 1




commit 0ad for openSUSE:Factory

2018-05-29 Thread root
Hello community,

here is the log from the commit of package 0ad for openSUSE:Factory checked in 
at 2018-05-29 16:48:19

Comparing /work/SRC/openSUSE:Factory/0ad (Old)
 and  /work/SRC/openSUSE:Factory/.0ad.new (New)


Package is "0ad"

Tue May 29 16:48:19 2018 rev:7 rq:610438 version:0.0.23

Changes:

--- /work/SRC/openSUSE:Factory/0ad/0ad.changes  2018-04-20 17:26:26.253137158 
+0200
+++ /work/SRC/openSUSE:Factory/.0ad.new/0ad.changes 2018-05-29 
16:48:22.504428243 +0200
@@ -1,0 +2,11 @@
+Fri May 18 09:03:04 UTC 2018 - mvet...@suse.com
+
+- Update to 0.0.23:
+  See https://play0ad.com/new-release-0-a-d-alpha-23-ken-wood/
+- Remove fix_abs_of_unsigned_char_on_arm.patch: upstreamed
+- Remove system-tinygettext.patch:
+  Upstream thinks this might lead to problems
+  See https://trac.wildfiregames.com/ticket/4192
+- Add BuildReq libsodium and remove tinygettext to use shipped one
+
+---

Old:

  0ad-0.0.22-alpha-unix-build.tar.xz
  fix_abs_of_unsigned_char_on_arm.patch
  system-tinygettext.patch

New:

  0ad-0.0.23-alpha-unix-build.tar.xz



Other differences:
--
++ 0ad.spec ++
--- /var/tmp/diff_new_pack.VmukHY/_old  2018-05-29 16:48:23.600387913 +0200
+++ /var/tmp/diff_new_pack.VmukHY/_new  2018-05-29 16:48:23.604387765 +0200
@@ -24,7 +24,7 @@
 %endif
 
 Name:   0ad
-Version:0.0.22
+Version:0.0.23
 Release:0
 Summary:A real-time strategy game of ancient warfare
 License:GPL-2.0+ and LGPL-3.0+ and CC-BY-SA-3.0 and MIT and ISC and 
MPL-2.0 and BSD-3-Clause
@@ -32,10 +32,6 @@
 Url:http://play0ad.com/
 Source: 
http://sourceforge.net/projects/zero-ad/files/releases/%{name}-%{version}-alpha-unix-build.tar.xz
 Source99:   %{name}.changes
-# PATCH-FEATURE-UPSTREAM system-tinygettext.patch -- 
http://trac.wildfiregames.com/ticket/4192
-Patch1: system-tinygettext.patch
-# PATCH-FIX-UPSTREAM fix_abs_of_unsigned_char_on_arm.patch
-Patch2: 
https://github.com/0ad/0ad/commit/0133d6070bf4c4b2c18c79bf72b53af23403a36d.patch#/fix_abs_of_unsigned_char_on_arm.patch
 BuildRequires:  cmake
 BuildRequires:  gcc-c++
 BuildRequires:  libXcursor-devel
@@ -61,11 +57,11 @@
 BuildRequires:  pkgconfig(icu-i18n)
 BuildRequires:  pkgconfig(libcurl)
 BuildRequires:  pkgconfig(libenet)
+BuildRequires:  pkgconfig(libsodium)
 BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  pkgconfig(mozjs-38)
 BuildRequires:  pkgconfig(openal)
 BuildRequires:  pkgconfig(sdl2)
-BuildRequires:  pkgconfig(tinygettext)
 BuildRequires:  pkgconfig(vorbis)
 BuildRequires:  pkgconfig(zlib)
 Requires:   0ad-data = %{version}
@@ -80,10 +76,6 @@
 
 %prep
 %setup -q -n %{name}-%{version}-alpha
-%patch1 -p1
-# Do not patch files not part of the distributed source
-sed -i -e 's@[-+]\{3\}.*/binaries/@#\0@; s@diff .*/binaries/@#\0@' %{PATCH2}
-%patch2 -p1
 
 # Fix usage of __DATE__ and __TIME__ macros
 modified="$(sed -n '/^/n;s/ - .*$//;p;q' "%{SOURCE99}")"
@@ -106,7 +98,6 @@
 %else
--without-nvtt \
 %endif
---with-system-tinygettext \
 --with-system-mozjs38 \
 
 pushd build/workspaces/gcc

++ 0ad-0.0.22-alpha-unix-build.tar.xz -> 0ad-0.0.23-alpha-unix-build.tar.xz 
++
/work/SRC/openSUSE:Factory/0ad/0ad-0.0.22-alpha-unix-build.tar.xz 
/work/SRC/openSUSE:Factory/.0ad.new/0ad-0.0.23-alpha-unix-build.tar.xz differ: 
char 26, line 1




commit 0ad for openSUSE:Factory

2018-04-20 Thread root
Hello community,

here is the log from the commit of package 0ad for openSUSE:Factory checked in 
at 2018-04-20 17:26:12

Comparing /work/SRC/openSUSE:Factory/0ad (Old)
 and  /work/SRC/openSUSE:Factory/.0ad.new (New)


Package is "0ad"

Fri Apr 20 17:26:12 2018 rev:6 rq:595103 version:0.0.22

Changes:

--- /work/SRC/openSUSE:Factory/0ad/0ad.changes  2018-02-05 10:53:56.377701250 
+0100
+++ /work/SRC/openSUSE:Factory/.0ad.new/0ad.changes 2018-04-20 
17:26:26.253137158 +0200
@@ -1,0 +2,19 @@
+Fri Mar  9 17:07:45 UTC 2018 - stefan.bru...@rwth-aachen.de
+
+- Keep fix_abs_of_unsigned_char_on_arm.patch intact and disable
+  the conflicting/irrelevant hunk in the spec file
+
+---
+Sun Feb 25 20:33:53 UTC 2018 - stefan.bru...@rwth-aachen.de
+
+- Revert the changes to use bundled mozjs38 on Leap 42.3 again
+  (no changelog entry), it does not build on 42.3. Use fixed
+  mozjs38 from distribution instead.
+
+---
+Sat Feb 24 18:46:33 UTC 2018 - stefan.bru...@rwth-aachen.de
+
+- Add fix_abs_of_unsigned_char_on_arm.patch, fixes build on 32/64
+  bit ARM (and probably PPC)
+
+---

New:

  fix_abs_of_unsigned_char_on_arm.patch



Other differences:
--
++ 0ad.spec ++
--- /var/tmp/diff_new_pack.0ComOY/_old  2018-04-20 17:26:27.685085232 +0200
+++ /var/tmp/diff_new_pack.0ComOY/_new  2018-04-20 17:26:27.689085087 +0200
@@ -34,6 +34,8 @@
 Source99:   %{name}.changes
 # PATCH-FEATURE-UPSTREAM system-tinygettext.patch -- 
http://trac.wildfiregames.com/ticket/4192
 Patch1: system-tinygettext.patch
+# PATCH-FIX-UPSTREAM fix_abs_of_unsigned_char_on_arm.patch
+Patch2: 
https://github.com/0ad/0ad/commit/0133d6070bf4c4b2c18c79bf72b53af23403a36d.patch#/fix_abs_of_unsigned_char_on_arm.patch
 BuildRequires:  cmake
 BuildRequires:  gcc-c++
 BuildRequires:  libXcursor-devel
@@ -79,6 +81,9 @@
 %prep
 %setup -q -n %{name}-%{version}-alpha
 %patch1 -p1
+# Do not patch files not part of the distributed source
+sed -i -e 's@[-+]\{3\}.*/binaries/@#\0@; s@diff .*/binaries/@#\0@' %{PATCH2}
+%patch2 -p1
 
 # Fix usage of __DATE__ and __TIME__ macros
 modified="$(sed -n '/^/n;s/ - .*$//;p;q' "%{SOURCE99}")"
@@ -102,7 +107,7 @@
--without-nvtt \
 %endif
 --with-system-tinygettext \
---with-system-mozjs38
+--with-system-mozjs38 \
 
 pushd build/workspaces/gcc
 make verbose=1 %{?_smp_mflags}

++ fix_abs_of_unsigned_char_on_arm.patch ++
>From 0133d6070bf4c4b2c18c79bf72b53af23403a36d Mon Sep 17 00:00:00 2001
From: elexis 
Date: Sun, 14 Jan 2018 21:18:37 +
Subject: [PATCH] Fix build on armhf with gcc 7.

The abs caused a compiler error in that environment, because wchar_t is 
unsigned on armhf, subtracting signed from unsigned results in unsigned and 
std::abs does not define an unsigned variant.

Differential Revision: https://code.wildfiregames.com/D1122
Patch By: Peter Michael Green
Uploaded By: Ludovic



git-svn-id: https://svn.wildfiregames.com/public/ps/trunk@20869 
3db68df2-c116-0410-a063-a993310a9797
---
 binaries/data/mods/public/gui/credits/texts/programming.json | 2 ++
 source/gui/CDropDown.cpp | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/binaries/data/mods/public/gui/credits/texts/programming.json 
b/binaries/data/mods/public/gui/credits/texts/programming.json
index 8b30612dfd..cac3e81da9 100644
--- a/binaries/data/mods/public/gui/credits/texts/programming.json
+++ b/binaries/data/mods/public/gui/credits/texts/programming.json
@@ -129,6 +129,7 @@
{"nick": "livingaftermidnight", "name": "Will Dull"},
{"nick": "Louhike"},
{"nick": "lsdh"},
+   {"nick": "Ludovic", "name": "Ludovic Rousseau"},
{"nick": "madmax", "name": "Abhijit Nandy"},
{"nick": "madpilot", "name": "Guido Falsi"},
{"nick": "m0l0t0ph", "name": "Christoph Gielisch"},
@@ -171,6 +172,7 @@
{"nick": "PeteVasi", "name": "Pete Vasiliauskas"},
{"nick": "pilino1234"},
{"nick": "PingvinBetyar", "name": "Schronk Tamás"},
+   {"nick": "plugwash", "name": "Peter Michael Green"},
{"nick": "Polakrity"},
{"nick": "Poya", "name": "Poya Manouchehri"},
{"name": "Quentin Pradet"},
diff --git a/source/gui/CDropDown.cpp b/source/gui/CDropDown.cpp
index 09527b2048..5f4ac2710a 

commit 0ad for openSUSE:Factory

2018-02-05 Thread root
Hello community,

here is the log from the commit of package 0ad for openSUSE:Factory checked in 
at 2018-02-05 10:53:22

Comparing /work/SRC/openSUSE:Factory/0ad (Old)
 and  /work/SRC/openSUSE:Factory/.0ad.new (New)


Package is "0ad"

Mon Feb  5 10:53:22 2018 rev:5 rq:572419 version:0.0.22

Changes:

--- /work/SRC/openSUSE:Factory/0ad/0ad.changes  2017-11-29 10:52:25.869148245 
+0100
+++ /work/SRC/openSUSE:Factory/.0ad.new/0ad.changes 2018-02-05 
10:53:56.377701250 +0100
@@ -1,0 +2,12 @@
+Sat Feb  3 14:27:50 UTC 2018 - guilla...@opensuse.org
+
+- Enable nvidia-texture-tools only on supported archs
+
+---
+Fri Feb  2 06:06:05 UTC 2018 - stefan.bru...@rwth-aachen.de
+
+- Use system mozjs38, bundled one fails to build on TW
+- Remove special handling for Leap 42.1
+- Pass compiler flags to bundled Collada
+
+---



Other differences:
--
++ 0ad.spec ++
--- /var/tmp/diff_new_pack.YSqg0t/_old  2018-02-05 10:53:57.545646629 +0100
+++ /var/tmp/diff_new_pack.YSqg0t/_new  2018-02-05 10:53:57.549646442 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package 0ad
 #
-# 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
@@ -16,6 +16,13 @@
 #
 
 
+# Enable NVTT only on arch supported by nvidia-texture-tools
+%ifarch %{ix86} x86_64 ppc
+%bcond_without enable_nvtt
+%else
+%bcond_with enable_nvtt
+%endif
+
 Name:   0ad
 Version:0.0.22
 Release:0
@@ -39,9 +46,10 @@
 BuildRequires:  libjpeg-devel
 BuildRequires:  libminiupnpc-devel
 BuildRequires:  libpng-devel
-BuildRequires:  mozilla-nspr-devel
 BuildRequires:  nasm
+%if %{with enable_nvtt}
 BuildRequires:  nvidia-texture-tools
+%endif
 BuildRequires:  pkgconfig
 BuildRequires:  python
 BuildRequires:  update-desktop-files
@@ -52,7 +60,7 @@
 BuildRequires:  pkgconfig(libcurl)
 BuildRequires:  pkgconfig(libenet)
 BuildRequires:  pkgconfig(libxml-2.0)
-#BuildRequires:  pkgconfig(mozjs-38)
+BuildRequires:  pkgconfig(mozjs-38)
 BuildRequires:  pkgconfig(openal)
 BuildRequires:  pkgconfig(sdl2)
 BuildRequires:  pkgconfig(tinygettext)
@@ -80,15 +88,21 @@
 
 %build
 export CFLAGS="%{optflags}"
+# bundled Collada uses CCFLAGS
+export CCFLAGS="%{optflags}"
 export CPPFLAGS="%{optflags} -fpermissive"
 build/workspaces/update-workspaces.sh \
 %{?_smp_mflags} \
 --bindir=%{_bindir} \
 --datadir=%{_datadir}/%{name} \
 --libdir=%{_libdir}/%{name} \
+%if %{with enable_nvtt}
 --with-system-nvtt \
---with-system-tinygettext
-#--with-system-mozjs38
+%else
+   --without-nvtt \
+%endif
+--with-system-tinygettext \
+--with-system-mozjs38
 
 pushd build/workspaces/gcc
 make verbose=1 %{?_smp_mflags}
@@ -99,7 +113,6 @@
 install -Dm 0755 binaries/system/pyrogenesis %{buildroot}%{_bindir}/pyrogenesis
 install -Dm 0755 binaries/system/libCollada.so 
%{buildroot}%{_libdir}/%{name}/libCollada.so
 install -Dm 0755 binaries/system/libAtlasUI.so 
%{buildroot}%{_libdir}/%{name}/libAtlasUI.so
-install -Dm 0755 binaries/system/libmozjs38-ps-release.so 
%{buildroot}%{_libdir}/%{name}/libmozjs38-ps-release.so
 
 install -Dm 0644 build/resources/0ad.desktop 
%{buildroot}%{_datadir}/applications/%{name}.desktop
 install -Dm 0644 build/resources/0ad.appdata.xml 
%{buildroot}%{_datadir}/appdata/%{name}.appdata.xml
@@ -115,13 +128,7 @@
 %files
 %defattr(-,root,root)
 %doc README.txt
-%if ( 0%{?suse_version} == 1315 && 0%{?sle_version} == 120100 ) || ! 
0%{?is_opensuse}
-# Fix for Leap 42.1 or SLE (TODO: Drop if 42.1 is out of maintenance)
-%doc LICENSE.txt license_gpl-2.0.txt license_lgpl-2.1.txt license_mit.txt
-%dir %{_datadir}/appdata
-%else
 %license LICENSE.txt license_gpl-2.0.txt license_lgpl-2.1.txt license_mit.txt
-%endif
 %{_bindir}/0ad
 %{_bindir}/pyrogenesis
 %{_bindir}/ActorEditor




commit 0ad for openSUSE:Factory

2017-11-29 Thread root
Hello community,

here is the log from the commit of package 0ad for openSUSE:Factory checked in 
at 2017-11-29 10:52:25

Comparing /work/SRC/openSUSE:Factory/0ad (Old)
 and  /work/SRC/openSUSE:Factory/.0ad.new (New)


Package is "0ad"

Wed Nov 29 10:52:25 2017 rev:4 rq:545563 version:0.0.22

Changes:

--- /work/SRC/openSUSE:Factory/0ad/0ad.changes  2017-08-24 18:52:20.297932600 
+0200
+++ /work/SRC/openSUSE:Factory/.0ad.new/0ad.changes 2017-11-29 
10:52:25.869148245 +0100
@@ -1,0 +2,5 @@
+Tue Nov 21 08:43:30 UTC 2017 - adam.ma...@suse.de
+
+- Stop depending on boost-devel (boo#1062766)
+
+---



Other differences:
--
++ 0ad.spec ++
--- /var/tmp/diff_new_pack.rL4hNu/_old  2017-11-29 10:52:26.929109790 +0100
+++ /var/tmp/diff_new_pack.rL4hNu/_new  2017-11-29 10:52:26.933109645 +0100
@@ -20,17 +20,22 @@
 Version:0.0.22
 Release:0
 Summary:A real-time strategy game of ancient warfare
-License:GPL-2.0+ AND LGPL-3.0+ AND CC-BY-SA-3.0 AND MIT AND ISC AND 
MPL-2.0 AND BSD-3-Clause
+License:GPL-2.0+ and LGPL-3.0+ and CC-BY-SA-3.0 and MIT and ISC and 
MPL-2.0 and BSD-3-Clause
 Group:  Amusements/Games/Strategy/Real Time
 Url:http://play0ad.com/
 Source: 
http://sourceforge.net/projects/zero-ad/files/releases/%{name}-%{version}-alpha-unix-build.tar.xz
 Source99:   %{name}.changes
 # PATCH-FEATURE-UPSTREAM system-tinygettext.patch -- 
http://trac.wildfiregames.com/ticket/4192
 Patch1: system-tinygettext.patch
-BuildRequires:  boost-devel
 BuildRequires:  cmake
 BuildRequires:  gcc-c++
 BuildRequires:  libXcursor-devel
+%if 0%{?suse_version} >= 1330
+BuildRequires:  libboost_filesystem-devel
+BuildRequires:  libboost_system-devel
+%else
+BuildRequires:  boost-devel
+%endif
 BuildRequires:  libjpeg-devel
 BuildRequires:  libminiupnpc-devel
 BuildRequires:  libpng-devel




commit 0ad for openSUSE:Factory

2017-08-24 Thread root
Hello community,

here is the log from the commit of package 0ad for openSUSE:Factory checked in 
at 2017-08-24 18:52:18

Comparing /work/SRC/openSUSE:Factory/0ad (Old)
 and  /work/SRC/openSUSE:Factory/.0ad.new (New)


Package is "0ad"

Thu Aug 24 18:52:18 2017 rev:3 rq:516786 version:0.0.22

Changes:

--- /work/SRC/openSUSE:Factory/0ad/0ad.changes  2017-03-03 17:53:57.313287981 
+0100
+++ /work/SRC/openSUSE:Factory/.0ad.new/0ad.changes 2017-08-24 
18:52:20.297932600 +0200
@@ -1,0 +2,23 @@
+Fri Aug 11 19:35:27 UTC 2017 - mailaen...@opensuse.org
+
+- Build with system nvidia-texture-tools (boo#1053393)
+
+---
+Fri Jul 28 10:37:17 UTC 2017 - dims...@opensuse.org
+
+- Update to version 0.0.22:
+  + Remake of many models, animations and textures, two new music
+tracks.
+  + Configuration-free Multiplayer Hosting.
+  + Capture the Relic Gamemode.
+  + Aura and Heal Range Visualization.
+  + Twelve new maps, including scripted enemies, rising water and a
+tutorial.
+  + Espionage Technology, Team Bonuses and Hero Auras.
+  + Petra AI Diplomacy and Attack Strategies.
+  + Summary Screen Graphs.
+  + Cinema Path Editing.
+  + Buddy System.
+- Drop 0ad-desktop.patch: fixed upstream.
+
+---

Old:

  0ad-0.0.21-alpha-unix-build.tar.xz
  0ad-desktop.patch

New:

  0ad-0.0.22-alpha-unix-build.tar.xz



Other differences:
--
++ 0ad.spec ++
--- /var/tmp/diff_new_pack.SI528t/_old  2017-08-24 18:52:22.737589084 +0200
+++ /var/tmp/diff_new_pack.SI528t/_new  2017-08-24 18:52:22.745587958 +0200
@@ -17,18 +17,16 @@
 
 
 Name:   0ad
-Version:0.0.21
+Version:0.0.22
 Release:0
 Summary:A real-time strategy game of ancient warfare
-License:GPL-2.0+ and LGPL-3.0+ and CC-BY-SA-3.0 and MIT and ISC and 
MPL-2.0 and BSD-3-Clause
+License:GPL-2.0+ AND LGPL-3.0+ AND CC-BY-SA-3.0 AND MIT AND ISC AND 
MPL-2.0 AND BSD-3-Clause
 Group:  Amusements/Games/Strategy/Real Time
 Url:http://play0ad.com/
 Source: 
http://sourceforge.net/projects/zero-ad/files/releases/%{name}-%{version}-alpha-unix-build.tar.xz
 Source99:   %{name}.changes
 # PATCH-FEATURE-UPSTREAM system-tinygettext.patch -- 
http://trac.wildfiregames.com/ticket/4192
 Patch1: system-tinygettext.patch
-# PATCH-RPMLINT-ERROR 0ad-desktopt.patch -- invalid key URL
-Patch2: %{name}-desktop.patch
 BuildRequires:  boost-devel
 BuildRequires:  cmake
 BuildRequires:  gcc-c++
@@ -38,6 +36,7 @@
 BuildRequires:  libpng-devel
 BuildRequires:  mozilla-nspr-devel
 BuildRequires:  nasm
+BuildRequires:  nvidia-texture-tools
 BuildRequires:  pkgconfig
 BuildRequires:  python
 BuildRequires:  update-desktop-files
@@ -48,13 +47,13 @@
 BuildRequires:  pkgconfig(libcurl)
 BuildRequires:  pkgconfig(libenet)
 BuildRequires:  pkgconfig(libxml-2.0)
+#BuildRequires:  pkgconfig(mozjs-38)
 BuildRequires:  pkgconfig(openal)
 BuildRequires:  pkgconfig(sdl2)
 BuildRequires:  pkgconfig(tinygettext)
 BuildRequires:  pkgconfig(vorbis)
 BuildRequires:  pkgconfig(zlib)
 Requires:   0ad-data = %{version}
-BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 
 %description
 0 A.D. (pronounced "zero ey-dee") is a real-time strategy (RTS) game
@@ -67,7 +66,6 @@
 %prep
 %setup -q -n %{name}-%{version}-alpha
 %patch1 -p1
-%patch2 -p1
 
 # Fix usage of __DATE__ and __TIME__ macros
 modified="$(sed -n '/^/n;s/ - .*$//;p;q' "%{SOURCE99}")"
@@ -83,7 +81,9 @@
 --bindir=%{_bindir} \
 --datadir=%{_datadir}/%{name} \
 --libdir=%{_libdir}/%{name} \
+--with-system-nvtt \
--with-system-tinygettext
+#--with-system-mozjs38
 
 pushd build/workspaces/gcc
 make verbose=1 %{?_smp_mflags}
@@ -95,10 +95,6 @@
 install -Dm 0755 binaries/system/libCollada.so 
%{buildroot}%{_libdir}/%{name}/libCollada.so
 install -Dm 0755 binaries/system/libAtlasUI.so 
%{buildroot}%{_libdir}/%{name}/libAtlasUI.so
 install -Dm 0755 binaries/system/libmozjs38-ps-release.so 
%{buildroot}%{_libdir}/%{name}/libmozjs38-ps-release.so
-install -Dm 0755 binaries/system/libnvcore.so 
%{buildroot}%{_libdir}/%{name}/libnvcore.so
-install -Dm 0755 binaries/system/libnvimage.so 
%{buildroot}%{_libdir}/%{name}/libnvimage.so
-install -Dm 0755 binaries/system/libnvmath.so 
%{buildroot}%{_libdir}/%{name}/libnvmath.so
-install -Dm 0755 binaries/system/libnvtt.so 
%{buildroot}%{_libdir}/%{name}/libnvtt.so
 
 install -Dm 0644 build/resources/0ad.desktop 
%{buildroot}%{_datadir}/applications/%{name}.desktop
 install -Dm 0644 build/resources/0ad.appdata.xml 
%{buildroot}%{_datadir}/appdata/%{name}.appdata.xml
@@ -124,13 +120,7 @@
 %{_bindir}/0ad
 

commit 0ad for openSUSE:Factory

2017-03-03 Thread root
Hello community,

here is the log from the commit of package 0ad for openSUSE:Factory checked in 
at 2017-03-03 17:53:56

Comparing /work/SRC/openSUSE:Factory/0ad (Old)
 and  /work/SRC/openSUSE:Factory/.0ad.new (New)


Package is "0ad"

Fri Mar  3 17:53:56 2017 rev:2 rq:461739 version:0.0.21

Changes:

--- /work/SRC/openSUSE:Factory/0ad/0ad.changes  2017-01-24 10:32:12.396562306 
+0100
+++ /work/SRC/openSUSE:Factory/.0ad.new/0ad.changes 2017-03-03 
17:53:57.313287981 +0100
@@ -1,0 +2,5 @@
+Fri Feb 17 11:38:45 UTC 2017 - dims...@opensuse.org
+
+- Install the upstream provided appdata.xml file.
+
+---



Other differences:
--
++ 0ad.spec ++
--- /var/tmp/diff_new_pack.wBimaJ/_old  2017-03-03 17:53:58.261154100 +0100
+++ /var/tmp/diff_new_pack.wBimaJ/_new  2017-03-03 17:53:58.265153536 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package 0ad
 #
-# 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
@@ -101,6 +101,7 @@
 install -Dm 0755 binaries/system/libnvtt.so 
%{buildroot}%{_libdir}/%{name}/libnvtt.so
 
 install -Dm 0644 build/resources/0ad.desktop 
%{buildroot}%{_datadir}/applications/%{name}.desktop
+install -Dm 0644 build/resources/0ad.appdata.xml 
%{buildroot}%{_datadir}/appdata/%{name}.appdata.xml
 install -Dm 0644 build/resources/0ad.png 
%{buildroot}%{_datadir}/pixmaps/%{name}.png
 
 %suse_update_desktop_file %{name}
@@ -113,10 +114,12 @@
 %files
 %defattr(-,root,root)
 %doc README.txt
-%if 0%{?suse_version} > 1320
-%license LICENSE.txt license_gpl-2.0.txt license_lgpl-2.1.txt license_mit.txt
-%else
+%if ( 0%{?suse_version} == 1315 && 0%{?sle_version} == 120100 ) || ! 
0%{?is_opensuse}
+# Fix for Leap 42.1 or SLE (TODO: Drop if 42.1 is out of maintenance)
 %doc LICENSE.txt license_gpl-2.0.txt license_lgpl-2.1.txt license_mit.txt
+%dir %{_datadir}/appdata
+%else
+%license LICENSE.txt license_gpl-2.0.txt license_lgpl-2.1.txt license_mit.txt
 %endif
 %{_bindir}/0ad
 %{_bindir}/pyrogenesis
@@ -129,6 +132,7 @@
 %{_libdir}/%{name}/libnvmath.so
 %{_libdir}/%{name}/libnvtt.so
 %{_datadir}/pixmaps/%{name}.png
+%{_datadir}/appdata/%{name}.appdata.xml
 %{_datadir}/applications/%{name}.desktop
 %dir %{_libdir}/%{name}
 %dir %{_datadir}/%{name}