diff --git a/.anaconda.metadata b/.anaconda.metadata
index 7464f76..65d41ac 100644
--- a/.anaconda.metadata
+++ b/.anaconda.metadata
@@ -1 +1 @@
-47c05f5047f1e90223fd51b10305aabbe83b9edc SOURCES/anaconda-21.48.22.121.tar.bz2
+251b90f160845c8b8ec82e45513905dada34b723 SOURCES/anaconda-21.48.22.134.tar.bz2
diff --git a/.gitignore b/.gitignore
index 3962a4b..6d05f13 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/anaconda-21.48.22.121.tar.bz2
+SOURCES/anaconda-21.48.22.134.tar.bz2
diff --git a/SOURCES/9800-rpmostreepayload-Rework-remote-add-handling.patch b/SOURCES/9800-rpmostreepayload-Rework-remote-add-handling.patch
deleted file mode 100644
index 59f7edf..0000000
--- a/SOURCES/9800-rpmostreepayload-Rework-remote-add-handling.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-diff -uNrp anaconda-21.48.22.121.orig/pyanaconda/packaging/rpmostreepayload.py anaconda-21.48.22.121/pyanaconda/packaging/rpmostreepayload.py
---- anaconda-21.48.22.121.orig/pyanaconda/packaging/rpmostreepayload.py 2017-06-21 12:44:34.000000000 +0000
-+++ anaconda-21.48.22.121/pyanaconda/packaging/rpmostreepayload.py 2017-08-23 02:28:23.121006339 +0000
-@@ -142,24 +142,25 @@ class RPMOSTreePayload(ArchivePayload):
- ["admin", "--sysroot=" + iutil.getTargetPhysicalRoot(),
- "init-fs", iutil.getTargetPhysicalRoot()])
-
-- repo_arg = "--repo=" + iutil.getTargetPhysicalRoot() + '/ostree/repo'
-+ self._sysroot_path = Gio.File.new_for_path(iutil.getTargetPhysicalRoot())
-+ sysroot = OSTree.Sysroot.new(self._sysroot_path)
-+ sysroot.load(cancellable)
-+ repo = sysroot.get_repo(None)[1]
-+ # We don't support resuming from interrupted installs
-+ repo.set_disable_fsync(True)
-+
-+ self._remoteOptions = {}
-
-- # Store this for use in postInstall too, where we need to
-- # undo/redo this step.
-- self._base_remote_args = ["remote", "add"]
-+ # Handle variations in pykickstart
- if ((hasattr(ostreesetup, 'noGpg') and ostreesetup.noGpg) or
- (hasattr(ostreesetup, 'nogpg') and ostreesetup.nogpg)):
-- self._base_remote_args.append("--set=gpg-verify=false")
-- self._base_remote_args.extend([ostreesetup.remote,
-- ostreesetup.url])
-- self._safeExecWithRedirect("ostree", [repo_arg] + self._base_remote_args)
-+ self._remoteOptions['gpg-verify'] = GLib.Variant('b', False)
-
-- self._sysroot_path = sysroot_path = Gio.File.new_for_path(iutil.getTargetPhysicalRoot())
-- sysroot = OSTree.Sysroot.new(sysroot_path)
-- sysroot.load(cancellable)
-+ repo.remote_change(None, OSTree.RepoRemoteChange.ADD_IF_NOT_EXISTS,
-+ ostreesetup.remote, ostreesetup.url,
-+ GLib.Variant('a{sv}', self._remoteOptions),
-+ cancellable)
-
-- repo = sysroot.get_repo(None)[1]
-- repo.set_disable_fsync(True)
- progressQ.send_message(_("Starting pull of %(branchName)s from %(source)s") % \
- {"branchName": ostreesetup.ref, "source": ostreesetup.remote})
-
-@@ -178,6 +179,14 @@ class RPMOSTreePayload(ArchivePayload):
-
- progressQ.send_message(_("Preparing deployment of %s") % (ostreesetup.ref, ))
-
-+ # Now that we have the data pulled, delete the remote for now.
-+ # This will allow a remote configuration defined in the tree
-+ # (if any) to override what's in the kickstart. Otherwise,
-+ # we'll re-add it in post. Ideally, ostree would support a
-+ # pull without adding a remote, but that would get quite
-+ # complex.
-+ repo.remote_delete(self.data.ostreesetup.remote, None)
-+
- self._safeExecWithRedirect("ostree",
- ["admin", "--sysroot=" + iutil.getTargetPhysicalRoot(),
- "os-init", ostreesetup.osname])
-@@ -257,20 +266,30 @@ class RPMOSTreePayload(ArchivePayload):
- from gi.repository import OSTree
- cancellable = None
-
-- # Reload this data - we couldn't keep it open across
-- # the remounts happening.
- sysroot = OSTree.Sysroot.new(self._sysroot_path)
- sysroot.load(cancellable)
- repo = sysroot.get_repo(None)[1]
-
-- # This is an ugly hack - we didn't have /etc/ostree/remotes.d,
-- # so the remote went into /ostree/repo/config. But we want it
-- # in /etc, so delete that remote, then re-add it to
-- # /etc/ostree/remotes.d, executing ostree inside the sysroot
-- # so that it understands it's a "system repository" and should
-- # modify /etc.
-- repo.remote_delete(self.data.ostreesetup.remote, None)
-- self._safeExecWithRedirect("ostree", self._base_remote_args, root=iutil.getSysroot())
-+ # CentOS specific patch (for now) - pull the remote config from usr/etc if it exists.
-+ # The OSTree handling here was buggy in that it wasn't looking in the sysroot
-+ # for existing remotes.
-+ default_remote_path = iutil.getSysroot() + '/usr/etc/ostree/remotes.d/' + self.data.ostreesetup.osname + '.conf'
-+ if os.path.isfile(default_remote_path):
-+ destpath = iutil.getSysroot() + '/etc/ostree/remotes.d/' + os.path.basename(default_remote_path)
-+ self._safeExecWithRedirect('cp', ['-r', '-p', default_remote_path, destpath])
-+ else:
-+ # Following up on the "remote delete" above, we removed the
-+ # remote from /ostree/repo/config. But we want it in /etc, so
-+ # re-add it to /etc/ostree/remotes.d, using the sysroot path.
-+ #
-+ # However, we ignore the case where the remote already exists,
-+ # which occurs when the content itself provides the remote
-+ # config file.
-+ repo.remote_change(Gio.File.new_for_path(iutil.getSysroot()),
-+ OSTree.RepoRemoteChange.ADD_IF_NOT_EXISTS,
-+ self.data.ostreesetup.remote, self.data.ostreesetup.url,
-+ GLib.Variant('a{sv}', self._remoteOptions),
-+ cancellable)
-
- boot = iutil.getSysroot() + '/boot'
-
diff --git a/SOURCES/anaconda-centos-add-centos-install-class.patch b/SOURCES/anaconda-centos-add-centos-install-class.patch
deleted file mode 100644
index 208a851..0000000
--- a/SOURCES/anaconda-centos-add-centos-install-class.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-diff -uNr anaconda-21.48.22.56__orig/pyanaconda/installclasses/fedora.py anaconda-21.48.22.56/pyanaconda/installclasses/fedora.py
---- anaconda-21.48.22.56__orig/pyanaconda/installclasses/fedora.py 2015-10-22 17:34:02.000000000 +0100
-+++ anaconda-21.48.22.56/pyanaconda/installclasses/fedora.py 2015-12-07 16:40:33.122000000 +0000
-@@ -25,7 +25,7 @@
- class FedoraBaseInstallClass(BaseInstallClass):
- name = "Fedora"
- sortPriority = 10000
-- if productName.startswith("Red Hat "):
-+ if productName.startswith("Red Hat ") or productName.startswith("CentOS"):
- hidden = True
-
- _l10n_domain = "anaconda"
-diff -uNr anaconda-21.48.22.56__orig/pyanaconda/installclasses/centos.py anaconda-21.48.22.56/pyanaconda/installclasses/centos.py
---- anaconda-21.48.22.56__orig/pyanaconda/installclasses/centos.py 1970-01-01 01:00:00.000000000 +0100
-+++ anaconda-21.48.22.56/pyanaconda/installclasses/centos.py 2015-12-07 16:52:11.157000000 +0000
-@@ -0,0 +1,97 @@
-+#
-+# rhel.py
-+#
-+# Copyright (C) 2010 Red Hat, Inc. All rights reserved.
-+#
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program. If not, see
...is not yet available for this screen.
-+You can check out the CentOS Linux resouces online at https://wiki.centos.org/InstallerHelp.
-+ -diff -uNr anaconda-21.48.22.56__orig/data/help/en-US/CentOSPlaceholderWithLinks.html anaconda-21.48.22.56/data/help/en-US/CentOSPlaceholderWithLinks.html ---- anaconda-21.48.22.56__orig/data/help/en-US/CentOSPlaceholderWithLinks.html 1970-01-01 01:00:00.000000000 +0100 -+++ anaconda-21.48.22.56/data/help/en-US/CentOSPlaceholderWithLinks.html 2015-12-07 17:09:47.845000000 +0000 -@@ -0,0 +1,5 @@ -+ -+...is not yet available for this screen.
-+You can check out the CentOS Linux resouces online at https://wiki.centos.org/InstallerHelp.
-+ diff --git a/SOURCES/anaconda-centos-set-right-eula-location.patch b/SOURCES/anaconda-centos-set-right-eula-location.patch deleted file mode 100644 index e33eb4e..0000000 --- a/SOURCES/anaconda-centos-set-right-eula-location.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -uNr anaconda-19.31.79__orig/pyanaconda/constants.py anaconda-19.31.79/pyanaconda/constants.py ---- anaconda-19.31.79__orig/pyanaconda/constants.py 2014-04-29 01:45:59.000000000 +0100 -+++ anaconda-19.31.79/pyanaconda/constants.py 2014-06-18 23:42:35.944668381 +0100 -@@ -50,7 +50,7 @@ - productArch = product.productArch - bugzillaUrl = product.bugUrl - isFinal = product.isFinal --eulaLocation = "/usr/share/redhat-release/EULA" -+eulaLocation = "/usr/share/centos-release/EULA" - - # for use in device names, eg: "fedora", "rhel" - shortProductName = productName.lower() diff --git a/SOURCES/anaconda-centos-skip-retry-if-not-connected.patch b/SOURCES/anaconda-centos-skip-retry-if-not-connected.patch deleted file mode 100644 index 2e51bc2..0000000 --- a/SOURCES/anaconda-centos-skip-retry-if-not-connected.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -uNr anaconda-21.48.22.56__orig/pyanaconda/packaging/yumpayload.py anaconda-21.48.22.56/pyanaconda/packaging/yumpayload.py ---- anaconda-21.48.22.56__orig/pyanaconda/packaging/yumpayload.py 2015-12-08 14:36:52.533000000 +0000 -+++ anaconda-21.48.22.56/pyanaconda/packaging/yumpayload.py 2015-12-08 14:38:51.464000000 +0000 -@@ -648,6 +648,10 @@ - # so that unattended installations on unreliable networks have - # a higher chance of finishing successfully - xdelay = xprogressive_delay() -+ if not nm_is_connected(): -+ MAX_METADATA_DOWNLOAD_RETRIES = 1 -+ else: -+ MAX_METADATA_DOWNLOAD_RETRIES = 10 - for retry_count in xrange(0, MAX_METADATA_DOWNLOAD_RETRIES + 1): - if retry_count > 0: - # introduce a retry delay diff --git a/SPECS/anaconda.spec b/SPECS/anaconda.spec index 50b81e2..0a2fd05 100644 --- a/SPECS/anaconda.spec +++ b/SPECS/anaconda.spec @@ -2,7 +2,7 @@ Summary: Graphical system installer Name: anaconda -Version: 21.48.22.121 +Version: 21.48.22.134 Release: 1%{?dist} License: GPLv2+ and MIT Group: Applications/System @@ -14,47 +14,41 @@ URL: http://fedoraproject.org/wiki/Anaconda # ./autogen.sh # make dist Source0: %{name}-%{version}.tar.bz2 -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 - + # Versions of required components (done so we make sure the buildrequires # match the requires versions of things). +%define dbusver 1.2.3 +%define dracutver 033-240 +%define fcoeutilsver 1.0.12-3.20100323git +%define firewalldver 0.3.5-1 %define gettextver 0.18.1 +%define gtk3ver 3.22.10 +%define helpver 1:7.5.3-1 %define intltoolver 0.31.2-3 -%define pykickstartver 1.99.66.12 -%define yumver 3.4.3-91 +%define iscsiver 6.2.0.870-3 +%define isomd5sum 1.0.10 +%define langtablever 0.0.31-3 +%define libarchivever 3.0.4 +%define libtimezonemapver 0.4.1-2 +%define libxklavierver 5.4 +%define mehver 0.23-1 +%define nmver 1.0.0-6.git20150107 %define partedver 1.8.1 +%define pykickstartver 1.99.66.18 %define pypartedver 2.5-2 %define pythonpyblockver 0.45 -%define nmver 1.0.0-6.git20150107 -%define dbusver 1.2.3 -%define yumutilsver 1.1.11-3 -%define mehver 0.23-1 -%define sckeyboardver 1.3.1 -%define firewalldver 0.3.5-1 %define pythonurlgrabberver 3.9.1-5 -%define utillinuxver 2.15.1 -%define dracutver 033-240 -%define isomd5sum 1.0.10 -%define fcoeutilsver 1.0.12-3.20100323git -%define iscsiver 6.2.0.870-3 %define rpmver 4.10.0 -%define libarchivever 3.0.4 -%define langtablever 0.0.31-3 -%define libxklavierver 5.4 -%define libtimezonemapver 0.4.1-2 -%define helpver 1:7.3.1-1 +%define sckeyboardver 1.3.1 +%define utillinuxver 2.15.1 +%define yumutilsver 1.1.11-3 +%define yumver 3.4.3-91 BuildRequires: audit-libs-devel BuildRequires: gettext >= %{gettextver} -BuildRequires: gtk3-devel +BuildRequires: gtk3-devel >= %{gtk3ver} BuildRequires: gtk-doc -BuildRequires: gtk3-devel-docs +BuildRequires: gtk3-devel-docs >= %{gtk3ver} BuildRequires: glib2-doc BuildRequires: gobject-introspection-devel BuildRequires: glade-devel @@ -184,7 +178,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 @@ -233,13 +227,6 @@ runtime on NFS/HTTP/FTP servers or local disks. %prep %setup -q -%patch1 -p1 -%patch2 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 %build %configure --disable-static \ @@ -332,15 +319,115 @@ update-desktop-database &> /dev/null || : %{_prefix}/libexec/anaconda/dd_* %changelog -* Tue Aug 22 2017 Johnny Hughes