commit nml for openSUSE:Factory

2020-03-25 Thread root
Hello community,

here is the log from the commit of package nml for openSUSE:Factory checked in 
at 2020-03-25 23:49:22

Comparing /work/SRC/openSUSE:Factory/nml (Old)
 and  /work/SRC/openSUSE:Factory/.nml.new.3160 (New)


Package is "nml"

Wed Mar 25 23:49:22 2020 rev:15 rq:788275 version:0.4.5

Changes:

--- /work/SRC/openSUSE:Factory/nml/nml.changes  2019-06-03 18:58:48.968352170 
+0200
+++ /work/SRC/openSUSE:Factory/.nml.new.3160/nml.changes2020-03-25 
23:50:34.164016230 +0100
@@ -1,0 +2,7 @@
+Tue Mar 24 17:28:15 UTC 2020 - Christophe Giboudeaux 
+
+- Add upstream patch to fix the python 3.8 compatibility:
+  * 0001-Fix-52-time.clock-has-been-removed-in-python-3.8-53.patch
+
+
+---

New:

  0001-Fix-52-time.clock-has-been-removed-in-python-3.8-53.patch



Other differences:
--
++ nml.spec ++
--- /var/tmp/diff_new_pack.oMVLNB/_old  2020-03-25 23:50:35.004016008 +0100
+++ /var/tmp/diff_new_pack.oMVLNB/_new  2020-03-25 23:50:35.004016008 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package nml
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,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/
 #
 
 
@@ -20,13 +20,15 @@
 Version:0.4.5
 Release:0
 Summary:NewGRF Meta Language
-License:GPL-2.0+
+License:GPL-2.0-or-later
 Group:  Development/Tools/Building
-Url:http://dev.openttdcoop.org/projects/nml
+URL:http://dev.openttdcoop.org/projects/nml
 Source: 
http://bundles.openttdcoop.org/nml/releases/%{version}/%{name}-%{version}.tar.gz
 Source99:   nml-rpmlintrc
 #PATCH-FIX-UPSTREAM Pillow changed it's version string 
https://github.com/OpenTTD/nml/pull/29
 Patch0:python-pillow-version.patch
+# PATCH-FIX-UPSTREAM time.clock() is gone in python 3.8
+Patch1: 0001-Fix-52-time.clock-has-been-removed-in-python-3.8-53.patch
 BuildRequires:  gcc
 BuildRequires:  python3-devel
 # We need the required packages also on building for regression tests:
@@ -44,7 +46,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -p1
+%autopatch -p1
 
 %build
 make

++ 0001-Fix-52-time.clock-has-been-removed-in-python-3.8-53.patch ++
>From e706f93926983b4c700953c92bdb35cdd5ffa2f0 Mon Sep 17 00:00:00 2001
From: glx22 
Date: Sun, 20 Oct 2019 11:05:25 +0200
Subject: [PATCH] Fix #52: time.clock() has been removed in python 3.8 (#53)

---
 nml/generic.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nml/generic.py b/nml/generic.py
index ce064b6..8ee602f 100644
--- a/nml/generic.py
+++ b/nml/generic.py
@@ -295,7 +295,7 @@ def clear_progress():
 hide_progress()
 
 if (progress_message is not None) and (verbosity_level >= 
VERBOSITY_TIMING):
-print("{} {:.1f} s".format(progress_message, time.clock() - 
progress_start_time))
+print("{} {:.1f} s".format(progress_message, time.process_time() - 
progress_start_time))
 
 progress_message = None
 progress_start_time = None
@@ -324,12 +324,12 @@ def print_progress(msg, incremental = False):
 progress_message = msg
 
 if incremental:
-t = time.clock()
+t = time.process_time()
 if (progress_update_time is not None) and (t - progress_update_time < 
1):
 return
 progress_update_time = t
 else:
-progress_start_time = time.clock()
+progress_start_time = time.process_time()
 
 print_eol(msg)
 
-- 
2.25.1




commit nml for openSUSE:Factory

2019-06-03 Thread root
Hello community,

here is the log from the commit of package nml for openSUSE:Factory checked in 
at 2019-06-03 18:58:29

Comparing /work/SRC/openSUSE:Factory/nml (Old)
 and  /work/SRC/openSUSE:Factory/.nml.new.5148 (New)


Package is "nml"

Mon Jun  3 18:58:29 2019 rev:14 rq:707210 version:0.4.5

Changes:

