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

[Christopher Meng]

commit 65909080c8ef655c130e3dfd8fca253e427aa085
Merge: 103a204 51787df
Author: Christopher Meng <i at cicku.me>
Date:   Mon Feb 2 18:32:35 2015 +0800

    Merge branch 'master' into epel7

 sources  |    2 +-
 yaz.spec |    8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)
---
diff --cc yaz.spec
index 9af9980,9a5aa7a..f999b28
--- a/yaz.spec
+++ b/yaz.spec
@@@ -125,9 -125,15 +125,15 @@@ make chec
  %{_mandir}/man1/yaz-config.*
  
  %files -n %{name}-doc
 -%{_pkgdocdir}
 +%{_docdir}/%{name}
  
  %changelog
+ * Mon Feb 02 2015 Christopher Meng <rpm at cicku.me> - 5.8.1-1
+ - Update to 5.8.1
+ 
+ * Mon Jan 26 2015 David Tardon <dtardon at redhat.com> - 5.6.0-2
+ - rebuild for ICU 54.1
+ 
  * Tue Nov 18 2014 Christopher Meng <rpm at cicku.me> - 5.6.0-1
  - Update to 5.6.0