Skip to content

Commit

Permalink
Merge pull request #26 from phillxnet/17_upgrade_testing_branch_depen…
Browse files Browse the repository at this point in the history
…dencies_re_Python_3

upgrade testing branch dependencies re Python 3 #17
  • Loading branch information
phillxnet authored Jul 20, 2023
2 parents 5f5c540 + 4ccc363 commit 470ee29
Showing 1 changed file with 6 additions and 9 deletions.
15 changes: 6 additions & 9 deletions rockstor.spec
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Prefix: /opt
# which is in-turn exported as a shell variable of RPM_BUILD_ROOT
BuildRoot: /var/tmp/%{name}-%{version}-%{release}-build

BuildRequires: python2
BuildRequires: python3
BuildRequires: systemd
BuildRequires: systemd-rpm-macros
# For when we update to current poetry for our build (Python 3 only):
Expand All @@ -53,8 +53,8 @@ BuildRequires: systemd-rpm-macros

# openSUSE Leap 15.0/15.1/15.2/15.3/15.4
%if 0%{?suse_version} == 1500
Requires: python
Requires: python-devel
Requires: python3
Requires: python3-devel
Requires: NetworkManager
Requires: nginx
Requires: btrfsprogs
Expand Down Expand Up @@ -86,15 +86,13 @@ Requires: nut-drivers-net
Requires: net-snmp
Requires: docker
Requires: cryptsetup
Requires: python3-distro
Requires: dnf-yum
Requires: dnf-plugins-core
Requires: python3-python-dateutil
Requires: which
Requires: shellinabox
Requires: avahi
Requires: cronie
Requires: python-xml
Requires: sssd
Requires: sssd-tools
Requires: sssd-ad
Expand All @@ -114,8 +112,9 @@ Requires: make
# Tumbleweed as of Nov 2022:
# Version unreliable as changes over time !
%if 0%{?suse_version} >= 1599
Requires: python
Requires: python-devel
# Nearest Python 3 in TW to our interim Py3.6 target is 3.8:
Requires: python38
Requires: python38-devel
Requires: NetworkManager
Requires: nginx
Requires: btrfsprogs
Expand Down Expand Up @@ -147,15 +146,13 @@ Requires: nut-drivers-net
Requires: net-snmp
Requires: docker
Requires: cryptsetup
Requires: python3-distro
Requires: dnf-yum
Requires: dnf-plugins-core
Requires: python3-python-dateutil
Requires: which
Requires: shellinabox
Requires: avahi
Requires: cronie
Requires: python-xml
Requires: sssd
Requires: sssd-tools
Requires: sssd-ad
Expand Down

0 comments on commit 470ee29

Please sign in to comment.