Hello community, here is the log from the commit of package warzone2100 for openSUSE:Factory checked in at 2017-08-24 18:31:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/warzone2100 (Old) and /work/SRC/openSUSE:Factory/.warzone2100.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "warzone2100" Thu Aug 24 18:31:07 2017 rev:3 rq:506108 version:3.2.3 Changes: -------- --- /work/SRC/openSUSE:Factory/warzone2100/warzone2100.changes 2017-03-16 09:51:52.994833063 +0100 +++ /work/SRC/openSUSE:Factory/.warzone2100.new/warzone2100.changes 2017-08-24 18:31:32.209726479 +0200 @@ -1,0 +2,35 @@ +Sat Jun 24 14:21:57 UTC 2017 - [email protected] + +- Remove upstreamed appdata.patch +- Replace system-miniupnpc.diff with system-miniupnpc.patch +- Update to version 3.2.3 + * Fix: Rescale body points if players have different armour levels when transferring units (d0934ff3ad, #4554) + * Fix: Occasional crash when entering host game menu (03d494d366, #4567, #4564, #4546, #4361 and others) + * Fix: Game freeze on clicking on start game in menu (382077800b, #4566) + * Fix: Never put scavengers on human teams by accident (a691778a5f, #4563) + * Add: We now support higher than 8x MSAA, if supported by driver - do not show 8x if not supported (33057c24ed) + * Change: Optimizing graphics rendering (92b50b7665, c1f697f28a, a70920985e, 486dd8e9c0) + * Change: Increase default resolution to 1024x720 rather than 640x480 (9b0fa9e79a) + * Fix: Avoiding some techniques to hopefully run with more drivers (8a2ff4499d, 4134f82d22, 871fa31c80) + * Fix: Fix clipped letters (9c04d4ad6b) + * Fix: Fix text rendering blend mode, makes progress bar more readable (0bfd217940, #4569) + * Fix: Still/moving helicopter/VTOL animations were reversed (fb9bea5e0a, #4489) + * Fix: Prevent structure turret stretching again (f79286dc13, #4537) + * Change: Lots of initial campaign ported to Javascript. Discuss these changes in our new porting forum here: viewforum.php?f=51 + * Add: donateObject() works on structures. findResearch() works on other players (839e0b0f5c) + * Add: New function hackDoNotSave(global name) to prevent variable from being put in savegames (ff57dc5733) + * Add: Add setHealth(object, health %) to set a game object's health (62a7c96168) +- Changes from 3.2.2 + * Change: Improved debug menu (e89e162540, 550f6eb01e) + * Change: Improved handling of multiplayer map/mod downloads (4b73c266fd) + * Fix: Fixed super heavy-gunner dependency (#4490, 116ac5c679) + * Fix: Do not crash on invalid research orders (c6e9dfcf65) + * Fix: Do not enter an infinite loop on loading invalid stored templates (a394991dd1) + * Change: Fixed functionality graphics rewritten to use programmable shaders + * Fix: Make water tiles visible even when just the water surface is visible (4e6d245b75, #4504) + * Change: New animation system (af9c9137d2) + * Fix: Alpha campaign cyborg production (bc3db59f5f, #4515) + * Fix: Disappearing commander designs in beta and gamma campaigns (df4e1e378c, #4458) + * Fix: Do not desynch when NullBot VTOLs rearm (216827c96f, #4464) + +------------------------------------------------------------------- Old: ---- appdata.patch system-miniupnpc.diff warzone2100-3.2.1.tar.xz New: ---- system-miniupnpc.patch warzone2100-3.2.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ warzone2100.spec ++++++ --- /var/tmp/diff_new_pack.afORjG/_old 2017-08-24 18:31:36.409134847 +0200 +++ /var/tmp/diff_new_pack.afORjG/_new 2017-08-24 18:31:36.413134283 +0200 @@ -17,7 +17,7 @@ Name: warzone2100 -Version: 3.2.1 +Version: 3.2.3 Release: 0 Summary: Innovative 3D real-time strategy License: GPL-2.0+ and CC-BY-SA-3.0 and CC0-1.0 and BSD-3-Clause and LGPL-2.1 @@ -25,9 +25,8 @@ Url: http://wz2100.net/ Source: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.xz Source99: %{name}.changes -# PATCH-FIX-UPSTREAM https://github.com/Warzone2100/warzone2100/pull/67 -Patch0: appdata.patch -Patch2: system-miniupnpc.diff +# PATCH-FIX-UPSTREAM https://github.com/Warzone2100/warzone2100/pull/89 +Patch2: system-miniupnpc.patch BuildRequires: asciidoc BuildRequires: automake BuildRequires: bison @@ -51,6 +50,7 @@ BuildRequires: pkgconfig(fribidi) BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(glew) >= 1.5.2 +BuildRequires: pkgconfig(harfbuzz) BuildRequires: pkgconfig(libcrypto) BuildRequires: pkgconfig(ogg) BuildRequires: pkgconfig(openal) @@ -110,7 +110,6 @@ %prep %setup -q -%patch0 -p1 %patch2 -p1 # constant timestamp for reproducible builds @@ -123,7 +122,7 @@ ./autogen.sh %configure \ --docdir=%{_docdir}/%{name} \ - --with-distributor="openSUSE BuildService" \ + --with-distributor="openSUSE Build Service" \ --with-icondir=%{_datadir}/pixmaps make %{?_smp_mflags} @@ -132,6 +131,9 @@ %find_lang %{name} %suse_update_desktop_file -i %{name} +mkdir -p %{buildroot}%{_datadir}/appdata/ +mv %{buildroot}%{_datadir}/metainfo/warzone2100.appdata.xml %{buildroot}%{_datadir}/appdata/warzone2100.appdata.xml + %post %desktop_database_post @@ -142,8 +144,7 @@ %defattr(-,root,root,-) %{_bindir}/* %{_datadir}/applications/* -%dir %{_datadir}/appdata/ -%{_datadir}/appdata/* +%{_datadir}/appdata/warzone2100.appdata.xml %{_datadir}/pixmaps/* %doc AUTHORS ChangeLog COPYING COPYING.NONGPL COPYING.README %doc %{_docdir}/%{name} ++++++ system-miniupnpc.patch ++++++ >From cae7a552c1d174764033f27e577ca0b5e2fab489 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= <[email protected]> Date: Sat, 24 Jun 2017 16:44:05 +0200 Subject: [PATCH] Use system supplied miniupnpc --- Makefile.am | 1 - configure.ac | 4 +++- src/Makefile.am | 7 +++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile.am b/Makefile.am index 563933e78a..5224a7a44c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,7 +6,6 @@ endif SUBDIRS = \ win32 \ - 3rdparty/miniupnpc \ lib/framework \ lib/exceptionhandler \ lib/script \ diff --git a/configure.ac b/configure.ac index 0a54c17b05..82ba6a3f61 100644 --- a/configure.ac +++ b/configure.ac @@ -425,6 +425,9 @@ PKG_CHECK_MODULES([LIBCRYPTO], [libcrypto >= 1.0.0]) # check for nearbyint() AC_CHECK_LIB(m, nearbyint, [MATH_LIB=""], AC_MSG_ERROR([nearbyint not found.])) +# check for miniupnpc +AC_CHECK_LIB(miniupnpc, upnpDiscover, AC_SUBST([MINIUPNPC_LIBS], [-lminiupnpc]), AC_MSG_ERROR([miniupnpc not found.])) + # When (cross-)compiling for Windows (MinGW) we need to link in iberty for the Dr. MinGW derived exception handler. if test "x$host_os_mingw32" = "xyes" ; then AC_CHECK_LIB(iberty, main, AC_SUBST([IBERTY_LIBS], [-liberty]), AC_MSG_ERROR([libiberty not found.])) @@ -502,7 +505,6 @@ AC_CONFIG_FILES([Makefile pkg/nsis/Makefile win32/Makefile tests/Makefile - 3rdparty/miniupnpc/Makefile lib/framework/Makefile lib/exceptionhandler/Makefile lib/gamelib/Makefile diff --git a/src/Makefile.am b/src/Makefile.am index ee4d49029b..9e6327944f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -290,8 +290,7 @@ COMMONLIBS = \ $(top_builddir)/lib/netplay/libnetplay.a \ $(top_builddir)/lib/ivis_opengl/libivis_opengl.a \ $(top_builddir)/lib/gamelib/libgamelib.a \ - $(top_builddir)/lib/exceptionhandler/libexceptionhandler.a \ - $(top_builddir)/3rdparty/miniupnpc/libminiupnpc.a + $(top_builddir)/lib/exceptionhandler/libexceptionhandler.a if PORTABLE warzone2100_portable_SOURCES = $(COMMONSOURCES) $(nodist_COMMONSOURCES) @@ -331,11 +330,11 @@ endif if PORTABLE warzone2100_portable_LDADD = $(warzone2100_portable_LIBS) $(LTLIBINTL) $(SDL_LIBS) $(PHYSFS_LIBS) $(PNG_LIBS) $(VORBISFILE_LIBS) $(VORBIS_LIBS) \ - $(THEORA_LIBS) $(OPENAL_LIBS) $(FONT_LIBS) $(OPENGL_LIBS) $(SQT5_LIBS) $(QT5_LIBS) $(GLEW_LIBS) \ + $(THEORA_LIBS) $(OPENAL_LIBS) $(FONT_LIBS) $(OPENGL_LIBS) $(SQT5_LIBS) $(QT5_LIBS) $(GLEW_LIBS) $(MINIUPNPC_LIBS) \ $(X_LIBS) $(X_EXTRA_LIBS) $(LIBCRYPTO_LIBS) $(LDFLAGS) else warzone2100_LDADD = $(warzone2100_LIBS) $(LTLIBINTL) $(SDL_LIBS) $(PHYSFS_LIBS) $(PNG_LIBS) $(VORBISFILE_LIBS) $(VORBIS_LIBS) \ - $(THEORA_LIBS) $(OPENAL_LIBS) $(FONT_LIBS) $(OPENGL_LIBS) $(SQT5_LIBS) $(QT5_LIBS) $(GLEW_LIBS) \ + $(THEORA_LIBS) $(OPENAL_LIBS) $(FONT_LIBS) $(OPENGL_LIBS) $(SQT5_LIBS) $(QT5_LIBS) $(GLEW_LIBS) $(MINIUPNPC_LIBS) \ $(X_LIBS) $(X_EXTRA_LIBS) $(LIBCRYPTO_LIBS) $(LDFLAGS) endif ++++++ warzone2100-3.2.1.tar.xz -> warzone2100-3.2.3.tar.xz ++++++ /work/SRC/openSUSE:Factory/warzone2100/warzone2100-3.2.1.tar.xz /work/SRC/openSUSE:Factory/.warzone2100.new/warzone2100-3.2.3.tar.xz differ: char 26, line 1
