From 465d01205ad108abdb0a2d68152c95ffb549abf1c6e262af84ab3e1ddb60d6d3 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Tue, 24 Jan 2012 14:30:35 +0000 Subject: [PATCH 1/3] Accepting request 101354 from Virtualization:Cloud:OpenStack:Diablo - fix Obsoletes OBS-URL: https://build.opensuse.org/request/show/101354 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-M2Crypto?expand=0&rev=8 --- python-M2Crypto.changes | 5 +++++ python-M2Crypto.spec | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/python-M2Crypto.changes b/python-M2Crypto.changes index 429838f..05fb66f 100644 --- a/python-M2Crypto.changes +++ b/python-M2Crypto.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jan 24 13:49:57 UTC 2012 - bwiedemann@suse.com + +- fix Obsoletes + ------------------------------------------------------------------- Tue Dec 13 13:16:21 UTC 2011 - coolo@suse.com diff --git a/python-M2Crypto.spec b/python-M2Crypto.spec index 13c2c84..f1999af 100644 --- a/python-M2Crypto.spec +++ b/python-M2Crypto.spec @@ -1,7 +1,7 @@ # # spec file for package python-M2Crypto # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,6 +15,8 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + + Name: python-M2Crypto Version: 0.21.1 Release: 0 @@ -38,7 +40,7 @@ BuildRequires: fdupes %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Provides: python-m2crypto = %{version} # TODO: Change <= back to = with new upstream release -Obsoletes: python-m2crypto <= %{version} +Obsoletes: python-m2crypto < %{version} %description M2Crypto is a crypto and SSL toolkit for Python featuring the From 6fa97fc6e7c58d52e73760a32a8d94f4d1768b7b35fb7c57537feb89b8c8b3b1 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Tue, 24 Jan 2012 14:34:33 +0000 Subject: [PATCH 2/3] remove unneeded todo OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-M2Crypto?expand=0&rev=9 --- python-M2Crypto.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/python-M2Crypto.spec b/python-M2Crypto.spec index f1999af..4103e52 100644 --- a/python-M2Crypto.spec +++ b/python-M2Crypto.spec @@ -39,7 +39,6 @@ BuildRequires: fdupes %endif %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Provides: python-m2crypto = %{version} -# TODO: Change <= back to = with new upstream release Obsoletes: python-m2crypto < %{version} %description From e60e7b485f9c91fc53eb0611fed1908d83d613e943729987fca1d7f3992d5883 Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Wed, 31 Oct 2012 13:10:53 +0000 Subject: [PATCH 3/3] - Narrow the scops of fdupes (see bnc#784670) OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-M2Crypto?expand=0&rev=10 --- python-M2Crypto.changes | 5 +++++ python-M2Crypto.spec | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/python-M2Crypto.changes b/python-M2Crypto.changes index 05fb66f..dd868f8 100644 --- a/python-M2Crypto.changes +++ b/python-M2Crypto.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Oct 31 13:09:21 UTC 2012 - saschpe@suse.de + +- Narrow the scops of fdupes (see bnc#784670) + ------------------------------------------------------------------- Tue Jan 24 13:49:57 UTC 2012 - bwiedemann@suse.com diff --git a/python-M2Crypto.spec b/python-M2Crypto.spec index 4103e52..5e33d49 100644 --- a/python-M2Crypto.spec +++ b/python-M2Crypto.spec @@ -16,7 +16,6 @@ # - Name: python-M2Crypto Version: 0.21.1 Release: 0 @@ -66,7 +65,7 @@ CFLAGS="%{optflags}" python setup.py build chmod 0644 demo/{https.howto/get_https,ssl/twistedsslclient,ssl/twistedsslserver,tinderbox/slave,x509/certdata2pem}.py # Fix executable bit for documentation: python setup.py install --prefix=%{_prefix} --root=%{buildroot} %if 0%{?suse_version} > 1010 -%fdupes -s . +%fdupes -s demo %endif %files