[python-pgpdump/epel7: 4/4] Merge branch 'master' into epel7

[Christopher Meng]

commit d5f7cce8097d1720760c23ee6a615356d4cb6d15
Merge: c03a92e a448ad1
Author: Christopher Meng <i at cicku.me>
Date:   Tue Feb 17 10:10:54 2015 +0800

    Merge branch 'master' into epel7

 .gitignore          |    1 +
 python-pgpdump.spec |   12 ++++++++----
 sources             |    2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)
---
diff --cc python-pgpdump.spec
index abd0368,50ced23..3438822
--- a/python-pgpdump.spec
+++ b/python-pgpdump.spec
@@@ -34,12 -56,34 +34,16 @@@ Currently supported things include
  
  %check
  PYTHONPATH=%{buildroot}%{python2_sitelib} %{__python2} pgpdump/test.py
 -pushd %{py3dir}
 -PYTHONPATH=%{buildroot}%{python3_sitelib} %{__python3} pgpdump/test.py
 -popd
  
  %files
- %doc COPYRIGHT README.md
+ %doc README.md
+ %license COPYRIGHT
 -%{python2_sitelib}/%{pkgname}-%{version}-py%{python_version}.egg-info
 +%{python2_sitelib}/%{pkgname}-%{version}-py%{python2_version}.egg-info
- %{python2_sitelib}/%{pkgname}
+ %{python2_sitelib}/%{pkgname}/
  
 -%files -n python3-%{pkgname}
 -%doc README.md
 -%license COPYRIGHT
 -%{python3_sitelib}/%{pkgname}-%{version}-py%{python3_version}.egg-info
 -%{python3_sitelib}/%{pkgname}/
 -
  %changelog
+ * Wed Jan 21 2015 Christopher Meng <rpm at cicku.me> - 1.5-1
+ - Update to 1.5
+ 
 -* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4-3
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 -
 -* Wed May 28 2014 Kalev Lember <kalevlember at gmail.com> - 1.4-2
 -- Rebuilt for https://fedoraproject.org/wiki/Changes/Python_3.4
 -
  * Wed Dec 19 2012 Christopher Meng <rpm at cicku.me> - 1.4-1
  - Initial Package.