Fix spec and build.sh

2 files changed, 19 insertions, 20 deletions

diff --git a/pyhelpers/specs/build.sh b/pyhelpers/specs/build.sh
index e357e713f4..2380473512 100755
--- a/pyhelpers/specs/build.sh
+++ b/pyhelpers/specs/build.sh
@@ -14,17 +14,16 @@ if [ -z "$RELEASE" ]; then
 	RELEASE=1
 fi
 
-basedir=`dirname $0`
+basedir=$(dirname "$0")
+
 PROJECT=$PROJECT VERSION=$VERSION RELEASE=$RELEASE rpmbuild -ba python35-mapsme-modules.spec
 if [ $? -ne 0 ]; then
 	echo "Build failed!"
 	exit
 fi
 
-#rsync -av $HOME/rpmbuild/RPMS/noarch/$PROJECT.maps.me-{meta,front,devel}-$VERSION-$RELEASE.el6.noarch.rpm mapsme-team@pkg.corp.mail.ru::c6-mapsme-noarch
-#rsync -av $HOME/rpmbuild/RPMS/x86_64/$PROJECT.maps.me-$VERSION-$RELEASE.el6.x86_64.rpm mapsme-team@pkg.corp.mail.ru::c6-mapsme-x64
+rsync -av $HOME/rpmbuild/RPMS/x86_64/python35-$PROJECT-$VERSION-$RELEASE.portal.el6.x86_64.rpm mapsme-team@pkg.corp.mail.ru::c6-mapsme-x64
 
-#echo "c6-mapsme-noarch" | nc pkg.corp.mail.ru 12222 | grep -v '^* c'
-#echo "c6-mapsme-x64" | nc pkg.corp.mail.ru 12222 | grep -v '^* c'
-#echo
+echo "c6-mapsme-x64" | nc pkg.corp.mail.ru 12222 | grep -v '^* c'
+echo
 echo "$PROJECT packages version $VERSION-$RELEASE build done, ready to deploy"
diff --git a/pyhelpers/specs/python35-mapsme-modules.spec b/pyhelpers/specs/python35-mapsme-modules.spec
index c8afaf730f..2dc42e4742 100644
--- a/pyhelpers/specs/python35-mapsme-modules.spec
+++ b/pyhelpers/specs/python35-mapsme-modules.spec
@@ -1,5 +1,3 @@
-# TODO(mgsergio, yershov): Add other modules.
-
 %global __arch_install_post     QA_SKIP_RPATHS=1 /usr/lib/rpm/check-rpaths   /usr/lib/rpm/check-buildroot
 %define py_version 3.5.1
 %define py_release 1.portal
@@ -21,6 +19,7 @@
     %{!?__jar_repack:/usr/lib/rpm/redhat/brp-java-repack-jars} \
 %{nil}
 
+%define project %(echo $PROJECT)
 %define version %(echo $VERSION)
 %define release %(echo $RELEASE)
 %define tag py-modules-%{version}
@@ -44,19 +43,20 @@ BuildRequires:  python35 >= %{py_version}
 BuildRequires:  cmake3
 BuildRequires:  boost_prefix-devel >= 1.54.0-3
 Requires:       python35 >= %{py_version}
-Requires:	python35-pylocal_ads = %{version}-%{release}
+Requires:	python35-%{project} = %{version}-%{release}
 
 %description
 Python maps.me modules metapackage. Installs all included modules
 
-%package -n python35-pylocal_ads
-Summary:  pylocal_ads python module from maps.me localads
+%package -n python35-%{project}
+Summary:  %{project} python module from maps.me localads
 Group:          Development/Languages/Python
 
-%description -n python35-pylocal_ads
-Separate pylocal_ads module for python35 from maps.me localads
+%description -n python35-%{project}
+Separate %{project} module for python35 from maps.me localads
 
 %prep
+
 %{__rm} -rf %{_builddir}/%{name}-%{version}
 if [ -e %{S:0} ]; then
         %{__tar} xzf %{S:0}
@@ -82,21 +82,21 @@ cd ..
 # TODO(mgergio, yershov): Why should we stills specify PYTHON_LIBRARY and
 # PYTHON_INCLUDE_DIR manually?
 %{__cmake3} -DPYTHON_LIBRARY=/usr/local/python35/lib/libpython3.so -DPYTHON_INCLUDE_DIR=/usr/local/python35/include/python3.5m/ -DPYTHON_VERSION=3.5 -DBOOST_INCLUDEDIR=/usr/local/boost_1.54.0/include/ -DPYBINDINGS=ON -DSKIP_DESKTOP=ON ../omim
-%{__make} %{?_smp_mflags} pylocal_ads
-%{__make} %{?_smp_mflags} pymwm_diff
+%{__make} %{?_smp_mflags} %{project}
 
 %install
-%{__install} -m 755 -D %{_builddir}/%{name}-%{version}/build/pylocal_ads.so %{buildroot}/%{python_sitelib}/pylocal_ads.so
-%{__install} -m 755 -D %{_builddir}/%{name}-%{version}/build/pymwm_diff.so %{buildroot}/%{python_sitelib}/pymwm_diff.so
+%{__install} -m 755 -D %{_builddir}/%{name}-%{version}/build/%{project}.so %{buildroot}/%{python_sitelib}/%{project}.so
 
 %clean
 rm -rf %{buildroot}
 
-%files -n python35-pylocal_ads
+%files -n python35-%{project}
 %defattr(-,root,root)
-%{python_sitelib}/pylocal_ads.so
-%{python_sitelib}/pymwm_diff.so
+%{python_sitelib}/%{project}.so
 
 %changelog
+* Thu Aug 03 2017 Sergey Yershov <yershov@corp.mail.ru> 0.2a-1
+- Adopted to build any of available bingings
+
 * Wed Apr 26 2017 Magidovich Sergey <s.magidovich@corp.mail.ru> - 0.1b-1
 - Initiated build