Commit 9c27818a authored by Maiken's avatar Maiken
Browse files

Merge branch 'python3-compat' into 'master'

Python3 compat

See merge request nordugrid/arc!238
parents e04e1242 b470bcd9
## Please do not change this file.
## Doing so will unfortunately create unnesseccary merge conflicts between branches and the fork, and nordugrid/arc version of this file.
## Please do not change this file.
## Doing so will unfortunately create unnesseccary merge conflicts between branches and the fork, and nordugrid/arc version of this file.
## To have the automatic builds work on your fork, check that the runner is enabled in your fork: Settings->CI/CD->Runner settings
stages:
- build
- packages
- deploy_and_test
build_forks_el6:
stage: build
image: maikenp/arc-build-centos6
script:
script:
- yum update -y
- ./autogen.sh
- ./configure
- yum-builddep nordugrid-arc.spec -y
- echo "Preparing and running rpmbuild"
- mkdir -p $CI_PROJECT_DIR/rpmbuild/{SOURCES,BUILD,RPMS,SRPMS}
- echo "%_topdir $CI_PROJECT_DIR/rpmbuild" > ~/.rpmmacros
- export VERSION=`cat VERSION`
- mkdir -p rpmbuild/{SOURCES,BUILD,RPMS,SRPMS}
- make dist
- cp "nordugrid-arc-${VERSION}.tar.gz" $CI_PROJECT_DIR/rpmbuild/SOURCES
- VERSION=`cat VERSION`
- mv nordugrid-arc-${VERSION}.tar.gz rpmbuild/SOURCES
- rpmbuild -D "_topdir $CI_PROJECT_DIR/rpmbuild" -ba nordugrid-arc.spec
tags:
- Computerome
except:
except:
refs:
- master
- next-major
......@@ -32,26 +32,25 @@ build_forks_el6:
- branches@nordugrid/arc
- tags@nordugrid/arc
allow_failure: false
build_forks_el7:
stage: build
image: maikenp/arc-build-centos7
script:
script:
- yum update -y
- ./autogen.sh
- CXXFLAGS=-std=c++11 ./configure
- ./configure
- yum-builddep nordugrid-arc.spec -y
- echo "Preparing and running rpmbuild"
- mkdir -p $CI_PROJECT_DIR/rpmbuild/{SOURCES,BUILD,RPMS,SRPMS}
- echo "%_topdir $CI_PROJECT_DIR/rpmbuild" > ~/.rpmmacros
- export VERSION=`cat VERSION`
- mkdir -p rpmbuild/{SOURCES,BUILD,RPMS,SRPMS}
- make dist
- cp "nordugrid-arc-${VERSION}.tar.gz" $CI_PROJECT_DIR/rpmbuild/SOURCES
- VERSION=`cat VERSION`
- mv nordugrid-arc-${VERSION}.tar.gz rpmbuild/SOURCES
- rpmbuild -D "_topdir $CI_PROJECT_DIR/rpmbuild" -ba nordugrid-arc.spec
tags:
- Computerome
except:
except:
refs:
- master
- next-major
......@@ -59,28 +58,27 @@ build_forks_el7:
- branches@nordugrid/arc
- tags@nordugrid/arc
allow_failure: false
build_forks_deb9:
stage: build
image: maikenp/arc-build-debian9
script:
- apt-get update -y
- ./autogen.sh
- ./configure
- apt build-dep nordugrid-arc -y
- ./configure
- echo "6.0.0">VERSION
- cp $CI_PROJECT_DIR/debian/changelog.deb $CI_PROJECT_DIR/debian/changelog
- sed -i 's/trunk-1/6.0.0-1/g' $CI_PROJECT_DIR/debian/changelog
- dpkg-buildpackage -b -us -uc
- echo "Run make"
- make clean
- make
- echo "Run make check"
- make check
script:
- apt-get update -y
- echo "6.0.0" > VERSION
- ./autogen.sh
- ./configure
- make dist
- VERSION=`cat VERSION`
- mv nordugrid-arc-${VERSION}.tar.gz nordugrid-arc_${VERSION}.orig.tar.gz
- tar -z -x -f nordugrid-arc_${VERSION}.orig.tar.gz
- cd nordugrid-arc-${VERSION}
- dpkg-buildpackage -S -us -uc -d
- apt-get build-dep ../nordugrid-arc_${VERSION}-1.dsc -y
- dpkg-buildpackage -b -us -uc
tags:
- Computerome
except:
except:
refs:
- master
- next-major
......@@ -88,55 +86,57 @@ build_forks_deb9:
- branches@nordugrid/arc
- tags@nordugrid/arc
allow_failure: false
make_debs_deb9:
stage: packages
image: maikenp/arc-build-debian9
script:
- apt-get update -y
- ./autogen.sh
- ./configure
- apt-get build-dep nordugrid-arc -y
- ./configure
- echo "Preparing and running dpkg-buildpackage"
- cp $CI_PROJECT_DIR/debian/changelog.deb $CI_PROJECT_DIR/debian/changelog
- echo "6.0.0">VERSION
- sed -i 's/trunk-1/6.0.0-1/g' $CI_PROJECT_DIR/debian/changelog
- dpkg-buildpackage -b -us -uc
script:
- apt-get update -y
- echo "6.0.0" > VERSION
- ./autogen.sh
- ./configure
- make dist
- VERSION=`cat VERSION`
- mv nordugrid-arc-${VERSION}.tar.gz nordugrid-arc_${VERSION}.orig.tar.gz
- tar -z -x -f nordugrid-arc_${VERSION}.orig.tar.gz
- cd nordugrid-arc-${VERSION}
- dpkg-buildpackage -S -us -uc -d
- apt-get build-dep ../nordugrid-arc_${VERSION}-1.dsc -y
- dpkg-buildpackage -b -us -uc
tags:
- Computerome
only:
only:
- branches@nordugrid/arc
- tags@nordugrid/arc
artifacts:
when: on_success
expire_in: 30 days
paths:
- ../$CI_PROJECT_DIR
- $CI_PROJECT_DIR/*.orig.tar.gz
- $CI_PROJECT_DIR/*.debian.tar.*
- $CI_PROJECT_DIR/*.dsc
- $CI_PROJECT_DIR/*.deb
allow_failure: true
make_rpms_el6:
stage: packages
image: maikenp/arc-build-centos6
script:
- yum update -y
- ./autogen.sh
- ./configure
- yum-builddep nordugrid-arc.spec -y
- ./configure
- echo "Preparing and running rpmbuild"
- mkdir -p $CI_PROJECT_DIR/rpmbuild/{SOURCES,BUILD,RPMS,SRPMS}
- echo "%_topdir $CI_PROJECT_DIR/rpmbuild" > ~/.rpmmacros
- export VERSION=`cat VERSION`
- make dist
- cp "nordugrid-arc-${VERSION}.tar.gz" $CI_PROJECT_DIR/rpmbuild/SOURCES
- rpmbuild -D "_topdir $CI_PROJECT_DIR/rpmbuild" -ba nordugrid-arc.spec
- cd $CI_PROJECT_DIR
script:
- yum update -y
- ./autogen.sh
- ./configure
- yum-builddep nordugrid-arc.spec -y
- echo "Preparing and running rpmbuild"
- mkdir -p rpmbuild/{SOURCES,BUILD,RPMS,SRPMS}
- make dist
- VERSION=`cat VERSION`
- mv nordugrid-arc-${VERSION}.tar.gz rpmbuild/SOURCES
- rpmbuild -D "_topdir $CI_PROJECT_DIR/rpmbuild" -ba nordugrid-arc.spec
tags:
- Computerome
only:
only:
- branches@nordugrid/arc
- tags@nordugrid/arc
artifacts:
......@@ -147,28 +147,25 @@ make_rpms_el6:
- $CI_PROJECT_DIR/rpmbuild/RPMS/noarch/
- $CI_PROJECT_DIR/rpmbuild/RPMS/x86_64/
allow_failure: false
make_rpms_el7:
stage: packages
image: maikenp/arc-build-centos7
script:
- yum update -y
- ./autogen.sh
- ./configure
- yum-builddep nordugrid-arc.spec -y
- ./configure
- echo "Preparing and running rpmbuild"
- mkdir -p $CI_PROJECT_DIR/rpmbuild/{SOURCES,BUILD,RPMS,SRPMS}
- echo "%_topdir $CI_PROJECT_DIR/rpmbuild" > ~/.rpmmacros
- export VERSION=`cat VERSION`
- make dist
- cp "nordugrid-arc-${VERSION}.tar.gz" $CI_PROJECT_DIR/rpmbuild/SOURCES
- rpmbuild -D "_topdir $CI_PROJECT_DIR/rpmbuild" -ba nordugrid-arc.spec
- cd $CI_PROJECT_DIR
script:
- yum update -y
- ./autogen.sh
- ./configure
- yum-builddep nordugrid-arc.spec -y
- echo "Preparing and running rpmbuild"
- mkdir -p rpmbuild/{SOURCES,BUILD,RPMS,SRPMS}
- make dist
- VERSION=`cat VERSION`
- mv nordugrid-arc-${VERSION}.tar.gz rpmbuild/SOURCES
- rpmbuild -D "_topdir $CI_PROJECT_DIR/rpmbuild" -ba nordugrid-arc.spec
tags:
- Computerome
only:
only:
- branches@nordugrid/arc
- tags@nordugrid/arc
artifacts:
......@@ -179,7 +176,7 @@ make_rpms_el7:
- $CI_PROJECT_DIR/rpmbuild/RPMS/noarch/
- $CI_PROJECT_DIR/rpmbuild/RPMS/x86_64/
allow_failure: false
deploy_staging_el6:
stage: deploy_and_test
......@@ -232,11 +229,11 @@ deploy_staging_el6:
tags:
- deploy
- el6
only:
only:
- branches@nordugrid/arc
- tags@nordugrid/arc
allow_failure: true
deploy_staging_el7:
stage: deploy_and_test
......@@ -289,7 +286,7 @@ deploy_staging_el7:
tags:
- deploy
- el7
only:
only:
- branches@nordugrid/arc
- tags@nordugrid/arc
allow_failure: true
......
......@@ -58,7 +58,7 @@ AC_DISABLE_STATIC
AC_LIBTOOL_WIN32_DLL
AM_PROG_LIBTOOL
AC_CHECK_PROG(PERL, perl, perl, :)
AC_PATH_PROG(PERL, perl, /usr/bin/perl, :)
# EL-5 compatibility. $(mkdir_p) is now obsolete.
test -n "$MKDIR_P" || MKDIR_P="$mkdir_p"
......@@ -315,7 +315,7 @@ AC_ARG_ENABLE(swig-python, AC_HELP_STRING([--disable-swig-python], [disable SWIG
AC_ARG_ENABLE(swig, AC_HELP_STRING([--disable-swig], [disable all bindings through SWIG]),
[enables_swig_python=$enableval],[])
if test "$enables_swig_python" = "yes"; then
AC_CHECK_PROGS(SWIG, swig)
AC_PATH_PROGS(SWIG, swig)
if test "x$SWIG" = "x"; then
enables_swig="no"
else
......@@ -372,9 +372,9 @@ if test "$enables_python" = "yes"; then
# We do not look for python binary when cross-compiling
# but we need to make the variable non-empty
if test "${build}" = "${host}"; then
AC_CHECK_PROGS(PYTHON, $with_python python)
AC_PATH_PROGS(PYTHON, $with_python python)
else
PYTHON=python
PYTHON=/usr/bin/python
fi
if test "X$PYTHON" != "X"; then
......@@ -500,7 +500,7 @@ if test "$enables_altpython" = "yes"; then
AC_ARG_WITH(altpython, AC_HELP_STRING([--with-altpython=(PYTHON)],
[specify alternative python program from PATH]))
AC_CHECK_PROGS(ALTPYTHON, $with_altpython)
AC_PATH_PROGS(ALTPYTHON, $with_altpython)
if test "X$ALTPYTHON" != "X"; then
ALTPYNAME=`basename $ALTPYTHON`
......@@ -597,7 +597,7 @@ dnl Check if pylint is explicitly disabled.
if test "$enables_hed" = "yes"; then
AC_ARG_ENABLE(pylint, AC_HELP_STRING([--disable-pylint], [disable python example checking using pylint]),
[enables_pylint=$enableval],[])
AC_CHECK_PROGS(PYLINT, pylint)
AC_PATH_PROGS(PYLINT, pylint)
if test "x$PYLINT" = "x"; then
enables_pylint="no"
else
......@@ -1925,7 +1925,7 @@ case "${host}" in
# its required to libtool generate .dlls on win32 using mingw
LDFLAGS="$LDFLAGS -no-undefined"
AC_DEFINE(HAVE_GETDOMAINNAME,,[windows has gethostname method])
AC_CHECK_PROGS(WINDRES, windres.exe ${host}-windres)
AC_PATH_PROGS(WINDRES, windres.exe ${host}-windres)
;;
*solaris*)
SOCKET_LIBS="-lsocket"
......@@ -1955,9 +1955,9 @@ case " $LDFLAGS " in
;;
esac
AC_CHECK_PROGS(PDFLATEX, pdflatex)
AC_CHECK_PROGS(DOXYGEN, doxygen)
AC_CHECK_PROGS(DOT, dot)
AC_PATH_PROGS(PDFLATEX, pdflatex)
AC_PATH_PROGS(DOXYGEN, doxygen)
AC_PATH_PROGS(DOT, dot)
# Check if user asks to skip documentation build
AC_ARG_ENABLE(doc, AC_HELP_STRING([--disable-doc], [disable building documentation (requires doxygen and pdflatex)]),[enables_doc=$enableval],[])
......@@ -2096,16 +2096,16 @@ AM_CONDITIONAL([DATADELIVERY_SERVICE_ENABLED],[test "x$enables_datadelivery_serv
# ACIX service
AC_ARG_ENABLE(acix, AC_HELP_STRING([--disable-acix], [disable building ACIX service]),
[enables_acix=$enableval],[])
dnl AM_PATH_PYTHON([2.4], [], [enables_acix="no"])
if test "x$PYTHON_VERSION" = "x2.2" -o "x$PYTHON_VERSION" = "x2.3"
then
AC_PATH_PROGS(TWISTD, twistd-${PYTHON_MAJOR} twistd${PYTHON_MAJOR} twistd)
if test "x$TWISTD" = "x"; then
AC_MSG_NOTICE([twistd not found - ACIX service disabled])
enables_acix="no"
fi
AC_MSG_NOTICE([ACIX enabled: $enables_acix])
AM_CONDITIONAL([ACIX_ENABLED],[test "x$enables_acix" = "xyes"])
# trial command (from python-twisted-core) is used for acix unittests
AC_CHECK_PROGS(TRIAL, trial)
AC_PATH_PROGS(TRIAL, trial-${PYTHON_MAJOR} trial${PYTHON_MAJOR} trial)
if test "x$TRIAL" = "x"; then
AC_MSG_NOTICE([trial not found - ACIX unit tests will be skipped])
fi
......@@ -2390,6 +2390,7 @@ AC_CONFIG_FILES([Makefile
src/services/a-rex/jura/Makefile
src/services/a-rex/jura/jura.1
src/services/a-rex/jura/ssm/Makefile
src/services/a-rex/jura/ssm/ssmsend
src/services/a-rex/ldif/Makefile
src/services/a-rex/lrms/Makefile
src/services/a-rex/lrms/test/Makefile
......@@ -2422,13 +2423,16 @@ AC_CONFIG_FILES([Makefile
src/services/a-rex/lrms/sge/scan-sge-job
src/services/a-rex/lrms/sge/cancel-sge-job
src/services/a-rex/lrms/slurm/Makefile
src/services/a-rex/lrms/slurm/test/Makefile
src/services/a-rex/lrms/slurm/test/scan/Makefile
src/services/a-rex/lrms/slurm/test/submit/Makefile
src/services/a-rex/lrms/slurm/submit-SLURM-job
src/services/a-rex/lrms/slurm/scan-SLURM-job
src/services/a-rex/lrms/slurm/cancel-SLURM-job
src/services/a-rex/lrms/slurm/test/Makefile
src/services/a-rex/lrms/slurm/test/scan/Makefile
src/services/a-rex/lrms/slurm/test/submit/Makefile
src/services/a-rex/lrms/dgbridge/Makefile
src/services/a-rex/lrms/dgbridge/DGAuthplug.py
src/services/a-rex/lrms/dgbridge/DGBridgeDataPlugin.py
src/services/a-rex/lrms/dgbridge/DGLog2XML.py
src/services/a-rex/lrms/dgbridge/submit-DGBridge-job
src/services/a-rex/lrms/dgbridge/scan-DGBridge-job
src/services/a-rex/lrms/dgbridge/cancel-DGBridge-job
......@@ -2437,6 +2441,9 @@ AC_CONFIG_FILES([Makefile
src/services/a-rex/lrms/boinc/scan-boinc-job
src/services/a-rex/lrms/boinc/cancel-boinc-job
src/services/a-rex/lrms/slurmpy/Makefile
src/services/a-rex/lrms/slurmpy/submit-SLURMPY-job
src/services/a-rex/lrms/slurmpy/scan-SLURMPY-job
src/services/a-rex/lrms/slurmpy/cancel-SLURMPY-job
src/services/a-rex/lrms/slurmpy/test/Makefile
src/services/a-rex/lrms/slurmpy/test/submit/Makefile
src/services/a-rex/lrms/slurmpy/test/scan/Makefile
......@@ -2534,7 +2541,9 @@ AC_CONFIG_FILES([Makefile
src/tests/client/Makefile
src/tests/lrms/Makefile
src/utils/archery/Makefile
src/utils/archery/archery-manage
src/utils/python/Makefile
src/utils/python/arcctl
src/utils/python/arcctl.1
src/utils/python/arc/Makefile
src/utils/python/arc/utils/Makefile
......@@ -2575,6 +2584,8 @@ AC_CONFIG_FILES([Makefile
nsis/arc.nsis
src/doxygen/Makefile
])
AC_CONFIG_FILES([src/utils/python/arcconfig-parser],
[chmod +x src/utils/python/arcconfig-parser])
AC_OUTPUT
AC_MSG_RESULT([
......
......@@ -3,7 +3,7 @@ Section: net
Priority: optional
Maintainer: Mattias Ellert <mattias.ellert@physics.uu.se>
Uploaders: Anders Waananen <waananen@nbi.dk>
Build-Depends: debhelper (>= 9), dh-autoreconf, autopoint, libxml2-dev (>= 2.4.0), libssl-dev, libglibmm-2.4-dev, python-dev, libltdl-dev, libldap2-dev, uuid-dev, libcppunit-dev, pkg-config, libdb++-dev, libxmlsec1-dev (>= 1.2.4), libglobus-common-dev, libglobus-gssapi-gsi-dev, libglobus-ftp-client-dev, libglobus-ftp-control-dev, dh-python | python-support, openssl, swig, libnss3-dev, pylint, libjson-xs-perl, libxml-simple-perl, libdbi-perl, libsqlite3-dev, libinline-python-perl | dash, libldns-dev
Build-Depends: debhelper (>= 9), dh-autoreconf, autopoint, libxml2-dev (>= 2.4.0), libssl-dev, libglibmm-2.4-dev, python-dev, libltdl-dev, libldap2-dev, uuid-dev, libcppunit-dev, pkg-config, libdb++-dev, libxmlsec1-dev (>= 1.2.4), libglobus-common-dev, libglobus-gssapi-gsi-dev, libglobus-ftp-client-dev, libglobus-ftp-control-dev, dh-python | python-support, openssl, swig, libnss3-dev, pylint, libjson-xs-perl, libxml-simple-perl, libdbi-perl, libsqlite3-dev, libinline-python-perl | dash, libldns-dev, python-twisted-core, python-twisted-web, python-openssl
XS-Python-Version: current
Standards-Version: 4.0.0
Homepage: http://www.nordugrid.org
......@@ -14,7 +14,8 @@ Conflicts: nordugrid-arc-chelonia (<< 2.0.0~), nordugrid-arc-hopi (<< 2.0.0~), n
Breaks: nordugrid-arc-hed (<< 1.0.1~rc2~), nordugrid-arc-arex (<< 2.0.1~), libarccommon0, libarccommon1, libarccommon2
Architecture: any
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
XB-Python-Version: ${python:Versions}
Description: ARC Grid middleware
NorduGrid is a collaboration aiming at development, maintenance and
support of the free Grid middleware, known as the Advanced Resource
......@@ -185,7 +186,7 @@ Description: ARC cache index - core components
Package: nordugrid-arc-acix-cache
Architecture: all
Depends: ${misc:Depends}, ${python:Depends}, python, python-twisted-core, python-twisted-web, python-openssl, nordugrid-arc-acix-core (= ${binary:Version}), lsb-base (>= 3.0-6)
Depends: ${misc:Depends}, ${python:Depends}, nordugrid-arc-acix-core (= ${binary:Version}), lsb-base (>= 3.0-6)
XB-Python-Version: ${python:Versions}
Description: ARC cache index - cache server
NorduGrid is a collaboration aiming at development, maintenance and
......@@ -198,7 +199,7 @@ Description: ARC cache index - cache server
Package: nordugrid-arc-acix-index
Architecture: all
Depends: ${misc:Depends}, ${python:Depends}, python, python-twisted-core, python-twisted-web, python-openssl, nordugrid-arc-acix-core (= ${binary:Version}), lsb-base (>= 3.0-6)
Depends: ${misc:Depends}, ${python:Depends}, nordugrid-arc-acix-core (= ${binary:Version}), lsb-base (>= 3.0-6)
XB-Python-Version: ${python:Versions}
Description: ARC cache index - index server
NorduGrid is a collaboration aiming at development, maintenance and
......
......@@ -7,10 +7,8 @@
%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
%if %{?rhel}%{!?rhel:0} == 6
%filter_provides_in %{python2_sitearch}.*\.so$
%filter_provides_in %{python2_sitearch}/.*\.so$
%filter_setup
%else
%global __provides_exclude_from ^(%{python2_sitearch}|%{python3_sitearch})/.*\\.so$
%endif
#
......@@ -72,6 +70,16 @@
%global with_pylint 0
%endif
%if %{?fedora}%{!?fedora:0} >= 29 || %{?rhel}%{!?rhel:0} >= 8
%global py3default 1
%global __defpython python3
%global __altpython python2
%else
%global py3default 0
%global __defpython python2
%global __altpython python3
%endif
%if %{?fedora}%{!?fedora:0} >= 7 || %{?rhel}%{!?rhel:0} >= 5 || %{?suse_version}%{!?suse_version:0} >= 1110
%global with_acix 1
%else
......@@ -277,6 +285,10 @@ BuildRequires: perl(Test::Harness)
BuildRequires: perl(Test::Simple)
# Needed to run ACIX unit tests
%if %{with_acix}
%if %{py3default}
BuildRequires: python3-twisted
BuildRequires: python3-pyOpenSSL
%else
%if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 8 || %{?suse_version:1}%{!?suse_version:0}
BuildRequires: python-twisted
%else
......@@ -289,11 +301,8 @@ BuildRequires: python-openssl
BuildRequires: pyOpenSSL
%endif
%endif
BuildRequires: swig
%if %{?suse_version:1}%{!?suse_version:0}
# Needed for python/doxy2swig.py
BuildRequires: python-xml
%endif
BuildRequires: swig
%if %{?fedora}%{!?fedora:0} >= 4 || %{?rhel}%{!?rhel:0} >= 5
BuildRequires: libtool-ltdl-devel
%else
......@@ -493,14 +502,24 @@ Requires: %{name} = %{version}-%{release}
Requires: %{name}-hed = %{version}-%{release}
Requires: %{name}-plugins-needed = %{version}-%{release}
%if %{with_python}
%if %{py3default}
Requires: python3-%{name} = %{version}-%{release}
%else
Requires: python2-%{name} = %{version}-%{release}
%endif
%endif
Requires: perl(JSON::XS)
Requires: perl(XML::Simple)
%if %{with_pythonlrms}
Requires: perl(Inline)
Requires: perl(Inline::Python)
%endif
%if %{py3default}
Requires: python3-stomppy
Requires: python3-ldap
Requires: python3-dirq
Requires: python3-isodate
%else
%if %{?fedora}%{!?fedora:0} >= 26 || %{?rhel}%{!?rhel:0} >= 8
Requires: python2-stomppy
%else
......@@ -508,7 +527,8 @@ Requires: stomppy
%endif
Requires: python-ldap
Requires: python-dirq
Requires: python-isodate
Requires: python-isodate
%endif
Requires(post): %{service_post_requires}
Requires(preun): %{service_preun_requires}
......@@ -618,13 +638,22 @@ Group: System Environment/Libraries
%if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6
BuildArch: noarch
%endif
%if %{py3default}
Requires: python3-twisted
Requires: python3-pyOpenSSL
%else
%if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 8 || %{?suse_version:1}%{!?suse_version:0}
Requires: python-twisted
%else
Requires: python-twisted-core
Requires: python-twisted-web
%endif
%if %{?suse_version:1}%{!?suse_version:0}
Requires: python-openssl
%else
Requires: pyOpenSSL
%endif
%endif
%description acix-core
NorduGrid is a collaboration aiming at development, maintenance and
......@@ -639,13 +668,6 @@ Group: System Environment/Libraries
%if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6
BuildArch: noarch
%endif
%if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 8 || %{?suse_version:1}%{!?suse_version:0}
Requires: python-twisted
%else
Requires: python-twisted-core
Requires: python-twisted-web
%endif
Requires: pyOpenSSL
Requires: %{name}-acix-core = %{version}-%{release}
Requires(post): %{service_post_requires}
......@@ -667,13 +689,6 @@ Group: System Environment/Libraries
%if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6
BuildArch: noarch
%endif
%if %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} >= 8 || %{?suse_version:1}%{!?suse_version:0}
Requires: python-twisted
%else
Requires: python-twisted-core
Requires: python-twisted-web
%endif
Requires: pyOpenSSL
Requires: %{name}-acix-core = %{version}-%{release}
Requires(post): %{service_post_requires}
......@@ -815,9 +830,9 @@ fi
%if %{with_s3}
--enable-s3 \
%endif
--with-python=python2 \
--with-python=%{__defpython} \
%if %{?fedora}%{!?fedora:0} >= 13 || %{?rhel}%{!?rhel:0} >= 7
--with-altpython=python3 \
--with-altpython=%{__altpython} \
%endif
%if %{with_canl}
--enable-canlxx \
......@@ -1041,22 +1056,18 @@ service nordugrid-arc-aris condrestart > /dev/null 2>&1 || :
%{_libdir}/%{pkgdir}/DataStagingDelivery
%dir %{_libexecdir}/%{pkgdir}
%{_libexecdir}/%{pkgdir}/arcconfig-parser
%if %{py3default}
%dir %{python3_sitearch}/%{pkgdir}
%{python3_sitearch}/%{pkgdir}/__init__.py
%{python3_sitearch}/%{pkgdir}/__pycache__/__init__.*
%{python3_sitearch}/%{pkgdir}/utils
%{python3_sitearch}/%{pkgdir}/control
%else
%dir %{python2_sitearch}/%{pkgdir}
%{python2_sitearch}/%{pkgdir}/__init__.py*
%dir %{python2_sitearch}/%{pkgdir}/utils
%{python2_sitearch}/%{pkgdir}/utils/__init__.py*
%{python2_sitearch}/%{pkgdir}/utils/config.py*
%dir %{python2_sitearch}/%{pkgdir}/control
%{python2_sitearch}/%{pkgdir}/control/__init__.py*
%{python2_sitearch}/%{pkgdir}/control/Accounting.py*
%{python2_sitearch}/%{pkgdir}/control/ControlCommon.py*
%{python2_sitearch}/%{pkgdir}/control/ControlPaths.py*
%{python2_sitearch}/%{pkgdir}/control/Jobs.py*
%{python2_sitearch}/%{pkgdir}/control/OSPackage.py*
%{python2_sitearch}/%{pkgdir}/control/OSService.py*
%{python2_sitearch}/%{pkgdir}/control/RunTimeEnvironment.py*
%{python2_sitearch}/%{pkgdir}/control/Services.py*
%{python2_sitearch}/%{pkgdir}/control/ThirdPartyDeployment.py*
%{python2_sitearch}/%{pkgdir}/utils
%{python2_sitearch}/%{pkgdir}/control
%endif
%dir %{_datadir}/%{pkgdir}
%dir %{_datadir}/%{pkgdir}/examples
%{_datadir}/%{pkgdir}/examples/arc.conf.reference
......@@ -1272,7 +1283,11 @@ service nordugrid-arc-aris condrestart > /dev/null 2>&1 || :
%{_datadir}/%{pkgdir}/ssm/sender.cfg
%if %{with_pythonlrms}
%{_libexecdir}/%{pkgdir}/arc-sshfs-mount
%if %{py3default}
%{python3_sitearch}/%{pkgdir}/lrms
%else
%{python2_sitearch}/%{pkgdir}/lrms
%endif
%{_datadir}/%{pkgdir}/SLURMPYmod.pm
%{_datadir}/%{pkgdir}/job_script.stubs