diff --git a/.anaconda.metadata b/.anaconda.metadata index 65d41ac..2c7032a 100644 --- a/.anaconda.metadata +++ b/.anaconda.metadata @@ -1 +1 @@ -251b90f160845c8b8ec82e45513905dada34b723 SOURCES/anaconda-21.48.22.134.tar.bz2 +bdf24b5842fda3537b6e5ffe4c434f754399f184 SOURCES/anaconda-21.48.22.147.tar.bz2 diff --git a/.gitignore b/.gitignore index 6d05f13..d3d639f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/anaconda-21.48.22.134.tar.bz2 +SOURCES/anaconda-21.48.22.147.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-Don-t-display-Alternate-Architectures-in-product-nam.patch b/SOURCES/0001-Don-t-display-Alternate-Architectures-in-product-nam.patch deleted file mode 100644 index 25445e1..0000000 --- a/SOURCES/0001-Don-t-display-Alternate-Architectures-in-product-nam.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 6cc9d3cb2562d0b6f1ae3fd8e0dd392c3daeb738 Mon Sep 17 00:00:00 2001 -From: Radek Vykydal -Date: Wed, 4 Oct 2017 11:12:06 +0200 -Subject: [PATCH] Don't display "Alternate Architectures" in product name - (#1544556) - -Temporary fix on anaconda side. This should be resolved in compose tools (or -testing infrastructure) side (#1488558). - -Resolves: rhbz#1544556 ---- - pyanaconda/product.py | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/pyanaconda/product.py b/pyanaconda/product.py -index 1ff004659..a77ad42a9 100644 ---- a/pyanaconda/product.py -+++ b/pyanaconda/product.py -@@ -41,6 +41,8 @@ bugUrl = config.get("Main", "BugURL") - isFinal = config.getboolean("Main", "IsFinal") - productArch = config.get("Main", "Arch") - productName = config.get("Main", "Product") -+if productName.endswith(" Alternate Architectures"): -+ productName = productName[:-len(" Alternate Architectures")] - productStamp = config.get("Main", "UUID") - productVersion = config.get("Main", "Version") - --- -2.14.3 - diff --git a/SPECS/anaconda.spec b/SPECS/anaconda.spec index 1efd754..a7b3bc0 100644 --- a/SPECS/anaconda.spec +++ b/SPECS/anaconda.spec @@ -2,8 +2,8 @@ Summary: Graphical system installer Name: anaconda -Version: 21.48.22.134 -Release: 3%{?dist} +Version: 21.48.22.147 +Release: 1%{?dist} License: GPLv2+ and MIT Group: Applications/System URL: http://fedoraproject.org/wiki/Anaconda @@ -14,15 +14,6 @@ URL: http://fedoraproject.org/wiki/Anaconda # ./autogen.sh # make dist Source0: %{name}-%{version}.tar.bz2 -Patch0: 0001-Don-t-display-Alternate-Architectures-in-product-nam.patch -Patch1: anaconda-centos-add-centos-install-class.patch -Patch2: anaconda-centos-set-right-eula-location.patch -Patch4: anaconda-centos-disable-mirrors.patch -Patch5: anaconda-centos-bootfs-default-to-xfs.patch -Patch6: anaconda-centos-help-text.patch -Patch7: anaconda-centos-skip-retry-if-not-connected.patch -Patch8: 9800-rpmostreepayload-Rework-remote-add-handling.patch -Patch9: yumpayload-dont-verify-disabled-repos.patch # Versions of required components (done so we make sure the buildrequires # match the requires versions of things). @@ -43,7 +34,7 @@ Patch9: yumpayload-dont-verify-disabled-repos.patch %define mehver 0.23-1 %define nmver 1.0.0-6.git20150107 %define partedver 1.8.1 -%define pykickstartver 1.99.66.18 +%define pykickstartver 1.99.66.19 %define pypartedver 2.5-2 %define pythonpyblockver 0.45 %define pythonurlgrabberver 3.9.1-5 @@ -98,7 +89,7 @@ The anaconda package is a metapackage for the Anaconda installer. %package core Summary: Core of the Anaconda installer -Requires: python-blivet >= 1:0.61.15.60 +Requires: python-blivet >= 1:0.61.15.71 Requires: python-meh >= %{mehver} Requires: libreport-anaconda >= 2.0.21-1 Requires: libreport-rhel-anaconda-bugzilla >= 2.1.11-1 @@ -116,6 +107,7 @@ Requires: authconfig Requires: firewalld >= %{firewalldver} Requires: util-linux >= %{utillinuxver} Requires: dbus-python +Requires: python-subprocess32 Requires: python-pwquality Requires: python-IPy Requires: python-nss @@ -142,6 +134,7 @@ Requires: rsync Requires: systemd %ifarch %{ix86} x86_64 Requires: fcoe-utils >= %{fcoeutilsver} +Requires: libblockdev-nvdimm %endif Requires: iscsi-initiator-utils >= %{iscsiver} %ifarch %{ix86} x86_64 ia64 @@ -187,7 +180,7 @@ Requires: keybinder3 Requires: NetworkManager-wifi %endif Requires: yelp -#Requires: anaconda-user-help >= %{helpver} +Requires: anaconda-user-help >= %{helpver} # Needed to compile the gsettings files BuildRequires: gsettings-desktop-schemas @@ -236,15 +229,6 @@ runtime on NFS/HTTP/FTP servers or local disks. %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 %build %configure --disable-static \ @@ -337,20 +321,101 @@ update-desktop-database &> /dev/null || : %{_prefix}/libexec/anaconda/dd_* %changelog -* Mon Apr 09 2018 CentOS Sources - 21.48.22.134-3.el7.centos -- Apply debranding changes - -* Mon Feb 20 2018 Radek Vykydal - 21.48.22.134-3 -- Actually include the patch for product name (rvykydal) - Related: rhbz#1544556 - -* Mon Feb 19 2018 Radek Vykydal - 21.48.22.134-2 -- Rebase to the latest 7.5 version (rvykydal) - Related: rhbz#1544556 - -* Wed Feb 16 2018 Radek Vykydal - 21.48.22.133-2 +* Wed Sep 26 2018 Radek Vykydal - 21.48.22.147-1 +- Pull in new translations (rvykydal) + Related: rhbz#1569416 + +* Wed Sep 19 2018 Radek Vykydal - 21.48.22.146-1 +- Revert "If someone really wants to eject the cdrom, then do it. (jkonecny)" + Resolves: rhbz#1618408 + +* Tue Aug 28 2018 Radek Vykydal - 21.48.22.145-1 +- Pull in new translations (rvykydal) + Resolves: rhbz#1569416 + +* Fri Jul 27 2018 Radek Vykydal - 21.48.22.144-1 +- Don't allow unlocking and using of LUKS2 devices (vponcova) + Resolves: rhbz#1608251 +- Fix glade accelerator conflicts (rvykydal) + Related: rhbz#1602436 +- Add nvdimm files to POTFILES.in (rvykydal) + Related: rhbz#1602436 +- Support nvdimm only on x86_64 (rvykydal) + Resolves: rhbz#1602436 + +* Fri Jun 22 2018 Radek Vykydal - 21.48.22.143-1 +- Add data loss warning to nvdimm reconfigure dialog. (rvykydal) + Resolves: rhbz#1280500 +- Add UI feedback for disk repopulating after nvdimm reconfiguration. + (rvykydal) + Resolves: rhbz#1280500 +- Use only devices specified by nvdimm command for installation. (rvykydal) + Resolves: rhbz#1280500 +- Add option to reconfigure nvdimm devices into sector mode. (rvykydal) + Resolves: rhbz#1280500 +- Allow only devices in sector mode to be selected. (rvykydal) + Resolves: rhbz#1280500 +- Add nvdimm devices to Advanced Storage spoke. (rvykydal) + Resolves: rhbz#1280500 +- Add kickstart support for nvdimm reconfiguration to sector mode. (rvykydal) + Resolves: rhbz#1280500 + +* Tue Jun 05 2018 Radek Vykydal - 21.48.22.142-1 +- If someone really wants to eject the cdrom, then do it. (sbueno) + Resolves: rhbz#1499792 + +* Wed May 30 2018 Radek Vykydal - 21.48.22.141-1 +- Use subprocess32 to prevent concurrency issues. (rvykydal) + Resolves: rhbz#1581200 + +* Wed May 23 2018 Radek Vykydal - 21.48.22.140-1 +- Preserve the boot option zfcp.allow_lun_scan (vponcova) + Resolves: rhbz#1561662 - Don't display "Alternate Architectures" in product name (rvykydal) - Resolves: rhbz#1544556 + Resolves: rhbz#1488558 + +* Wed May 16 2018 Radek Vykydal - 21.48.22.139-1 +- installclasses/rhelah: Allow LVM thin and dm-crypt (walters) + Resolves: rhbz#1546252 +- Ask for a default passphrase if required (vponcova) + Resolves: rhbz#1436304 +- Add support for setting different types of passwords in TUI (vponcova) + Related: rhbz#1436304 + +* Thu May 10 2018 Radek Vykydal - 21.48.22.138-1 +- Fix crash on inst.noverifyssl with non-url method (rvykydal) + Resolves: rhbz#1515678 + +* Wed May 02 2018 Radek Vykydal - 21.48.22.137-1 +- Improve UI feedback for invalid boot on non-iBFT iSCSI devices. (rvykydal) + Related: rhbz#1562301 +- Add inst.nonibftiscsiboot boot option. (rvykydal) + Resolves: rhbz#1562301 + +* Wed Apr 25 2018 Radek Vykydal - 21.48.22.136-1 +- Once again fix cmdline error handling. (sbueno+anaconda) + Resolves: rhbz#1360223 +- Extend the timeout period to 180s in the case of cmdline error. + (sbueno+anaconda) + Resolves: rhbz#1360223 +- kickstart: "clearpart --list" does not work (marcel) + Resolves: rhbz#1561930 + +* Mon Apr 16 2018 Radek Vykydal - 21.48.22.135-1 +- Clear errors when a user updates partitioning settings (vponcova) + Resolves: rhbz#1535781 +- Don't try to create required partitions if there are none (vponcova) + Resolves: rhbz#1557485 +- Fix parsing of hostname from cmdline for ipv6. (rvykydal) + Resolves: rhbz#1554271 + +* Mon Feb 19 2018 Radek Vykydal - 21.48.22.134-1 +- Revert "UI support for configuring certain mitigations (mkolman)" + Resolves: rhbz#1546267 +- Revert "Performance spoke related CI fixes" (mkolman) + Related: rhbz#1546267 +- Revert "Fix mitigation toggling with kickstart" (mkolman) + Related: rhbz#1546267 * Wed Feb 14 2018 Radek Vykydal - 21.48.22.133-1 - Fix mitigation toggling with kickstart (mkolman)