[gdbm: 2/3] Merge branch 'master' of ssh://pkgs.fedoraproject.org/gdbm

[Honza Horak]

commit 64761adcc6ed2775049b8e0bb3a86e75fce6d824
Merge: 2eef95f cf47206
Author: Honza Horák <hhorak at redhat.com>
Date:   Mon Mar 25 15:37:18 2013 +0100

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/gdbm
    
    Conflicts:
    	gdbm.spec

 gdbm.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --cc gdbm.spec
index 7e035da,96811b7..8a0a29d
--- a/gdbm.spec
+++ b/gdbm.spec
@@@ -2,7 -2,7 +2,7 @@@
  Summary: A GNU set of database routines which use extensible hashing
  Name: gdbm
  Version: 1.10
--Release: 5%{?dist}
++Release: 6%{?dist}
  Source: http://ftp.gnu.org/gnu/gdbm/gdbm-%{version}.tar.gz
  # Prevent gdbm from storing uninitialized memory content
  # to database files.
@@@ -108,9 -106,9 +108,12 @@@ f
  %{_mandir}/man3/* 
  
  %changelog
- * Mon Mar 25 2013 Honza Horak <hhorak at redhat.com> - 1.10-5
++* Mon Mar 25 2013 Honza Horak <hhorak at redhat.com> - 1.10-6
 +- Fixed some issues found by Coverity
 +
+ * Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.10-5
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+ 
  * Mon Aug 27 2012 Honza Horak <hhorak at redhat.com> - 1.10-4
  - Spec file cleanup
  - Use make DESTDIR=... install instead of %%make_install