[bsd-games] wtf: Removing duplicate prefix when rpm -q succeeds

[Jaromír Cápík]

commit 15d822c327999bc025288b51d4b52ee2c853f9a0
Author: Jaromir Capik <jcapik at redhat.com>
Date:   Thu May 30 18:31:01 2013 +0200

    wtf: Removing duplicate prefix when rpm -q succeeds

 bsd-games-2.17-wtfrpm.patch |   11 +++++++----
 bsd-games.spec              |    7 +++++--
 2 files changed, 12 insertions(+), 6 deletions(-)
---
diff --git a/bsd-games-2.17-wtfrpm.patch b/bsd-games-2.17-wtfrpm.patch
index f751a93..b1aa25e 100644
--- a/bsd-games-2.17-wtfrpm.patch
+++ b/bsd-games-2.17-wtfrpm.patch
@@ -1,6 +1,7 @@
---- wtf/wtf.in.orig	2013-04-25 11:58:13.594320227 +0200
-+++ wtf/wtf.in	2013-04-25 13:02:15.392234252 +0200
-@@ -70,8 +70,8 @@
+diff -Naur bsd-games-2.17.orig/wtf/wtf.in bsd-games-2.17/wtf/wtf.in
+--- bsd-games-2.17.orig/wtf/wtf.in	2013-05-30 18:14:29.000000000 +0200
++++ bsd-games-2.17/wtf/wtf.in	2013-05-30 18:16:15.396266060 +0200
+@@ -70,10 +70,10 @@
  		shift ; continue
  	fi
  
@@ -9,5 +10,7 @@
 +	# Try rpm(8) next
 +	ans=`rpm -q --qf "%{name}: %{summary}\n" -- $1 2> /dev/null`
  	if [ $? -eq 0 ] ; then
- 		echo "$1: $ans"
+-		echo "$1: $ans"
++		echo "$ans"
  		shift ; continue
+ 	fi
diff --git a/bsd-games.spec b/bsd-games.spec
index 8b138f8..c42b20c 100644
--- a/bsd-games.spec
+++ b/bsd-games.spec
@@ -4,7 +4,7 @@
 Summary: Collection of text-based games
 Name: bsd-games
 Version: 2.17
-Release: 39%{?dist}
+Release: 40%{?dist}
 License: BSD and BSD with advertising
 Group: Amusements/Games
 URL: ftp://metalab.unc.edu/pub/Linux/games/
@@ -68,7 +68,7 @@ install -p -m 755 %{SOURCE1} .
 %patch15 -p0 -b .wtfupdate
 %patch16 -p0 -b .backgammonsize
 %patch17 -p0 -b .adventurecrc
-%patch18 -p0 -b .wtfrpm
+%patch18 -p1 -b .wtfrpm
 
 %build
 # We include a templatized configuration settings file to set
@@ -194,6 +194,9 @@ exit 0
 %doc AUTHORS COPYING ChangeLog ChangeLog.0 THANKS YEAR2000 README.hunt trek/USD.doc/trek.me
 
 %changelog
+* Thu May 30 2013 Jaromir Capik <jcapik at redhat.com> - 2.17-40
+- wtf: Removing duplicate prefix when rpm -q succeeds
+
 * Thu Apr 25 2013 Jan Pokorny <jpokorny at redhat.com> - 2.17-39
 - Make wtf fetch package info from rpm instead of pkg_info
   (BZ #956648)