diff --git a/tools/centos6/osrm-routed.spec b/tools/centos6/osrm-routed.spec index 793455f548..356e421120 100644 --- a/tools/centos6/osrm-routed.spec +++ b/tools/centos6/osrm-routed.spec @@ -1,6 +1,6 @@ -%define version_string 20150602.1200 +%define version_string 20151229.1200 %define version_date %(date -d "`echo %{version_string} | sed -e 's#\\.# #'`" +"%Y-%m-%d %H:%M") -%define clone_url git@gitmm.corp.mail.ru:maps/omim.git +%define clone_url git@github.com:mapsme/omim.git Name: osrm-routed Version: %{version_string} @@ -9,7 +9,7 @@ Summary: OSRM - OpenStreetmap Routing Machine Group: System Environment/Daemons License: Proprietary -URL: https://gitmm.corp.mail.ru/maps/omim +URL: https://github.com/mapsme/omim BuildRoot: %{_tmppath}/%{name}-%{version}-%(id -u -n) Source0: omim-%{version}.tar.gz Source1: %{name}.init @@ -22,7 +22,7 @@ Requires: omim-data-polygons = %{version}-%{release} %description OSM Routing Machine with Maps.me additions -https://gitmm.corp.mail.ru/maps/omim.git +https://github.com/mapsme/omim.git %package -n omim-data-polygons Summary: Data polygons - Maps.me data from OMIM (One Month In Minsk) repository @@ -43,36 +43,14 @@ else git clone %{clone_url} %{_builddir}/%{name}-%{version}/omim-%{version} cd %{_builddir}/%{name}-%{version}/omim-%{version} git checkout `git rev-list -n 1 --before="%{version_date}" master` + git submodule update --init + ./configure.sh # pack source to save it in src rpm cd .. %{__tar} czf %{S:0} omim-%{version} fi %build -# aux build script -cat < build_conf_co6_mailru.sh -#!/bin/bash -set -x -u -e - -DIRNAME=\$1 - -if [ ! -d \$DIRNAME ]; then - mkdir \$DIRNAME - ln -s ../omim-%{version}/data \$DIRNAME/data -fi - -CONF=\`sed -e 's#.*-\(\)#\1#' <<< \$1\` -INC="INCLUDEPATH *= /usr/include/ /opt/rh/devtoolset-2/root/usr/include/c++/4.8.2/ /opt/rh/devtoolset-2/root/usr/include/c++/4.8.2/x86_64-redhat-linux/" -LIB="LIBPATH *= /opt/rh/devtoolset-2/root/usr/lib/gcc/x86_64-redhat-linux/4.8.2/ /opt/rh/devtoolset-2/root/usr/lib" - -export BOOST_INCLUDEDIR=/usr/local/boost_1.54.0/include - -pushd \$DIRNAME -qmake-qt5 -r ../omim-%{version}/omim.pro CONFIG+=\$CONF "\$INC" "\$LIB" -spec linux-clang -make %{?_smp_mflags} -popd -EOF -chmod +x build_conf_co6_mailru.sh # logging cat << EOF > rsyslog-osrm-routed.conf @@ -80,19 +58,15 @@ if $programname == 'osrm-routed' then /logs/mapsme/osrm-routed.log & ~ EOF -./build_conf_co6_mailru.sh omim-build-release -./build_conf_co6_mailru.sh omim-build-debug - -%{__mkdir} omim-%{version}/3party/osrm/osrm-backend/build -cd omim-%{version}/3party/osrm/osrm-backend/build -. /opt/rh/devtoolset-2/enable -cmake28 . -DBOOST_ROOT="/usr/local/boost_1.54.0/" .. -make %{?_smp_mflags} +export TARGET=%{_builddir}/%{name}-%{version}-release +export OSRM_TARGET=%{_builddir}/%{name}-%{version}-osrm +export CONFIG=no-tests +omim-%{version}/tools/unix/build_omim.sh -o %install rm -rf %{buildroot} %{__mkdir_p} %{buildroot}%{_bindir} %{buildroot}%{_initrddir} %{buildroot}%{_localstatedir}/run/%{name} %{buildroot}%{_sysconfdir}/rsyslog.d %{buildroot}/logs/mapsme -cd omim-%{version}/3party/osrm/osrm-backend/build +cd %{_builddir}/%{name}-%{version}-osrm %{__install} -m 755 %{name} %{buildroot}%{_bindir}/%{name} %{__install} -m 555 %{S:1} %{buildroot}%{_initrddir}/%{name} %{__install} -m 644 %{_builddir}/%{name}-%{version}/rsyslog-osrm-routed.conf %{buildroot}%{_sysconfdir}/rsyslog.d/osrm-routed.conf @@ -125,5 +99,5 @@ getent passwd osrm >/dev/null || useradd -r -g osrm -d /var/lib/osrm/ -s /sbin/n %{_datadir}/omim/data/* %changelog -* Thu May 28 2015 Victor Popov - 20150602.1200 +* Tue Dec 29 2015 Dragunov Lev - 20151229.1200 - inital packaging