[fedora-easy-karma/epel7: 22/22] Merge branch 'el6' into epel7

[Till Maas]

commit 3e9faaf7c56b016d70978911d4003713137b7bf4
Merge: 8f6bd80 1b51011
Author: Till Maas <opensource at till.name>
Date:   Fri Aug 29 21:42:58 2014 +0200

    Merge branch 'el6' into epel7
    
    Conflicts:
    	fedora-easy-karma.spec

 fedora-easy-karma-0-default-product.patch |   12 ++++++++++++
 fedora-easy-karma.spec                    |    9 ++++++++-
 2 files changed, 20 insertions(+), 1 deletions(-)
---
diff --cc fedora-easy-karma-0-default-product.patch
index 0000000,07dcd8a..7660916
mode 000000,100644..100644
--- a/fedora-easy-karma-0-default-product.patch
+++ b/fedora-easy-karma-0-default-product.patch
@@@ -1,0 -1,12 +1,12 @@@
+ diff -up fedora-easy-karma-0gitd0a4bc7e/fedora-easy-karma.py.default-product fedora-easy-karma-0gitd0a4bc7e/fedora-easy-karma.py
+ --- fedora-easy-karma-0gitd0a4bc7e/fedora-easy-karma.py.default-product	2010-08-08 00:24:28.000000000 +0200
+ +++ fedora-easy-karma-0gitd0a4bc7e/fedora-easy-karma.py	2010-08-08 00:31:15.783233461 +0200
+ @@ -83,7 +83,7 @@ class FedoraEasyKarma(object):
+          parser.add_option("", "--installed-min-days", dest="installed_min_days", help="Only check packages installed for at least XX days, default: %default", metavar="DAYS", default=0, type="int")
+          parser.add_option("", "--list-rpms-only", dest="list_rpms_only", help="Only list affected rpms", action="store_true", default=False)
+          parser.add_option("", "--no-skip-empty-comment", dest="skip_empty_comment", help="Do not skip update if comment is empty", action="store_false", default=True)
+ -        parser.add_option("", "--product", dest="product", help="product to query Bodhi for, 'F' for Fedora, 'EL-' for EPEL, default: %default", default="F")
 -+        parser.add_option("", "--product", dest="product", help="product to query Bodhi for, 'F' for Fedora, 'EL-' for EPEL, default: %default", default="EL-")
+++        parser.add_option("", "--product", dest="product", help="product to query Bodhi for, 'F' for Fedora, 'EL-' for EPEL 5 or 6, 'EPEL-' for EPEL 7, default: %default", default="EPEL-")
+          parser.add_option("", "--releasever", dest="releasever", help="releasever to query Bodhi for, default: releasever from yum", default=None)
+          parser.add_option("", "--retries", dest="retries", help="Number if retries when submitting a comment in case of an error, default: %default", default=3, type="int")
+          parser.add_option("", "--wrap-bugs", dest="wrap_bugs", help="Apply line-wrapping to bugs", action="store_true", default=False)
diff --cc fedora-easy-karma.spec
index 2e50701,e3910ce..0cc102e
--- a/fedora-easy-karma.spec
+++ b/fedora-easy-karma.spec
@@@ -13,7 -13,10 +13,10 @@@ URL:            https://fedoraproject.o
  # Updated using:
  # http://fedorapeople.org/gitweb?p=walters/public_git/fedpkg-make-pull.git;a=summary
  # Commandline: fedpkg-vcs -f pull-retarget
 -Source0:        fedora-easy-karma-0gitb0706146.tar.bz2
 -# 2010-07-02: set the default product to EL- on EPEL. This might be autodected
 +Source0:        fedora-easy-karma-0git121694f6.tar.bz2
++# 2014-08-29: set the default product to EPEL- on EPEL 7. This might be autodected
+ # some time in the far far aways future. Not suitable for upstreaming.
+ Patch0:         fedora-easy-karma-0-default-product.patch
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  BuildArch:      noarch
  
@@@ -29,7 -32,8 +32,8 @@@ updates that you have currently install
  
  
  %prep
 -%setup -q -n fedora-easy-karma-0gitb0706146
 +%setup -q -n fedora-easy-karma-0git121694f6
+ %patch0 -p1 -b .default-product
  
  
  %build