--- /work/SRC/openSUSE:Factory/nml/nml.changes  2015-11-17 14:22:49.0 
+0100
+++ /work/SRC/openSUSE:Factory/.nml.new.5148/nml.changes2019-06-03 
18:58:48.968352170 +0200
@@ -1,0 +2,32 @@
+Mon May 27 14:41:43 UTC 2019 - Jon Brightwell 
+
+- Removed nml-python341.diff - python bug, fixed python upstream (3.4.2rc1).
+- Removed nml-0.4.2-pillow.diff - superceded upstream
+- added python-pillow-version.patch - fixes incorrect version number query 
https://github.com/OpenTTD/nml/pull/29
+
+- update to 0.4.5
+  - Feature: increase cargo ID range from 32 to 64, to support 64 cargos in 
OpenTTD 11ab3c4ea2f6a6d29efda8c9ba2af04194621ea7
+  - Change: Support more DCxx strings for OpenTTD r27769.
+  - Add: Properties for vehicle sprite stack.
+  - Add: CB_FLAG_MORE_SPRITES, PALETTE_IDENTITY
+  - Add: String command 9A 1E CARGO_NAME.
+  - Add: CB_RESULT_IND_NO_TEXT_NO_AMOUNT
+  - Codechange: Store textids without offset in string_ranges
+  - Fix: String encoding with cases was non-deterministic and resulted in 
differing md5sums for the NewGRF.
+  - Fix: Rearrange order of string id assignment to keep compatibility.
+  - Fix: When some IDs depleted, an internal NML error was raised instead of 
the intended error message.
+  - Fix: most_common_refit was reading the wrong bits in var 42; read the 
write bits and rename it to most_common_cargo_type
+   as it's more accurate; also add most_common_cargo_subtype which also 
reads var 42 and was previously missing
+  - Fix: Switch from :r format code to !r conversion flag to avoid crashes.
+
+- 0.4.4 (2016-01-07)
+  - Fix/Revert: Stripping one path level is not enough
+
+- 0.4.3 (2016-01-07)
+  - Add: prob_map_gen as alternative name for the mapgen industry probability 
property
+  - Fix: Stripping one path level is enough
+  - Fix: Compatibility with newer versions of pillow.
+  - Fix: Vehicle 'sort' function caused internal error when an empty list was 
passed.
+  - Fix: motion_counter is 24 bits, not 4.
+
+---
@@ -4 +36 @@
-- update tp 0.4.2
+- update to 0.4.2

Old:

  nml-0.4.2-pillow.diff
  nml-0.4.2.tar.gz
  nml-python341.diff

New:

  nml-0.4.5.tar.gz
  python-pillow-version.patch



Other differences:
--
++ nml.spec ++
--- /var/tmp/diff_new_pack.wylOZ8/_old  2019-06-03 18:58:50.140351735 +0200
+++ /var/tmp/diff_new_pack.wylOZ8/_new  2019-06-03 18:58:50.144351733 +0200
@@ -17,7 +17,7 @@
 
 
 Name:   nml
-Version:0.4.2
+Version:0.4.5
 Release:0
 Summary:NewGRF Meta Language
 License:GPL-2.0+
@@ -25,10 +25,8 @@
 Url:http://dev.openttdcoop.org/projects/nml
 Source: 
http://bundles.openttdcoop.org/nml/releases/%{version}/%{name}-%{version}.tar.gz
 Source99:   nml-rpmlintrc
-# PATCH-FIX-OPENSUSE nml-python341.diff lnus...@suse.de -- fix build for Leap 
https://dev.openttdcoop.org/issues/7637
-Patch0: nml-python341.diff
-# PATCH-FIX-OPENSUSE nml-0.4.2-pillow.diff -- fix build for new Pillow instead 
of PIL
-Patch1: nml-0.4.2-pillow.diff
+#PATCH-FIX-UPSTREAM Pillow changed it's version string 
https://github.com/OpenTTD/nml/pull/29
+Patch0:python-pillow-version.patch
 BuildRequires:  gcc
 BuildRequires:  python3-devel
 # We need the required packages also on building for regression tests:
@@ -47,7 +45,6 @@
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1
-%patch1 -p1
 
 %build
 make

++ nml-0.4.2.tar.gz -> nml-0.4.5.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/nml-0.4.2/PKG-INFO new/nml-0.4.5/PKG-INFO
--- old/nml-0.4.2/PKG-INFO  2015-09-12 20:47:24.0 +0200
+++ new/nml-0.4.5/PKG-INFO  2018-06-30 11:11:19.0 +0200
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: nml
-Version: 0.4.2
+Version: 0.4.5
 Summary: A tool to compile nml files to grf or nfo files
 Home-page: http://dev.openttdcoop.org/projects/nml
 Author: NML Development Team
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/nml-0.4.2/docs/changelog.txt 
new/nml-0.4.5/docs/changelog.txt
--- old/nml-0.4.2/docs/changelog.txt2015-09-12 20:46:39.0 +0200
+++ new/nml-0.4.5/docs/changelog.txt2018-06-30 11:10:30.0 +0200
@@ -1,3 +1,35 @@
+0.4.5 (2018-06-30)
+-

commit nml for openSUSE:Factory

2015-11-17 Thread h_root
Hello community,

here is the log from the commit of package nml for openSUSE:Factory checked in 
at 2015-11-17 14:22:47

Comparing /work/SRC/openSUSE:Factory/nml (Old)
 and  /work/SRC/openSUSE:Factory/.nml.new (New)


Package is "nml"

Changes:

--- /work/SRC/openSUSE:Factory/nml/nml.changes  2015-06-08 08:30:21.0 
+0200
+++ /work/SRC/openSUSE:Factory/.nml.new/nml.changes 2015-11-17 
14:22:49.0 +0100
@@ -1,0 +2,13 @@
+Sun Nov 15 12:58:04 UTC 2015 - opens...@dstoecker.de
+
+- update tp 0.4.2
+- add fix for new Pillow (nml-0.4.2-pillow.diff) taken from pyglet
+  issue 677
+
+---
+Fri Oct 23 13:24:12 UTC 2015 - lnus...@suse.de
+
+- lift requirement on python3-devel and add nml-python341.diff to
+  fix build on Leap
+
+---

