From 139061e9c3ef7794ad56af5e61ea2ba9a0bc170008670b32abc89c1c5e9dbdd7 Mon Sep 17 00:00:00 2001 From: Frank Kunz Date: Wed, 20 Jan 2021 21:38:24 +0000 Subject: [PATCH 1/3] - Adapt build recipe to python 3 parallel installation support - Update to new upstream version 2.4.17: - Add support for Performance DC Bricklet and Servo Bricklet 2.0 OBS-URL: https://build.opensuse.org/package/show/electronics/brickv?expand=0&rev=15 --- brickv.changes | 7 +++++++ brickv.spec | 19 ++++++++++--------- v2.4.16.tar.gz | 3 --- v2.4.17.tar.gz | 3 +++ 4 files changed, 20 insertions(+), 12 deletions(-) delete mode 100644 v2.4.16.tar.gz create mode 100644 v2.4.17.tar.gz diff --git a/brickv.changes b/brickv.changes index 15df249..5b53a61 100644 --- a/brickv.changes +++ b/brickv.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Jan 20 21:22:02 UTC 2021 - Frank Kunz + +- Adapt build recipe to python 3 parallel installation support +- Update to new upstream version 2.4.17: + - Add support for Performance DC Bricklet and Servo Bricklet 2.0 + ------------------------------------------------------------------- Thu Dec 10 20:23:38 UTC 2020 - Frank Kunz diff --git a/brickv.spec b/brickv.spec index 1809699..e5d3a30 100644 --- a/brickv.spec +++ b/brickv.spec @@ -1,7 +1,7 @@ # # spec file for package brickv # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # Copyright (c) 2019 Frank Kunz # # All modifications and additions to the file contributed by third parties @@ -17,25 +17,26 @@ # +%{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: brickv -Version: 2.4.16 +Version: 2.4.17 Release: 0 Summary: Tinkerforge Brick Viewer License: GPL-2.0-only Group: Development/Tools/Debuggers URL: http://www.tinkerforge.com Source0: https://github.com/Tinkerforge/brickv/archive/v%{version}.tar.gz +BuildRequires: %{python_module qt5} +BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: iso-codes BuildRequires: mobile-broadband-provider-info -BuildRequires: python3-qt5 -BuildRequires: python3-rpm-macros -BuildRequires: python3-setuptools +BuildRequires: python-rpm-macros BuildRequires: update-desktop-files -Requires: python3-pytz -Requires: python3-qt5 -Requires: python3-serial -Requires: python3-tzlocal +Requires: python-pytz +Requires: python-qt5 +Requires: python-serial +Requires: python-tzlocal BuildArch: noarch %description diff --git a/v2.4.16.tar.gz b/v2.4.16.tar.gz deleted file mode 100644 index ee527ad..0000000 --- a/v2.4.16.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f2c7f6e41cb7b05b35e61c15d2f0768e62aeee59288d8dd36d698f0a385a96c8 -size 11332676 diff --git a/v2.4.17.tar.gz b/v2.4.17.tar.gz new file mode 100644 index 0000000..7fbee57 --- /dev/null +++ b/v2.4.17.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bd1998cac4583ca859c4cdd839fa3b54cf1fdca2c0fe26da33da1ddece5816b4 +size 11366957 From fb75d45f62cb21e93e8135f65bc39c8de5efc3b2b50feb64347300c11fe9a804 Mon Sep 17 00:00:00 2001 From: Frank Kunz Date: Sun, 21 Feb 2021 20:19:56 +0000 Subject: [PATCH 2/3] Fix requires packages OBS-URL: https://build.opensuse.org/package/show/electronics/brickv?expand=0&rev=16 --- brickv.spec | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/brickv.spec b/brickv.spec index e5d3a30..f72f726 100644 --- a/brickv.spec +++ b/brickv.spec @@ -17,7 +17,6 @@ # -%{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: brickv Version: 2.4.17 Release: 0 @@ -33,10 +32,10 @@ BuildRequires: iso-codes BuildRequires: mobile-broadband-provider-info BuildRequires: python-rpm-macros BuildRequires: update-desktop-files -Requires: python-pytz -Requires: python-qt5 -Requires: python-serial -Requires: python-tzlocal +Requires: python3-pytz +Requires: python3-qt5 +Requires: python3-serial +Requires: python3-tzlocal BuildArch: noarch %description @@ -51,7 +50,7 @@ export ISOCODES_JSON_PATH=/usr/share/iso-codes/json/iso_3166-1.json # force UTF-8 for build scripts export LANG=C.UTF-8 pushd src -python3 build_src.py +%python_exec build_src.py # remove no more needed build scripts rm -f build_src.py brickv/plugin_system/plugins/red/build_extra.py brickv/plugin_system/plugins/red/build_scripts.py popd @@ -63,13 +62,13 @@ install -m 644 -D -t %{buildroot}%{_udevrulesdir} build_data/linux/%{name}/lib/u install -m 644 -D -t %{buildroot}/usr/share/pixmaps build_data/linux/%{name}/usr/share/pixmaps/brickv-icon.png install -m 644 -D -t %{buildroot}/usr/share/applications build_data/linux/%{name}/usr/share/applications/%{name}.desktop popd -%fdupes -s %{buildroot}%{python3_sitelib}/brickv/ +%fdupes -s %{buildroot}%{python_sitelib}/brickv/ %suse_update_desktop_file -r %{name} Development Debugger %files -n %{name} %doc src/changelog README.rst %{_bindir}/%{name} -%{python3_sitelib}/brickv* +%{python_sitelib}/brickv* %{_udevrulesdir}/*.rules /usr/share/pixmaps/* /usr/share/applications/* From b22883ad75510df6217e992e9dc8ffb5da3aec176ac5120bb4c151b8f0d34e53 Mon Sep 17 00:00:00 2001 From: Frank Kunz Date: Sun, 21 Feb 2021 21:10:34 +0000 Subject: [PATCH 3/3] Fix leap OBS-URL: https://build.opensuse.org/package/show/electronics/brickv?expand=0&rev=17 --- brickv.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/brickv.spec b/brickv.spec index f72f726..e1d288c 100644 --- a/brickv.spec +++ b/brickv.spec @@ -31,6 +31,7 @@ BuildRequires: fdupes BuildRequires: iso-codes BuildRequires: mobile-broadband-provider-info BuildRequires: python-rpm-macros +BuildRequires: python3 BuildRequires: update-desktop-files Requires: python3-pytz Requires: python3-qt5 @@ -50,7 +51,7 @@ export ISOCODES_JSON_PATH=/usr/share/iso-codes/json/iso_3166-1.json # force UTF-8 for build scripts export LANG=C.UTF-8 pushd src -%python_exec build_src.py +python3 build_src.py # remove no more needed build scripts rm -f build_src.py brickv/plugin_system/plugins/red/build_extra.py brickv/plugin_system/plugins/red/build_scripts.py popd @@ -62,13 +63,13 @@ install -m 644 -D -t %{buildroot}%{_udevrulesdir} build_data/linux/%{name}/lib/u install -m 644 -D -t %{buildroot}/usr/share/pixmaps build_data/linux/%{name}/usr/share/pixmaps/brickv-icon.png install -m 644 -D -t %{buildroot}/usr/share/applications build_data/linux/%{name}/usr/share/applications/%{name}.desktop popd -%fdupes -s %{buildroot}%{python_sitelib}/brickv/ +%fdupes -s %{buildroot}%{python3_sitelib}/brickv/ %suse_update_desktop_file -r %{name} Development Debugger %files -n %{name} %doc src/changelog README.rst %{_bindir}/%{name} -%{python_sitelib}/brickv* +%{python3_sitelib}/brickv* %{_udevrulesdir}/*.rules /usr/share/pixmaps/* /usr/share/applications/*