yaneti pushed to gnome-2048 (master). "Update to upstream master. (..more)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Wed Apr 15 11:12:16 UTC 2015
>From bc84094afe91f4455d95efffbd026c7f5e348245 Mon Sep 17 00:00:00 2001
From: Yanko Kaneti <yaneti at declera.com>
Date: Wed, 15 Apr 2015 14:11:42 +0300
Subject: Update to upstream master.
- Temporarily bundle libgames-support until in gets in the distribution
Review - https://bugzilla.redhat.com/show_bug.cgi?id=1195614
- Use license macro
- Make builds verbose
diff --git a/.gitignore b/.gitignore
index 6c59d36..76b0a26 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
/gnome-2048-0.1.0-83c5a4a.tar.xz
+/gnome-2048-0.1.0-3ea1464.tar.xz
+/libgames-support-8654371.tar.xz
diff --git a/gnome-2048-private-libgames-support.patch b/gnome-2048-private-libgames-support.patch
new file mode 100644
index 0000000..1fb0a9b
--- /dev/null
+++ b/gnome-2048-private-libgames-support.patch
@@ -0,0 +1,38 @@
+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 c7f4384..1367c47 100644
--- a/gnome-2048.spec
+++ b/gnome-2048.spec
@@ -1,26 +1,31 @@
-%global gitrev 83c5a4a
+%global gitrev 3ea1464
+%global libgames_support_gitrev 8654371
%global icon_themes hicolor
Name: gnome-2048
Version: 0.1.0
-Release: 0.2.git%{gitrev}%{?dist}
+Release: 0.3.git%{gitrev}%{?dist}
Summary: A 2048 clone for GNOME
-License: GPLv3+
+License: GPLv3+ and LGPLv3+
URL: https://wiki.gnome.org/Apps/2048
-# The source for this package was pulled from upstream's vcs. Use the
-# following commands to generate the tarball:
+# The sources for this package were pulled from upstream's vcs. Use the
+# following commands to generate the tarballs:
# git clone git://git.gnome.org/gnome-2048 && cd gnome-2048
-# git archive --format=tar --prefix gnome-2048-0.1.0-%{gitrev}/ HEAD | xz > ../gnome-2048-0.1.0-%{gitrev}.tar.xz
+# git archive --format=tar --prefix gnome-2048-0.1.0-%{gitrev}/ %{gitrev} | xz > ../gnome-2048-0.1.0-%{gitrev}.tar.xz
+# git clone git://git.gnome.org/libgames-support && cd libgames-support
+# git archive --format=tar --prefix libgames-support-%{libgames_support_gitrev}/ %{libgames_support_gitrev} | xz > ../libgames-support-%{libgames_support_gitrev}.tar.xz
Source0: gnome-2048-0.1.0-%{gitrev}.tar.xz
+Source1: libgames-support-%{libgames_support_gitrev}.tar.xz
-# Upstream fix for https://bugzilla.gnome.org/show_bug.cgi?id=743119
-Patch1: 0001-Fix-crash-due-to-not-available-colors.patch
+# Use bundled libgames-support
+Patch1: gnome-2048-private-libgames-support.patch
BuildRequires: pkgconfig(gtk+-3.0)
BuildRequires: pkgconfig(clutter-1.0)
BuildRequires: pkgconfig(clutter-gtk-1.0)
BuildRequires: pkgconfig(gee-0.8)
+BuildRequires: pkgconfig(appstream-glib)
BuildRequires: desktop-file-utils
# auto + vala
@@ -34,19 +39,29 @@ http://en.wikipedia.org/wiki/2048_(video_game)
%prep
%setup -q -n %{name}-%{version}-%{gitrev}
-%patch1 -p1 -b .colorcrash
+%patch1 -p1 -b .bundle
+tar -xJf %{SOURCE1}
%build
+pushd libgames-support-%{libgames_support_gitrev}
+NOCONFIGURE=1 ./autogen.sh
+%configure
+make %{?_smp_mflags} V=1
+make V=1 install DESTDIR=`pwd`/../libgames-support-private
+popd
+
NOCONFIGURE=1 ./autogen.sh
%configure
-make %{?_smp_mflags}
+make %{?_smp_mflags} V=1
%install
%make_install
%find_lang %{name} --with-gnome
-desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
+desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.gnome-2048.desktop
+
+install -m755 -D libgames-support-private/%{_libdir}/libgames-support.so.0 $RPM_BUILD_ROOT%{_libdir}/gnome-2048/libgames-support.so.0
%post
@@ -73,15 +88,23 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
%files -f %{name}.lang
-%doc COPYING
+%license COPYING libgames-support-%{libgames_support_gitrev}/COPYING.LESSER
%{_bindir}/gnome-2048
-%{_datadir}/appdata/gnome-2048.appdata.xml
-%{_datadir}/applications/gnome-2048.desktop
+%{_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.*
+%{_libdir}/gnome-2048
%changelog
+* Wed Apr 15 2015 Yanko Kaneti <yaneti at declera.com> - 0.1.0-0.3.3ea1464
+- Update to upstream master.
+- Temporarily bundle libgames-support until in gets in the distribution
+ Review - https://bugzilla.redhat.com/show_bug.cgi?id=1195614
+- Use license macro
+- Make builds verbose
+
* Fri Apr 3 2015 Yanko Kaneti <yaneti at declera.com> - 0.1.0-0.2.83c5a4a
- Apply upstream patch for bug 1208841
diff --git a/sources b/sources
index 5b9fdad..6334a21 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-0a95faa15a28880999c5e62289d292c7 gnome-2048-0.1.0-83c5a4a.tar.xz
+fc347df05a9d2894d633d99edf5444cf gnome-2048-0.1.0-3ea1464.tar.xz
+266613055e8c2a80994cc9728cbd9a63 libgames-support-8654371.tar.xz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/gnome-2048.git/commit/?h=master&id=bc84094afe91f4455d95efffbd026c7f5e348245
More information about the scm-commits
mailing list