Old:

  nml-0.4.1.tar.gz

New:

  nml-0.4.2-pillow.diff
  nml-0.4.2.tar.gz
  nml-python341.diff



Other differences:
--
++ nml.spec ++
--- /var/tmp/diff_new_pack.3FDu3t/_old  2015-11-17 14:22:50.0 +0100
+++ /var/tmp/diff_new_pack.3FDu3t/_new  2015-11-17 14:22:50.0 +0100
@@ -17,7 +17,7 @@
 
 
 Name:   nml
-Version:0.4.1
+Version:0.4.2
 Release:0
 Summary:NewGRF Meta Language
 License:GPL-2.0+
@@ -25,9 +25,12 @@
 Url:http://dev.openttdcoop.org/projects/nml
 Source: 
http://bundles.openttdcoop.org/nml/releases/%{version}/%{name}-%{version}.tar.gz
 Source99:   nml-rpmlintrc
+# PATCH-FIX-OPENSUSE nml-python341.diff lnus...@suse.de -- fix build for Leap 
https://dev.openttdcoop.org/issues/7637
+Patch0: nml-python341.diff
+# PATCH-FIX-OPENSUSE nml-0.4.2-pillow.diff -- fix build for new Pillow instead 
of PIL
+Patch1: nml-0.4.2-pillow.diff
 BuildRequires:  gcc
-# https://dev.openttdcoop.org/issues/7637
-BuildRequires:  python3-devel > 3.4.1
+BuildRequires:  python3-devel
 # We need the required packages also on building for regression tests:
 BuildRequires:  python3-Pillow
 BuildRequires:  python3-ply
@@ -43,6 +46,8 @@
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch0 -p1
+%patch1 -p1
 
 %build
 make

