diff --git a/Trololio-LICENSE b/LICENSE similarity index 100% rename from Trololio-LICENSE rename to LICENSE diff --git a/python-Trololio.changes b/python-Trololio.changes index 29ec74d..0703793 100644 --- a/python-Trololio.changes +++ b/python-Trololio.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Dec 6 14:32:51 UTC 2018 - Tomáš Chvátal + +- Run %fdupes call properly +- Shorten the link for the LICENSE file + ------------------------------------------------------------------- Sun Jul 8 13:15:22 UTC 2018 - Neal Gompa diff --git a/python-Trololio.spec b/python-Trololio.spec index ccc1917..2c31fd0 100644 --- a/python-Trololio.spec +++ b/python-Trololio.spec @@ -1,6 +1,7 @@ # # spec file for package python-Trololio # +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2018 Neal Gompa . # # All modifications and additions to the file contributed by third parties @@ -12,7 +13,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/ # @@ -26,16 +27,15 @@ Group: Development/Libraries/Python URL: http://github.com/ThinkChaos/Trololio Source: https://files.pythonhosted.org/packages/source/T/Trololio/Trololio-%{version}.zip # License file from source repository -Source1: https://raw.githubusercontent.com/ThinkChaos/Trololio/25fe6b9a0d9e2dc69d59f1b5c6e6e56a6615c305/LICENSE#/Trololio-LICENSE +Source1: https://raw.githubusercontent.com/ThinkChaos/Trololio/master/LICENSE BuildRequires: %{python_module setuptools} -BuildRequires: unzip BuildRequires: fdupes BuildRequires: python-rpm-macros -%if "%{python_flavor}" == "python2" +BuildRequires: unzip +BuildArch: noarch +%ifpython2 Requires: python2-trollius %endif - -BuildArch: noarch %python_subpackages %description @@ -46,7 +46,6 @@ It addresses the differences listed in Trollius and Tulip: * Provides missing objects and aliases for the others. * Synchronizes debug environnement variables. - %prep %setup -q -n Trololio-%{version} @@ -58,8 +57,7 @@ cp %{SOURCE1} LICENSE %install %python_install - -%fdupes %{buildroot}/%{_prefix} +%python_expand %fdupes %{buildroot}%{$python_sitelib} %files %{python_files} %{python_sitelib}/*