[jzlib/f18: 2/2] Merge branch 'f17' into f18

[mbooth]

commit 18c5c1b648c45a840bf4d0bbe1a8a7586a1470d5
Merge: f507572 0234e38
Author: Mat Booth <fedora at matbooth.co.uk>
Date:   Tue Oct 23 11:48:00 2012 +0100

    Merge branch 'f17' into f18
    
    Conflicts:
    	jzlib.spec

 jzlib.spec |   18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 deletions(-)
---
diff --cc jzlib.spec
index d58d70c,ec35524..12c1b4f
--- a/jzlib.spec
+++ b/jzlib.spec
@@@ -30,7 -30,7 +30,7 @@@
  
  Name:           jzlib
  Version:        1.1.0
--Release:        2%{?dist}
++Release:        3%{?dist}
  Epoch:          0
  Summary:        Re-implementation of zlib in pure Java
  
@@@ -102,9 -109,9 +109,12 @@@ install -pm 644 pom.xml $RPM_BUILD_ROOT
  %doc %{_datadir}/%{name}
  
  %changelog
 -* Tue Oct 23 2012 Mat Booth <fedora at matbooth.co.uk> 0:1.1.0-2
++* Tue Oct 23 2012 Mat Booth <fedora at matbooth.co.uk> 0:1.1.0-3
+ - Add maven pom and depmap rhbz #806572.
+ 
 +* Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.1.0-2
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 +
  * Fri Jan 13 2012 Alexander Kurtakov <akurtako at redhat.com> 0:1.1.0-1
  - Update to upstream 1.1.0 release.