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 "pth@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/armagetron/armagetron.changes 2011-09-26 10:29:04.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.armagetron.new/armagetron.changes 2012-03-20 11:25:22.000000000 +0100 @@ -1,0 +2,13 @@ +Thu Mar 15 22:53:39 UTC 2012 - dimstar@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.000000000 +0100 +++ /var/tmp/diff_new_pack.PgqLzl/_new 2012-03-20 11:25:24.000000000 +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+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de