From 7c48a7560370ecb4c52df837cc5f4658bfd15a4b Mon Sep 17 00:00:00 2001 From: Christopher Meng Date: Dec 03 2013 05:38:44 +0000 Subject: Manually merge --- diff --git a/python-keyring.spec b/python-keyring.spec index ec03231..4d711b2 100644 --- a/python-keyring.spec +++ b/python-keyring.spec @@ -2,24 +2,16 @@ %global with_python3 1 %endif -%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} - Name: python-keyring -Version: 3.1 +Version: 3.3 Release: 1%{?dist} -Summary: Python library to access the system keyring service - +Summary: Python 2.x library to store and access passwords safely +URL: http://bitbucket.org/kang/python-keyring-lib/ Source0: http://pypi.python.org/packages/source/k/keyring/keyring-%{version}.zip -Patch0: keyring-3.1-fix-cli.patch License: Python -Group: Development/Libraries -URL: http://pypi.python.org/pypi/keyring BuildArch: noarch -BuildRequires: python-devel -%if 0%{?with_python3} -BuildRequires: python3-devel -BuildRequires: python3-setuptools -%endif +BuildRequires: python2-devel +BuildRequires: python-setuptools Obsoletes: %{name}-kwallet < %{version} Obsoletes: %{name}-gnome < %{version} Obsoletes: %{name} < %{version} @@ -28,71 +20,107 @@ Obsoletes: %{name} < %{version} The Python keyring lib provides a easy way to access the system keyring service from python. It can be used in any application that needs safe password storage. + +The keyring services supported by the Python keyring lib: + +* **OSXKeychain**: supports the Keychain service in Mac OS X. +* **KDEKWallet**: supports the KDE's Kwallet service. +* **GnomeKeyring**: for Gnome 2 environment. +* **SecretServiceKeyring**: for newer GNOME and KDE environments. +* **WinVaultKeyring**: supports the Windows Credential Vault + +Besides these native password storing services provided by operating systems. +Python keyring lib also provides following build-in keyrings. + +* **Win32CryptoKeyring**: for Windows 2k+. +* **CryptedFileKeyring**: a command line interface keyring base on PyCrypto. +* **UncryptedFileKeyring**: a keyring which leaves passwords directly in file. %if 0%{?with_python3} -%package -n python3-keyring -Summary: Python library to access the system keyring service for Python 3 -Group: Development/Libraries +%package -n python3-keyring +Summary: Python 3.x library to access the system keyring service +BuildRequires: python3-devel +BuildRequires: python3-setuptools %description -n python3-keyring The Python keyring lib provides a easy way to access the system keyring service from python. It can be used in any application that needs safe password storage. + +The keyring services supported by the Python keyring lib: + +* **OSXKeychain**: supports the Keychain service in Mac OS X. +* **KDEKWallet**: supports the KDE's Kwallet service. +* **GnomeKeyring**: for Gnome 2 environment. +* **SecretServiceKeyring**: for newer GNOME and KDE environments. +* **WinVaultKeyring**: supports the Windows Credential Vault + +Besides these native password storing services provided by operating systems. +Python keyring lib also provides following build-in keyrings. + +* **Win32CryptoKeyring**: for Windows 2k+. +* **CryptedFileKeyring**: a command line interface keyring base on PyCrypto. +* **UncryptedFileKeyring**: a keyring which leaves passwords directly in file. %endif %prep -%setup -q -n keyring-%{version} -%patch0 -p1 - +%setup -qn keyring-%{version} +rm -rf keyring.egg-info +sed -i '1{\@^#!/usr/bin/env python@d}' keyring/cli.py %if 0%{?with_python3} rm -rf %{py3dir} cp -a . %{py3dir} %endif - %build -CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build - +%{__python2} setup.py build %if 0%{?with_python3} pushd %{py3dir} -CFLAGS="${RPM_OPT_FLAGS}" %{__python3} setup.py build +%{__python3} setup.py build popd %endif - %install %if 0%{?with_python3} pushd %{py3dir} -%{__python3} setup.py install --skip-build --root $RPM_BUILD_ROOT -cp %{buildroot}/%{_bindir}/keyring %{buildroot}/%{_bindir}/python3-keyring +%{__python3} setup.py install -O1 --skip-build --root %{buildroot} +cp -p %{buildroot}%{_bindir}/keyring %{buildroot}%{_bindir}/keyring-%{python3_version} popd %endif - -%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT - - -%clean -%{__rm} -rf $RPM_BUILD_ROOT - +%{__python2} setup.py install -O1 --skip-build --root %{buildroot} + +# Failed on Koji due to X environment not available. +#%check +#%if 0%{?with_python3} +#pushd %{py3dir} +#%{__python3} setup.py ptr +#nosetests-%{python3_version} +#popd +#%endif +#%{__python2} setup.py ptr +#nosetests %files -%defattr(-,root,root,-) -%doc README.rst CHANGES.rst CONTRIBUTORS.txt demo +%doc CHANGES.rst README.rst CONTRIBUTORS.txt demo %{_bindir}/keyring -%{python_sitelib}/keyring -%{python_sitelib}/keyring-*.egg-info +%{python2_sitelib}/keyring +%{python2_sitelib}/keyring-%{version}-py%{python2_version}.egg-info %if 0%{?with_python3} %files -n python3-keyring -%defattr(-,root,root,-) -%{_bindir}/python3-keyring -%doc README.rst CHANGES.rst CONTRIBUTORS.txt demo -%{python3_sitelib}/* +%doc CHANGES.rst README.rst CONTRIBUTORS.txt demo +%{_bindir}/keyring-%{python3_version} +%{python3_sitelib}/keyring-%{version}-py%{python3_version}.egg-info +%{python3_sitelib}/keyring %endif - %changelog -* Tue Oct 22 2013 rtnpro - 3.1-1 +* Mon Dec 02 2013 Christopher Meng - 3.3-1 +- Update to 3.3(BZ#1007354,BZ#872262) +- Cleanup dependencies mess(BZ#1030944). +- Optimize the %%changelog section of the spec. + +* Tue Oct 22 2013 Ratnadeep Debnath - 3.1-1 - Bump to version 3.1 * Thu Feb 14 2013 Fedora Release Engineering - 0.7-3 @@ -101,7 +129,7 @@ popd * Sat Jul 21 2012 Fedora Release Engineering - 0.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild -* Sat Jan 14 2012 rtnpro 0.7-1 +* Sat Jan 14 2012 Ratnadeep Debnath 0.7-1 - Python 3 is now supported. All tests now pass under Python 3.2 on Windows and Linux (although Linux backend support is limited). Fixes #28. - Extension modules on Mac and Windows replaced by pure-Python ctypes @@ -115,36 +143,36 @@ to browser your keyring (for ex. with Seahorse) - keyring.util.escape now accepts only unicode strings. Don't try to encode strings passed to it. -* Tue Nov 08 2011 rtnpro 0.6.2-1 +* Tue Nov 08 2011 Ratnadeep Debnath 0.6.2-1 - fix compiling on OSX with XCode 4.0 - Gnome keyring should not be used if there is no DISPLAY or if the dbus is not around (https://bugs.launchpad.net/launchpadlib/+bug/752282). - Added keyring.http for facilitating HTTP Auth using keyring. - Add a utility to access the keyring from the command line. -* Mon Jan 10 2011 rtnpro 0.5.1-1 +* Mon Jan 10 2011 Ratnadeep Debnath 0.5.1-1 - Remove a spurious KDE debug message when using KWallet - Fix a bug that caused an exception if the user canceled the KWallet dialog -* Sun Nov 28 2010 rtnpro 0.5-2 +* Sun Nov 28 2010 Ratnadeep Debnath 0.5-2 - Removed sub-packages: gnome and kwallet; removed "Requires: PyKDE4 PyQt4" -* Mon Nov 22 2010 rtnpro 0.5-1 +* Mon Nov 22 2010 Ratnadeep Debnath 0.5-1 - RPM for keyring-0.5 -* Mon Nov 01 2010 rtnpro 0.4-1 +* Mon Nov 01 2010 Ratnadeep Debnath 0.4-1 - Updated rpm to python-keyring version 0.4 -* Sat Oct 30 2010 rtnpro 0.2-4 +* Sat Oct 30 2010 Ratnadeep Debnath 0.2-4 - Filtered gnome_keyring.so from the provides list, removed kdelibs-devel -* Sat Oct 02 2010 rtnpro 0.2-3 +* Sat Oct 02 2010 Ratnadeep Debnath 0.2-3 - Updated dependencies to kdelibs4-devel, some cleanup -* Tue Aug 24 2010 rtnpro 0.2-2 +* Tue Aug 24 2010 Ratnadeep Debnath 0.2-2 - Some updates according to bugzilla reviews -* Sat Jun 26 2010 rtnpro 0.2-1.3 +* Sat Jun 26 2010 Ratnadeep Debnath 0.2-1.3 - Some cleanup * Sat Jun 26 2010 Felix Schwarz 0.2-1.2 @@ -155,11 +183,9 @@ strings passed to it. - create subpackage for gnome, disable KWallet for now - look for files in arch-dependend site-packages -* Tue May 25 2010 rtnpro 0.2-1 +* Tue May 25 2010 Ratnadeep Debnath 0.2-1 - Incorporated some changes with reference to http://vcrhonek.fedorapeople.org/python-keyring/python-keyring.spec - Fixed some rpmlint errors -* Wed May 19 2010 rtnpro 0.2 +* Wed May 19 2010 Ratnadeep Debnath 0.2 - Initial RPM package - - diff --git a/sources b/sources index f235d30..992ff25 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3c82a11101a61d0e51624b41e09888b3 keyring-3.1.zip +81291e0c7337affb71442e6c7671e77f keyring-3.3.zip