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

[Christopher Meng]

commit d8e4d37d3766a5b17dec678882a7b35171608b64
Merge: 5956576 3ff5b26
Author: Christopher Meng <i at cicku.me>
Date:   Fri Jul 18 11:14:27 2014 +0800

    Merge branch 'master' into epel7

 001_yaz_fix_buildconf.patch |   11 -----------
 yaz.spec                    |   20 ++++++++++++--------
 2 files changed, 12 insertions(+), 19 deletions(-)
---
diff --cc yaz.spec
index efddf33,2e4d6bf..25be3bd
--- a/yaz.spec
+++ b/yaz.spec
@@@ -124,9 -125,12 +125,12 @@@ make chec
  %{_mandir}/man1/yaz-config.*
  
  %files -n %{name}-doc
 -%{_pkgdocdir}
 +%{_docdir}/%{name}
  
  %changelog
+ * Fri Jul 18 2014 Christopher Meng <rpm at cicku.me> - 5.3.0-2
+ - Enable GnuTLS support.
+ 
  * Thu Jul 17 2014 Christopher Meng <rpm at cicku.me> - 5.3.0-1
  - Update to 5.3.0