From 210a8c745a145ae6476e61448d91cdc7448a21a8 Mon Sep 17 00:00:00 2001 From: Christopher Meng Date: Feb 06 2015 00:39:00 +0000 Subject: Merge branch 'master' into f20 --- diff --git a/.gitignore b/.gitignore index 84a4a6f..abab17a 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /keyring-3.6.zip /keyring-3.8.zip /keyring-4.0.zip +/keyring-5.0.zip diff --git a/python-keyring.spec b/python-keyring.spec index 4ae2777..6979273 100644 --- a/python-keyring.spec +++ b/python-keyring.spec @@ -1,7 +1,7 @@ %global with_python3 1 Name: python-keyring -Version: 4.0 +Version: 5.0 Release: 1%{?dist} Summary: Python 2 library to store and access passwords safely License: Python @@ -62,7 +62,7 @@ Python keyring lib also provides following build-in keyrings. %prep %setup -qn keyring-%{version} -rm -rf keyring.egg-info +rm -frv keyring.egg-info sed -i '1{\@^#!/usr/bin/env python@d}' keyring/cli.py %if 0%{?with_python3} rm -rf %{py3dir} @@ -112,6 +112,9 @@ popd %endif %changelog +* Wed Feb 04 2015 Christopher Meng - 5.0-1 +- Update to 5.0 + * Sat Aug 02 2014 Christopher Meng - 4.0-1 - Update to 4.0 diff --git a/sources b/sources index eb545b1..2583387 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4d1055abcac582f11cb0941cf22ab4d0 keyring-4.0.zip +3239a8d7290c933b93e6ef85c9e4116c keyring-5.0.zip