From 9f3c225b98a46c650fc49793dcd8f1146fcffc03 Mon Sep 17 00:00:00 2001
From: Felix Kaechele <heffer@fedoraproject.org>
Date: Mar 31 2014 12:51:34 +0000
Subject: update to 0.3.0


- drop patch for pillow support (upstreamed)
- change Source0 URL / source dir name

---

diff --git a/.gitignore b/.gitignore
index 2c06204..9ddc5f5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /nml-0.2.3.src.tar.gz
 /nml-0.2.4.src.tar.gz
+/nml-0.3.0-src.tgz
diff --git a/changeset_rab7e104b7811.diff b/changeset_rab7e104b7811.diff
deleted file mode 100644
index 02a4cb7..0000000
--- a/changeset_rab7e104b7811.diff
+++ /dev/null
@@ -1,62 +0,0 @@
-diff -r 7c249349d2a9 -r ab7e104b7811 nml/actions/real_sprite.py
---- a/nml/actions/real_sprite.py
-+++ b/nml/actions/real_sprite.py
-@@ -16,7 +16,8 @@
- from nml import generic, expression
- from nml.actions import base_action
- from nml.ast import assignment
--import os, Image
-+import os
-+from PIL import Image
- 
- palmap_d2w = [
-           0, 215, 216, 136,  88, 106,  32,  33, #   0..7
-diff -r 7c249349d2a9 -r ab7e104b7811 nml/ast/alt_sprites.py
---- a/nml/ast/alt_sprites.py
-+++ b/nml/ast/alt_sprites.py
-@@ -16,7 +16,8 @@
- from nml import expression, generic, global_constants
- from nml.actions import real_sprite
- from nml.ast import base_statement
--import os, Image
-+import os
-+from PIL import Image
- 
- """
- List with all AltSpritesBlocks encountered in the nml file.
-diff -r 7c249349d2a9 -r ab7e104b7811 nml/main.py
---- a/nml/main.py
-+++ b/nml/main.py
-@@ -19,7 +19,7 @@
- from nml.ast import general, grf, alt_sprites
- 
- try:
--    import Image
-+    from PIL import Image
- except ImportError:
-     pass
- 
-diff -r 7c249349d2a9 -r ab7e104b7811 nml/output_grf.py
---- a/nml/output_grf.py
-+++ b/nml/output_grf.py
-@@ -18,7 +18,7 @@
- from nml.actions.real_sprite import palmap_w2d
- 
- try:
--    import Image
-+    from PIL import Image
- except ImportError:
-     pass
- 
-diff -r 7c249349d2a9 -r ab7e104b7811 nml/version_info.py
---- a/nml/version_info.py
-+++ b/nml/version_info.py
-@@ -47,7 +47,7 @@
-     versions = {}
-     #PIL
-     try:
--        import Image
-+        from PIL import Image
-         versions["PIL"] = Image.VERSION
-     except ImportError:
-         versions["PIL"] = "Not found!"
diff --git a/nml.spec b/nml.spec
index 673a1bb..2299918 100644
--- a/nml.spec
+++ b/nml.spec
@@ -1,15 +1,13 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
 
 Name:           nml
-Version:        0.2.4
-Release:        2%{?dist}
+Version:        0.3.0
+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}.src.tar.gz
-# python-pillow support
-Patch0:         changeset_rab7e104b7811.diff
+Source0:        http://bundles.openttdcoop.org/nml/releases/%{version}/%{name}-%{version}-src.tgz
 
 BuildArch:      noarch
 BuildRequires:  python2-devel python-setuptools-devel
@@ -20,8 +18,7 @@ A tool to compile nml files to grf or nfo files, making newgrf coding easier.
 
 
 %prep
-%setup -q
-%patch0 -p1
+%setup -q -n %{name}-%{version}-src
 
 
 %build
@@ -45,6 +42,11 @@ rm docs/nmlc.1.gz
 
 
 %changelog
+* Mon Mar 31 2014 Felix Kaechele <heffer@fedoraproject.org> - 0.3.0-1
+- update to 0.3.0
+- drop patch for pillow support (upstreamed)
+- change Source0 URL / source dir name
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.2.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index 55cb80f..be2064e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ef770edf2adab08546c87dc58c19504b  nml-0.2.4.src.tar.gz
+638630e3b188cb62a3fd864efa5c3910  nml-0.3.0-src.tgz