diff --git a/2048-cli-0.9_fix-manpages.patch b/2048-cli-0.9_fix-manpages.patch new file mode 100644 index 0000000..fa68983 --- /dev/null +++ b/2048-cli-0.9_fix-manpages.patch @@ -0,0 +1,100 @@ +From 218168f0b31d61ace917ffba2b0e041699d1f6fb 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/2] create manpages with one target + +--- + Makefile | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index 4ba965f..bdeb1e8 100644 +--- a/Makefile ++++ b/Makefile +@@ -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 845af1198a9867bc0f6a964bf403a49fd64950c8 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/2] 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 + .\" ----------------------------------------------------------------- diff --git a/2048-cli.spec b/2048-cli.spec index adb2e54..c1dfbc0 100644 --- a/2048-cli.spec +++ b/2048-cli.spec @@ -16,7 +16,7 @@ Name: 2048-cli Version: 0.9 -Release: 1%{?gitrel}%{?dist} +Release: 2%{?gitrel}%{?dist} Summary: The game 2048 for your Linux terminal %{?el5:Group: Amusements/Games} @@ -27,6 +27,8 @@ 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 @@ -47,10 +49,11 @@ A non-ncurses cli version of the game 2048 for your Linux terminal. %prep %setup -q%{!?rel_build:n %{name}-%{commit}} +%patch0 -p1 %build -%{__make} %{?_smp_mflags} 2048 2048nc man man-nc \ +%{__make} %{?_smp_mflags} 2048 2048nc man \ CFLAGS='%{optflags}' LDFLAGS='%{?__global_ldflags}' @@ -83,6 +86,9 @@ A non-ncurses cli version of the game 2048 for your Linux terminal. %changelog +* Sat Dec 13 2014 Björn Esser - 0.9-2 +- added Patch0 to fix malformated manpages + * Fri Dec 05 2014 Björn Esser - 0.9-1 - new upstream release v0.9 - obsoleted Patch0