[cabal-rpm/el5: 3/3] Merge remote-tracking branch 'origin' into el5

[Jens Petersen]

commit 2f452d32fd35a350aef5fcc408309f0bce8bd17e
Merge: 4e2c693 cc2b495
Author: Jens Petersen <petersen at redhat.com>
Date:   Sat May 17 18:52:13 2014 +0900

    Merge remote-tracking branch 'origin' into el5

 .gitignore     |    1 +
 cabal-rpm.spec |   19 ++++++++++++++++---
 cblrpm-diff    |    4 ++--
 sources        |    2 +-
 4 files changed, 20 insertions(+), 6 deletions(-)
---
diff --cc cabal-rpm.spec
index 78c9c80,e8899ef..2a79990
--- a/cabal-rpm.spec
+++ b/cabal-rpm.spec
@@@ -5,10 -8,9 +8,10 @@@ Version:        0.8.1
  Release:        1%{?dist}
  Summary:        RPM packaging tool for Haskell Cabal-based packages
  
 +Group:          Development/Tools
  License:        GPLv3+
  URL:            http://hackage.haskell.org/package/%{name}
- Source0:        http://hackage.haskell.org/packages/archive/%{name}/%{version}/%{name}-%{version}.tar.gz
+ Source0:        http://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.tar.gz
  Source1:        cabal-rpm.1
  Source2:        cblrpm-diff