[yaz/epel7: 4/4] Merge branch 'master' into epel7

[Christopher Meng]

commit 59565769733566bb8db08a826e9fc2c63b4e319c
Merge: b44c5b7 d33419b
Author: Christopher Meng <i at cicku.me>
Date:   Thu Jul 17 13:31:51 2014 +0800

    Merge branch 'master' into epel7

 sources       |    2 +-
 yaz-656.patch |   13 -------------
 yaz.spec      |   14 +++++++++++++-
 3 files changed, 14 insertions(+), 15 deletions(-)
---
diff --cc yaz.spec
index 08ea606,a59849c..efddf33
--- a/yaz.spec
+++ b/yaz.spec
@@@ -121,9 -124,18 +124,18 @@@ make chec
  %{_mandir}/man1/yaz-config.*
  
  %files -n %{name}-doc
 -%{_pkgdocdir}
 +%{_docdir}/%{name}
  
  %changelog
+ * Thu Jul 17 2014 Christopher Meng <rpm at cicku.me> - 5.3.0-1
+ - Update to 5.3.0
+ 
+ * Mon Jun 30 2014 Christopher Meng <rpm at cicku.me> - 5.2.1-1
+ - Update to 5.2.1
+ 
+ * Sun Jun 15 2014 Christopher Meng <rpm at cicku.me> - 5.2.0-1
+ - Update to 5.2.0
+ 
  * Mon Jun 09 2014 Christopher Meng <rpm at cicku.me> - 5.1.3-1
  - Update to 5.1.3