- up to 0.5.3

diff --git a/nml.spec b/nml.spec
index cd664ba8b327fd994ef589a4a6aa97bc7562d374..c20cedfffc57a5856bedb7a9ee6f3044894a77e4 100644 (file)
--- a/nml.spec
+++ b/nml.spec
@@ -1,16 +1,23 @@
 Summary:       convert meta-languate to openttd's grf and/or nfo files
 Name:          nml
-Version:       0.2.4
+Version:       0.5.3
 Release:       1
 License:       GPL v2
 Group:         Applications
-Source0:       http://bundles.openttdcoop.org/nml/releases/0.2.4/%{name}-%{version}.src.tar.gz
-# Source0-md5: ef770edf2adab08546c87dc58c19504b
+Source0:       https://github.com/OpenTTD/nml/releases/download/%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: 0c2010b53f864f74d0a8b36bc40c7e84
+Source1:       https://github.com/OpenTTD/nml/raw/07c5a4de27fec1383d2657aa51a092b1d2c658fe/regression/arctic_railwagons.pcx
+Source2:       https://github.com/OpenTTD/nml/raw/07c5a4de27fec1383d2657aa51a092b1d2c658fe/regression/opengfx_generic_trams1.pcx
+Source3:       https://github.com/OpenTTD/nml/raw/07c5a4de27fec1383d2657aa51a092b1d2c658fe/regression/opengfx_trains_start.pcx
 URL:           https://dev.openttdcoop.org/projects/nml
+BuildRequires: python3-pillow
+BuildRequires: python3-ply
+BuildRequires: python3-setuptools
 BuildRequires: rpm-pythonprov
 BuildRequires: rpmbuild(macros) >= 1.234
-Requires:      python-PIL
-Requires:      python-ply
+Requires:      python3-pillow
+Requires:      python3-ply
+Requires:      python3-setuptools
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -19,16 +26,26 @@ newgrf coding easier.
 
 %prep
 %setup -q
+cp %{SOURCE1} %{SOURCE2} %{SOURCE3} regression
 
 %build
-%{__python} setup.py build
+%{__make}
+%{__make} extensions
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__python} setup.py install \
+%{__python3} setup.py install \
+       --skip-build \
        --optimize=2 \
+       --prefix=%{_prefix} \
        --root=$RPM_BUILD_ROOT
+install -D docs/nmlc.1 $RPM_BUILD_ROOT%{_mandir}/man1/nmlc.1
+
+# The actual python code is not being installed?!?
+install -d $RPM_BUILD_ROOT%{py3_sitescriptdir}/nml
+cp -rp nml/* $RPM_BUILD_ROOT%{py3_sitescriptdir}/nml/
+
 %py_postclean
 
 %clean
@@ -36,6 +53,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/*
-%{py_sitescriptdir}/nml
-%{py_sitescriptdir}/nml-%{version}*.egg-info
+%attr(755,root,root) %{_bindir}/nmlc
+%doc docs/*.txt
+%{_mandir}/man1/nmlc.1*
+%{py3_sitedir}/*
+%{py3_sitescriptdir}/%{name}/