++ nml-0.4.2-pillow.diff ++
diff -ur nml-0.4.2/nml/spriteencoder.py nml-0.4.2_fix/nml/spriteencoder.py
--- nml-0.4.2/nml/spriteencoder.py  2015-09-12 20:46:39.0 +0200
+++ nml-0.4.2_fix/nml/spriteencoder.py  2015-11-15 14:09:46.774656565 +0100
@@ -276,7 +276,10 @@
 pos = generic.build_position(sprite_info.poslist)
 raise generic.ScriptError("Read beyond bounds of image file 
'{}'".format(filename_32bpp.value), pos)
 sprite = im.crop((x, y, x + size_x, y + size_y))
-rgb_sprite_data = sprite.tostring()
+# tostring is deprecated, replaced by tobytes in Pillow (PIL fork)
+# (1.1.7) PIL still uses it
+sprite_data_fn = getattr(sprite, "tobytes", getattr(sprite, 
"tostring"))
+rgb_sprite_data = sprite_data_fn()
 
 if (info_byte & INFO_ALPHA) != 0:
 # Check for half-transparent pixels (not valid for ground 
sprites)
@@ -296,7 +299,10 @@
 raise generic.ScriptError("Read beyond bounds of image file 
'{}'".format(filename_8bpp.value), pos)
 mask_sprite = mask_im.crop((mask_x, mask_y, mask_x + size_x, 
mask_y + size_y))
 
-mask_sprite_data = self.palconvert(mask_sprite.tostring(), 
im_mask_pal)
+# tostring is deprecated, replaced by tobytes in Pillow (PIL fork)
+# (1.1.7) PIL still uses it
+mask_sprite_data_fn = getattr(mask_sprite, "tobytes", 
getattr(mask_sprite, "tostring"))
+mask_sprite_data = self.palconvert(mask_sprite_data_fn(), 
im_mask_pal)
 
 # Check for white pixels; those that cause "artefacts" when shading
 pixel_stats['white'] = sum(p == 255 for p in mask_sprite_data)
++ nml-0.4.1.tar.gz -> nml-0.4.2.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/nml-0.4.1/MANIFEST.in new/nml-0.4.2/MANIFEST.in
--- old/nml-0.4.1/MANIFEST.in   2015-04-12 22:20:36.0 +0200
+++ new/nml-0.4.2/MANIFEST.in   2015-09-12 20:46:39.0 +0200
@@ -1,11 +1,22 @@
 global-exclude ._*
+
+# Include documentation
 recursive-include docs *.html *.txt nmlc.1 nml.spec
+
+# Include regression tests
 recursive-include regression *.nml *.lng *.grf *.nfo *.png *.pcx
-recursive-include examples *.nml *.lng *.png
-recursive-include nml *.py *.c
+include regression/Makefile
+include regression/beef.wav
+# But do not include files generated by regression tests
 prune regression/output
 prune regression/out

commit nml for openSUSE:Factory

2015-06-07 Thread h_root
Hello community,

here is the log from the commit of package nml for openSUSE:Factory checked in 
at 2015-06-08 08:30:20

Comparing /work/SRC/openSUSE:Factory/nml (Old)
 and  /work/SRC/openSUSE:Factory/.nml.new (New)


Package is "nml"

Changes:

--- /work/SRC/openSUSE:Factory/nml/nml.changes  2015-05-22 09:52:05.0 
+0200
+++ /work/SRC/openSUSE:Factory/.nml.new/nml.changes 2015-06-08 
08:30:21.0 +0200
@@ -1,0 +2,7 @@
+Sat Jun  6 07:39:09 UTC 2015 - mailaen...@opensuse.org
+
+- don't run the regression tests twice
+- install the man page
+- avoid a runtime dependency on setuptools
+
+---



Other differences:
--
++ nml.spec ++
--- /var/tmp/diff_new_pack.BEZWC9/_old  2015-06-08 08:30:21.0 +0200
+++ /var/tmp/diff_new_pack.BEZWC9/_new  2015-06-08 08:30:21.0 +0200
@@ -50,17 +50,21 @@
 
 %install
 python3 setup.py install --skip-build --root=%{buildroot} --prefix=%{_prefix}
+
+install -D -m0644 docs/nmlc.1 %{buildroot}%{_mandir}/man1/nmlc.1
+
+#setuptools should not be a requirement on running, so we install the nmlc 
wrapper from source
+install -m0755 nmlc %{buildroot}%{_bindir}/nmlc
+
 # The actual python code is not being installed?!?
 mkdir -p %{buildroot}%{python3_sitelib}/nml
 cp -rp nml/* %{buildroot}%{python3_sitelib}/nml/
 
-%check
-make test
-
 %files
 %defattr(-,root,root,-)
 %doc docs/*.txt
 %{_bindir}/nmlc
+%{_mandir}/man1/nmlc.1*
 %{python3_sitearch}/*
 %{python3_sitelib}/%{name}/
 




commit nml for openSUSE:Factory

2015-05-22 Thread h_root
Hello community,

here is the log from the commit of package nml for openSUSE:Factory checked in 
at 2015-05-22 09:52:04

Comparing /work/SRC/openSUSE:Factory/nml (Old)
 and  /work/SRC/openSUSE:Factory/.nml.new (New)


Package is "nml"

Changes:

--- /work/SRC/openSUSE:Factory/nml/nml.changes  2015-05-18 22:29:51.0 
+0200
+++ /work/SRC/openSUSE:Factory/.nml.new/nml.changes 2015-05-22 
09:52:05.0 +0200
@@ -1,0 +2,15 @@
+Wed May 20 08:42:46 UTC 2015 - dims...@opensuse.org
+
+- Add python3-setuptools requires: nml makes use of pkg_resources
+  during runtime
+  from openttd-opengfx build log:
+  /usr/bin/nmlc -c -p DOS --grf ogfxt_toyland.grf ogfxt_toyland.nml
+  Traceback (most recent call last):
+ File "/usr/bin/nmlc", line 5, in 
+  from pkg_resources import load_entry_point
+ImportError: No module named 'pkg_resources'
+- Manually install the nml directory into python3_sitelib: python
+  setup.py forgets to install this, resulting in nmlc not being able
+  to be started (failed to import nml).
+
+---



Other differences:
--
++ nml.spec ++
--- /var/tmp/diff_new_pack.QiJN25/_old  2015-05-22 09:52:06.0 +0200
+++ /var/tmp/diff_new_pack.QiJN25/_new  2015-05-22 09:52:06.0 +0200
@@ -34,6 +34,7 @@
 BuildRequires:  python3-setuptools
 Requires:   python3-Pillow
 Requires:   python3-ply
+Requires:   python3-setuptools
 Provides:   nmlc = %{version}
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 
@@ -45,9 +46,13 @@
 
 %build
 make
+make extensions
 
 %install
 python3 setup.py install --skip-build --root=%{buildroot} --prefix=%{_prefix}
+# The actual python code is not being installed?!?
+mkdir -p %{buildroot}%{python3_sitelib}/nml
+cp -rp nml/* %{buildroot}%{python3_sitelib}/nml/
 
 %check
 make test
@@ -57,6 +62,6 @@
 %doc docs/*.txt
 %{_bindir}/nmlc
 %{python3_sitearch}/*
-%{python3_sitearch}/%{name}-%{version}-py%{py3_ver}.egg-info
+%{python3_sitelib}/%{name}/
 
 %changelog




commit nml for openSUSE:Factory

2015-05-18 Thread h_root
Hello community,

here is the log from the commit of package nml for openSUSE:Factory checked in 
at 2015-05-18 22:29:50

Comparing /work/SRC/openSUSE:Factory/nml (Old)
 and  /work/SRC/openSUSE:Factory/.nml.new (New)


Package is "nml"

Changes:

--- /work/SRC/openSUSE:Factory/nml/nml.changes  2014-06-16 21:29:09.0 
+0200
+++ /work/SRC/openSUSE:Factory/.nml.new/nml.changes 2015-05-18 
22:29:51.0 +0200
@@ -1,0 +2,6 @@
+Sun Apr 26 13:22:43 UTC 2015 - mailaen...@opensuse.org
+
+- update to 0.4.1 (drops support for Python 2)
+  - improved performance and NewGRF support
+
+---

Old:

  nml-0.3.1.r5242-f6a3ae1163ab.tar.gz

New:

  nml-0.4.1.tar.gz



Other differences:
--
++ nml.spec ++
--- /var/tmp/diff_new_pack.rtFPVl/_old  2015-05-18 22:29:52.0 +0200
+++ /var/tmp/diff_new_pack.rtFPVl/_new  2015-05-18 22:29:52.0 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package nml
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,52 +17,46 @@
 
 
 Name:   nml
-Version:0.3.1
+Version:0.4.1
 Release:0
 Summary:NewGRF Meta Language
 License:GPL-2.0+
 Group:  Development/Tools/Building
 Url:http://dev.openttdcoop.org/projects/nml
-Source: 
http://bundles.openttdcoop.org/nml/releases/%{version}/%{name}-%{version}.r5242-f6a3ae1163ab.tar.gz
-BuildRequires:  python-devel >= 2.7
-BuildRequires:  python-setuptools
+Source: 
http://bundles.openttdcoop.org/nml/releases/%{version}/%{name}-%{version}.tar.gz
+Source99:   nml-rpmlintrc
+BuildRequires:  gcc
+# https://dev.openttdcoop.org/issues/7637
+BuildRequires:  python3-devel > 3.4.1
 # We need the required packages also on building for regression tests:
-BuildRequires:  python-imaging
-BuildRequires:  python-ply
-Requires:   python-imaging
-Requires:   python-ply
+BuildRequires:  python3-Pillow
+BuildRequires:  python3-ply
+BuildRequires:  python3-setuptools
+Requires:   python3-Pillow
+Requires:   python3-ply
 Provides:   nmlc = %{version}
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
-%if 0%{?suse_version} && 0%{?suse_version} <= 1110
-%{!?python_sitelib: %global python_sitelib %(python -c "from 
distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%else
-BuildArch:  noarch
-%endif
 
 %description
 A tool to compile nml files to grf or nfo files, making newgrf coding easier.
 
 %prep
-%setup -q -n %{name}-%{version}.r5242-f6a3ae1163ab
+%setup -q -n %{name}-%{version}
 
 %build
-python setup.py build
+make
 
 %install
-python setup.py install --skip-build --root=%{buildroot} --prefix=%{_prefix}
-install -D -m0644 docs/nmlc.1 %{buildroot}%{_mandir}/man1/nmlc.1
-#setuptools should not be a requirement on running, so we install the nmlc 
wrapper from source
-install -m0755 nmlc %{buildroot}%{_bindir}/nmlc
+python3 setup.py install --skip-build --root=%{buildroot} --prefix=%{_prefix}
 
 %check
-cd regression
-PYTHONPATH=%{buildroot}%{python_sitelib} make _V= 
NMLC=%{buildroot}%{_bindir}/nmlc
+make test
 
 %files
 %defattr(-,root,root,-)
 %doc docs/*.txt
 %{_bindir}/nmlc
-%{_mandir}/man1/nmlc.1*
-%{python_sitelib}/*
+%{python3_sitearch}/*
+%{python3_sitearch}/%{name}-%{version}-py%{py3_ver}.egg-info
 
 %changelog

++ nml-0.3.1.r5242-f6a3ae1163ab.tar.gz -> nml-0.4.1.tar.gz ++
 7340 lines of diff (skipped)




commit nml for openSUSE:Factory

2014-06-16 Thread h_root
Hello community,

here is the log from the commit of package nml for openSUSE:Factory checked in 
at 2014-06-16 21:29:07

Comparing /work/SRC/openSUSE:Factory/nml (Old)
 and  /work/SRC/openSUSE:Factory/.nml.new (New)


Package is "nml"

Changes:

--- /work/SRC/openSUSE:Factory/nml/nml.changes  2013-01-07 17:27:12.0 
+0100
+++ /work/SRC/openSUSE:Factory/.nml.new/nml.changes 2014-06-16 
21:29:09.0 +0200
@@ -1,0 +2,5 @@
+Sat Jun 14 17:40:16 UTC 2014 - mailaen...@opensuse.org
+
+- update to 0.3.1 (drops support for Python version 2.5)
+
+---

Old:

  nml-0.2.4.src.tar.gz

New:

  nml-0.3.1.r5242-f6a3ae1163ab.tar.gz



Other differences:
--
++ nml.spec ++
--- /var/tmp/diff_new_pack.mRPYua/_old  2014-06-16 21:29:10.0 +0200
+++ /var/tmp/diff_new_pack.mRPYua/_new  2014-06-16 21:29:10.0 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package nml
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,16 +17,16 @@
 
 
 Name:   nml
-Version:0.2.4
+Version:0.3.1
 Release:0
 Summary:NewGRF Meta Language
 License:GPL-2.0+
 Group:  Development/Tools/Building
 Url:http://dev.openttdcoop.org/projects/nml
-Source0:
http://bundles.openttdcoop.org/nml/releases/%{version}/%{name}-%{version}.src.tar.gz
-BuildRequires:  python-devel >= 2.5
+Source: 
http://bundles.openttdcoop.org/nml/releases/%{version}/%{name}-%{version}.r5242-f6a3ae1163ab.tar.gz
+BuildRequires:  python-devel >= 2.7
 BuildRequires:  python-setuptools
-#We need for regression test the required packages also on building:
+# We need the required packages also on building for regression tests:
 BuildRequires:  python-imaging
 BuildRequires:  python-ply
 Requires:   python-imaging
@@ -43,7 +43,7 @@
 A tool to compile nml files to grf or nfo files, making newgrf coding easier.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}.r5242-f6a3ae1163ab
 
 %build
 python setup.py build

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit nml for openSUSE:Factory

2013-01-07 Thread h_root
Hello community,

here is the log from the commit of package nml for openSUSE:Factory checked in 
at 2013-01-07 17:27:11

Comparing /work/SRC/openSUSE:Factory/nml (Old)
 and  /work/SRC/openSUSE:Factory/.nml.new (New)


Package is "nml", Maintainer is ""

Changes:

--- /work/SRC/openSUSE:Factory/nml/nml.changes  2012-11-03 21:30:59.0 
+0100
+++ /work/SRC/openSUSE:Factory/.nml.new/nml.changes 2013-01-07 
17:27:12.0 +0100
@@ -1,0 +2,6 @@
+Sat Dec 29 10:50:06 UTC 2012 - s...@ammler.ch
+
+- update to 0.2.4 (OpenGFX 0.4.6.1)
+  (check changelog.txt)
+
+---

Old:

  nml-0.2.3.src.tar.gz

New:

  nml-0.2.4.src.tar.gz



Other differences:
--
++ nml.spec ++
--- /var/tmp/diff_new_pack.bHyxrT/_old  2013-01-07 17:27:13.0 +0100
+++ /var/tmp/diff_new_pack.bHyxrT/_new  2013-01-07 17:27:13.0 +0100
@@ -17,7 +17,7 @@
 
 
 Name:   nml
-Version:0.2.3
+Version:0.2.4
 Release:0
 Summary:NewGRF Meta Language
 License:GPL-2.0+

++ nml-0.2.3.src.tar.gz -> nml-0.2.4.src.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/nml-0.2.3/PKG-INFO new/nml-0.2.4/PKG-INFO
--- old/nml-0.2.3/PKG-INFO  2012-02-19 20:51:51.0 +0100
+++ new/nml-0.2.4/PKG-INFO  2012-10-14 23:24:20.0 +0200
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: nml
-Version: 0.2.3
+Version: 0.2.4
 Summary: A tool to compile nml files to grf or nfo files
 Home-page: http://dev.openttdcoop.org/projects/nml
 Author: NML Development Team
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/nml-0.2.3/docs/changelog.txt 
new/nml-0.2.4/docs/changelog.txt
--- old/nml-0.2.3/docs/changelog.txt2012-02-19 20:44:40.0 +0100
+++ new/nml-0.2.4/docs/changelog.txt2012-10-14 23:22:42.0 +0200
@@ -1,6 +1,29 @@
+0.2.4 (2012-10-14)
+
+- Feature: Report NML line information as well as pixel position for pure 
white pixels. Also, report number of pixels in the sprite, instead of the whole 
image. (issue #4029)
+- Feature: 'signals' callback for railtypes.
+- Feature: Allow the 'nfo' unit to be used with non-constant values. (issue 
#3828)
+- Feature: 'build_prod_change' callback for industries to set industry 
production level on construction.
+- Feature: Constant CB_RESULT_REFIT_COST_MASK
+- Feature: Vehicle misc_flag VEHTYPE_FLAG_NO_BREAKDOWN_SMOKE.
+- Feature: 'current_max_speed' variable for vehicles. (issue #3979)
+- Feature: 'vehicle_is_in_depot' variable for aircraft.
+- Feature: 'range' property and callback for aircraft.
+- Feature: 'production_rate_1/2' variables for industries.
+- Feature: 'town_zone' variable for railtypes.
+- Feature: 'other_veh_(curv_info|is_hidden|x_offset|y_offset|z_offset)' 
variables for vehicles.
+- Fix: Provide a proper error message when running out of action2 IDs
+- Fix: A '{' at the end of a string could cause a crash
+- Fix: Backslash-escapes in strings weren't properly validated. Also remove 
useless \n escape. (issue #3636)
+- Fix: Provide a proper error message if a substring is missing, instead of an 
assertion error. (issue #3932)
+- Fix: 'refit_cost' callback may also be called from the purchase menu.
+- Fix: Allow using constants > 255 as variable parameter. (issue #4086)
+- Fix: Sprite layout register code contained an unsorted iteration over 
dictionary keys, resulting in possible regression failures.
+
+
 0.2.3 (2012-02-19)
 
-- Add: Action5 for tunnel portals
+- Feature: Action5 for tunnel portals
 - Fix: Properly catch out-of-bounds image reads (issue #3666)
 - Fix: Character code 0xA0 (NBSP) is used for an up arrow in TTD, so
don't write it as ascii. Force unicode instead (issue #3643)
@@ -8,9 +31,9 @@
 
 0.2.2 (2012-01-29)
 
-- Add: support for (optional) url-information in the grf-block
-- Add: names for newly defined cargo classes: CC_POWDERIZED and CC_NEO_BULK
-- Add: clean target to Makefile in main dir and let make clean remove 
regression/parsetab.py
+- Feature: support for (optional) url-information in the grf-block
+- Feature: names for newly defined cargo classes: CC_POWDERIZED and CC_NEO_BULK
+- Feature: clean target to Makefile in main dir and let make clean remove 
regression/parsetab.py
 - Fix: don't crash when a line in custom_tags.txt is missing a colon delimiter
 - Fix: each action4 is limited to 255 strings. Write multiple actions when we 
have more than that
 - F

commit nml for openSUSE:Factory

2012-11-03 Thread h_root
Hello community,

here is the log from the commit of package nml for openSUSE:Factory checked in 
at 2012-11-03 21:30:58

Comparing /work/SRC/openSUSE:Factory/nml (Old)
 and  /work/SRC/openSUSE:Factory/.nml.new (New)


Package is "nml", Maintainer is ""

Changes:

--- /work/SRC/openSUSE:Factory/nml/nml.changes  2012-10-22 22:08:07.0 
+0200
+++ /work/SRC/openSUSE:Factory/.nml.new/nml.changes 2012-11-03 
21:30:59.0 +0100
@@ -1,0 +2,6 @@
+Sat Oct 27 11:14:52 UTC 2012 - s...@ammler.ch
+
+- downgrade to 0.2.3
+  OpenGFX 0.4.5 builds with NML 0.2.3 only
+
+---

Old:

  nml-0.2.4.src.tar.gz

New:

  nml-0.2.3.src.tar.gz



Other differences:
--
++ nml.spec ++
--- /var/tmp/diff_new_pack.ejIz3a/_old  2012-11-03 21:31:00.0 +0100
+++ /var/tmp/diff_new_pack.ejIz3a/_new  2012-11-03 21:31:00.0 +0100
@@ -17,7 +17,7 @@
 
 
 Name:   nml
-Version:0.2.4
+Version:0.2.3
 Release:0
 Summary:NewGRF Meta Language
 License:GPL-2.0+

++ nml-0.2.4.src.tar.gz -> nml-0.2.3.src.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/nml-0.2.4/PKG-INFO new/nml-0.2.3/PKG-INFO
--- old/nml-0.2.4/PKG-INFO  2012-10-14 23:24:20.0 +0200
+++ new/nml-0.2.3/PKG-INFO  2012-02-19 20:51:51.0 +0100
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: nml
-Version: 0.2.4
+Version: 0.2.3
 Summary: A tool to compile nml files to grf or nfo files
 Home-page: http://dev.openttdcoop.org/projects/nml
 Author: NML Development Team
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/nml-0.2.4/docs/changelog.txt 
new/nml-0.2.3/docs/changelog.txt
--- old/nml-0.2.4/docs/changelog.txt2012-10-14 23:22:42.0 +0200
+++ new/nml-0.2.3/docs/changelog.txt2012-02-19 20:44:40.0 +0100
@@ -1,29 +1,6 @@
-0.2.4 (2012-10-14)
-
-- Feature: Report NML line information as well as pixel position for pure 
white pixels. Also, report number of pixels in the sprite, instead of the whole 
image. (issue #4029)
-- Feature: 'signals' callback for railtypes.
-- Feature: Allow the 'nfo' unit to be used with non-constant values. (issue 
#3828)
-- Feature: 'build_prod_change' callback for industries to set industry 
production level on construction.
-- Feature: Constant CB_RESULT_REFIT_COST_MASK
-- Feature: Vehicle misc_flag VEHTYPE_FLAG_NO_BREAKDOWN_SMOKE.
-- Feature: 'current_max_speed' variable for vehicles. (issue #3979)
-- Feature: 'vehicle_is_in_depot' variable for aircraft.
-- Feature: 'range' property and callback for aircraft.
-- Feature: 'production_rate_1/2' variables for industries.
-- Feature: 'town_zone' variable for railtypes.
-- Feature: 'other_veh_(curv_info|is_hidden|x_offset|y_offset|z_offset)' 
variables for vehicles.
-- Fix: Provide a proper error message when running out of action2 IDs
-- Fix: A '{' at the end of a string could cause a crash
-- Fix: Backslash-escapes in strings weren't properly validated. Also remove 
useless \n escape. (issue #3636)
-- Fix: Provide a proper error message if a substring is missing, instead of an 
assertion error. (issue #3932)
-- Fix: 'refit_cost' callback may also be called from the purchase menu.
-- Fix: Allow using constants > 255 as variable parameter. (issue #4086)
-- Fix: Sprite layout register code contained an unsorted iteration over 
dictionary keys, resulting in possible regression failures.
-
-
 0.2.3 (2012-02-19)
 
-- Feature: Action5 for tunnel portals
+- Add: Action5 for tunnel portals
 - Fix: Properly catch out-of-bounds image reads (issue #3666)
 - Fix: Character code 0xA0 (NBSP) is used for an up arrow in TTD, so
don't write it as ascii. Force unicode instead (issue #3643)
@@ -31,9 +8,9 @@
 
 0.2.2 (2012-01-29)
 
-- Feature: support for (optional) url-information in the grf-block
-- Feature: names for newly defined cargo classes: CC_POWDERIZED and CC_NEO_BULK
-- Feature: clean target to Makefile in main dir and let make clean remove 
regression/parsetab.py
+- Add: support for (optional) url-information in the grf-block
+- Add: names for newly defined cargo classes: CC_POWDERIZED and CC_NEO_BULK
+- Add: clean target to Makefile in main dir and let make clean remove 
regression/parsetab.py
 - Fix: don't crash when a line in custom_tags.txt is missing a colon delimiter
 - Fix: each action4 is limited to 255 strings. Write multiple actions when we 
have more than that

commit nml for openSUSE:Factory

2012-10-22 Thread h_root
Hello community,

here is the log from the commit of package nml for openSUSE:Factory checked in 
at 2012-10-22 22:08:06

Comparing /work/SRC/openSUSE:Factory/nml (Old)
 and  /work/SRC/openSUSE:Factory/.nml.new (New)


Package is "nml", Maintainer is ""

Changes:

--- /work/SRC/openSUSE:Factory/nml/nml.changes  2012-03-16 13:20:12.0 
+0100
+++ /work/SRC/openSUSE:Factory/.nml.new/nml.changes 2012-10-22 
22:08:07.0 +0200
@@ -1,0 +2,5 @@
+Sun Oct 14 22:31:27 UTC 2012 - s...@ammler.ch
+
+- update to 0.2.4 (bugfix release) 
+
+---

Old:

  nml-0.2.3.src.tar.gz

New:

  nml-0.2.4.src.tar.gz



Other differences:
--
++ nml.spec ++
--- /var/tmp/diff_new_pack.4pdgE1/_old  2012-10-22 22:08:09.0 +0200
+++ /var/tmp/diff_new_pack.4pdgE1/_new  2012-10-22 22:08:09.0 +0200
@@ -17,7 +17,7 @@
 
 
 Name:   nml
-Version:0.2.3
+Version:0.2.4
 Release:0
 Summary:NewGRF Meta Language
 License:GPL-2.0+

++ nml-0.2.3.src.tar.gz -> nml-0.2.4.src.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/nml-0.2.3/PKG-INFO new/nml-0.2.4/PKG-INFO
--- old/nml-0.2.3/PKG-INFO  2012-02-19 20:51:51.0 +0100
+++ new/nml-0.2.4/PKG-INFO  2012-10-14 23:24:20.0 +0200
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: nml
-Version: 0.2.3
+Version: 0.2.4
 Summary: A tool to compile nml files to grf or nfo files
 Home-page: http://dev.openttdcoop.org/projects/nml
 Author: NML Development Team
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/nml-0.2.3/docs/changelog.txt 
new/nml-0.2.4/docs/changelog.txt
--- old/nml-0.2.3/docs/changelog.txt2012-02-19 20:44:40.0 +0100
+++ new/nml-0.2.4/docs/changelog.txt2012-10-14 23:22:42.0 +0200
@@ -1,6 +1,29 @@
+0.2.4 (2012-10-14)
+
+- Feature: Report NML line information as well as pixel position for pure 
white pixels. Also, report number of pixels in the sprite, instead of the whole 
image. (issue #4029)
+- Feature: 'signals' callback for railtypes.
+- Feature: Allow the 'nfo' unit to be used with non-constant values. (issue 
#3828)
+- Feature: 'build_prod_change' callback for industries to set industry 
production level on construction.
+- Feature: Constant CB_RESULT_REFIT_COST_MASK
+- Feature: Vehicle misc_flag VEHTYPE_FLAG_NO_BREAKDOWN_SMOKE.
+- Feature: 'current_max_speed' variable for vehicles. (issue #3979)
+- Feature: 'vehicle_is_in_depot' variable for aircraft.
+- Feature: 'range' property and callback for aircraft.
+- Feature: 'production_rate_1/2' variables for industries.
+- Feature: 'town_zone' variable for railtypes.
+- Feature: 'other_veh_(curv_info|is_hidden|x_offset|y_offset|z_offset)' 
variables for vehicles.
+- Fix: Provide a proper error message when running out of action2 IDs
+- Fix: A '{' at the end of a string could cause a crash
+- Fix: Backslash-escapes in strings weren't properly validated. Also remove 
useless \n escape. (issue #3636)
+- Fix: Provide a proper error message if a substring is missing, instead of an 
assertion error. (issue #3932)
+- Fix: 'refit_cost' callback may also be called from the purchase menu.
+- Fix: Allow using constants > 255 as variable parameter. (issue #4086)
+- Fix: Sprite layout register code contained an unsorted iteration over 
dictionary keys, resulting in possible regression failures.
+
+
 0.2.3 (2012-02-19)
 
-- Add: Action5 for tunnel portals
+- Feature: Action5 for tunnel portals
 - Fix: Properly catch out-of-bounds image reads (issue #3666)
 - Fix: Character code 0xA0 (NBSP) is used for an up arrow in TTD, so
don't write it as ascii. Force unicode instead (issue #3643)
@@ -8,9 +31,9 @@
 
 0.2.2 (2012-01-29)
 
-- Add: support for (optional) url-information in the grf-block
-- Add: names for newly defined cargo classes: CC_POWDERIZED and CC_NEO_BULK
-- Add: clean target to Makefile in main dir and let make clean remove 
regression/parsetab.py
+- Feature: support for (optional) url-information in the grf-block
+- Feature: names for newly defined cargo classes: CC_POWDERIZED and CC_NEO_BULK
+- Feature: clean target to Makefile in main dir and let make clean remove 
regression/parsetab.py
 - Fix: don't crash when a line in custom_tags.txt is missing a colon delimiter
 - Fix: each action4 is limited to 255 strings. Write multiple actions when we 
have more than that
 - Fix: groff warning about m