From 2f735d1b538fcd0a509f8be7b2a0ffca4122c397 Mon Sep 17 00:00:00 2001
From: Shlomi Fish <shlomif@shlomifish.org>
Date: Tue, 8 Nov 2016 17:48:32 +0200
Subject: [PATCH] Got "python setup.py bdist_rpm" to work again.

One should do "make mo" first - TODO: test in Travis-CI and test the
resultant rpm files. Had to change README to README.md in several
places.
---
 MANIFEST.in                        | 3 ++-
 docs/README.SOURCE                 | 2 +-
 scripts/pygettext.py               | 0
 setup.cfg                          | 2 +-
 setup_osx.py                       | 2 +-
 tests/style/style-trailing-space.t | 2 +-
 6 files changed, 6 insertions(+), 5 deletions(-)
 mode change 100644 => 100755 scripts/pygettext.py

diff --git a/MANIFEST.in b/MANIFEST.in
index 2e65eca1..fcfab63b 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -4,7 +4,7 @@
 ## code
 ##
 include pysol.py setup.py setup_osx.py setup.cfg MANIFEST.in Makefile
-include COPYING README AUTHORS
+include COPYING README.md AUTHORS
 #recursive-include pysollib *.py
 include pysollib/*.py pysollib/macosx/*.py pysollib/configobj/*.py
 include pysollib/winsystems/*.py
@@ -15,6 +15,7 @@ include data/tcl/*.tcl
 include data/pysol.desktop
 include data/pysolfc.glade
 graft data/themes
+recursive-exclude data/themes *.py
 include scripts/build.bat scripts/create_iss.py scripts/mahjongg_utils.py
 include scripts/pygettext.py scripts/all_games.py scripts/cardset_viewer.py
 #graft data/plugins
diff --git a/docs/README.SOURCE b/docs/README.SOURCE
index 3e75d42f..4d613d93 100644
--- a/docs/README.SOURCE
+++ b/docs/README.SOURCE
@@ -223,7 +223,7 @@ Contributing
 ------------
 Apart from contributing new games you can also help by improving the
 interface - e.g. some fancy statistics dialogs would be very nice.
-See the main README for more ideas.
+See the main README.md for more ideas.
 
 
 Have fun,
diff --git a/scripts/pygettext.py b/scripts/pygettext.py
old mode 100644
new mode 100755
diff --git a/setup.cfg b/setup.cfg
index 0ebc5083..d13b57af 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -4,6 +4,6 @@ force_manifest = 1
 
 [bdist_rpm]
 release = 1
-doc_files = COPYING README
+doc_files = COPYING README.md
 use_bzip2 = 1
 group = Amusements/Games
diff --git a/setup_osx.py b/setup_osx.py
index 8621c5b7..87073846 100644
--- a/setup_osx.py
+++ b/setup_osx.py
@@ -64,7 +64,7 @@ PLIST = dict(
     )
 APP = ['pysol.py']
 ICON_FILE = 'data/PySol.icns'
-DATA_FILES = ['docs', 'data', 'scripts','COPYING', 'README'] + SOLVER
+DATA_FILES = ['docs', 'data', 'scripts','COPYING', 'README.md'] + SOLVER
 RESOURCES = [os.path.join(TCL_EXTENSION_PATH, TILE)] if TILE else []
 FRAMEWORKS = [SOLVER_LIB_PATH] if SOLVER_LIB_PATH else []
 OPTIONS = dict(argv_emulation=True,
diff --git a/tests/style/style-trailing-space.t b/tests/style/style-trailing-space.t
index 2c70c597..d6443e73 100644
--- a/tests/style/style-trailing-space.t
+++ b/tests/style/style-trailing-space.t
@@ -18,7 +18,7 @@ else
 my $finder = Test::TrailingSpace->new(
     {
         root => '.',
-        filename_regex => qr/(?:(?:\.(?:t|pm|pl|PL|yml|json|arc|vim|py|tcl))|README|Changes|LICENSE|MANIFEST|AUTHORS|COPYING)\z/,
+        filename_regex => qr/(?:(?:\.(?:t|pm|pl|PL|yml|json|arc|vim|py|tcl))|README(?:\.md)?|Changes|LICENSE|MANIFEST|AUTHORS|COPYING)\z/,
     },
 );