heffer pushed to nml (f20). "update to 0.4.1 (..more)"

notifications at fedoraproject.org notifications at fedoraproject.org
Mon May 18 19:41:53 UTC 2015


From 8da4823fca70826377b5ea4715ec8910618614aa Mon Sep 17 00:00:00 2001
From: Felix Kaechele <heffer at fedoraproject.org>
Date: Mon, 18 May 2015 12:26:59 +0200
Subject: update to 0.4.1

- remove version_foo variable (YAY!)

diff --git a/.gitignore b/.gitignore
index 9ddc5f5..c1ecbe7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /nml-0.2.3.src.tar.gz
 /nml-0.2.4.src.tar.gz
 /nml-0.3.0-src.tgz
+/nml-0.4.1.tar.gz
diff --git a/nml.spec b/nml.spec
index a4805b1..73120c1 100644
--- a/nml.spec
+++ b/nml.spec
@@ -1,35 +1,30 @@
-%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
-
-%global version_foo r5242-f6a3ae1163ab
-
 Name:           nml
-Version:        0.3.1
-Release:        2%{?dist}
+Version:        0.4.1
+Release:        1%{?dist}
 Summary:        NewGRF Meta Language compiler
 
 License:        GPLv2+
 URL:            http://dev.openttdcoop.org/projects/nml
-Source0:        http://bundles.openttdcoop.org/nml/releases/%{version}/%{name}-%{version}.%{version_foo}.tar.gz
+Source0:        http://bundles.openttdcoop.org/nml/releases/%{version}/%{name}-%{version}.tar.gz
 
-BuildArch:      noarch
-BuildRequires:  python2-devel python-setuptools
-Requires:       python-imaging python-ply python-setuptools
+BuildRequires:  python3-devel python3-setuptools
+Requires:       python3-pillow python3-ply python3-setuptools
 
 %description
 A tool to compile nml files to grf or nfo files, making newgrf coding easier.
 
 
 %prep
-%setup -q -n %{name}-%{version}.%{version_foo}
+%setup -q
 
 
 %build
-%{__python} setup.py build
+CFLAGS="$RPM_OPT_FLAGS" %{__python3} setup.py build
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+%{__python3} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 
 gzip docs/nmlc.1
 install -Dpm 644 docs/nmlc.1.gz $RPM_BUILD_ROOT%{_mandir}/man1/nmlc.1.gz
@@ -40,10 +35,19 @@ rm docs/nmlc.1.gz
 %doc docs/*
 %doc %{_mandir}/man1/nmlc.1.gz
 %{_bindir}/nmlc
-%{python_sitelib}/*
+%{python3_sitearch}/nml*
 
 
 %changelog
+* Mon May 18 2015 Felix Kaechele <heffer at fedoraproject.org> - 0.4.1-1
+- update to 0.4.1
+- remove version_foo variable (YAY!)
+
+* Wed Feb 18 2015 Felix Kaechele <heffer at fedoraproject.org> - 0.4.0-1
+- update to 0.4.0
+- now uses Python 3
+- is no longer noarch
+
 * Mon Jun 30 2014 Toshio Kuratomi <toshio at fedoraproject.org> - 0.3.1-2
 - Replace python-setuptools-devel BR with python-setuptools
 
diff --git a/sources b/sources
index 1140e5e..7dc8e2c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e10e80feff43be7071ebce6d8d52721f  nml-0.3.1.r5242-f6a3ae1163ab.tar.gz
+a515f743d29a71676dd5fbb206f3c610  nml-0.4.1.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/nml.git/commit/?h=f20&id=8da4823fca70826377b5ea4715ec8910618614aa


More information about the scm-commits mailing list