updated Patch0

This commit is contained in:
Björn Esser 2014-12-13 16:57:48 +01:00
commit 0966b9a16e
2 changed files with 84 additions and 8 deletions

View file

@ -1,16 +1,25 @@
From 218168f0b31d61ace917ffba2b0e041699d1f6fb Mon Sep 17 00:00:00 2001
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/2] create manpages with one target
Subject: [PATCH 1/3] create manpages with one target
---
Makefile | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
Makefile | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index 4ba965f..bdeb1e8 100644
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
@ -27,10 +36,10 @@ index 4ba965f..bdeb1e8 100644
rm -f man/2048nc.1
$(ASCIIDOC) -d manpage -f manpage man/2048nc.1.txt
From 845af1198a9867bc0f6a964bf403a49fd64950c8 Mon Sep 17 00:00:00 2001
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/2] fixed malformated manpage
Subject: [PATCH 2/3] fixed malformated manpage
---
man/2048.1 | 6 +++---
@ -98,3 +107,67 @@ index d0151de..c027dcd 100644
.\" -----------------------------------------------------------------
.\" * 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).

View file

@ -16,7 +16,7 @@
Name: 2048-cli
Version: 0.9
Release: 2%{?gitrel}%{?dist}
Release: 3%{?gitrel}%{?dist}
Summary: The game 2048 for your Linux terminal
%{?el5:Group: Amusements/Games}
@ -86,6 +86,9 @@ A non-ncurses cli version of the game 2048 for your Linux terminal.
%changelog
* Sat Dec 13 2014 Björn Esser <bjoern.esser@gmail.com> - 0.9-3
- updated Patch0
* Sat Dec 13 2014 Björn Esser <bjoern.esser@gmail.com> - 0.9-2
- added Patch0 to fix malformated manpages