Blob Blame History Raw
From bc6f565c61529d78ce00523a4419d7c451f5fe32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <bjoern.esser@gmail.com>
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?= <bjoern.esser@gmail.com>
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 <http://docbook.sf.net/>
-.\"      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 <http://docbook.sf.net/>
-.\"      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?= <bjoern.esser@gmail.com>
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 <size>      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).