diff --git a/ltris-1.0.19.tar.gz b/ltris-1.0.19.tar.gz deleted file mode 100644 index de0e0a0..0000000 --- a/ltris-1.0.19.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8f6a9e7719d22004aee153db29ffd9ca41c7a6cd87fc791591994eecc2e625a1 -size 883543 diff --git a/ltris-1.0.20.tar.gz b/ltris-1.0.20.tar.gz new file mode 100644 index 0000000..add9d75 --- /dev/null +++ b/ltris-1.0.20.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:36823f781b9445793b26d84c74dd6b09a848a02505982dfd78a9574598c6eb9b +size 897167 diff --git a/ltris-fix-with-gcc5.patch b/ltris-fix-with-gcc5.patch deleted file mode 100644 index 3661048..0000000 --- a/ltris-fix-with-gcc5.patch +++ /dev/null @@ -1,80 +0,0 @@ -diff -Nur ltris-1.0.19/src/sdl.c ltris-1.0.19-new/src/sdl.c ---- ltris-1.0.19/src/sdl.c 2013-10-29 16:21:35.000000000 +0100 -+++ ltris-1.0.19-new/src/sdl.c 2016-01-02 14:02:50.996108557 +0100 -@@ -905,7 +905,7 @@ - /* - update rectangle (0,0,0,0)->fullscreen - */ --inline void refresh_screen(int x, int y, int w, int h) -+extern inline void refresh_screen(int x, int y, int w, int h) - { - SDL_UpdateRect(sdl.screen, x, y, w, h); - } -@@ -1132,7 +1132,7 @@ - /* - get milliseconds since last call - */ --inline int get_time() -+extern inline int get_time() - { - int ms; - cur_time = SDL_GetTicks(); -@@ -1148,7 +1148,7 @@ - /* - reset timer - */ --inline void reset_timer() -+extern inline void reset_timer() - { - last_time = SDL_GetTicks(); - } -diff -Nur ltris-1.0.19/src/tools.c ltris-1.0.19-new/src/tools.c ---- ltris-1.0.19/src/tools.c 2013-05-03 19:13:11.000000000 +0200 -+++ ltris-1.0.19-new/src/tools.c 2016-01-02 13:48:10.219694001 +0100 -@@ -23,27 +23,27 @@ - #include "ltris.h" - - /* compares to strings and returns true if their first strlen(str1) chars are equal */ --inline int strequal( char *str1, char *str2 ) -+extern inline int strequal( char *str1, char *str2 ) - { - if ( strlen( str1 ) != strlen( str2 ) ) return 0; - return ( !strncmp( str1, str2, strlen( str1 ) ) ); - } - - /* set delay to ms milliseconds */ --inline void delay_set( Delay *delay, int ms ) -+extern inline void delay_set( Delay *delay, int ms ) - { - delay->limit = ms; - delay->cur = 0; - } - - /* reset delay ( cur = 0 )*/ --inline void delay_reset( Delay *delay ) -+extern inline void delay_reset( Delay *delay ) - { - delay->cur = 0; - } - - /* check if times out and reset */ --inline int delay_timed_out( Delay *delay, int ms ) -+extern inline int delay_timed_out( Delay *delay, int ms ) - { - delay->cur += ms; - if ( delay->cur >= delay->limit ) { -@@ -56,12 +56,12 @@ - } - - /* set timer so that we have a time out next call of delay_timed_out() */ --inline void delay_force_time_out( Delay *delay ) -+extern inline void delay_force_time_out( Delay *delay ) - { - delay->cur = delay->limit; - } - --inline void goto_tile( int *x, int *y, int d ) -+extern inline void goto_tile( int *x, int *y, int d ) - { - /* 0 -up, clockwise, 5 - left up */ - switch ( d ) { diff --git a/ltris.changes b/ltris.changes index 01b3a63..b3a6745 100644 --- a/ltris.changes +++ b/ltris.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Sat Jun 20 18:36:26 UTC 2020 - Martin Hauke + +- Update to version 1.0.20: + * updated configure.in to configure.ac + * added wide screen support + * removed all inline keywords to work with GCC 5 +- Remove not longer needed patch: + * ltris-fix-with-gcc5.patch +- Specfile cleanup + ------------------------------------------------------------------- Sat Jan 2 12:30:35 UTC 2016 - rpm@fthiessen.de diff --git a/ltris.spec b/ltris.spec index 7745295..7f67e4c 100644 --- a/ltris.spec +++ b/ltris.spec @@ -1,7 +1,7 @@ # # spec file for package ltris # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,29 +12,25 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: ltris -Version: 1.0.19 +Version: 1.0.20 Release: 0 Summary: Tetris Clone with Multiplayer and CPU Opponents -License: GPL-2.0+ +License: GPL-2.0-or-later Group: Amusements/Games/Logic -Url: http://lgames.sourceforge.net/index.php?project=LTris +URL: http://lgames.sourceforge.net/index.php?project=LTris Source: http://sourceforge.net/projects/lgames/files/ltris/ltris-%{version}.tar.gz Source1: %{name}.desktop -# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch0: ltris-no_system_wide_hiscore_file.patch -# PATCH-FIX-UPSTREAM ltris-fix-with-gcc5.patch -- Fix build with gcc5, needed for openSUSE > 13.2 -Patch1: ltris-fix-with-gcc5.patch -BuildRequires: SDL_mixer-devel -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?suse_version} BuildRequires: fdupes +BuildRequires: pkgconfig BuildRequires: update-desktop-files -%endif +BuildRequires: pkgconfig(SDL_mixer) +BuildRequires: pkgconfig(sdl) %description LTris is a very polished Tetris clone. It is highly configurable due to @@ -46,9 +42,6 @@ controlled. %prep %setup -q %patch0 -%if 0%{?suse_version} > 1320 -%patch1 -p1 -%endif # 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): @@ -57,29 +50,25 @@ touch src/Makefile.in %build export CFLAGS="%{optflags} -fPIC -fPIE" export CXXFLAGS="$CFLAGS" +export LDFLAGS="-pie" %configure \ --datadir=%{_datadir}/games \ --localstatedir=%{_localstatedir}/games -make %{?_smp_mflags} +%make_build %install -make DESTDIR=%{buildroot} install %{?_smp_mflags} -install -m 0755 -d %{buildroot}%{_datadir}/pixmaps/ -install -m 0644 icons/ltris48.xpm %{buildroot}%{_datadir}/pixmaps/ltris.xpm +%make_install +install -D -m 0644 icons/ltris48.xpm %{buildroot}%{_datadir}/pixmaps/ltris.xpm mv %{buildroot}%{_datadir}/games/locale %{buildroot}%{_datadir}/locale rm -rf "%{buildroot}%{_datadir}/games/applications" rm -rf "%{buildroot}%{_datadir}/games/icons" -%if 0%{?suse_version} -%suse_update_desktop_file -i %{name} Game ArcadeGame -%endif -%find_lang %{name} -%if 0%{?suse_version} %fdupes -s "%{buildroot}%{_datadir}/games/ltris" -%endif +%suse_update_desktop_file -i %{name} Game ArcadeGame +%find_lang %{name} %files -f %{name}.lang -%defattr(-,root,root) -%doc AUTHORS COPYING ChangeLog README +%license COPYING +%doc AUTHORS ChangeLog README %{_bindir}/ltris %{_datadir}/games/ltris/ %{_datadir}/applications/%{name}.desktop