Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package trytond_country for openSUSE:Factory
checked in at 2022-03-09 18:47:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/trytond_country (Old)
and /work/SRC/openSUSE:Factory/.trytond_country.new.2349 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "trytond_country"
Wed Mar 9 18:47:31 2022 rev:10 rq:960368 version:6.0.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/trytond_country/trytond_country.changes
2022-03-07 17:48:46.207088151 +0100
+++
/work/SRC/openSUSE:Factory/.trytond_country.new.2349/trytond_country.changes
2022-03-11 11:37:01.674320891 +0100
@@ -1,0 +2,11 @@
+Tue Mar 8 13:35:21 UTC 2022 - Axel Braun <axel.br...@gmx.de>
+
+- added pycountry.diff (https://bugs.tryton.org/issue11128 )
+ build-conditions for TW added
+
+-------------------------------------------------------------------
+Tue Mar 8 08:59:37 UTC 2022 - Axel Braun <axel.br...@gmx.de>
+
+- runtime dependency python-pycountry added
+
+-------------------------------------------------------------------
New:
----
pycountry.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ trytond_country.spec ++++++
--- /var/tmp/diff_new_pack.KZf4s9/_old 2022-03-11 11:37:02.166321467 +0100
+++ /var/tmp/diff_new_pack.KZf4s9/_new 2022-03-11 11:37:02.174321477 +0100
@@ -28,10 +28,18 @@
Source:
http://downloads.tryton.org/%{majorver}/%{name}-%{version}.tar.gz
Source2:
http://downloads.tryton.org/%{majorver}/%{name}-%{version}.tar.gz.asc
Source3:
https://keybase.io/cedrickrier/pgp_keys.asc?fingerprint=7C5A4360F6DF81ABA91FD54D6FF50AFE03489130#/%{name}.keyring
+Patch0: pycountry.diff
# List of additional build dependencies
BuildRequires: fdupes
+BuildRequires: python-rpm-macros
BuildRequires: python3-setuptools
Requires: proteus
+# Leap uses an older pycountry
+%if 0%{?suse_version} <= 1500
+Requires: python3-pycountry <= 20.7.3
+%else
+Requires: python3-pycountry
+%endif
Requires: trytond
BuildArch: noarch
@@ -47,6 +55,13 @@
%prep
%setup -q
+echo %{?suse_version}
+
+# TW uses newer pycountry
+%if 0%{?suse_version} > 1500
+%patch0 -p1
+%endif
+
%build
%python3_build
++++++ pycountry.diff ++++++
diff -U 3 -dHrN -- a/country.py b/country.py
--- a/country.py 2021-05-03 16:34:04.000000000 +0200
+++ b/country.py 2022-03-08 16:43:29.615772343 +0100
@@ -94,15 +94,18 @@
code = fields.Char('Code', required=True, select=True,
help="The ISO code of the subdivision.")
type = fields.Selection([
+ (None, ""),
('administration', 'Administration'),
('administrative area', 'Administrative area'),
('administrative atoll', 'Administrative atoll'),
+ ('administrative precinct', 'Administrative precinct'),
('administrative region', 'Administrative Region'),
('administrative territory', 'Administrative Territory'),
('area', 'Area'),
('atoll', 'Atoll'),
('arctic region', 'Arctic Region'),
('autonomous city', 'Autonomous City'),
+ ('autonomous city in north africa', 'Autonomous city in north africa'),
('autonomous commune', 'Autonomous Commune'),
('autonomous communities', 'Autonomous communities'),
('autonomous community', 'Autonomous community'),
@@ -118,44 +121,63 @@
('autonomous territorial unit', 'Autonomous territorial unit'),
('borough', 'Borough'),
('canton', 'Canton'),
+ ('capital', 'Capital'),
('capital city', 'Capital city'),
('capital district', 'Capital District'),
('capital metropolitan city', 'Capital Metropolitan City'),
('capital territory', 'Capital Territory'),
+ ('chain (of islands)', 'Chain (of islands)'),
('chains (of islands)', 'Chains (of islands)'),
('city', 'City'),
('city corporation', 'City corporation'),
+ ('city municipality', 'City municipality'),
('city with county rights', 'City with county rights'),
('commune', 'Commune'),
('constitutional province', 'Constitutional province'),
('council area', 'Council area'),
('country', 'Country'),
('county', 'County'),
+ ('decentralized regional entity', 'Decentralized regional entity'),
('department', 'Department'),
('dependency', 'Dependency'),
('development region', 'Development region'),
('district', 'District'),
('district council area', 'District council area'),
+ ('district municipality', 'District municipality'),
+ ('districts under republic administration',
+ 'Districts under republic administration'),
+ ('district with special status', 'District with special status'),
('division', 'Division'),
('economic prefecture', 'Economic Prefecture'),
('economic region', 'Economic region'),
('emirate', 'Emirate'),
('entity', 'Entity'),
+ ('federal capital territory', 'Federal capital territory'),
('federal dependency', 'Federal Dependency'),
('federal district', 'Federal District'),
+ ('federal territory', 'Federal Territory'),
('federal territories', 'Federal Territories'),
+ ('free municipal consortium', 'Free municipal consortium'),
('geographical entity', 'Geographical entity'),
('geographical region', 'Geographical region'),
('geographical unit', 'Geographical unit'),
('governorate', 'Governorate'),
+ ('group of islands (20 inhabited islands)',
+ 'Group of islands (20 inhabited islands)'),
('included for completeness', 'Included for completeness'),
('indigenous region', 'Indigenous region'),
('island', 'Island'),
('island council', 'Island council'),
('island group', 'Island group'),
+ ('islands, groups of islands', 'Islands, groups of islands'),
+ ('land', 'Land'),
('local council', 'Local council'),
('london borough', 'London borough'),
+ ('metropolitan administration', 'Metropolitan administration'),
+ ('metropolitan city', 'Metropolitan city'),
('metropolitan cities', 'Metropolitan cities'),
+ ('metropolitan collectivity with special status',
+ 'Metropolitan collectivity with special status'),
('metropolitan department', 'Metropolitan department'),
('metropolitan district', 'Metropolitan district'),
('metropolitan region', 'Metropolitan region'),
@@ -164,12 +186,18 @@
('nation', 'Nation'),
('oblast', 'Oblast'),
('outlying area', 'Outlying area'),
+ ('overseas collectivity', 'Overseas collectivity'),
+ ('overseas collectivity with special status',
+ 'Overseas collectivity with special status'),
('overseas department', 'Overseas department'),
('overseas region', 'Overseas region'),
('overseas region/department', 'Overseas region/department'),
+ ('overseas territory', 'Overseas territory'),
('overseas territorial collectivity',
'Overseas territorial collectivity'),
+ ('pakistan administered area', 'Pakistan administered area'),
('parish', 'Parish'),
+ ('popularate', 'Popularate'),
('popularates', 'Popularates'),
('prefecture', 'Prefecture'),
('principality', 'Principality'),
@@ -178,27 +206,37 @@
('rayon', 'Rayon'),
('region', 'Region'),
('regional council', 'Regional council'),
+ ('regional state', 'Regional state'),
('republic', 'Republic'),
('republican city', 'Republican City'),
+ ('rural municipality', 'Rural municipality'),
('self-governed part', 'Self-governed part'),
+ ('special administrative city', 'Special administrative city'),
('special administrative region', 'Special administrative region'),
('special city', 'Special city'),
('special district', 'Special District'),
('special island authority', 'Special island authority'),
('special municipality', 'Special Municipality'),
('special region', 'Special Region'),
+ ('special self-governing city', 'Special self-governing city'),
+ ('special self-governing province', 'Special self-governing province'),
('special zone', 'Special zone'),
('state', 'State'),
('territorial unit', 'Territorial unit'),
('territory', 'Territory'),
+ ('town', 'Town'),
('town council', 'Town council'),
('two-tier county', 'Two-tier county'),
('union territory', 'Union territory'),
('unitary authority', 'Unitary authority'),
('unitary authority (england)', 'Unitary authority (england)'),
('unitary authority (wales)', 'Unitary authority (wales)'),
+ ('urban community', 'Urban community'),
+ ('urban municipality', 'Urban municipality'),
+ ('voivodship', 'Voivodship'),
+ ('ward', 'Ward'),
('zone', 'zone'),
- ], 'Type', required=True)
+ ], "Type")
parent = fields.Many2One('country.subdivision', 'Parent',
domain=[
('country', '=', Eval('country', -1)),
@@ -220,10 +258,15 @@
super().__register__(module_name)
+ table_h = cls.__table_handler__(module_name)
+
# Migration from 5.2: remove country data
cursor.execute(*data.delete(where=(data.module == 'country')
& (data.model == cls.__name__)))
+ # Migration from 6.2: remove type required
+ table_h.not_null_action('type', action='remove')
+
@classmethod
def search_rec_name(cls, name, clause):
return ['OR',
