Accepting request 761278 from electronics
- Update to new upstream version 2.4.11... OBS-URL: https://build.opensuse.org/request/show/761278 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/brickv?expand=0&rev=2
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
33ee766206
@ -1,44 +0,0 @@
|
||||
From 9d865bd9027f0fea4835886495ce235b6591a016 Mon Sep 17 00:00:00 2001
|
||||
From: Frank Kunz <mailinglists@kunz-im-inter.net>
|
||||
Date: Mon, 30 Sep 2019 12:02:07 +0200
|
||||
Subject: [PATCH 1/2] Support to use local iso codes and mobile providers
|
||||
database
|
||||
|
||||
This allows to select an already installed iso codes and mobile
|
||||
providers database during build instead of downloading them. It
|
||||
simplifies package build when the build environment does not have
|
||||
an internet connection. To select local installed files the two
|
||||
environment variables SERVICEPROVIDERS_XML_PATH and ISOCODES_JSON_PATH
|
||||
can be set. E.g.:
|
||||
|
||||
SERVICEPROVIDERS_XML_PATH=/path/to/serviceproviders.xml ISOCODES_JSON_PATH=/path/to/iso_3166-1.json ./build_src.py
|
||||
|
||||
Signed-off-by: Frank Kunz <mailinglists@kunz-im-inter.net>
|
||||
---
|
||||
.../plugins/red/build_serviceproviders.py | 10 ++++++++--
|
||||
1 file changed, 8 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/brickv/plugin_system/plugins/red/build_serviceproviders.py b/src/brickv/plugin_system/plugins/red/build_serviceproviders.py
|
||||
index 018923dc..96397755 100644
|
||||
--- a/src/brickv/plugin_system/plugins/red/build_serviceproviders.py
|
||||
+++ b/src/brickv/plugin_system/plugins/red/build_serviceproviders.py
|
||||
@@ -31,8 +31,14 @@ import urllib.error
|
||||
import xml.etree.ElementTree as ET
|
||||
from pprint import pformat
|
||||
|
||||
-XML_URL = 'https://git.gnome.org/browse/mobile-broadband-provider-info/plain/serviceproviders.xml'
|
||||
-ISO3166_URL = 'https://salsa.debian.org/iso-codes-team/iso-codes/raw/master/data/iso_3166-1.json'
|
||||
+try:
|
||||
+ XML_URL = 'file://{0}'.format(os.environ['SERVICEPROVIDERS_XML_PATH'])
|
||||
+except KeyError:
|
||||
+ XML_URL = 'https://git.gnome.org/browse/mobile-broadband-provider-info/plain/serviceproviders.xml'
|
||||
+try:
|
||||
+ ISO3166_URL = 'file://{0}'.format(os.environ['ISOCODES_JSON_PATH'])
|
||||
+except KeyError:
|
||||
+ ISO3166_URL = 'https://salsa.debian.org/iso-codes-team/iso-codes/raw/master/data/iso_3166-1.json'
|
||||
DATA_FILE = 'serviceprovider_data.py'
|
||||
|
||||
try:
|
||||
--
|
||||
2.23.0
|
||||
|
||||
@ -1,55 +0,0 @@
|
||||
From 16462d6580d79bfca47e7312bdb53f3fcfd33427 Mon Sep 17 00:00:00 2001
|
||||
From: Frank Kunz <mailinglists@kunz-im-inter.net>
|
||||
Date: Mon, 30 Sep 2019 13:39:06 +0200
|
||||
Subject: [PATCH 2/2] Fix shebang
|
||||
|
||||
Files that do not provide direct executable code should
|
||||
not have a shebang line.
|
||||
|
||||
Signed-off-by: Frank Kunz <mailinglists@kunz-im-inter.net>
|
||||
---
|
||||
src/brickv/bin_validator.py | 1 -
|
||||
src/brickv/hex_validator.py | 1 -
|
||||
src/brickv/object_creator.py | 1 -
|
||||
src/brickv/qhexedit.py | 1 -
|
||||
4 files changed, 4 deletions(-)
|
||||
|
||||
diff --git a/src/brickv/bin_validator.py b/src/brickv/bin_validator.py
|
||||
index a071d538..9bbc07c9 100644
|
||||
--- a/src/brickv/bin_validator.py
|
||||
+++ b/src/brickv/bin_validator.py
|
||||
@@ -1,4 +1,3 @@
|
||||
-#!/usr/bin/env python3
|
||||
# -*- coding: utf-8 -*-
|
||||
"""
|
||||
brickv (Brick Viewer)
|
||||
diff --git a/src/brickv/hex_validator.py b/src/brickv/hex_validator.py
|
||||
index a71a3df8..28936ab8 100644
|
||||
--- a/src/brickv/hex_validator.py
|
||||
+++ b/src/brickv/hex_validator.py
|
||||
@@ -1,4 +1,3 @@
|
||||
-#!/usr/bin/env python3
|
||||
# -*- coding: utf-8 -*-
|
||||
"""
|
||||
brickv (Brick Viewer)
|
||||
diff --git a/src/brickv/object_creator.py b/src/brickv/object_creator.py
|
||||
index 4ecb3899..e904a6fc 100644
|
||||
--- a/src/brickv/object_creator.py
|
||||
+++ b/src/brickv/object_creator.py
|
||||
@@ -1,4 +1,3 @@
|
||||
-#!/usr/bin/env python3
|
||||
# -*- coding: utf-8 -*-
|
||||
"""
|
||||
brickv (Brick Viewer)
|
||||
diff --git a/src/brickv/qhexedit.py b/src/brickv/qhexedit.py
|
||||
index 23fb2a49..b2fcd7ff 100644
|
||||
--- a/src/brickv/qhexedit.py
|
||||
+++ b/src/brickv/qhexedit.py
|
||||
@@ -1,4 +1,3 @@
|
||||
-#!/usr/bin/env python3
|
||||
# -*- coding: utf-8 -*-
|
||||
#
|
||||
# Copyright (C) 2011 Loic Jaquemet loic.jaquemet+python@gmail.com
|
||||
--
|
||||
2.23.0
|
||||
|
||||
@ -1,3 +1,23 @@
|
||||
-------------------------------------------------------------------
|
||||
Sun Jan 5 11:00:43 UTC 2020 - Frank Kunz <mailinglists@kunz-im-inter.net>
|
||||
|
||||
- Update to new upstream version 2.4.11:
|
||||
- Make Thermal Imaging Bricklet image view detachable
|
||||
- Fix firmware auto-update for Co-MCU Bricklets
|
||||
- Avoid potential config file writing collision between two Brick Viewer
|
||||
instances on Linux and macOS
|
||||
- Notarize Brick Viewer app to make it ready for macOS 10.15
|
||||
- Fix potential crash in WIFI Extension 2.0 firmware update detection logic
|
||||
- Fix exception hook for Python 3.8
|
||||
- Prefer hPa over mbar and Tesla over Gauss
|
||||
- Add Data Logger support for RS232 Bricklet 2.0 data reading
|
||||
- Add Server Monitoring support for Humidity Bricklet 2.0 temperature value
|
||||
- Lower Hardened Runtime restrictions to make ctypes work again on macOS
|
||||
- Fix encoding issues in Server Monitoring script
|
||||
- remove integrated upstream patches
|
||||
0001-Support-to-use-local-iso-codes-and-mobile-providers-.patch
|
||||
0002-Fix-shebang.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Oct 14 17:08:20 UTC 2019 - Frank Kunz <mailinglists@kunz-im-inter.net>
|
||||
|
||||
|
||||
23
brickv.spec
23
brickv.spec
@ -1,6 +1,7 @@
|
||||
#
|
||||
# spec file for package brickv
|
||||
#
|
||||
# Copyright (c) 2020 SUSE LLC
|
||||
# Copyright (c) 2019 Frank Kunz
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
@ -12,27 +13,28 @@
|
||||
# license that conforms to the Open Source Definition (Version 1.9)
|
||||
# published by the Open Source Initiative.
|
||||
|
||||
# Please submit bugfixes or comments via https://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
|
||||
Name: brickv
|
||||
Version: 2.4.9
|
||||
Version: 2.4.11
|
||||
Release: 0
|
||||
Summary: Tinkerforge Brick Viewer
|
||||
License: GPL-2.0-only
|
||||
Group: Development/Tools/Debuggers
|
||||
Url: http://www.tinkerforge.com
|
||||
URL: http://www.tinkerforge.com
|
||||
Source0: https://github.com/Tinkerforge/brickv/archive/v%{version}.tar.gz
|
||||
Patch0: 0001-Support-to-use-local-iso-codes-and-mobile-providers-.patch
|
||||
Patch1: 0002-Fix-shebang.patch
|
||||
BuildRequires: python3-setuptools
|
||||
BuildRequires: python3-rpm-macros
|
||||
BuildRequires: python3-qt5
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: mobile-broadband-provider-info
|
||||
BuildRequires: iso-codes
|
||||
BuildRequires: mobile-broadband-provider-info
|
||||
BuildRequires: python3-qt5
|
||||
BuildRequires: python3-rpm-macros
|
||||
BuildRequires: python3-setuptools
|
||||
BuildRequires: update-desktop-files
|
||||
Requires: python3-pytz
|
||||
Requires: python3-qt5
|
||||
Requires: python3-serial
|
||||
Requires: python3-pytz
|
||||
Requires: python3-tzlocal
|
||||
BuildArch: noarch
|
||||
|
||||
@ -41,8 +43,6 @@ Small Qt GUI to control and test all Bricks and Bricklets from Tinkerforge.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
|
||||
%build
|
||||
export SERVICEPROVIDERS_XML_PATH=/usr/share/mobile-broadband-provider-info/serviceproviders.xml
|
||||
@ -73,5 +73,4 @@ popd
|
||||
/usr/share/pixmaps/*
|
||||
/usr/share/applications/*
|
||||
|
||||
|
||||
%changelog
|
||||
|
||||
3
v2.4.11.tar.gz
Normal file
3
v2.4.11.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:f170a9125cc3befb4009798dd82d77543208aa9c147b9c6141d4fc5c4ae83215
|
||||
size 11265464
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:dc3d32c2d000eff5053552f7daf07cb050d054b882eda814c32aad4bcbaafc20
|
||||
size 11287662
|
||||
Loading…
Reference in New Issue
Block a user