git://git.onelab.eu
/
myplc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ec6e324
)
use rpm macro python3_sitelib instead of homebrewed PYTHON_SITEARCH that was for...
author
parmentelat
<thierry.parmentelat@inria.fr>
Wed, 12 Dec 2018 13:57:24 +0000
(14:57 +0100)
committer
parmentelat
<thierry.parmentelat@inria.fr>
Wed, 12 Dec 2018 13:57:24 +0000
(14:57 +0100)
myplc.spec
patch
|
blob
|
history
diff --git
a/myplc.spec
b/myplc.spec
index
df27265
..
b9e12ba
100644
(file)
--- a/
myplc.spec
+++ b/
myplc.spec
@@
-3,7
+3,7
@@
%define taglevel 4
%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
%define taglevel 4
%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
-%global python_sitearch %( python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)" )
+
Name: %{name}
Version: %{version}
Name: %{name}
Version: %{version}
@@
-138,9
+138,8
@@
This package provides the Python module to configure MyPLC.
rm -rf $RPM_BUILD_ROOT
# Install configuration scripts
rm -rf $RPM_BUILD_ROOT
# Install configuration scripts
-echo "* Installing plc_config.py in " ${PYTHON_SITEARCH}
-PYTHON_SITEARCH=`python -c 'from distutils.sysconfig import get_python_lib; print get_python_lib(1)'`
-install -D -m 755 plc_config.py ${RPM_BUILD_ROOT}/${PYTHON_SITEARCH}/plc_config.py
+echo "* Installing plc_config.py in %{python3_sitelib}"
+install -D -m 755 plc_config.py ${RPM_BUILD_ROOT}/%{python3_sitelib}
echo "* Installing scripts in /usr/bin"
mkdir -p ${RPM_BUILD_ROOT}/usr/bin
echo "* Installing scripts in /usr/bin"
mkdir -p ${RPM_BUILD_ROOT}/usr/bin
@@
-288,7
+287,7
@@
fi
%files config
%defattr(-,root,root,-)
/usr/bin/plc-config
%files config
%defattr(-,root,root,-)
/usr/bin/plc-config
-%{python
_sitearch
}/plc_config.py*
+%{python
3_sitelib
}/plc_config.py*
%changelog
%changelog