Mention also ~/.bugzrc file

2 files changed, 16 insertions, 10 deletions

diff --git a/pybugz-0.10git69cd7-downstream.patch b/pybugz-0.10git69cd7-downstream.patch
index 71423b7..e7218fc 100644
--- a/pybugz-0.10git69cd7-downstream.patch
+++ b/pybugz-0.10git69cd7-downstream.patch
@@ -1,4 +1,4 @@
-From def461619e48e5675930dee00a515cae413bbb90 Mon Sep 17 00:00:00 2001
+From c2181585aac4684390cd7003a6daaa4f1af7ca64 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
@@ -14,11 +14,11 @@ Subject: [PATCH] Downstream patch to follow
  bugzrc.example          |  61 --------------
  conf/conf.d/gentoo.conf |   3 +
  conf/conf.d/redhat.conf |   3 +
- conf/pybugz.conf        | 123 +++++++++++++++++++++++++++
+ conf/pybugz.conf        | 126 ++++++++++++++++++++++++++++
  lbugz                   |   2 +-
- man/bugz.1              |  12 ++-
+ man/bugz.1              |  14 +++-
  setup.py                |   4 +
- 13 files changed, 525 insertions(+), 232 deletions(-)
+ 13 files changed, 530 insertions(+), 232 deletions(-)
  create mode 100644 bugz/errhandling.py
  create mode 100644 bugz/log.py
  delete mode 100644 bugzrc.example
@@ -972,10 +972,10 @@ 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..236bd11
+index 0000000..1bd5176
 --- /dev/null
 +++ b/conf/pybugz.conf
-@@ -0,0 +1,123 @@
+@@ -0,0 +1,126 @@
 +# ===========================================================================
 +#       The "root" configuration file of PyBugz bugzilla interface.
 +# ===========================================================================
@@ -983,7 +983,10 @@ index 0000000..236bd11
 +# Overview
 +# ========
 +#   PyBugz is configured by hierarchy of *.conf files.  All the configuration
-+#   job starts from this file.
++#   job starts from this file.  User specific configuration is by default in
++#   file ~/.bugzrc.  This is specially usefull to allow user to redefine some
++#   system configuration (an example could be adding user's credentials
++#   for specific connection — see the following text).
 +#
 +# Syntax
 +# ======
@@ -1110,7 +1113,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..97638f2 100644
+index 628eae9..b228bfc 100644
 --- a/man/bugz.1
 +++ b/man/bugz.1
 @@ -1,8 +1,8 @@
@@ -1124,7 +1127,7 @@ index 628eae9..97638f2 100644
  .nh
  .SH NAME
  bugz \(em command line interface to bugzilla
-@@ -32,8 +32,12 @@ will show the help for a specific subcommand.
+@@ -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.
  Bugs should be reported to the bug tracker there.
@@ -1134,8 +1137,10 @@ index 628eae9..97638f2 100644
 +.PP
 +For documentation how to configure PyBugz take a look into distributed
 +.B pybugz.conf
++file.  User specific configuration may be defined in
++.B
++~/.bugzrc
 +file.
-+
  .SH AUTHOR
  .PP
  The original author is Alastair Tse <alastair@liquidx.net>.
diff --git a/pybugz.spec b/pybugz.spec
index ffeafa7..35e87fc 100644
--- a/pybugz.spec
+++ b/pybugz.spec
@@ -87,6 +87,7 @@ mkdir -p %{buildroot}%{_docdir}
 - update URL as upstream is now on github
 - make the RedHat bugzilla default
 - fedora-review fixes: s/define/global/, BR python2-devel, noreplace
+- mention in documentation the ~/.bugzrc file
 
 * Mon Oct 01 2012 Pavel Raiskup <praiskup@redhat.com> - 0.10-1
 - rebase to 0.10