[python-keyring/f20: 3/10] Merge branch 'master' into f20

Christopher Meng cicku at fedoraproject.org
Tue Dec 3 05:44:00 UTC 2013 

commit b977d7f228c14bfe0761294613ab870587d44509
Merge: 400b1e9 5e9c40a
Author: Christopher Meng <rpm at cicku.me>
Date:   Tue Dec 3 13:32:26 2013 +0800

    Merge branch 'master' into f20
    
    Conflicts:
    	.gitignore
    	python-keyring.spec
    	sources

 .gitignore          |    5 +--
 python-keyring.spec |  142 ++++++++++++++++++++++++++++++++++++++++++++++-----
 sources             |    4 ++
 3 files changed, 133 insertions(+), 18 deletions(-)
---
diff --cc .gitignore
index 1a5dffb,45e8cb9..4a9eb45
--- a/.gitignore
+++ b/.gitignore
@@@ -1,4 -1,5 +1,1 @@@
--/keyring-0.4.tar.gz
--/keyring-0.5.1.tar.gz
--/keyring-0.7.zip
--/keyring-3.1.zip
+ /keyring-3.3.zip
diff --cc python-keyring.spec
index ec03231,f794b2e..3747c0d
--- a/python-keyring.spec
+++ b/python-keyring.spec
@@@ -1,25 -1,18 +1,37 @@@
  %if 0%{?fedora} > 12
  %global with_python3 1
  %endif
++<<<<<<< HEAD
 +
 +%{!?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
 +Release:        1%{?dist}
 +Summary:        Python library to access the system keyring service
 +
++=======
+ 
+ Name:           python-keyring
+ Version:        3.3
+ Release:        1%{?dist}
+ Summary:        Python 2.x library to store and access passwords safely
+ URL:            http://bitbucket.org/kang/python-keyring-lib/
++>>>>>>> master
  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
++<<<<<<< HEAD
 +BuildRequires:  python-devel
 +%if 0%{?with_python3}
 +BuildRequires:  python3-devel
 +BuildRequires:  python3-setuptools
 +%endif
++=======
+ BuildRequires:  python2-devel
+ BuildRequires:  python-setuptools
++>>>>>>> master
  Obsoletes:      %{name}-kwallet < %{version}
  Obsoletes:      %{name}-gnome < %{version}
  Obsoletes:      %{name} < %{version}
@@@ -28,71 -21,107 +40,173 @@@
  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.
++<<<<<<< HEAD
 +
 +%if 0%{?with_python3}
 +%package -n python3-keyring
 +Summary:        Python library to access the system keyring service for Python 3
 +Group:          Development/Libraries
++=======
+         
+ 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 3.x library to access the system keyring service
+ BuildRequires:  python3-devel
+ BuildRequires:  python3-setuptools
++>>>>>>> master
  
  %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.
++<<<<<<< HEAD
 +%endif
 +
 +%prep
 +%setup -q -n keyring-%{version}
++=======
+         
+ 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 -qn keyring-%{version}
+ rm -rf keyring.egg-info
++>>>>>>> master
  %patch0 -p1
+ %if 0%{?with_python3}
+ rm -rf %{py3dir}
+ cp -a . %{py3dir}
+ %endif
  
 +%if 0%{?with_python3}
 +rm -rf %{py3dir}
 +cp -a . %{py3dir}
 +%endif
 +
 +
  %build
++<<<<<<< HEAD
 +CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
 +
 +%if 0%{?with_python3}
 +pushd %{py3dir}
 +CFLAGS="${RPM_OPT_FLAGS}" %{__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
 +popd
 +%endif
 +
 +%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
 +
 +
 +%clean
 +%{__rm} -rf $RPM_BUILD_ROOT
++=======
+ %{__python2} setup.py build
+ %if 0%{?with_python3}
+ pushd %{py3dir}
+ %{__python3} setup.py build
+ popd
+ %endif
++>>>>>>> master
  
+ %install
+ %if 0%{?with_python3}
+ pushd %{py3dir}
+ %{__python3} setup.py install -O1 --skip-build --root %{buildroot}
+ cp -p %{buildroot}%{_bindir}/keyring %{buildroot}%{_bindir}/keyring-%{python3_version}
+ popd
+ %endif
+ %{__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
++<<<<<<< HEAD
 +%defattr(-,root,root,-)
 +%doc README.rst CHANGES.rst CONTRIBUTORS.txt demo
 +%{_bindir}/keyring
 +%{python_sitelib}/keyring
 +%{python_sitelib}/keyring-*.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}/*
 +%endif
 +
 +
 +%changelog
 +* Tue Oct 22 2013 rtnpro <rtnpro at gmail.com> - 3.1-1
++=======
+ %doc CHANGES.rst README.rst CONTRIBUTORS.txt demo
+ %{_bindir}/keyring
+ %{python2_sitelib}/keyring
+ %{python2_sitelib}/keyring-%{version}-py%{python2_version}.egg-info
+ 
+ %if 0%{?with_python3}
+ %files -n python3-keyring
+ %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
+ * Mon Dec 02 2013 Christopher Meng <rpm at cicku.me> - 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 <rtnpro at gmail.com> - 3.1-1
++>>>>>>> master
  - Bump to version 3.1
  
  * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7-3
diff --cc sources
index f235d30,992ff25..f11202e
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
 +3c82a11101a61d0e51624b41e09888b3  keyring-3.1.zip
++=======
+ 81291e0c7337affb71442e6c7671e77f  keyring-3.3.zip
++>>>>>>> master

More information about the scm-commits mailing list