[cabal-rpm] update to 0.9 release

[Jens Petersen]

commit b365ac15764050f522069aee6fb97f54ad451644
Author: Jens Petersen <petersen at redhat.com>
Date:   Thu Jul 17 23:10:18 2014 +0900

    update to 0.9 release
    
    lot of enhancements, improvements and bugfixes
    
    - new spec-centric logic and src prep setup
    - install command now does recursive rpm building and install
    - support for RHEL5 rpm packaging on EL5
    - reduce usage of rpmquery to save time and bandwidth

 .gitignore     |    1 +
 cabal-rpm.spec |   18 ++++++++++++++++--
 sources        |    2 +-
 3 files changed, 18 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9be881d..23bf5d6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@
 /cabal-rpm-0.8.9.tar.gz
 /cabal-rpm-0.8.10.tar.gz
 /cabal-rpm-0.8.11.tar.gz
+/cabal-rpm-0.9.tar.gz
diff --git a/cabal-rpm.spec b/cabal-rpm.spec
index e14bd27..237576f 100644
--- a/cabal-rpm.spec
+++ b/cabal-rpm.spec
@@ -4,8 +4,8 @@
 %global debug_package %{nil}
 
 Name:           cabal-rpm
-Version:        0.8.11
-Release:        2%{?dist}
+Version:        0.9
+Release:        1%{?dist}
 Summary:        RPM packaging tool for Haskell Cabal-based packages
 
 License:        GPLv3+
@@ -70,8 +70,22 @@ ln -s cblrpm-diff %{buildroot}%{_bindir}/%{name}-diff
 
 
 %changelog
+<<<<<<< Updated upstream
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.11-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+=======
+* Thu Jul 17 2014 Jens Petersen <petersen at redhat.com> - 0.9-1
+- setup logic completely reworked to make better use of existing spec file
+  and prep source tree for version properly
+- default to Library packaging instead of BinLib:
+  override with --binary which replaces --library
+- 'install' command now does local recursive rpmbuilding
+- try "rpm -qf" and then rpmquery to resolve clib devel depends
+- support packaging on RHEL5
+- improved output for 'depends' command
+- use current dir name as a last guess of package name
+- refactoring and improvements including no duplicate clibs deps
+>>>>>>> Stashed changes
 
 * Sat May 17 2014 Jens Petersen <petersen at redhat.com> - 0.8.11-1
 - use .spec file to determine pkg-ver when no .cabal file around
diff --git a/sources b/sources
index 10fd1de..03b8478 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-72e403079d16428762c93d0aa5bff033  cabal-rpm-0.8.11.tar.gz
+08c16e69ed644f0063d947a2cb4d6b6e  cabal-rpm-0.9.tar.gz