From 8cd565a1a4902da8edf752f8d5bcfd3fdc34c6a7 Mon Sep 17 00:00:00 2001
From: Daniel Steiner <daniel.steiner@greenmail.ch>
Date: Sat, 16 Nov 2019 19:15:20 +0100
Subject: [PATCH] Fixes for polemarch and mod_tile

---
 fedora/SPECS/mod_tile.spec  | 9 ++++++---
 fedora/SPECS/polemarch.spec | 7 ++++++-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/fedora/SPECS/mod_tile.spec b/fedora/SPECS/mod_tile.spec
index e88e568..88c0c5e 100644
--- a/fedora/SPECS/mod_tile.spec
+++ b/fedora/SPECS/mod_tile.spec
@@ -1,6 +1,6 @@
 Name:		  mod_tile
 Version:	0.5
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A program to efficiently render and serve map tiles for www.openstreetmap.org map using Apache and Mapnik.
 
 License:	GPLv2
@@ -42,7 +42,7 @@ at compile time, see: render_config.h
 %install
 %{__make} install DESTDIR=%{buildroot}
 %{__make} install-%{name} DESTDIR=%{buildroot}
-%{__install} -D %{S:1} %{buildroot}%{_sysconfdir}/httpd/conf.module.d/10-tile.conf
+%{__install} -D %{S:1} %{buildroot}%{_sysconfdir}/httpd/conf.modules.d/10-tile.conf
 
 %post
 if [ $1 -eq 1 ]; then
@@ -61,7 +61,7 @@ fi
 %files
 %doc COPYING mod_tile.conf
 %config(noreplace) %{_sysconfdir}/renderd.conf
-%config %{_sysconfdir}/httpd/conf.module.d/10-tile.conf
+%config %{_sysconfdir}/httpd/conf.modules.d/10-tile.conf
 %{_bindir}/render*
 %{_libdir}/httpd/modules/%{name}.so
 %{_libdir}/libiniparser*
@@ -69,6 +69,9 @@ fi
 %{_mandir}/man8/*
 
 %changelog
+* Sat Nov 9 2019 Daniel Steiner <daniel.steiner@daniel-steiner.org>
+- Fix for modules config path.
+
 * Fri Nov 8 2019 Daniel Steiner <daniel.steiner@daniel-steiner.org>
 - First build on Fedora 31 httpd-2.4.41.
 
diff --git a/fedora/SPECS/polemarch.spec b/fedora/SPECS/polemarch.spec
index 54c1646..3a94b0e 100644
--- a/fedora/SPECS/polemarch.spec
+++ b/fedora/SPECS/polemarch.spec
@@ -16,7 +16,7 @@
 %define user polemarch
 %define datad poledata
 %define version 1.4.4
-%define release 1
+%define release 2
 %define __prelink_undo_cmd %{nil}
 %define _binaries_in_noarch_packages_terminate_build   0
 %define unmangled_version %{version}
@@ -70,6 +70,7 @@ mv %{buildroot}/var/run %{buildroot}/
 install -d %{buildroot}/%{_var}/log/%{name}
 install -d %{buildroot}/opt/%{datad}
 ln -s %{python3_sitearch}/MySQLdb %{buildroot}/opt/polemarch/lib/python3.7/site-packages/MySQLdb
+ln -s %{python3_sitelib}/pymysql %{buildroot}/opt/polemarch/lib/python3.7/site-packages/pymysql
 # remove buildroot path in opt/polemarch/bin/activate.xsh:
 sed -i -e 's|/root/rpmbuild/BUILDROOT/polemarch.*x86_64||' %{buildroot}/opt/polemarch/bin/activate.xsh
 
@@ -113,6 +114,10 @@ sudo -u %{user} /opt/%{name}/bin/%{shortname}ctl migrate
 [ "%{_builddir}" != "/" ] && [ -d "%{_builddir}" ] && rm -rf %{_builddir}/*
 
 %changelog
+* Sat Nov 9 2019 Daniel Steiner <daniel.steiner@daniel-steiner.org>
+- Changes for Fedora 31.
+- mysqlcient symlink added.
+
 * Sat Sep 21 2019 Daniel Steiner <daniel.steiner@daniel-steiner.org>
 - Update to 1.4.4 version.