[fedora-easy-karma/epel7: 2/2] Merge branch 'master' into epel7

[Till Maas]

commit 6377e64e0b341f6d0336dda2d4f5d090be824876
Merge: 3e9faaf c6fa9cc
Author: Till Maas <opensource at till.name>
Date:   Sun Aug 31 17:21:27 2014 +0200

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

 .gitignore             |    1 +
 fedora-easy-karma.spec |    9 ++++++---
 sources                |    2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)
---
diff --cc fedora-easy-karma.spec
index 0cc102e,42994a6..936d95e
--- a/fedora-easy-karma.spec
+++ b/fedora-easy-karma.spec
@@@ -13,10 -13,7 +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-0git121694f6.tar.bz2
+ Source0:        fedora-easy-karma-0git1ae921a8.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
  
@@@ -32,8 -29,7 +32,8 @@@ updates that you have currently install
  
  
  %prep
- %setup -q -n fedora-easy-karma-0git121694f6
+ %setup -q -n fedora-easy-karma-0git1ae921a8
 +%patch0 -p1 -b .default-product
  
  
  %build