Switch the binary name back to 'bugz'

4 files changed, 10 insertions, 64 deletions

diff --git a/pybugz-0.10git69cd7-1.fc17.src.rpm b/pybugz-0.10git69cd7-1.fc17.src.rpm
index ec27db8..7249245 100644
--- a/pybugz-0.10git69cd7-1.fc17.src.rpm
+++ b/pybugz-0.10git69cd7-1.fc17.src.rpm
diff --git a/pybugz-0.10git69cd7-bash-complete.patch b/pybugz-0.10git69cd7-bash-complete.patch
deleted file mode 100644
index 3163c18..0000000
--- a/pybugz-0.10git69cd7-bash-complete.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff --git a/contrib/bash-completion b/contrib/bash-completion
-index a51ee10..8530291 100644
---- a/contrib/bash-completion
-+++ b/contrib/bash-completion
-@@ -79,4 +79,4 @@ _bugz() {
- 			;;
- 	esac
- }
--complete -F _bugz bugz
-+complete -F _bugz pybugz
diff --git a/pybugz-0.10git69cd7-rhel-fedora-cust.patch b/pybugz-0.10git69cd7-rhel-fedora-cust.patch
index 388dd11..8a05846 100644
--- a/pybugz-0.10git69cd7-rhel-fedora-cust.patch
+++ b/pybugz-0.10git69cd7-rhel-fedora-cust.patch
@@ -1,12 +1,11 @@
-From 6924d70c1585dc89d3d609fda11b6c4b9741b348 Mon Sep 17 00:00:00 2001
+From e6ceb40155df600cbc2bba6a593c55fe327a3987 Mon Sep 17 00:00:00 2001
 From: Pavel Raiskup <pavel@raiskup.cz>
 Date: Sun, 20 Jan 2013 15:20:45 +0100
 Subject: [PATCH] Refine for Fedora purposes
 
 ---
- conf/pybugz.conf |  2 +-
- man/bugz.1       | 14 +++++++-------
- 2 files changed, 8 insertions(+), 8 deletions(-)
+ conf/pybugz.conf | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/conf/pybugz.conf b/conf/pybugz.conf
 index 3a486b4..1bd5176 100644
@@ -18,44 +17,6 @@ index 3a486b4..1bd5176 100644
  confdir = /etc/pybugz/conf.d/
 -default = Gentoo
 +default = RedHat
-diff --git a/man/bugz.1 b/man/bugz.1
-index 34ef561..bac6b9d 100644
---- a/man/bugz.1
-+++ b/man/bugz.1
-@@ -2,12 +2,12 @@
- .\" Copyright (c) 2011, 2012 William Hubbs
- .\" This is free software; see the GNU General Public Licence version 2
- .\" or later for copying conditions.  There is NO warranty.
--.TH bugz 1 "20 Jan 2013" "0.10.2"
-+.TH pybugz 1 "20 Jan 2013" "0.10.2"
- .nh
- .SH NAME
--bugz \(em command line interface to bugzilla
-+pybugz \(em command line interface to bugzilla
- .SH SYNOPSIS
--.B bugz
-+.B pybugz
- [
- .B global options
- ]
-@@ -20,13 +20,13 @@ bugz \(em command line interface to bugzilla
- .\" .B \-o value, \-\^\-long=value
- .\" Describe the option.
- .SH DESCRIPTION
--Bugz is a program which gives you access to the features of the
-+Pybugz is a program which gives you access to the features of the
- bugzilla bug tracking system from the command line.
- .PP
--This man page is a stub; the bugz program has extensive built in help.
--.B bugz -h
-+This man page is a stub; the pybugz program has extensive built in help.
-+.B pybugz -h
- will show the help for the global options and
--.B bugz [subcommand] -h
-+.B pybugz [subcommand] -h
- will show the help for a specific subcommand.
- .SH BUGS
- .PP
 -- 
 1.7.11.7
 
diff --git a/pybugz.spec b/pybugz.spec
index 081becd..f28ef28 100644
--- a/pybugz.spec
+++ b/pybugz.spec
@@ -27,12 +27,10 @@ BuildRequires: bash-completion pkgconfig
 # script.
 Source0: %{name}-%{version}.tar.gz
 
-# use the 'pybugz' binary in bash completion
-Patch0: %{name}-%{version}-bash-complete.patch
 # follow https://github.com/praiskup/pybugz changes (until accepted by upstream)
-Patch1: %{name}-%{version}-downstream.patch
+Patch0: %{name}-%{version}-downstream.patch
 # make the installation better satisfy RHEL / Fedora purposes
-Patch2: %{name}-%{version}-rhel-fedora-cust.patch
+Patch1: %{name}-%{version}-rhel-fedora-cust.patch
 
 %description
 Pybugz was conceived as a tool to speed up the work-flow for Gentoo Linux
@@ -43,21 +41,16 @@ comfortably from the command line.
 
 %prep
 %setup -q
-%patch0 -p1 -b .bash-complete
-%patch1 -p1 -b .downstream
-%patch2 -p1 -b .rhel-fedora-cust
+%patch0 -p1 -b .downstream
+%patch1 -p1 -b .rhel-fedora-cust
 
 %build
 %{__python} setup.py build
 
 %install
-# use rather 'pybugz' than just 'bugz'
-%global pybugz_binary pybugz
-
 # default install process
 %{__python} setup.py install --root=%{buildroot}
 
-mv %{buildroot}%{_bindir}/bugz %{buildroot}%{_bindir}/%{pybugz_binary}
 %global bash_cmpl_dir %(pkg-config --variable=completionsdir bash-completion)
 %if %{?bash_completion}
   # find the proper directory to install bash-completion script
@@ -73,7 +66,7 @@ mkdir -p %{buildroot}%{_docdir}
 %clean
 
 %files
-%{_bindir}/%{pybugz_binary}
+%{_bindir}/bugz
 %{python_sitelib}/bugz
 %if %{?bash_completion}
   %{bash_cmpl_dir}/pybugz
@@ -91,6 +84,8 @@ mkdir -p %{buildroot}%{_docdir}
 - make the RedHat bugzilla default, s/bugz/pybugz/ in manpage
 - fedora-review fixes: s/define/global/, BR python2-devel, noreplace
 - mention in documentation the ~/.bugzrc file
+- switch the binary name to 'bugz' again, it would mislead users (see merge
+  review bug comment)
 
 * Mon Oct 01 2012 Pavel Raiskup <praiskup@redhat.com> - 0.10-1
 - rebase to 0.10