yaneti pushed to gnome-2048 (master). "First official release - 3.17.1"
notifications at fedoraproject.org
notifications at fedoraproject.org
Sun Jun 7 19:32:59 UTC 2015
From 729c4c1611f46f24b342577d0e42a43698a09af7 Mon Sep 17 00:00:00 2001
From: Yanko Kaneti <yaneti at declera.com>
Date: Sun, 7 Jun 2015 22:32:40 +0300
Subject: First official release - 3.17.1
diff --git a/.gitignore b/.gitignore
index 76b0a26..354edaf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/gnome-2048-0.1.0-83c5a4a.tar.xz
/gnome-2048-0.1.0-3ea1464.tar.xz
/libgames-support-8654371.tar.xz
+/gnome-2048-3.17.1.tar.xz
diff --git a/0001-Fix-crash-due-to-not-available-colors.patch b/0001-Fix-crash-due-to-not-available-colors.patch
deleted file mode 100644
index 382bac1..0000000
--- a/0001-Fix-crash-due-to-not-available-colors.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 445d6769678a6ea01c4d1395812d586a782d39f7 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Juan=20R=2E=20Garc=C3=ADa=20Blanco?= <juanrgar at gmail.com>
-Date: Sun, 15 Feb 2015 22:22:07 +0100
-Subject: [PATCH] Fix crash due to not available colors
-
-Tiles up to 2048 are assigned colors, while tiles greater than that are
-not. The program crashed when such a tile needed to be displayed.
-
-A very simple algorithm has been added to deterministically generate
-colors based on the tile value and a pre-defined set of colors.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=743119
----
- src/view.vala | 19 ++++++++++++++++++-
- 1 file changed, 18 insertions(+), 1 deletion(-)
-
-diff --git a/src/view.vala b/src/view.vala
-index 3d0428d..aef124e 100644
---- a/src/view.vala
-+++ b/src/view.vala
-@@ -177,6 +177,23 @@ public class ColorPalette : GLib.Object
-
- public Clutter.Color pick_color (uint val)
- {
-- return _palette.get (val);
-+ Clutter.Color color;
-+
-+ if (_palette.has_key (val)) {
-+ color = _palette.get (val);
-+ } else {
-+ uint norm_val;
-+ uint8 sbits;
-+
-+ norm_val = val / 2048;
-+ color = _palette.get (norm_val);
-+
-+ sbits = (uint8)(val % 7);
-+ color.red <<= sbits;
-+ color.green <<= sbits;
-+ color.blue <<= sbits;
-+ }
-+
-+ return color;
- }
- }
---
-2.3.4
-
diff --git a/gnome-2048-private-libgames-support.patch b/gnome-2048-private-libgames-support.patch
deleted file mode 100644
index 1fb0a9b..0000000
--- a/gnome-2048-private-libgames-support.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 9742e9e..bfc78ca 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -28,7 +28,6 @@ PKG_CHECK_MODULES(GNOME_2048, [
- clutter-1.0 >= $CLUTTER_REQUIRED
- clutter-gtk-1.0 >= $CLUTTER_GTK_REQUIRED
- gee-0.8 >= $GEE_REQUIRED
-- libgames-support >= $LIBGAMES_REQUIRED
- ])
-
- AC_PATH_PROG([DESKTOP_FILE_VALIDATE], [desktop-file-validate], [/bin/true])
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 3ef75b9..bf65a01 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -15,6 +15,8 @@ gnome_2048_CFLAGS = \
- -DDATA_DIRECTORY=\"$(datadir)/gnome-2048\" \
- -DLOCALEDIR=\"$(datadir)/locale\" \
- $(GNOME_2048_CFLAGS) \
-+ -I$(top_srcdir)/libgames-support-private$(includedir)/gnome-games \
-+ -Wl,-rpath=$(libdir)/gnome-2048
- -w
-
- gnome_2048_VALAFLAGS = \
-@@ -26,10 +28,12 @@ gnome_2048_VALAFLAGS = \
- --pkg clutter-gtk-1.0 \
- --pkg cogl-1.0 \
- --pkg gee-0.8 \
-+ --vapidir $(top_srcdir)/libgames-support-private$(datadir)/vala/vapi/ \
- --pkg games-support
-
- gnome_2048_LDADD = \
- $(GNOME_2048_LIBS) \
-+ -L$(top_srcdir)/libgames-support-private$(libdir) -lgames-support \
- -lm
-
- data_files = $(shell $(GLIB_COMPILE_RESOURCES) \
diff --git a/gnome-2048.spec b/gnome-2048.spec
index 7f1dd0c..3933af0 100644
--- a/gnome-2048.spec
+++ b/gnome-2048.spec
@@ -1,18 +1,13 @@
-%global gitrev 3ea1464
%global icon_themes hicolor
Name: gnome-2048
-Version: 0.1.0
-Release: 0.5.git%{gitrev}%{?dist}
+Version: 3.17.1
+Release: 1%{?dist}
Summary: A 2048 clone for GNOME
License: GPLv3+
URL: https://wiki.gnome.org/Apps/2048
-# The sources for this package were pulled from upstream's vcs. Use the
-# following commands to generate the tarball:
-# git clone git://git.gnome.org/gnome-2048 && cd gnome-2048
-# git archive --format=tar --prefix gnome-2048-0.1.0-%{gitrev}/ %{gitrev} | xz > ../gnome-2048-0.1.0-%{gitrev}.tar.xz
-Source0: gnome-2048-0.1.0-%{gitrev}.tar.xz
+Source0: http://download.gnome.org/sources/gnome-2048/3.17/gnome-2048-%{version}.tar.xz
BuildRequires: pkgconfig(gtk+-3.0)
BuildRequires: pkgconfig(clutter-1.0)
@@ -21,9 +16,8 @@ BuildRequires: pkgconfig(gee-0.8)
BuildRequires: pkgconfig(appstream-glib)
BuildRequires: pkgconfig(libgames-support)
+BuildRequires: intltool itstool
BuildRequires: desktop-file-utils
-# auto + vala
-BuildRequires: automake autoconf yelp-tools intltool gnome-common vala
%description
@@ -32,11 +26,10 @@ http://en.wikipedia.org/wiki/2048_(video_game)
%prep
-%setup -q -n %{name}-%{version}-%{gitrev}
+%setup -q
%build
-NOCONFIGURE=1 ./autogen.sh
%configure
make %{?_smp_mflags} V=1
@@ -76,10 +69,13 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
%{_datadir}/appdata/org.gnome.gnome-2048.appdata.xml
%{_datadir}/applications/org.gnome.gnome-2048.desktop
%{_datadir}/glib-2.0/schemas/org.gnome.2048.gschema.xml
-%{_datadir}/icons/hicolor/*/apps/gnome-2048.*
+%{_datadir}/icons/hicolor/*/apps/gnome-2048*
%changelog
+* Sun Jun 7 2015 Yanko Kaneti <yaneti at declera.com> - 3.17.1
+- First official release - 3.17.1
+
* Tue Apr 21 2015 Yanko Kaneti <yaneti at declera.com> - 0.1.0-0.5.git3ea1464
- Unbundle libgames-support
diff --git a/sources b/sources
index cb0a861..c3bae41 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fc347df05a9d2894d633d99edf5444cf gnome-2048-0.1.0-3ea1464.tar.xz
+b7360e4bb4360418f0aed8df3b3b32db gnome-2048-3.17.1.tar.xz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/gnome-2048.git/commit/?h=master&id=729c4c1611f46f24b342577d0e42a43698a09af7
More information about the scm-commits
mailing list