Commit f4e53fd2 authored by Maiken's avatar Maiken

Merge branch 'python-fixes' into 'master'

Python fixes

See merge request nordugrid/arc!588
parents bb7cd6c5 780b5a67
......@@ -1463,12 +1463,12 @@ service arc-infosys-ldap condrestart > /dev/null 2>&1 || :
%{python2_sitearch}/%{pkgdir}
%else
%{python2_sitearch}/%{pkgdir}/[^_p]*.py*
%endif
%{_libdir}/%{pkgdir}/libaccPythonBroker.so
%{_libdir}/%{pkgdir}/libaccPythonBroker.apd
%{_libdir}/%{pkgdir}/libpythonservice.so
%{_libdir}/%{pkgdir}/libpythonservice.apd
%endif
%endif
%if %{?fedora}%{!?fedora:0} >= 13 || %{?rhel}%{!?rhel:0} >= 7
%files -n python%{python3_pkgversion}-%{name}
......@@ -1477,6 +1477,10 @@ service arc-infosys-ldap condrestart > /dev/null 2>&1 || :
%if %{py3default}
%{python3_sitearch}/%{pkgdir}/[^_p]*.py
%{python3_sitearch}/%{pkgdir}/__pycache__/[^_p]*.*
%{_libdir}/%{pkgdir}/libaccPythonBroker.so
%{_libdir}/%{pkgdir}/libaccPythonBroker.apd
%{_libdir}/%{pkgdir}/libpythonservice.so
%{_libdir}/%{pkgdir}/libpythonservice.apd
%else
%{python3_sitearch}/%{pkgdir}
%endif
......
EXTRA_DIST = __init__.py
if PYTHON_SWIG_ENABLED
INITPY =
else
INITPY = __init__.py
endif
pkgpythondir = $(PYTHON_SITE_ARCH)/arc
pkgpython_PYTHON = paths.py
pkgpython_PYTHON = paths.py $(INITPY)
nodist_pkgpython_PYTHON = paths_dist.py
paths_dist.py: gen_paths_dist.sh
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment