[python-keyring/f14/master] imported python-keyring-0.5.1 to f14

[Ratnadeep Debnath]

commit 227694f96ca6a2441cac3ce5d18d3a47a8ed9a02
Author: Ratnadeep Debnath <rtnpro at gmail.com>
Date:   Wed Jan 26 19:12:44 2011 +0530

    imported python-keyring-0.5.1 to f14

 python-keyring.spec |   65 +++++++++++++-------------------------------------
 sources             |    2 +-
 2 files changed, 18 insertions(+), 49 deletions(-)
---
diff --git a/python-keyring.spec b/python-keyring.spec
index d602afb..8d1ca84 100644
--- a/python-keyring.spec
+++ b/python-keyring.spec
@@ -1,12 +1,7 @@
 %global upstream_name keyring
 
-%{?filter_setup:
-%filter_provides_in %{python_sitearch}/.*\.so$
-%filter_setup
-}
-
 Name:           python-keyring
-Version:        0.4
+Version:        0.5.1
 Release:        1%{?dist}
 Summary:        Python library to access the system keyring service
 
@@ -14,18 +9,12 @@ Source0:        http://pypi.python.org/packages/source/k/keyring/%{upstream_name
 License:        Python
 Group:          Development/Libraries
 URL:            http://pypi.python.org/pypi/keyring
-
-# Actually the main package is noarch but -gnome and -kwallet contain
-# architecture-specific code. Currently it's impossible to have a noarch main
-# package with arch-specific subpackages. Therefore we can't use 'noarch' here.
+BuildArch:      noarch
 BuildRequires:  python-devel
-
-# Gnome-Keyring
-BuildRequires:  dbus-devel glib2-devel gnome-keyring-devel
-
-# KWallet
-BuildRequires:  kdelibs4-devel
-
+Obsoletes:      %{name}-kwallet < %{version}
+Obsoletes:      %{name}-gnome < %{version}
+Obsoletes:      %{name} < %{version}
+Obsoletes:      %{name} < %{version}
 
 %description
 The Python keyring lib provides a easy way to access the system keyring 
@@ -36,32 +25,11 @@ This package only provides file-based pseudo-keyrings. To interface with
 gnome-keyring or KWallet, please install one of python-keyring-gnome or 
 python-keyring-kwallet.
 
-
-%package        gnome
-Summary:        Use gnome-keyring as backend for python-keyring
-Requires:       %{name} = %{version}-%{release}
-Requires:       dbus gnome-keyring
-
-%description    gnome
-Integrate python-keyring with gnome-keyring so passwords can be read from/
-stored in the gnome-keyring database.
-
-
-%package        kwallet
-Summary:        Use KWallet as backend for python-keyring
-Requires:       %{name} = %{version}-%{release}
-
-%description    kwallet
-Integrate python-keyring with KWallet so passwords can be read 
-from/stored in the KWallet database.
-
-
 %prep
 %setup -q -n %{upstream_name}-%{version}
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="-L %{_libdir}/kde4/devel" %{__python} setup.py build
-
+CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
@@ -73,19 +41,20 @@ CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="-L %{_libdir}/kde4/devel" %{__python} setup.py
 %files 
 %defattr(-,root,root,-)
 %doc README.txt demo
-%{python_sitearch}/%{upstream_name}
-%{python_sitearch}/%{upstream_name}-*.egg-info
+%{python_sitelib}/%{upstream_name}
+%{python_sitelib}/%{upstream_name}-*.egg-info
 
-%files gnome
-%defattr(-,root,root,-) 
-%{python_sitearch}/gnome_keyring.so
+%changelog
+* Mon Jan 10 2011 rtnpro <rtnpro at gmail.com> 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
 
-%files kwallet
-%defattr(-,root,root,-) 
-%{python_sitearch}/kde_kwallet.so
+* Sun Nov 28 2010 rtnpro <rtnpro at gmail.com> 0.5-2
+- Removed sub-packages: gnome and kwallet; removed "Requires: PyKDE4 PyQt4" 
 
+* Mon Nov 22 2010 rtnpro <rtnpro at gmail.com> 0.5-1
+- RPM for keyring-0.5
 
-%changelog
 * Mon Nov 01 2010 rtnpro <rtnpro at gmail.com> 0.4-1
 - Updated rpm to python-keyring version 0.4
 
diff --git a/sources b/sources
index 34707f8..1d6471a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f4c8fe1a3aa7236e437679d03f5f52c2  keyring-0.4.tar.gz
+a2f0dcea7185580c163ef2db1f4fbe0c  keyring-0.5.1.tar.gz