Skip to content

Commit

Permalink
Use Python 3 versions of Python dependencies (#1014220)
Browse files Browse the repository at this point in the history
  • Loading branch information
M4rtinK committed Jun 1, 2015
1 parent 9c84767 commit 58d2083
Showing 1 changed file with 28 additions and 32 deletions.
60 changes: 28 additions & 32 deletions anaconda.spec.in
Expand Up @@ -27,7 +27,6 @@ Source0: %{name}-%{version}.tar.bz2
%define pypartedver 2.5-2
%define nmver 0.9.9.0-10.git20130906
%define dbusver 1.2.3
%define yumutilsver 1.1.11-3
%define mehver 0.23-1
%define firewalldver 0.3.5-1
%define utillinuxver 2.15.1
Expand All @@ -54,12 +53,12 @@ BuildRequires: intltool >= %{intltoolver}
BuildRequires: libgnomekbd-devel
BuildRequires: libxklavier-devel >= %{libxklavierver}
BuildRequires: pango-devel
BuildRequires: python-kickstart >= %{pykickstartver}
BuildRequires: python3-kickstart >= %{pykickstartver}
%if ! 0%{?rhel}
BuildRequires: python-bugzilla
BuildRequires: python3-bugzilla
%endif
BuildRequires: python-devel
BuildRequires: python-nose
BuildRequires: python3-devel
BuildRequires: python3-nose
BuildRequires: systemd
# rpm and libarchive are needed for driver disk handling
BuildRequires: rpm-devel >= %{rpmver}
Expand All @@ -81,29 +80,28 @@ The anaconda package is a metapackage for the Anaconda installer.

%package core
Summary: Core of the Anaconda installer
Requires: dnf >= %{dnfver}
Requires: python-dnf >= %{dnfver}
Requires: python-blivet >= 1:1.3
Requires: python-meh >= %{mehver}
Requires: python3-dnf >= %{dnfver}
Requires: python3-blivet >= 1:1.0
Requires: python3-meh >= %{mehver}
Requires: libreport-anaconda >= 2.0.21-1
Requires: libselinux-python
Requires: rpm-python >= %{rpmver}
Requires: libselinux-python3
Requires: rpm-python3 >= %{rpmver}
Requires: parted >= %{partedver}
Requires: pyparted >= %{pypartedver}
Requires: python-requests
Requires: python-requests-file
Requires: python-requests-ftp
Requires: python-kickstart >= %{pykickstartver}
Requires: python3-pyparted >= %{pypartedver}
Requires: python3-requests
Requires: python3-requests-file
Requires: python3-requests-ftp
Requires: python3-kickstart >= %{pykickstartver}
Requires: langtable-data >= %{langtablever}
Requires: langtable-python >= %{langtablever}
Requires: libuser-python
Requires: langtable-python3 >= %{langtablever}
Requires: libuser-python3
Requires: authconfig
Requires: firewalld >= %{firewalldver}
Requires: util-linux >= %{utillinuxver}
Requires: dbus-python
Requires: python-pwquality
Requires: python-IPy
Requires: pytz
Requires: python3-dbus
Requires: python3-pwquality
Requires: python-IPy-python3
Requires: python3-pytz
Requires: realmd
Requires: teamd
%ifarch %livearches
Expand All @@ -113,16 +111,15 @@ Requires: usermode
Requires: openssh
%endif
Requires: isomd5sum >= %{isomd5sum}
Requires: yum-utils >= %{yumutilsver}
Requires: createrepo_c
Requires: NetworkManager >= %{nmver}
Requires: NetworkManager-glib >= %{nmver}
Requires: NetworkManager-team
Requires: dhclient
Requires: libselinux-python
Requires: libselinux-python3
Requires: kbd
Requires: chrony
Requires: python-ntplib
Requires: python3-ntplib
Requires: rsync
Requires: systemd
%ifarch %{ix86} x86_64
Expand All @@ -136,11 +133,10 @@ Requires: hfsplus-tools
%endif
Requires: kexec-tools

Requires: python-coverage
Requires: pygobject3-base
Requires: python3-coverage

# Used by rescue.py and the low RAM message in /sbin/anaconda
Requires: newt-python
Requires: newt-python3

# required because of the rescue mode and VNC question
Requires: anaconda-tui = %{version}-%{release}
Expand All @@ -159,7 +155,7 @@ system.
Summary: Graphical user interface for the Anaconda installer
Requires: anaconda-core = %{version}-%{release}
Requires: anaconda-widgets = %{version}-%{release}
Requires: python-meh-gui >= %{mehver}
Requires: python3-meh-gui >= %{mehver}
Requires: adwaita-icon-theme
Requires: system-logos
Requires: tigervnc-server-minimal
Expand All @@ -176,7 +172,7 @@ Requires: NetworkManager-wifi
%endif
Requires: anaconda-user-help >= %{helpver}
Requires: yelp
Requires: pygobject3
Requires: python3-gobject

# Needed to compile the gsettings files
BuildRequires: gsettings-desktop-schemas
Expand All @@ -194,7 +190,7 @@ This package contains textual user interface for the Anaconda installer.
%package widgets
Summary: A set of custom GTK+ widgets for use with anaconda
Group: System Environment/Libraries
Requires: python
Requires: python3

%description widgets
This package contains a set of custom GTK+ widgets used by the anaconda installer.
Expand All @@ -215,7 +211,7 @@ Summary: The anaconda dracut module
Requires: dracut >= %{dracutver}
Requires: dracut-network
Requires: xz
Requires: python-kickstart
Requires: python3-kickstart

%description dracut
The 'anaconda' dracut module handles installer-specific boot tasks and
Expand Down

0 comments on commit 58d2083

Please sign in to comment.