public/rpms
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixes for polemarch and mod_tile

Browse Source
This commit is contained in:
dani
2019-11-16 19:15:20 +01:00
parent f753f8312b
commit 8cd565a1a4
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
fedora/SPECS/mod_tile.spec
View File

@@ -1,6 +1,6 @@
Name: mod_tile Name: mod_tile
Version: 0.5 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. Summary: A program to efficiently render and serve map tiles for www.openstreetmap.org map using Apache and Mapnik.
License: GPLv2 License: GPLv2
@@ -42,7 +42,7 @@ at compile time, see: render_config.h
%install %install
%{__make} install DESTDIR=%{buildroot} %{__make} install DESTDIR=%{buildroot}
%{__make} install-%{name} 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 %post
if [ $1 -eq 1 ]; then if [ $1 -eq 1 ]; then
@@ -61,7 +61,7 @@ fi
%files %files
%doc COPYING mod_tile.conf %doc COPYING mod_tile.conf
%config(noreplace) %{_sysconfdir}/renderd.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* %{_bindir}/render*
%{_libdir}/httpd/modules/%{name}.so %{_libdir}/httpd/modules/%{name}.so
%{_libdir}/libiniparser* %{_libdir}/libiniparser*
@@ -69,6 +69,9 @@ fi
%{_mandir}/man8/* %{_mandir}/man8/*
%changelog %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> * Fri Nov 8 2019 Daniel Steiner <daniel.steiner@daniel-steiner.org>
- First build on Fedora 31 httpd-2.4.41. - First build on Fedora 31 httpd-2.4.41.

7
fedora/SPECS/polemarch.spec
View File

@@ -16,7 +16,7 @@
%define user polemarch %define user polemarch
%define datad poledata %define datad poledata
%define version 1.4.4 %define version 1.4.4
%define release 1 %define release 2
%define __prelink_undo_cmd %{nil} %define __prelink_undo_cmd %{nil}
%define _binaries_in_noarch_packages_terminate_build 0 %define _binaries_in_noarch_packages_terminate_build 0
%define unmangled_version %{version} %define unmangled_version %{version}
@@ -70,6 +70,7 @@ mv %{buildroot}/var/run %{buildroot}/
install -d %{buildroot}/%{_var}/log/%{name} install -d %{buildroot}/%{_var}/log/%{name}
install -d %{buildroot}/opt/%{datad} install -d %{buildroot}/opt/%{datad}
ln -s %{python3_sitearch}/MySQLdb %{buildroot}/opt/polemarch/lib/python3.7/site-packages/MySQLdb 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: # 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 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}/* [ "%{_builddir}" != "/" ] && [ -d "%{_builddir}" ] && rm -rf %{_builddir}/*
%changelog %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> * Sat Sep 21 2019 Daniel Steiner <daniel.steiner@daniel-steiner.org>
- Update to 1.4.4 version. - Update to 1.4.4 version.