From 3ced07c82526e59fce9288b8bc4367363dd360b5a3476e9b4679c3711802d988 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 7 Dec 2018 11:47:51 +0000 Subject: [PATCH] - Make sure to run %fdupes correctly OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pmw?expand=0&rev=18 --- python-pmw.changes | 5 +++++ python-pmw.spec | 26 +++++++++++--------------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/python-pmw.changes b/python-pmw.changes index 237e936..f539af1 100644 --- a/python-pmw.changes +++ b/python-pmw.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Dec 7 11:47:08 UTC 2018 - Tomáš Chvátal + +- Make sure to run %fdupes correctly + ------------------------------------------------------------------- Wed Aug 16 21:32:37 UTC 2017 - dhall@wustl.edu diff --git a/python-pmw.spec b/python-pmw.spec index f70318f..ada91db 100644 --- a/python-pmw.spec +++ b/python-pmw.spec @@ -1,7 +1,7 @@ # # spec file for package python-pmw # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -21,25 +21,22 @@ Name: python-pmw Version: 2.0.1 Release: 0 -Url: http://pmw.sourceforge.net/ Summary: High-level compound widgets in Python using the Tkinter module -#PATCH-FIX-UPSTREAM py36.patch https://sourceforge.net/p/pmw/patches/7/ License: MIT Group: Development/Languages/Python -Patch: py36.patch -Source: https://pypi.python.org/packages/e7/20/8d0c4ba96a5fe62e1bcf2b8a212ccfecd67ad951e8f3e89cf147d63952aa/Pmw-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: %{python_module base} +URL: http://pmw.sourceforge.net/ +Source: https://files.pythonhosted.org/packages/source/P/Pmw/Pmw-%{version}.tar.gz +#PATCH-FIX-UPSTREAM py36.patch https://sourceforge.net/p/pmw/patches/7/ +Patch0: py36.patch +BuildRequires: %{python_module setuptools} +BuildRequires: fdupes BuildRequires: python-rpm-macros Requires: python-tk -BuildRequires: fdupes BuildArch: noarch -%define oldpython python %ifpython2 Obsoletes: %{oldpython}-pmw < %{version} Provides: %{oldpython}-pmw = %{version} %endif - %python_subpackages %description @@ -50,7 +47,7 @@ dialog windows. %prep %setup -q -n Pmw-%{version} -%patch +%patch0 sed -i '1d' Pmw/Pmw_1_3_3/{demos/All,bin/bundlepmw,tests/All,tests/ManualTests}.py # Fix non-executable scripts sed -i '1d' Pmw/Pmw_2_0_1/{demos/All,bin/bundlepmw,tests/All,tests/ManualTests}.py # Fix non-executable scripts @@ -59,10 +56,9 @@ sed -i '1d' Pmw/Pmw_2_0_1/{demos/All,bin/bundlepmw,tests/All,tests/ManualTests}. %install %python_install -%fdupes %{buildroot}/%{_prefix} +%python_expand %fdupes %{buildroot}%{$python_sitelib} -%files %python_files -%defattr(-,root,root,-) +%files %{python_files} %{python_sitelib}/* %changelog