diff --git a/0001-fix-extraneous-licence.patch b/0001-fix-extraneous-licence.patch deleted file mode 100644 index c8b2b8c..0000000 --- a/0001-fix-extraneous-licence.patch +++ /dev/null @@ -1,29 +0,0 @@ -From: Baptiste BEAUPLAT -Date: Mon, 15 Oct 2018 20:57:40 +0200 -Subject: fix-extraneous-licence - -Remove licence.txt file from the Makefile ---- - Makefile | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/Makefile b/Makefile -index 05ef506..5df6982 100644 ---- a/Makefile -+++ b/Makefile -@@ -56,7 +56,6 @@ src/src-conf.mk: config.mk Makefile src-conf.sh - install: $(PROGNAME) - $(INSTALL) -d $(DESTDIR)$(bindir) $(DESTDIR)$(docdir) - $(INSTALL) -m755 $(PROGNAME) $(DESTDIR)$(bindir) -- $(INSTALL) -m644 README licence.txt $(DESTDIR)$(docdir) - if [ -n "$(pixmapdir)" ]; then \ - $(INSTALL) -d $(DESTDIR)$(pixmapdir) && \ - $(INSTALL) -m644 vitetris.xpm $(DESTDIR)$(pixmapdir); fi -@@ -82,7 +81,6 @@ install-hiscores: - uninstall: - rm -f $(bindir)/$(PROGNAME) - rm -f $(docdir)/README -- rm -f $(docdir)/licence.txt - rmdir $(docdir) - test -z "$(pixmapdir)" || rm -f $(pixmapdir)/vitetris.xpm - -rmdir "$(pixmapdir)" diff --git a/0002-fix-insecure-printf.patch b/0002-fix-insecure-printf.patch deleted file mode 100644 index 77a307b..0000000 --- a/0002-fix-insecure-printf.patch +++ /dev/null @@ -1,45 +0,0 @@ -From: Baptiste BEAUPLAT -Date: Mon, 15 Oct 2018 20:57:40 +0200 -Subject: fix-insecure-printf - -Fix insecure printf ---- - src/cfgfile.c | 4 ++-- - src/cmdline.c | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/cfgfile.c b/src/cfgfile.c -index 53210a6..b74083b 100644 ---- a/src/cfgfile.c -+++ b/src/cfgfile.c -@@ -300,7 +300,7 @@ static void printbtnmapping(FILE *fp, int n, int keypress, int i) - return; - fprintf(fp, "%s=", input_keynames[i]); - if (b < 10) -- fprintf(fp, input_chr9[b-1]); -+ fprintf(fp, "%s", input_chr9[b-1]); - else - fprintf(fp, "%d", b-'0'); - putc('\n', fp); -@@ -337,7 +337,7 @@ static void printkeymapping(FILE *fp, int keypress, int i) - if (s[0] > ' ') - putc(s[0], fp); - else if (s[0] < 10) -- fprintf(fp, input_chr9[s[0]-1]); -+ fprintf(fp, "%s", input_chr9[s[0]-1]); - else - fprintf(fp, "%d", s[0]); - putc('\n', fp); -diff --git a/src/cmdline.c b/src/cmdline.c -index ec9ba73..32929c6 100644 ---- a/src/cmdline.c -+++ b/src/cmdline.c -@@ -357,7 +357,7 @@ static void print_hiscorelist() - else { - printf(" Name Score Lvl Lines\n"); - gethiscorelist(buf); -- printf(buf); -+ printf("%s", buf); - } - } - diff --git a/0003-rename-program-to-vitetris.patch b/0003-rename-program-to-vitetris.patch deleted file mode 100644 index 1b6229d..0000000 --- a/0003-rename-program-to-vitetris.patch +++ /dev/null @@ -1,86 +0,0 @@ -From: Baptiste BEAUPLAT -Date: Mon, 15 Oct 2018 21:03:33 +0200 -Subject: Rename program from tetris to vitetris to avoid using a registered - name - ---- - INSTALL | 2 +- - Makefile | 2 +- - README | 8 ++++---- - vitetris.desktop | 2 +- - 4 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/INSTALL b/INSTALL -index b951d22..36aa9b5 100644 ---- a/INSTALL -+++ b/INSTALL -@@ -7,7 +7,7 @@ Linux, *BSD, Mac OS X, etc. - - ./configure && make - -- A single executable "tetris" should then have been created, which may be -+ A single executable "vitetris" should then have been created, which may be - moved anywhere. You can also run "make install" to install the program - along with documentation and desktop integration files in /usr/local. - -diff --git a/Makefile b/Makefile -index 5df6982..3a03ed2 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,6 +1,6 @@ - include config.mk - --PROGNAME = tetris$(EXE) -+PROGNAME = vitetris$(EXE) - - # Uncomment to change the default. (Only used in Unix-like systems.) - #HISCORE_FILENAME = /var/games/vitetris-hiscores -diff --git a/README b/README -index ee4f6f4..3d48abf 100644 ---- a/README -+++ b/README -@@ -77,7 +77,7 @@ The Command Line Is Your Friend - (since version 0.54) if you only want to connect to a server. But still, - you will always get a little more from the command line. - -- Use "tetris -help" (or whatever the command name is) to get a help message -+ Use "vitetris -help" (or whatever the command name is) to get a help message - with a list of command-line options. If you're on Windows, you need to - run this from a cmd window, or a "DOS window". - -@@ -104,11 +104,11 @@ Network Play: The Traditional Way - - To play against someone on the internet, one needs to listen with - -- tetris listen PORT -+ vitetris listen PORT - - (where PORT is a number, e.g. 34034); the other connects with - -- tetris connect HOSTNAME:PORT -+ vitetris connect HOSTNAME:PORT - - HOSTNAME may be an IP address or a hostname. If it is omitted, localhost - is used. -@@ -118,7 +118,7 @@ Network Play: The Traditional Way - - It is also possible to play using Unix domain sockets, which means that - filenames on the local system are used as addresses. The most convenient -- way to set up such a connection is as follows. Start tetris on two -+ way to set up such a connection is as follows. Start vitetris on two - different terminals. Then one player enters "2-Player Game", which will - bring up a list of ttys. When the tty of the other player is selected, an - invitation will appear on his screen. -diff --git a/vitetris.desktop b/vitetris.desktop -index 34daf7b..d26e132 100644 ---- a/vitetris.desktop -+++ b/vitetris.desktop -@@ -3,7 +3,7 @@ Type=Application - Encoding=UTF-8 - Name=vitetris - GenericName=Text-mode Tetris --Exec=tetris -w 80 -+Exec=vitetris -w 80 - Icon=vitetris - Categories=Game;BlocksGame; - Terminal=true diff --git a/0004-add-comment-desktop.patch b/0004-add-comment-desktop.patch deleted file mode 100644 index 5d9be03..0000000 --- a/0004-add-comment-desktop.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: Baptiste BEAUPLAT -Date: Mon, 15 Oct 2018 21:26:30 +0200 -Subject: add-comment-desktop - ---- - vitetris.desktop | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/vitetris.desktop b/vitetris.desktop -index d26e132..1fa6333 100644 ---- a/vitetris.desktop -+++ b/vitetris.desktop -@@ -1,9 +1,9 @@ - [Desktop Entry] - Type=Application --Encoding=UTF-8 - Name=vitetris - GenericName=Text-mode Tetris - Exec=vitetris -w 80 - Icon=vitetris - Categories=Game;BlocksGame; - Terminal=true -+Comment=Terminal-based Tetris game diff --git a/0005-fix-implicit-declaration.patch b/0005-fix-implicit-declaration.patch deleted file mode 100644 index 1c51489..0000000 --- a/0005-fix-implicit-declaration.patch +++ /dev/null @@ -1,27 +0,0 @@ -From: Baptiste BEAUPLAT -Date: Mon, 15 Oct 2018 21:40:48 +0200 -Subject: fix-implicit-declaration - ---- - src/menu/netplay.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/menu/netplay.c b/src/menu/netplay.c -index 4814a89..0b03ec7 100644 ---- a/src/menu/netplay.c -+++ b/src/menu/netplay.c -@@ -1,11 +1,14 @@ - #include - #include -+#include -+#include - #include "menu.h" - #include "menuext.h" - #include "../input/input.h" - #include "../textgfx/textgfx.h" - #include "../netw/sock.h" - #include "../options.h" -+#include "../draw/draw.h" - - extern FILE *inet_out; - diff --git a/vitetris-0.57.2.tar.gz b/vitetris-0.57.2.tar.gz deleted file mode 100644 index 7527365..0000000 --- a/vitetris-0.57.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c023b33f663a7a47418652b520e83cdcf8d395584e30ec4bcb5e2b3563d4372b -size 99880 diff --git a/vitetris-0.58.0.tar.gz b/vitetris-0.58.0.tar.gz new file mode 100644 index 0000000..50596a6 --- /dev/null +++ b/vitetris-0.58.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e7e7cb74bb814b9fec80fe4ede3c3f04134d8217d630e092a097238248d604f9 +size 96957 diff --git a/vitetris.changes b/vitetris.changes index 5658c50..1970be9 100644 --- a/vitetris.changes +++ b/vitetris.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Sun Mar 10 16:32:02 UTC 2019 - Martin Hauke + +- Update to version 0.58 + * bugfix release - no functional changes +- Remove patches (included upstream): + * 0001-fix-extraneous-licence.patch + * 0002-fix-insecure-printf.patch + * 0003-rename-program-to-vitetris.patch + * 0004-add-comment-desktop.patch + * 0005-fix-implicit-declaration.patch + ------------------------------------------------------------------- Thu Jan 17 15:29:01 UTC 2019 - Jan Engelhardt diff --git a/vitetris.spec b/vitetris.spec index d9f83c8..4da14ef 100644 --- a/vitetris.spec +++ b/vitetris.spec @@ -20,9 +20,8 @@ %bcond_without ncurses # build with support for allegro - disabled by default %bcond_with allegro - Name: vitetris -Version: 0.57.2 +Version: 0.58.0 Release: 0 Summary: Terminal-based Tetris clone License: BSD-2-Clause @@ -31,11 +30,6 @@ URL: http://victornils.net/tetris/ #Git-Clone: https://github.com/vicgeralds/vitetris.git Source: https://github.com/vicgeralds/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz Source1: vitetris.6 -Patch0: 0001-fix-extraneous-licence.patch -Patch1: 0002-fix-insecure-printf.patch -Patch2: 0003-rename-program-to-vitetris.patch -Patch3: 0004-add-comment-desktop.patch -Patch4: 0005-fix-implicit-declaration.patch Patch5: vitetris-no-need-for-root-to-install.patch Patch6: vitetris-fix-font-path.patch %if 0%{with allegro} @@ -58,18 +52,14 @@ makes it possible to play at higher levels. (It does not make it possible to prevent the piece from ever locking by abusing lock delay resets.) + %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 %patch5 -p1 %patch6 -p1 +sed -i 's|Exec=tetris|Exec=vitetris|' vitetris.desktop %build -# not autoconf ./configure \ --prefix=%{_prefix} \ --datarootdir=%{_datadir} \ @@ -95,6 +85,8 @@ make CFLAGS='%{optflags} -Wno-return-type' %{?_smp_mflags} %install %make_install install -Dm 0644 %{SOURCE1} %{buildroot}%{_mandir}/man6/vitetris.6 +mv %{buildroot}%{_bindir}/tetris %{buildroot}%{_bindir}/vitetris +rm -fR %{buildroot}%{_datadir}/doc/vitetris/ %files %doc README changes.txt