From edb16aae4a0f9d36d30fa9f274ed4281de8309956489f0371bfae4f1f752bab6 Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Fri, 22 Mar 2013 14:01:43 +0000 Subject: [PATCH 1/3] - Bring back kde and gnome sub-packages, this time with proper requires OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-keyring?expand=0&rev=12 --- python-keyring.changes | 5 +++++ python-keyring.spec | 39 +++++++++++++++++++++++++++++++++++---- 2 files changed, 40 insertions(+), 4 deletions(-) diff --git a/python-keyring.changes b/python-keyring.changes index 34866fc..d48b913 100644 --- a/python-keyring.changes +++ b/python-keyring.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Mar 22 13:59:27 UTC 2013 - speilicke@suse.com + +- Bring back kde and gnome sub-packages, this time with proper requires + ------------------------------------------------------------------- Mon Feb 11 09:19:27 UTC 2013 - saschpe@suse.de diff --git a/python-keyring.spec b/python-keyring.spec index e101eff..4767fb3 100644 --- a/python-keyring.spec +++ b/python-keyring.spec @@ -32,10 +32,6 @@ BuildRequires: python-mock BuildRequires: python-nose BuildRequires: python-pytest-runner BuildRequires: python-unittest2 -Provides: python-keyring-kde = %{version} -Obsoletes: python-keyring-kde < %{version} -Provides: python-keyring-gnome = %{version} -Obsoletes: python-keyring-gnome < %{version} %if 0%{?suse_version} && 0%{?suse_version} <= 1110 %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %else @@ -46,6 +42,30 @@ BuildArch: noarch 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. +%package gnome +Summary: Store and access your passwords safely - Gnome backend +Group: Development/Languages/Python +Requires: %{name} = %{version} +Requires: python-gnomekeyring + +%description gnome +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. + +This package contains the Gnome (kwallet) backend. + +%package kde +Summary: Store and access your passwords safely - KDE backend +Group: Development/Languages/Python +Requires: %{name} = %{version} +Requires: python-kde4 + +%description kde +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. + +This package contains the KDE (kwallet) backend. + %prep %setup -q -n keyring-%{version} # For rpmlint warning: remove shebang from python library: @@ -56,6 +76,7 @@ python setup.py build %install python setup.py install --prefix=%{_prefix} --root=%{buildroot} +rm -r %{buildroot}%{python_sitelib}/keyring/tests # Don't ship testsuite %check nosetests @@ -65,5 +86,15 @@ nosetests %doc CONTRIBUTORS.txt README.rst CHANGES.rst %{_bindir}/keyring %{python_sitelib}/* +%exclude %{python_sitelib}/keyring/backends/Gnome.py* +%exclude %{python_sitelib}/keyring/backends/kwallet.py* + +%files gnome +%defattr(-,root,root) +%{python_sitelib}/keyring/backends/Gnome.py* + +%files kde +%defattr(-,root,root) +%{python_sitelib}/keyring/backends/kwallet.py* %changelog From 33202255b6638fdb98e67b63f1f7143cf7501c06e86409cc3a045556c649050d Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Fri, 22 Mar 2013 14:11:29 +0000 Subject: [PATCH 2/3] - Require python-gnomekeyring to have a working keyring on both Gnome and KDE. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-keyring?expand=0&rev=13 --- python-keyring.changes | 5 +++-- python-keyring.spec | 44 +++++++++--------------------------------- 2 files changed, 12 insertions(+), 37 deletions(-) diff --git a/python-keyring.changes b/python-keyring.changes index d48b913..f75569d 100644 --- a/python-keyring.changes +++ b/python-keyring.changes @@ -1,7 +1,8 @@ ------------------------------------------------------------------- -Fri Mar 22 13:59:27 UTC 2013 - speilicke@suse.com +Fri Mar 22 14:07:23 UTC 2013 - speilicke@suse.com -- Bring back kde and gnome sub-packages, this time with proper requires +- Require python-gnomekeyring to have a working keyring on both + Gnome and KDE. ------------------------------------------------------------------- Mon Feb 11 09:19:27 UTC 2013 - saschpe@suse.de diff --git a/python-keyring.spec b/python-keyring.spec index 4767fb3..0835889 100644 --- a/python-keyring.spec +++ b/python-keyring.spec @@ -32,6 +32,15 @@ BuildRequires: python-mock BuildRequires: python-nose BuildRequires: python-pytest-runner BuildRequires: python-unittest2 +Provides: python-keyring-kde = %{version} +Obsoletes: python-keyring-kde < %{version} +Provides: python-keyring-gnome = %{version} +Obsoletes: python-keyring-gnome < %{version} +#NOTE(saschpe): When running under KDE, the 'Gnome' keyring backend is chosen still. +# on openSUSE, python-gnomekeyring has much less deps than python-kde4, so we take +# it as the default: +Requires: python-gnomekeyring +Recommends: python-kde4 %if 0%{?suse_version} && 0%{?suse_version} <= 1110 %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %else @@ -42,30 +51,6 @@ BuildArch: noarch 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. -%package gnome -Summary: Store and access your passwords safely - Gnome backend -Group: Development/Languages/Python -Requires: %{name} = %{version} -Requires: python-gnomekeyring - -%description gnome -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. - -This package contains the Gnome (kwallet) backend. - -%package kde -Summary: Store and access your passwords safely - KDE backend -Group: Development/Languages/Python -Requires: %{name} = %{version} -Requires: python-kde4 - -%description kde -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. - -This package contains the KDE (kwallet) backend. - %prep %setup -q -n keyring-%{version} # For rpmlint warning: remove shebang from python library: @@ -76,7 +61,6 @@ python setup.py build %install python setup.py install --prefix=%{_prefix} --root=%{buildroot} -rm -r %{buildroot}%{python_sitelib}/keyring/tests # Don't ship testsuite %check nosetests @@ -86,15 +70,5 @@ nosetests %doc CONTRIBUTORS.txt README.rst CHANGES.rst %{_bindir}/keyring %{python_sitelib}/* -%exclude %{python_sitelib}/keyring/backends/Gnome.py* -%exclude %{python_sitelib}/keyring/backends/kwallet.py* - -%files gnome -%defattr(-,root,root) -%{python_sitelib}/keyring/backends/Gnome.py* - -%files kde -%defattr(-,root,root) -%{python_sitelib}/keyring/backends/kwallet.py* %changelog From 2ae9394168a48391a76786637d638cc2eb35a357729a73b1d1c4aba2ffa678ab Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Fri, 22 Mar 2013 14:30:45 +0000 Subject: [PATCH 3/3] - Recommend both python-gnomekeyring and python-kde4 needed for Gnome and KDE keyring implementations. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-keyring?expand=0&rev=14 --- python-keyring.changes | 4 ++-- python-keyring.spec | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/python-keyring.changes b/python-keyring.changes index f75569d..716af9e 100644 --- a/python-keyring.changes +++ b/python-keyring.changes @@ -1,8 +1,8 @@ ------------------------------------------------------------------- Fri Mar 22 14:07:23 UTC 2013 - speilicke@suse.com -- Require python-gnomekeyring to have a working keyring on both - Gnome and KDE. +- Recommend both python-gnomekeyring and python-kde4 needed for + Gnome and KDE keyring implementations. ------------------------------------------------------------------- Mon Feb 11 09:19:27 UTC 2013 - saschpe@suse.de diff --git a/python-keyring.spec b/python-keyring.spec index 0835889..039e313 100644 --- a/python-keyring.spec +++ b/python-keyring.spec @@ -36,10 +36,7 @@ Provides: python-keyring-kde = %{version} Obsoletes: python-keyring-kde < %{version} Provides: python-keyring-gnome = %{version} Obsoletes: python-keyring-gnome < %{version} -#NOTE(saschpe): When running under KDE, the 'Gnome' keyring backend is chosen still. -# on openSUSE, python-gnomekeyring has much less deps than python-kde4, so we take -# it as the default: -Requires: python-gnomekeyring +Recommends: python-gnomekeyring Recommends: python-kde4 %if 0%{?suse_version} && 0%{?suse_version} <= 1110 %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}