Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package whipper for openSUSE:Factory checked
in at 2021-04-01 14:17:24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/whipper (Old)
and /work/SRC/openSUSE:Factory/.whipper.new.2401 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "whipper"
Thu Apr 1 14:17:24 2021 rev:4 rq:882123 version:0.9.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/whipper/whipper.changes 2020-12-02
13:58:01.469788690 +0100
+++ /work/SRC/openSUSE:Factory/.whipper.new.2401/whipper.changes
2021-04-01 14:18:41.628108330 +0200
@@ -1,0 +2,5 @@
+Tue Mar 30 08:44:31 UTC 2021 - Dr. Werner Fink <wer...@suse.de>
+
+- Make it build again
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ whipper.spec ++++++
--- /var/tmp/diff_new_pack.RlTFjZ/_old 2021-04-01 14:18:42.016108800 +0200
+++ /var/tmp/diff_new_pack.RlTFjZ/_new 2021-04-01 14:18:42.020108805 +0200
@@ -1,7 +1,7 @@
#
# spec file for package whipper
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,6 +16,10 @@
#
+%{?!python_module:%define python_module() python-%{**} python3-%{**}}
+%define skip_python2 1
+%define skip_python36 1
+
Name: whipper
Version: 0.9.0
Release: 0
@@ -24,36 +28,36 @@
Group: Productivity/Multimedia/CD/Grabbers
URL: https://github.com/JoeLametta/whipper/
Source0:
https://github.com/JoeLametta/whipper/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
+BuildRequires: %{python_module devel}
+BuildRequires: %{python_module gobject}
+BuildRequires: %{python_module setuptools_scm}
+BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
BuildRequires: libsndfile-devel
BuildRequires: python-rpm-macros
-BuildRequires: python3-devel
-BuildRequires: python3-gobject
-BuildRequires: python3-setuptools
-BuildRequires: python3-setuptools_scm
# SECTION test requirements
BuildRequires: cd-paranoia >= 10.2
+BuildRequires: %{python_module Twisted}
+BuildRequires: %{python_module musicbrainzngs}
+BuildRequires: %{python_module mutagen}
+BuildRequires: %{python_module pycdio}
+BuildRequires: %{python_module pytest}
+BuildRequires: %{python_module requests}
+BuildRequires: %{python_module ruamel.yaml}
BuildRequires: cdrdao
-BuildRequires: python3-Twisted
-BuildRequires: python3-musicbrainzngs
-BuildRequires: python3-mutagen
-BuildRequires: python3-pycdio
-BuildRequires: python3-pytest
-BuildRequires: python3-requests
-BuildRequires: python3-ruamel.yaml
BuildRequires: sox
# /SECTION
# nb: there is a difference between cd-paranoia [we want] and
# cdparanoia [we don't]
Requires: cd-paranoia >= 10.2
+Requires: %{python_module gobject}
+Requires: %{python_module musicbrainzngs}
+Requires: %{python_module mutagen}
+Requires: %{python_module pycdio}
+Requires: %{python_module requests}
+Requires: %{python_module ruamel.yaml}
Requires: cdrdao
Requires: flac
-Requires: python3-gobject
-Requires: python3-musicbrainzngs
-Requires: python3-mutagen
-Requires: python3-pycdio
-Requires: python3-requests
-Requires: python3-ruamel.yaml
Requires: sox
Conflicts: morituri
@@ -69,17 +73,17 @@
%build
echo "Version: %{version}" > PKG-INFO
-%python3_build
+%python_build
%install
-%python3_install
-%fdupes %{buildroot}%{python_sitearch}
+%python_install
+%python_expand %fdupes %{buildroot}%{$python_sitearch}
%check
cd whipper/test/
# Don't run accurip tests since those needs a network connection to
www.accuraterip.com
rm -f test_common_accurip.py
-export PYTHONPATH=%{buildroot}%{python3_sitearch}
+%python_expand export PYTHONPATH=%{buildroot}%{$python_sitearch}
%pytest
%files
@@ -87,9 +91,9 @@
%license LICENSE
%{_bindir}/accuraterip-checksum
%{_bindir}/whipper
-%{python3_sitearch}/whipper
-%{python3_sitearch}/accuraterip.cpython*
-%{python3_sitearch}/%{name}-%{version}-py%{py3_ver}.egg-info
+%{python_sitearch}/whipper
+%{python_sitearch}/accuraterip.cpython*
+%{python_sitearch}/%{name}-%{version}-py%{python_version}.egg-info
%{_datadir}/metainfo/com.github.whipper_team.Whipper.metainfo.xml
%changelog
