Better satisfy RHEL/Fedora needs

4 files changed, 84 insertions, 7 deletions

diff --git a/pybugz-0.10git69cd7-1.fc17.src.rpm b/pybugz-0.10git69cd7-1.fc17.src.rpm
index e111823..ec27db8 100644
--- a/pybugz-0.10git69cd7-1.fc17.src.rpm
+++ b/pybugz-0.10git69cd7-1.fc17.src.rpm
diff --git a/pybugz-0.10git69cd7-downstream.patch b/pybugz-0.10git69cd7-downstream.patch
index 1fde628..ee34dd6 100644
--- a/pybugz-0.10git69cd7-downstream.patch
+++ b/pybugz-0.10git69cd7-downstream.patch
@@ -1,4 +1,4 @@
-From 38b5153043ee4bacf450cf4f3f62652f4789d324 Mon Sep 17 00:00:00 2001
+From a484ef7733937d564f65325ff0d87bbf6a3fa1f5 Mon Sep 17 00:00:00 2001
 From: Pavel Raiskup <pavel@raiskup.cz>
 Date: Sun, 20 Jan 2013 10:33:59 +0100
 Subject: [PATCH] Downstream patch to follow
@@ -16,9 +16,9 @@ Subject: [PATCH] Downstream patch to follow
  conf/conf.d/redhat.conf |   3 +
  conf/pybugz.conf        | 126 ++++++++++++++++++++++++++++
  lbugz                   |   2 +-
- man/bugz.1              |  14 +++-
+ man/bugz.1              |  18 ++--
  setup.py                |   4 +
- 13 files changed, 534 insertions(+), 235 deletions(-)
+ 13 files changed, 536 insertions(+), 237 deletions(-)
  create mode 100644 bugz/errhandling.py
  create mode 100644 bugz/log.py
  delete mode 100644 bugzrc.example
@@ -976,7 +976,7 @@ index 0000000..0f50fb7
 +query_statuses = NEW ASSIGNED MODIFIED ON_DEV POST
 diff --git a/conf/pybugz.conf b/conf/pybugz.conf
 new file mode 100644
-index 0000000..1bd5176
+index 0000000..3a486b4
 --- /dev/null
 +++ b/conf/pybugz.conf
 @@ -0,0 +1,126 @@
@@ -1105,7 +1105,7 @@ index 0000000..1bd5176
 +type = settings
 +homeconf = ~/.bugzrc
 +confdir = /etc/pybugz/conf.d/
-+default = RedHat
++default = Gentoo
 diff --git a/lbugz b/lbugz
 index f1b1b7a..2329859 100755
 --- a/lbugz
@@ -1117,7 +1117,7 @@ index f1b1b7a..2329859 100755
 -	subprocess.call(args)
 +	sys.exit(subprocess.call(args))
 diff --git a/man/bugz.1 b/man/bugz.1
-index 628eae9..b228bfc 100644
+index 628eae9..34ef561 100644
 --- a/man/bugz.1
 +++ b/man/bugz.1
 @@ -1,8 +1,8 @@
@@ -1131,6 +1131,19 @@ index 628eae9..b228bfc 100644
  .nh
  .SH NAME
  bugz \(em command line interface to bugzilla
+@@ -20,10 +20,10 @@ bugz \(em command line interface to bugzilla
+ .\" .B \-o value, \-\^\-long=value
+ .\" Describe the option.
+ .SH DESCRIPTION
+-Bugz is a cprogram which gives you access to the features of the
++Bugz 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 bugs program has extensive built in help.
++This man page is a stub; the bugz program has extensive built in help.
+ .B bugz -h
+ will show the help for the global options and
+ .B bugz [subcommand] -h
 @@ -32,8 +32,14 @@ will show the help for a specific subcommand.
  .PP
  The home page of this project is http://www.github.com/williamh/pybugz.
diff --git a/pybugz-0.10git69cd7-rhel-fedora-cust.patch b/pybugz-0.10git69cd7-rhel-fedora-cust.patch
new file mode 100644
index 0000000..388dd11
--- /dev/null
+++ b/pybugz-0.10git69cd7-rhel-fedora-cust.patch
@@ -0,0 +1,61 @@
+From 6924d70c1585dc89d3d609fda11b6c4b9741b348 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(-)
+
+diff --git a/conf/pybugz.conf b/conf/pybugz.conf
+index 3a486b4..1bd5176 100644
+--- a/conf/pybugz.conf
++++ b/conf/pybugz.conf
+@@ -123,4 +123,4 @@
+ type = settings
+ homeconf = ~/.bugzrc
+ 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 35e87fc..081becd 100644
--- a/pybugz.spec
+++ b/pybugz.spec
@@ -31,6 +31,8 @@ Source0: %{name}-%{version}.tar.gz
 Patch0: %{name}-%{version}-bash-complete.patch
 # follow https://github.com/praiskup/pybugz changes (until accepted by upstream)
 Patch1: %{name}-%{version}-downstream.patch
+# make the installation better satisfy RHEL / Fedora purposes
+Patch2: %{name}-%{version}-rhel-fedora-cust.patch
 
 %description
 Pybugz was conceived as a tool to speed up the work-flow for Gentoo Linux
@@ -43,6 +45,7 @@ comfortably from the command line.
 %setup -q
 %patch0 -p1 -b .bash-complete
 %patch1 -p1 -b .downstream
+%patch2 -p1 -b .rhel-fedora-cust
 
 %build
 %{__python} setup.py build
@@ -85,7 +88,7 @@ mkdir -p %{buildroot}%{_docdir}
 - apply downstream patches to reflect https://github.com/praiskup/pybugz
   it allows hierarchy of configuration files and a bit better error handling
 - update URL as upstream is now on github
-- make the RedHat bugzilla default
+- 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