[bsd-games] Make wtf fetch package info from rpm instead of pkg_info

Jaromír Cápík jcapik at fedoraproject.org
Thu May 30 16:31:08 UTC 2013


commit bd9a4b77d1f4902d8f33dd1e7b731155a3f559a1
Author: Jan Pokorný <jpokorny at redhat.com>
Date:   Thu Apr 25 13:32:54 2013 +0200

    Make wtf fetch package info from rpm instead of pkg_info
    
    (BZ #956648)
    
    Signed-off-by: Jan Pokorný <jpokorny at redhat.com>

 bsd-games-2.17-wtfrpm.patch |   13 +++++++++++++
 bsd-games.spec              |    8 +++++++-
 2 files changed, 20 insertions(+), 1 deletions(-)
---
diff --git a/bsd-games-2.17-wtfrpm.patch b/bsd-games-2.17-wtfrpm.patch
new file mode 100644
index 0000000..f751a93
--- /dev/null
+++ b/bsd-games-2.17-wtfrpm.patch
@@ -0,0 +1,13 @@
+--- 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 @@
+ 		shift ; continue
+ 	fi
+ 
+-	# Try pkg_info(1) next
+-	ans=`pkg_info -qc $1 2> /dev/null`
++	# Try rpm(8) next
++	ans=`rpm -q --qf "%{name}: %{summary}\n" -- $1 2> /dev/null`
+ 	if [ $? -eq 0 ] ; then
+ 		echo "$1: $ans"
+ 		shift ; continue
diff --git a/bsd-games.spec b/bsd-games.spec
index a29737a..8b138f8 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: 38%{?dist}
+Release: 39%{?dist}
 License: BSD and BSD with advertising
 Group: Amusements/Games
 URL: ftp://metalab.unc.edu/pub/Linux/games/
@@ -35,6 +35,7 @@ Patch14: bsd-games-2.17-bogglewords.patch
 Patch15: bsd-games-2.17-wtfupdate.patch
 Patch16: bsd-games-2.17-backgammonsize.patch
 Patch17: bsd-games-2.17-adventurecrc.patch
+Patch18: bsd-games-2.17-wtfrpm.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: ncurses-devel words flex flex-static bison
 Requires(pre): shadow-utils
@@ -67,6 +68,7 @@ install -p -m 755 %{SOURCE1} .
 %patch15 -p0 -b .wtfupdate
 %patch16 -p0 -b .backgammonsize
 %patch17 -p0 -b .adventurecrc
+%patch18 -p0 -b .wtfrpm
 
 %build
 # We include a templatized configuration settings file to set
@@ -192,6 +194,10 @@ exit 0
 %doc AUTHORS COPYING ChangeLog ChangeLog.0 THANKS YEAR2000 README.hunt trek/USD.doc/trek.me
 
 %changelog
+* 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)
+
 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.17-38
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 


More information about the scm-commits mailing list