commit c5c0b9ecce1a7c78cd3c07ed7cd98739fe2d8c21
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Fri May 21 10:52:41 2021 +0100
Change to fork of user tatankat which have gtk3 support
.gitignore | 1 +
gtetrinet.spec | 44 +++++++++++++++++++++++++-------------------
sources | 3 +--
3 files changed, 27 insertions(+), 21 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 25e9a43..780653b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ gtetrinet-0.7.11.tar.bz2
mmr-sounds-1.0.tar.gz
/gtetrinet-GTETRINET_0_7_11.tar.gz
/GTETRINET_0_7_11...12cec675f4354d585ef754813b79695db30a8b1e.diff
+/gtetrinet-09e8db1.tar.gz
diff --git a/gtetrinet.spec b/gtetrinet.spec
index 8f6a74d..c958d77 100644
--- a/gtetrinet.spec
+++ b/gtetrinet.spec
@@ -1,25 +1,29 @@
+%global commit 09e8db1c1681704d7c21d5dda77c0623c5102705
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
+%global gitdate 20210107
+
Summary: GNOME version of a tetris game playable on the net
Name: gtetrinet
Version: 0.7.11
-Release: 19%{?dist}
+Release: 20.%{gitdate}.git%{shortcommit}%{?dist}
License: GPLv2+
Group: Amusements/Games
URL:
http://gtetrinet.sourceforge.net/
-Source0:
https://github.com/stump/gtetrinet/archive/GTETRINET_0_7_11/gtetrinet-GTE...
+Source0:
https://github.com/tatankat/gtetrinet/archive/%{commit}/gtetrinet-%{short...
Source1: tetrinet.txt
Source2:
http://www.mavit.pwp.blueyonder.co.uk/mmr-sounds-1.0.tar.gz
Source3: %{name}.appdata.xml
-# Fork of user stump, but removed last 3 commits, they break translations in menus.
-Patch2:
https://github.com/stump/gtetrinet/compare/GTETRINET_0_7_11...12cec675f43...
-BuildRequires: gtk2-devel >= 2.18.0
+BuildRequires: gcc
+BuildRequires: make
+BuildRequires: gtk3-devel
BuildRequires: glib2-devel >= 2.32.0
-BuildRequires: libgnome-devel >= 2.0.0
-BuildRequires: libgnomeui-devel >= 2.0.0
-BuildRequires: esound-devel
+#BuildRequires: libgnome-devel >= 2.0.0
+#BuildRequires: libgnomeui-devel >= 2.0.0
BuildRequires: libcanberra-devel
-BuildRequires: autoconf automake libtool gettext-devel intltool
-BuildRequires: perl(XML::Parser)
+BuildRequires: autoconf automake libtool gettext-devel
+BuildREquires: popt-devel
+#BuildRequires: perl(XML::Parser)
Recommends: tetrinetx
@@ -30,38 +34,40 @@ is, check out
tetrinet.org)
%prep
-%autosetup -p1 -n gtetrinet-GTETRINET_0_7_11
+%autosetup -p1 -n gtetrinet-%{commit}
%build
-mkdir m4
-./autogen.sh
-%configure --disable-dependency-tracking --enable-ipv6
+autoreconf --install --verbose
+%configure
%make_build
%install
-%make_install GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 \
- gamesdir=%{_bindir}
-%find_lang %{name}
+%make_install
+
+%find_lang %{name} --with-gnome
%{__cp} -ap %{SOURCE1} .
%{__tar} -xzvf %{SOURCE2} -C %{buildroot}%{_datadir}/gtetrinet/themes/
install -m 0644 -D %{SOURCE3} %{buildroot}%{_metainfodir}/%{name}.appdata.xml
%files -f %{name}.lang
-%doc AUTHORS ChangeLog NEWS README tetrinet.txt
+%doc AUTHORS ChangeLog NEWS README.md tetrinet.txt
%license COPYING
-%config %{_sysconfdir}/gconf/schemas/gtetrinet.schemas
%{_bindir}/gtetrinet
%{_datadir}/applications/gtetrinet.desktop
%{_datadir}/gtetrinet/
%{_datadir}/pixmaps/gtetrinet/
%{_datadir}/pixmaps/gtetrinet.png
%{_mandir}/man6/gtetrinet.6*
+%{_datadir}/glib-2.0/schemas/*.xml
%{_metainfodir}/%{name}.appdata.xml
%changelog
+* Thu May 20 2021 Sérgio Basto <sergio(a)serjux.com> - 0.7.11-20
+- Change to fork of user tatankat which have gtk3 support
+
* Wed Feb 03 2021 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> -
0.7.11-19
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
diff --git a/sources b/sources
index e5bf40a..1cfaf57 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
-SHA512 (gtetrinet-GTETRINET_0_7_11.tar.gz) =
863e5aee97f15e91b3fac350ebae881bc0688c334c3d7695f340f5f8a4f0a1ed6b8c43ee29a798a131d80ca8d799c5a700f42ae484a3d635ef8ae1bf354c2672
SHA512 (mmr-sounds-1.0.tar.gz) =
5065aa60d8296e346a152625d1556095b99ccae21c5d6891c754e10ea90d5a1e1796474b7a8cb0003f3a3ff7e454cce9b5aa28a841d9e5490e39758a5753ecf9
-SHA512 (GTETRINET_0_7_11...12cec675f4354d585ef754813b79695db30a8b1e.diff) =
8f2d76bc8cfc8367d87a6d88a1f534b66e3a543b775188fb7ccd3a73b2801911fe9ce1a7d863c6ef47ba25a1d61927ee891cb94e94187032c44b6f4136a2d577
+SHA512 (gtetrinet-09e8db1.tar.gz) =
51f8f89a40296e2a975f8806b9352b5b8845f35aca15ab91d88ed7474bc061a88177c6de8be52e4bc6c04e2e273f506ee333d418486a0da136b656111787503e