diff --git a/.anaconda.metadata b/.anaconda.metadata
index ef535dd..5f94c10 100644
--- a/.anaconda.metadata
+++ b/.anaconda.metadata
@@ -1 +1 @@
-1f2c8234827e67c1a3f12932a08651216ec49496 SOURCES/anaconda-29.19.0.43.tar.bz2
+7705327b7a750eeaeeda887a2937f3dfcb202f99 SOURCES/anaconda-29.19.1.13.tar.bz2
diff --git a/.gitignore b/.gitignore
index e213f3b..72e29bd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/anaconda-29.19.0.43.tar.bz2
+SOURCES/anaconda-29.19.1.13.tar.bz2
diff --git a/README.debrand b/README.debrand
deleted file mode 100644
index 01c46d2..0000000
--- a/README.debrand
+++ /dev/null
@@ -1,2 +0,0 @@
-Warning: This package was configured for automatic debranding, but the changes
-failed to apply.
diff --git a/SOURCES/0001-branding-syspurpose-doesn-t-make-sense-for-CentOS.patch b/SOURCES/0001-branding-syspurpose-doesn-t-make-sense-for-CentOS.patch
deleted file mode 100644
index fad6d73..0000000
--- a/SOURCES/0001-branding-syspurpose-doesn-t-make-sense-for-CentOS.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From baa49690977c02b258bcd4e7c274ecc46919856a Mon Sep 17 00:00:00 2001
-From: Pat Riehecky <riehecky@fnal.gov>
-Date: Wed, 10 Jul 2019 09:48:12 -0500
-Subject: [PATCH] branding: syspurpose doesn't make sense for CentOS
-
----
- pyanaconda/ui/gui/spokes/system_purpose.py | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/pyanaconda/ui/gui/spokes/system_purpose.py b/pyanaconda/ui/gui/spokes/system_purpose.py
-index 98664de..a73d6f9 100644
---- a/pyanaconda/ui/gui/spokes/system_purpose.py
-+++ b/pyanaconda/ui/gui/spokes/system_purpose.py
-@@ -62,6 +62,10 @@ class SystemPurposeSpoke(NormalSpoke):
- # record if the spoke has been visited by the user at least once
- self._spoke_visited = False
-
-+ @property
-+ def showable(self):
-+ return False
-+
- def initialize(self):
- NormalSpoke.initialize(self)
- self.initialize_start()
---
-1.8.3.1
-
diff --git a/SOURCES/0002-add-centos-background-color.patch b/SOURCES/0002-add-centos-background-color.patch
deleted file mode 100644
index f0d45c4..0000000
--- a/SOURCES/0002-add-centos-background-color.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- anaconda-29.19.0.40-orig/data/anaconda-gtk.css 2019-07-12 01:08:43.579816964 -0300
-+++ anaconda-29.19.0.40/data/anaconda-gtk.css 2019-07-12 01:09:52.994191971 -0300
-@@ -81,10 +81,11 @@
-
- @define-color redhat #2d2d2d;
- @define-color fedora #2f4265;
-+@define-color centos #000a38;
-
- /* theme colors/images */
-
--@define-color theme_bg_color @redhat;
-+@define-color theme_bg_color @centos;
-
- /* logo and sidebar classes */
-
diff --git a/SOURCES/centos-l10n.patch b/SOURCES/centos-l10n.patch
deleted file mode 100644
index c8bc238..0000000
--- a/SOURCES/centos-l10n.patch
+++ /dev/null
@@ -1,184 +0,0 @@
-diff -uNrp anaconda-29.19.0.43.orig/po/be.po anaconda-29.19.0.43/po/be.po
---- anaconda-29.19.0.43.orig/po/be.po 2019-08-27 02:41:03.000000000 -0500
-+++ anaconda-29.19.0.43/po/be.po 2019-10-07 10:12:23.876293108 -0500
-@@ -6525,7 +6525,7 @@ msgid "SYSTEM PURPOSE"
- msgstr "ПРЫЗНАЧЭННЕ СІСТЭМЫ"
-
- #: pyanaconda/ui/gui/spokes/system_purpose.glade:98
--msgid "Red Hat Service Level Agreement"
-+msgid "Support"
- msgstr "Умова ўзроўню паслугаў Red Hat"
-
- #: pyanaconda/ui/gui/spokes/system_purpose.glade:118
-@@ -7109,24 +7109,24 @@ msgstr "anaconda"
-
- #: data/liveinst/gnome/rhel-welcome.desktop:3
- #: data/liveinst/gnome/rhel-welcome.js:62
--msgid "Welcome to Red Hat Enterprise Linux"
--msgstr "Вітаем у сістэме Red Hat Enterprise Linux"
-+msgid "Welcome to CentOS Linux"
-+msgstr "Вітаем у сістэме CentOS Linux"
-
- #: data/liveinst/liveinst-setup.desktop:4
- msgid "Liveinst Setup"
- msgstr "Наладка інсталяцыі Live"
-
- #: data/liveinst/gnome/rhel-welcome.js:91
--msgid "Try RHEL"
--msgstr "Паспрабуйце RHEL"
-+msgid "Try CentOS"
-+msgstr "Паспрабуйце CentOS"
-
- #: data/liveinst/gnome/rhel-welcome.js:107
- msgid ""
--"You are currently running Red Hat Enterprise Linux from live media.\n"
--"You can install Red Hat Enterprise Linux now, or choose \"Install to Hard Drive\" in the Activities Overview at any later time."
-+"You are currently running CentOS Linux from live media.\n"
-+"You can install CentOS Linux now, or choose \"Install to Hard Drive\" in the Activities Overview at any later time."
- msgstr ""
--"Цяпер вы запусцілі Red Hat Enterprise Linux з live носьбіта.\n"
--"Можна зараз інсталяваць Red Hat Enterprise Linux альбо у любы пазнейшы час выберыце \"Інсталяваць на цвёрды дыск\" у аглядзе дзеянняў."
-+"Цяпер вы запусцілі CentOS Linux з live носьбіта.\n"
-+"Можна зараз інсталяваць CentOS Linux альбо у любы пазнейшы час выберыце \"Інсталяваць на цвёрды дыск\" у аглядзе дзеянняў."
-
- #: data/liveinst/gnome/rhel-welcome.js:125
- msgid ""
-diff -uNrp anaconda-29.19.0.43.orig/po/cs.po anaconda-29.19.0.43/po/cs.po
---- anaconda-29.19.0.43.orig/po/cs.po 2019-08-27 02:39:42.000000000 -0500
-+++ anaconda-29.19.0.43/po/cs.po 2019-10-07 10:12:11.359293162 -0500
-@@ -6508,8 +6508,8 @@ msgid "SYSTEM PURPOSE"
- msgstr "ÚČEL SYSTÉMU"
-
- #: pyanaconda/ui/gui/spokes/system_purpose.glade:98
--msgid "Red Hat Service Level Agreement"
--msgstr "Red Hat Service Level Agreement"
-+msgid "Support"
-+msgstr "Support"
-
- #: pyanaconda/ui/gui/spokes/system_purpose.glade:118
- msgid "Usage"
-@@ -7095,24 +7095,24 @@ msgstr "anaconda"
-
- #: data/liveinst/gnome/rhel-welcome.desktop:3
- #: data/liveinst/gnome/rhel-welcome.js:62
--msgid "Welcome to Red Hat Enterprise Linux"
--msgstr "Vítejte v Red Hat Enterprise Linuxu"
-+msgid "Welcome to CentOS Linux"
-+msgstr "Vítejte v CentOS Linuxu"
-
- #: data/liveinst/liveinst-setup.desktop:4
- msgid "Liveinst Setup"
- msgstr "Nastavení Liveinst"
-
- #: data/liveinst/gnome/rhel-welcome.js:91
--msgid "Try RHEL"
--msgstr "Zkuste RHEL"
-+msgid "Try CentOS"
-+msgstr "Zkuste CentOS"
-
- #: data/liveinst/gnome/rhel-welcome.js:107
- msgid ""
--"You are currently running Red Hat Enterprise Linux from live media.\n"
--"You can install Red Hat Enterprise Linux now, or choose \"Install to Hard Drive\" in the Activities Overview at any later time."
-+"You are currently running CentOS Linux from live media.\n"
-+"You can install CentOS Linux now, or choose \"Install to Hard Drive\" in the Activities Overview at any later time."
- msgstr ""
--"Máte Red Hat Enterprise Linux spuštěný z LIVE média.\n"
--"Můžete instalovat Red Hat Enterprise Linux hned, nebo vybrat \"Instalovat na pevný disk\" v Přehledu Aktivit kdykoli později."
-+"Máte CentOS Linux spuštěný z LIVE média.\n"
-+"Můžete instalovat CentOS Linux hned, nebo vybrat \"Instalovat na pevný disk\" v Přehledu Aktivit kdykoli později."
-
- #: data/liveinst/gnome/rhel-welcome.js:125
- msgid ""
-diff -uNrp anaconda-29.19.0.43.orig/po/nl.po anaconda-29.19.0.43/po/nl.po
---- anaconda-29.19.0.43.orig/po/nl.po 2019-08-27 02:40:55.000000000 -0500
-+++ anaconda-29.19.0.43/po/nl.po 2019-10-07 10:13:01.923292945 -0500
-@@ -6533,8 +6533,8 @@ msgid "SYSTEM PURPOSE"
- msgstr "SYSTEEMDOEL"
-
- #: pyanaconda/ui/gui/spokes/system_purpose.glade:98
--msgid "Red Hat Service Level Agreement"
--msgstr "Red Hat Service Level Agreement"
-+msgid "Support"
-+msgstr "Support"
-
- #: pyanaconda/ui/gui/spokes/system_purpose.glade:118
- msgid "Usage"
-@@ -7132,24 +7132,24 @@ msgstr "anaconda"
-
- #: data/liveinst/gnome/rhel-welcome.desktop:3
- #: data/liveinst/gnome/rhel-welcome.js:62
--msgid "Welcome to Red Hat Enterprise Linux"
--msgstr "Welkom bij Red Hat Enterprise Linux"
-+msgid "Welcome to CentOS Linux"
-+msgstr "Welkom bij CentOS Linux"
-
- #: data/liveinst/liveinst-setup.desktop:4
- msgid "Liveinst Setup"
- msgstr "Liveinst instelling"
-
- #: data/liveinst/gnome/rhel-welcome.js:91
--msgid "Try RHEL"
--msgstr "Probeer RHEL"
-+msgid "Try CentOS"
-+msgstr "Probeer CentOS"
-
- #: data/liveinst/gnome/rhel-welcome.js:107
- msgid ""
--"You are currently running Red Hat Enterprise Linux from live media.\n"
--"You can install Red Hat Enterprise Linux now, or choose \"Install to Hard Drive\" in the Activities Overview at any later time."
-+"You are currently running CentOS Linux from live media.\n"
-+"You can install CentOS Linux now, or choose \"Install to Hard Drive\" in the Activities Overview at any later time."
- msgstr ""
--"Je draait Red Hat Enterprise Linux op dit moment vanaf live-media.\n"
--"Je kunt Red Hat Enterprise Linux nu installeren, of je kiest \"Naar harde schijf installeren\" in het 'Activiteiten'-overzicht op een later moment."
-+"Je draait CentOS Linux op dit moment vanaf live-media.\n"
-+"Je kunt CentOS Linux nu installeren, of je kiest \"Naar harde schijf installeren\" in het 'Activiteiten'-overzicht op een later moment."
-
- #: data/liveinst/gnome/rhel-welcome.js:125
- msgid ""
-diff -uNrp anaconda-29.19.0.43.orig/po/sk.po anaconda-29.19.0.43/po/sk.po
---- anaconda-29.19.0.43.orig/po/sk.po 2019-08-27 02:41:33.000000000 -0500
-+++ anaconda-29.19.0.43/po/sk.po 2019-10-07 10:13:32.832292813 -0500
-@@ -6508,8 +6508,8 @@ msgid "SYSTEM PURPOSE"
- msgstr "ÚČEL SYSTÉMU"
-
- #: pyanaconda/ui/gui/spokes/system_purpose.glade:98
--msgid "Red Hat Service Level Agreement"
--msgstr "Red Hat Service Level Agreement"
-+msgid "Support"
-+msgstr "Support"
-
- #: pyanaconda/ui/gui/spokes/system_purpose.glade:118
- msgid "Usage"
-@@ -7098,23 +7098,23 @@ msgstr "anaconda"
-
- #: data/liveinst/gnome/rhel-welcome.desktop:3
- #: data/liveinst/gnome/rhel-welcome.js:62
--msgid "Welcome to Red Hat Enterprise Linux"
--msgstr "Vitajte v Red Hat Enterprise Linuxe"
-+msgid "Welcome to CentOS Linux"
-+msgstr "Vitajte v CentOS Linuxe"
-
- #: data/liveinst/liveinst-setup.desktop:4
- msgid "Liveinst Setup"
- msgstr "Nastavenie Liveinst"
-
- #: data/liveinst/gnome/rhel-welcome.js:91
--msgid "Try RHEL"
--msgstr "Vyskúšajte RHEL"
-+msgid "Try CentOS"
-+msgstr "Vyskúšajte CentOS"
-
- #: data/liveinst/gnome/rhel-welcome.js:107
- msgid ""
--"You are currently running Red Hat Enterprise Linux from live media.\n"
--"You can install Red Hat Enterprise Linux now, or choose \"Install to Hard Drive\" in the Activities Overview at any later time."
-+"You are currently running CentOS Linux from live media.\n"
-+"You can install CentOS Linux now, or choose \"Install to Hard Drive\" in the Activities Overview at any later time."
- msgstr ""
--"Momentálne máte spustený systém Red Hat Enterprise Linux z live média.\n"
-+"Momentálne máte spustený systém CentOS Linux z live média.\n"
- "Môžete ho nainštalovať ihneď alebo kedykoľvek neskôr spustením odkazu „Inštalovať na pevný disk“ v prehľade Aktivít."
-
- #: data/liveinst/gnome/rhel-welcome.js:125
diff --git a/SPECS/anaconda.spec b/SPECS/anaconda.spec
index b065d86..eef83d5 100644
--- a/SPECS/anaconda.spec
+++ b/SPECS/anaconda.spec
@@ -6,15 +6,12 @@
Summary: Graphical system installer
Name: anaconda
-Version: 29.19.0.43
+Version: 29.19.1.13
Release: 1%{?dist}
License: GPLv2+ and MIT
Group: Applications/System
URL: http://fedoraproject.org/wiki/Anaconda
-Patch100: centos-l10n.patch
-Patch101: 0001-branding-syspurpose-doesn-t-make-sense-for-CentOS.patch
-Patch102: 0002-add-centos-background-color.patch
# To generate Source0 do:
# git clone https://github.com/rhinstaller/anaconda
# git checkout -b archive-branch anaconda-%%{version}-%%{release}
@@ -40,7 +37,7 @@ Source0: %{name}-%{version}.tar.bz2
%define libxklavierver 5.4
%define mehver 0.23-1
%define nmver 1.0
-%define pykickstartver 3.16.4-1
+%define pykickstartver 3.16.6-1
%define pypartedver 2.5-2
%define rpmver 4.10.0
%define simplelinever 1.1-1
@@ -88,7 +85,7 @@ The anaconda package is a metapackage for the Anaconda installer.
Summary: Core of the Anaconda installer
Requires: python3-libs
Requires: python3-dnf >= %{dnfver}
-Requires: python3-blivet >= 1:3.1.0-11
+Requires: python3-blivet >= 1:3.1.0-12
Requires: python3-blockdev >= %{libblockdevver}
Requires: python3-meh >= %{mehver}
Requires: libreport-anaconda >= 2.0.21-1
@@ -347,35 +344,91 @@ update-desktop-database &> /dev/null || :
%{_prefix}/libexec/anaconda/dd_*
%changelog
-* Tue Sep 10 2019 CentOS Sources <bugs@centos.org> - 29.19.0.43-1.el8.centos
-- Apply debranding changes
-
-* Tue Aug 27 2019 Radek Vykydal <rvykydal@redhat.com> - 29.19.0.43-1
-- Set the flag lvm_metadata_backup (#1673901) (vponcova)
- Related: rhbz#1715344
-
-* Thu Aug 15 2019 Radek Vykydal <rvykydal@redhat.com> - 29.19.0.42-2
-- Gating adjustments
- Related: rhbz#1715344
-
-* Thu Aug 15 2019 Radek Vykydal <rvykydal@redhat.com> - 29.19.0.42-1
-- Require blivet with flags.protect_cdrom support (rvykydal)
- Resolves: rhbz#1715344
+* Fri Sep 27 2019 Radek Vykydal <rvykydal@redhat.com> - 29.19.1.13-1
+- Change the bases of the install classes for RHVH (vponcova)
+ Related: rhbz#1753316
+
+* Tue Sep 24 2019 Radek Vykydal <rvykydal@redhat.com> - 29.19.1.12-1
+- Add the install class for Red Hat Virtualization (vponcova)
+ Resolves: rhbz#1753316
+- Extend support for custom storage checking (vponcova)
+ Related: rhbz#1753316
+- Enable to define the autopart type in an install class (vponcova)
+ Related: rhbz#1753316
+
+* Mon Aug 26 2019 Radek Vykydal <rvykydal@redhat.com> - 29.19.1.11-1
+- Fix noverifyssl when downloading .treeinfo file (jkonecny)
+ Resolves: rhbz#1726156
+ Resolves: rhbz#1723811
+
+* Fri Aug 02 2019 Radek Vykydal <rvykydal@redhat.com> - 29.19.1.10-1
- Do not try to mount cdrom source also if it has been mounted in dracut.
(rvykydal)
- Resolves: rhbz#1715344
+ Resolves: rhbz#1733507
+
+* Tue Jul 02 2019 Radek Vykydal <rvykydal@redhat.com> - 29.19.1.9-1
+- Adjust the exclude arguments for livepayloads (bcl)
+ Related: rhbz#1684542
+- Recreate the BLS entries when using liveimg (bcl)
+ Resolves: rhbz#1684542
+- Cache the liveimg tar kernel list (bcl)
+ Related: rhbz#1684542
+- Add common function for creating rescue images (bcl)
+ Related: rhbz#1684542
+- Re-generate BLS loader file snippets on live installs (awilliam)
+ Related: rhbz#1684542
+
+* Tue Jul 02 2019 Radek Vykydal <rvykydal@redhat.com> - 29.19.1.8-1
+- Respect changesok password policy for root password (mkolman)
+ Resolves: rhbz#1584145
+- Fix default value for pwpolicy emptyok (mkolman)
+ Resolves: rhbz#1664704
+
+* Tue Jun 25 2019 Radek Vykydal <rvykydal@redhat.com> - 29.19.1.7-1
+- Add support for disabling modules via module --disable (mkolman)
+ Resolves: rhbz#1655523
+ Related: rhbz#1719347
+
+* Fri Jun 14 2019 Radek Vykydal <rvykydal@redhat.com> - 29.19.1.6-1
+- Require blivet with flags.protect_cdrom support (rvykydal)
+ Related: rhbz#1671713
- Be more strict when checking for mounted dvd source. (rvykydal)
- Resolves: rhbz#1715344
+ Resolves: rhbz#1671713
- Protect cdroms during tree population for image installs. (rvykydal)
- Resolves: rhbz#1715344
-- Use rhel-8.0 zanata version. (rvykydal)
- Related: rhbz#1715344
+ Resolves: rhbz#1671713
+
+* Thu Jun 13 2019 Radek Vykydal <rvykydal@redhat.com> - 29.19.1.5-1
+- Fix the rescue mode (vponcova)
+ Resolves: rhbz#1628653
+
+* Wed Jun 12 2019 Radek Vykydal <rvykydal@redhat.com> - 29.19.1.4-1
+- Set default entry to the BLS id instead of the entry index (javierm)
+ Resolves: rhbz#1671047
+- Fix non-root dir of install tree HD installation (jkonecny)
+ Resolves: rhbz#1689194
+
+* Tue Jun 11 2019 Radek Vykydal <rvykydal@redhat.com> - 29.19.1.3-1
+- Handle bytes and strings from RPM (vponcova)
+ Resolves: rhbz#1689909
+- Set the flag lvm_metadata_backup (vponcova)
+ Resolves: rhbz#1673901
+- Rename add-ons to additional software (jkonecny)
+ Resolves: rhbz#1674011
+- Move product version modifications for ui into function and add unit test.
+ (rvykydal)
+ Resolves: rhbz#1671384
+- Do not show quarterly release part of the version in UI. (rvykydal)
+ Resolves: rhbz#1671384
+
+* Mon Jun 10 2019 Radek Vykydal <rvykydal@redhat.com> - 29.19.1.2-1
- Rename zanata rhel-devel version (rvykydal)
- Related: rhbz#1715344
+ Related: rhbz#1666319
+- Adapt makebumpver to rhel-devel -> rhel-8 branch renaming. (rvykydal)
+ Resolves: rhbz#1666319
-* Wed Apr 3 2019 Radek Vykydal <rvykydal@redhat.com> - 29.19.0.41-1
-- Use new ssl certificate kickstart options (lueberni)
- Resolves: rhbz#1693976
+* Thu Jun 06 2019 Radek Vykydal <rvykydal@redhat.com> - 29.19.1.1-1
+- Use new ssl certificate kickstart options (lars)
+ Resolves: rhbz#1663954
* Thu Mar 14 2019 Radek Vykydal <rvykydal@redhat.com> - 29.19.0.40-1
- Pull in new translations (rvykydal)