From 81bb1f5869849e42429a2002fad9c086a9c33b0ac2242a72fe4f8de6ab6e22d1 Mon Sep 17 00:00:00 2001 From: Ferdinand Thiessen Date: Tue, 7 Jul 2020 05:07:19 +0000 Subject: [PATCH] Accepting request 818834 from home:Kieltux:branches:games - Update to version 1.2: * added classic game style: no wall-kicks, random pieces, no shadow piece, ... * added auto-delay shift (das) and are (entry delay) * menu simplified * code cleanups * statistics for single player mode * fixed compiler warnings - Rebase ltris-no_system_wide_hiscore_file.patch OBS-URL: https://build.opensuse.org/request/show/818834 OBS-URL: https://build.opensuse.org/package/show/games/ltris?expand=0&rev=15 --- ltris-1.0.20.tar.gz | 3 -- ltris-1.2.tar.gz | 3 ++ ltris-no_system_wide_hiscore_file.patch | 41 +++++++++++++------------ ltris.changes | 13 ++++++++ ltris.spec | 6 ++-- 5 files changed, 41 insertions(+), 25 deletions(-) delete mode 100644 ltris-1.0.20.tar.gz create mode 100644 ltris-1.2.tar.gz diff --git a/ltris-1.0.20.tar.gz b/ltris-1.0.20.tar.gz deleted file mode 100644 index add9d75..0000000 --- a/ltris-1.0.20.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:36823f781b9445793b26d84c74dd6b09a848a02505982dfd78a9574598c6eb9b -size 897167 diff --git a/ltris-1.2.tar.gz b/ltris-1.2.tar.gz new file mode 100644 index 0000000..7fcd521 --- /dev/null +++ b/ltris-1.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a7bc6c5fc6539b88505077a1b4580edc9b179ce0a6b829c58fbd9416cf456195 +size 1803626 diff --git a/ltris-no_system_wide_hiscore_file.patch b/ltris-no_system_wide_hiscore_file.patch index 8a5676a..fd835f1 100644 --- a/ltris-no_system_wide_hiscore_file.patch +++ b/ltris-no_system_wide_hiscore_file.patch @@ -1,7 +1,8 @@ ---- src/chart.c.orig 2011-03-02 11:10:19.000000000 +0100 -+++ src/chart.c 2011-10-31 12:00:50.608000463 +0100 -@@ -189,14 +189,10 @@ - if ( charts ) list_delete( charts ); charts = 0; +diff -Nur ltris-1.2/src/chart.c new/src/chart.c +--- ltris-1.2/src/chart.c 2020-06-10 20:31:43.000000000 +0200 ++++ new/src/chart.c 2020-07-05 11:03:15.635480526 +0200 +@@ -202,14 +202,10 @@ + charts = 0; charts = list_create( LIST_AUTO_DELETE, chart_set_delete ); /* load highscore */ - if ( !chart_load_from_path( HI_DIR ) ) { @@ -16,21 +17,9 @@ } printf( "Saving highscore chart in: %s\n", chart_path ); /* load resources */ ---- src/Makefile.in.orig 2011-10-31 12:00:55.535000463 +0100 -+++ src/Makefile.in 2011-10-31 12:01:03.235000463 +0100 -@@ -610,10 +610,6 @@ - install-data-local: - $(mkinstalldirs) $(DESTDIR)$(inst_dir) - $(INSTALL_DATA) figures $(DESTDIR)$(inst_dir)/figures -- $(mkinstalldirs) $(DESTDIR)$(hi_dir) -- if ! test -f $(DESTDIR)$(hi_dir)/ltris.hscr; then \ -- $(INSTALL_DATA) --mode=666 empty.hscr $(DESTDIR)$(hi_dir)/ltris.hscr; \ -- fi; - - uninstall-local: - -rm -fr $(DESTDIR)$(inst_dir) ---- src/Makefile.am.orig 2011-03-02 11:10:19.000000000 +0100 -+++ src/Makefile.am 2011-10-31 12:00:50.627000462 +0100 +diff -Nur ltris-1.2/src/Makefile.am new/src/Makefile.am +--- ltris-1.2/src/Makefile.am 2018-11-02 20:56:25.000000000 +0100 ++++ new/src/Makefile.am 2020-07-05 11:04:50.122838050 +0200 @@ -18,10 +18,6 @@ install-data-local: $(mkinstalldirs) $(DESTDIR)$(inst_dir) @@ -42,3 +31,17 @@ uninstall-local: -rm -fr $(DESTDIR)$(inst_dir) +diff -Nur ltris-1.2/src/Makefile.in new/src/Makefile.in +--- ltris-1.2/src/Makefile.in 2020-06-28 20:24:49.000000000 +0200 ++++ new/src/Makefile.in 2020-07-05 11:03:57.439196277 +0200 +@@ -780,10 +780,6 @@ + install-data-local: + $(mkinstalldirs) $(DESTDIR)$(inst_dir) + $(INSTALL_DATA) figures $(DESTDIR)$(inst_dir)/figures +- $(mkinstalldirs) $(DESTDIR)$(hi_dir) +- if ! test -f $(DESTDIR)$(hi_dir)/ltris.hscr; then \ +- $(INSTALL_DATA) --mode=666 empty.hscr $(DESTDIR)$(hi_dir)/ltris.hscr; \ +- fi; + + uninstall-local: + -rm -fr $(DESTDIR)$(inst_dir) diff --git a/ltris.changes b/ltris.changes index b3a6745..f8769e8 100644 --- a/ltris.changes +++ b/ltris.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Sun Jul 5 08:55:08 UTC 2020 - Carsten Ziepke + +- Update to version 1.2: + * added classic game style: no wall-kicks, random pieces, + no shadow piece, ... + * added auto-delay shift (das) and are (entry delay) + * menu simplified + * code cleanups + * statistics for single player mode + * fixed compiler warnings +- Rebase ltris-no_system_wide_hiscore_file.patch + ------------------------------------------------------------------- Sat Jun 20 18:36:26 UTC 2020 - Martin Hauke diff --git a/ltris.spec b/ltris.spec index 7f67e4c..870c03c 100644 --- a/ltris.spec +++ b/ltris.spec @@ -17,13 +17,13 @@ Name: ltris -Version: 1.0.20 +Version: 1.2 Release: 0 Summary: Tetris Clone with Multiplayer and CPU Opponents License: GPL-2.0-or-later Group: Amusements/Games/Logic URL: http://lgames.sourceforge.net/index.php?project=LTris -Source: http://sourceforge.net/projects/lgames/files/ltris/ltris-%{version}.tar.gz +Source: https://sourceforge.net/projects/lgames/files/ltris/ltris-%{version}.tar.gz Source1: %{name}.desktop Patch0: ltris-no_system_wide_hiscore_file.patch BuildRequires: fdupes @@ -41,7 +41,7 @@ controlled. %prep %setup -q -%patch0 +%patch0 -p1 # we patch both Makefile.am and Makefile.in; touch Makefile.in here again # to make sure configure won't run autoreconf (which it does if the .am file # is newer than the .in file):