From 65afb74b7440260e6c7e1068ca9fbc1c5306c692 Mon Sep 17 00:00:00 2001 From: Björn Esser Date: Dec 14 2014 08:41:58 +0000 Subject: update to new snapshot git20141214.723738c, obsoletes Patch0 --- diff --git a/2048-cli-0.9_fix-manpages.patch b/2048-cli-0.9_fix-manpages.patch deleted file mode 100644 index 2ba62c9..0000000 --- a/2048-cli-0.9_fix-manpages.patch +++ /dev/null @@ -1,173 +0,0 @@ -From bc6f565c61529d78ce00523a4419d7c451f5fe32 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= -Date: Sat, 13 Dec 2014 15:47:55 +0100 -Subject: [PATCH 1/3] create manpages with one target - ---- - Makefile | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/Makefile b/Makefile -index 4ba965f..be1b60c 100644 ---- a/Makefile -+++ b/Makefile -@@ -3,7 +3,7 @@ CC ?= gcc - CFLAGS := -Wall -Wextra $(CFLAGS) - LIBS = -lcurses - --.PHONY: clean man man-nc -+.PHONY: clean man man-2048 man-2048nc - - 2048: src/2048.c - $(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) src/2048.c -o 2048 -@@ -16,10 +16,12 @@ all: 2048 - clean: - rm -f 2048 2048nc - --man: -+man: man-2048 man-2048nc -+ -+man-2048: - rm -f man/2048.1 - $(ASCIIDOC) -d manpage -f manpage man/2048.1.txt - --man-nc: -+man-2048nc: - rm -f man/2048nc.1 - $(ASCIIDOC) -d manpage -f manpage man/2048nc.1.txt - -From 3b82fe1c7efa4d97629d7a08187e4e81345eff53 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= -Date: Sat, 13 Dec 2014 15:55:39 +0100 -Subject: [PATCH 2/3] fixed malformated manpage - ---- - man/2048.1 | 6 +++--- - man/2048.1.txt | 2 +- - man/2048nc.1 | 4 ++-- - 3 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/man/2048.1 b/man/2048.1 -index e1448f5..970db25 100644 ---- a/man/2048.1 -+++ b/man/2048.1 -@@ -2,12 +2,12 @@ - .\" Title: \e20\e4\e8 - .\" Author: [see the "AUTHOR" section] - .\" Generator: DocBook XSL Stylesheets v1.78.1 --.\" Date: 12/05/2014 -+.\" Date: 12/13/2014 - .\" Manual: \ \& - .\" Source: \ \& - .\" Language: English - .\" --.TH "\E20\E4\E8" "1" "12/05/2014" "\ \&" "\ \&" -+.TH "\E20\E4\E8" "1" "12/13/2014" "\ \&" "\ \&" - .\" ----------------------------------------------------------------- - .\" * Define some portability stuff - .\" ----------------------------------------------------------------- -@@ -70,7 +70,7 @@ Display usage information\&. - .RE - .SH "CONTROLS" - .PP --\fBhjkl or *wasd\fR or \fBarrow keys\fR -+\fBhjkl\fR or \fBwasd\fR or \fBarrow keys\fR - .RS 4 - Movement - .RE -diff --git a/man/2048.1.txt b/man/2048.1.txt -index 50754fe..c9b0a92 100644 ---- a/man/2048.1.txt -+++ b/man/2048.1.txt -@@ -36,7 +36,7 @@ OPTIONS - - CONTROLS - -------- --*hjkl or *wasd* or *arrow keys*:: -+*hjkl* or *wasd* or *arrow keys*:: - Movement - *q*:: - Quit the game. -diff --git a/man/2048nc.1 b/man/2048nc.1 -index d0151de..c027dcd 100644 ---- a/man/2048nc.1 -+++ b/man/2048nc.1 -@@ -2,12 +2,12 @@ - .\" Title: \e20\e4\e8nc - .\" Author: [see the "AUTHOR" section] - .\" Generator: DocBook XSL Stylesheets v1.78.1 --.\" Date: 12/05/2014 -+.\" Date: 12/13/2014 - .\" Manual: \ \& - .\" Source: \ \& - .\" Language: English - .\" --.TH "\E20\E4\E8NC" "1" "12/05/2014" "\ \&" "\ \&" -+.TH "\E20\E4\E8NC" "1" "12/13/2014" "\ \&" "\ \&" - .\" ----------------------------------------------------------------- - .\" * Define some portability stuff - .\" ----------------------------------------------------------------- - -From 3ee17edd2c4099b40d9524e8f7b6884b1ad499b5 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= -Date: Sat, 13 Dec 2014 16:49:36 +0100 -Subject: [PATCH 3/3] update readme for Fedora and EPEL - ---- - README.md | 28 ++++++++++++++++++++-------- - 1 file changed, 20 insertions(+), 8 deletions(-) - -diff --git a/README.md b/README.md -index 71e3392..e8c50fa 100644 ---- a/README.md -+++ b/README.md -@@ -1,24 +1,35 @@ - #2048-cli - --A cli version of the game [2048](https://github.com/gabrielecirulli/2048) for your Linux --terminal. -+A cli version of the game [2048](https://github.com/gabrielecirulli/2048) -+for your Linux terminal. - - #####2048_curses.c - ![Screenshot](http://i.imgur.com/QU7t5mH.png) - - #####2048_no_curses.c --![Screenshot](http://i.imgur.com/fwZEvdh.png) -+![Screenshot](http://i.imgur.com/fwZEvdh.png) - - ## Installation --This requires the ncurses library to link against during compilation. It is available --in most package managers. The program creates and uses a file name `.hs2048g` in the --working directory. Any file with this name will be modified and replaced. -+This requires the ncurses library to link against during compilation. -+It is available in most package managers. The program creates and uses -+a file name `.hs2048g` in the working directory. Any file with this -+name will be modified and replaced. -+ -+You can easily install this on el >= 5 (CentOS, RedHat Enterprise Linux, -+Scientific Linux, Oracle) and Fedora >= 19 using the package-manager: -+ -+ sudo yum install 2048-cli[-nocurses] -+ -+For el you will need to have the -+[EPEL-repository](https://fedoraproject.org/wiki/EPEL/FAQ#How_can_I_install_the_packages_from_the_EPEL_software_repository.3F) -+enabled. - - ### Get - git clone https://github.com/Tiehuis/2048-cli.git - make -+ - ### Run -- ./2048 -+ ./2048 - - ## Options - -s Set the grid border length -@@ -28,4 +39,5 @@ working directory. Any file with this name will be modified and replaced. - -C Disables color support (ncurses version only) - - ## License --This code is licensed under the [MIT License](https://github.com/Tiehuis/2048-cli/blob/master/LICENSE). -+This code is licensed under the -+[MIT License](https://github.com/Tiehuis/2048-cli/blob/master/LICENSE). diff --git a/2048-cli.spec b/2048-cli.spec index 1970c49..0d6559b 100644 --- a/2048-cli.spec +++ b/2048-cli.spec @@ -1,12 +1,12 @@ # Conditional for release and snapshot builds. Uncomment for release-builds. -%global rel_build 1 +#global rel_build 1 # Setup _pkgdocdir if not defined already. %{!?_pkgdocdir:%global _pkgdocdir %{_docdir}/%{name}-%{version}} # Settings used for build from snapshots. -%{!?rel_build:%global commit a9505d949e58dd6b5f00b85deb9d4de49e1e2ba5} -%{!?rel_build:%global commit_date 20141205} +%{!?rel_build:%global commit 723738c7069e83cd2d4fe1a0593e635839e42b22} +%{!?rel_build:%global commit_date 20141214} %{!?rel_build:%global shortcommit %(c=%{commit};echo ${c:0:7})} %{!?rel_build:%global gitver git%{commit_date}-%{shortcommit}} %{!?rel_build:%global gitrel .git%{commit_date}.%{shortcommit}} @@ -16,7 +16,7 @@ Name: 2048-cli Version: 0.9 -Release: 3%{?gitrel}%{?dist} +Release: 4%{?gitrel}%{?dist} Summary: The game 2048 for your Linux terminal %{?el5:Group: Amusements/Games} @@ -27,8 +27,6 @@ URL: https://github.com/Tiehuis/%{name} # Sources for snapshot-builds. %{!?rel_build:Source0: %{url}/archive/%{commit}.tar.gz#/%{gittar}} -Patch0: %{url}/pull/10.patch#/%{name}-%{version}_fix-manpages.patch - %{?el5:BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)} BuildRequires: asciidoc BuildRequires: docbook-style-xsl @@ -49,7 +47,6 @@ A non-ncurses cli version of the game 2048 for your Linux terminal. %prep %setup -q%{!?rel_build:n %{name}-%{commit}} -%patch0 -p1 %build @@ -86,6 +83,9 @@ A non-ncurses cli version of the game 2048 for your Linux terminal. %changelog +* Sun Dec 14 2014 Björn Esser - 0.9-4.git20141214.723738c +- update to new snapshot git20141214.723738c, obsoletes Patch0 + * Sat Dec 13 2014 Björn Esser - 0.9-3 - updated Patch0 diff --git a/sources b/sources index 20edf73..ad387ac 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -972710728d3e8b68a241e135fe8aac65 2048-cli-0.9.tar.gz +66b80f377302602cb28432a004bcb107 2048-cli-0.9-git20141214-723738c.tar.gz