##// END OF EJS Templates
packaging: use "python3" for fedora29 ... and as buildrpm default...
Mads Kiilerich -
r43675:51865531 stable
parent child Browse files
Show More
@@ -6,7 +6,7 b''
6
6
7 BUILD=1
7 BUILD=1
8 RPMBUILDDIR="$PWD/rpmbuild"
8 RPMBUILDDIR="$PWD/rpmbuild"
9 PYTHONEXE=python2
9 PYTHONEXE=python3
10
10
11 while [ "$1" ]; do
11 while [ "$1" ]; do
12 case "$1" in
12 case "$1" in
@@ -7,8 +7,8 b' RUN dnf install -y \\'
7 gcc \
7 gcc \
8 gettext \
8 gettext \
9 make \
9 make \
10 python-devel \
10 python3-devel \
11 python-docutils \
11 python3-docutils \
12 rpm-build
12 rpm-build
13
13
14 # For creating repo meta data
14 # For creating repo meta data
@@ -2,7 +2,7 b''
2
2
3 %define withpython %{nil}
3 %define withpython %{nil}
4
4
5 %global pythonexe python2
5 %global pythonexe python3
6
6
7 %if "%{?withpython}"
7 %if "%{?withpython}"
8
8
@@ -39,8 +39,8 b' BuildRequires: make, gcc, gettext'
39 %if "%{?withpython}"
39 %if "%{?withpython}"
40 BuildRequires: readline-devel, openssl-devel, ncurses-devel, zlib-devel, bzip2-devel
40 BuildRequires: readline-devel, openssl-devel, ncurses-devel, zlib-devel, bzip2-devel
41 %else
41 %else
42 BuildRequires: python >= %{pythonver}, python-devel, python-docutils >= 0.5
42 BuildRequires: %{pythonexe} >= %{pythonver}, %{pythonexe}-devel, %{pythonexe}-docutils >= 0.5
43 Requires: python >= %{pythonver}
43 Requires: %{pythonexe} >= %{pythonver}
44 %endif
44 %endif
45 # The hgk extension uses the wish tcl interpreter, but we don't enforce it
45 # The hgk extension uses the wish tcl interpreter, but we don't enforce it
46 #Requires: tk
46 #Requires: tk
General Comments 0
You need to be logged in to leave comments. Login now