From: František Dvořák <valtri@civ.zcu.cz>
Date: Mon, 31 Aug 2015 13:01:16 +0000 (+0200)
Subject: Fix default binaries.
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=07508d17ac2af70e1d70f3472010b5f192a33eee;p=packaging-rpm-pOCCI.git

Fix default binaries.
---

diff --git a/python-pOCCI.spec b/python-pOCCI.spec
index 2ef1d9f..d452177 100644
--- a/python-pOCCI.spec
+++ b/python-pOCCI.spec
@@ -112,24 +112,30 @@ popd
 pushd python2
 %py2_install
 popd
-cp -p %{buildroot}%{_bindir}/pOCCI %{buildroot}%{_bindir}/pOCCI-%{python2_version}
-cp -p %{buildroot}%{_bindir}/pOCCI-parse %{buildroot}%{_bindir}/pOCCI-parse-%{python2_version}
+mv %{buildroot}%{_bindir}/pOCCI %{buildroot}%{_bindir}/pOCCI-%{python2_version}
+mv %{buildroot}%{_bindir}/pOCCI-parse %{buildroot}%{_bindir}/pOCCI-parse-%{python2_version}
 rm -f %{buildroot}%{python2_sitelib}/%{srcname}/pOCCI.cfg
 rm -rf %{buildroot}%{python2_sitelib}/tests
 chmod +x %{buildroot}%{python2_sitelib}/%{srcname}/pOCCI.py
+chmod +x %{buildroot}%{python2_sitelib}/%{srcname}/pOCCI-parse.py
 
 %if 0%{?with_python3}
 pushd python3
 %py3_install
-cp -p %{buildroot}%{_bindir}/pOCCI %{buildroot}%{_bindir}/pOCCI-%{python3_version}
-cp -p %{buildroot}%{_bindir}/pOCCI-parse %{buildroot}%{_bindir}/pOCCI-parse-%{python3_version}
+mv %{buildroot}%{_bindir}/pOCCI %{buildroot}%{_bindir}/pOCCI-%{python3_version}
+mv %{buildroot}%{_bindir}/pOCCI-parse %{buildroot}%{_bindir}/pOCCI-parse-%{python3_version}
 rm -f %{buildroot}%{python3_sitelib}/%{srcname}/pOCCI.cfg
 rm -rf %{buildroot}%{python3_sitelib}/tests
 chmod +x %{buildroot}%{python3_sitelib}/%{srcname}/pOCCI.py
+chmod +x %{buildroot}%{python3_sitelib}/%{srcname}/pOCCI-parse.py
 rm -f %{buildroot}%{python3_sitelib}/%{srcname}/pOCCI*.1
 popd
 %endif
 
+# default binary
+cp -p %{buildroot}%{_bindir}/pOCCI-%{python2_version} %{buildroot}%{_bindir}/pOCCI
+cp -p %{buildroot}%{_bindir}/pOCCI-parse-%{python2_version} %{buildroot}%{_bindir}/pOCCI-parse
+# man-page
 mkdir -p %{buildroot}%{_mandir}/man1
 mv %{buildroot}%{python2_sitelib}/%{srcname}/pOCCI*.1 %{buildroot}%{_mandir}/man1/
 
@@ -159,7 +165,9 @@ popd
 %doc python2/%{srcname}/pOCCI.cfg
 %{python2_sitelib}/%{srcname}/
 %{python2_sitelib}/%{srcname}-%{version}*.egg-info/
+%{_bindir}/pOCCI
 %{_bindir}/pOCCI-2*
+%{_bindir}/pOCCI-parse
 %{_bindir}/pOCCI-parse-2*
 %{_mandir}/man1/pOCCI.1*
 %{_mandir}/man1/pOCCI-parse.1*
@@ -174,9 +182,7 @@ popd
 %doc python3/%{srcname}/pOCCI.cfg
 %{python3_sitelib}/%{srcname}/
 %{python3_sitelib}/%{srcname}-%{version}*.egg-info/
-%{_bindir}/pOCCI
 %{_bindir}/pOCCI-3*
-%{_bindir}/pOCCI-parse
 %{_bindir}/pOCCI-parse-3*
 %{_mandir}/man1/pOCCI.1*
 %{_mandir}/man1/pOCCI-parse.1*