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/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 index 1abdefe..25445e1 100644 --- a/SOURCES/0001-Don-t-display-Alternate-Architectures-in-product-nam.patch +++ b/SOURCES/0001-Don-t-display-Alternate-Architectures-in-product-nam.patch @@ -1,19 +1,19 @@ -From 5d888b98e50aadf12204c5105ab2d6d8372772bb Mon Sep 17 00:00:00 2001 +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 - (#1498138) + (#1544556) -Temporary fix on anaconda side for Pegas 1.0. For Pegas 1.1 this should be -resolved in compose tools (or testing infrastructure) side. +Temporary fix on anaconda side. This should be resolved in compose tools (or +testing infrastructure) side (#1488558). -Resolves: rhbz#1498138 +Resolves: rhbz#1544556 --- pyanaconda/product.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pyanaconda/product.py b/pyanaconda/product.py -index 1ff0046..a77ad42 100644 +index 1ff004659..a77ad42a9 100644 --- a/pyanaconda/product.py +++ b/pyanaconda/product.py @@ -41,6 +41,8 @@ bugUrl = config.get("Main", "BugURL") @@ -26,5 +26,5 @@ index 1ff0046..a77ad42 100644 productVersion = config.get("Main", "Version") -- -2.4.3 +2.14.3 diff --git a/SPECS/anaconda.spec b/SPECS/anaconda.spec index 4aa2a0b..8cef4b2 100644 --- a/SPECS/anaconda.spec +++ b/SPECS/anaconda.spec @@ -2,8 +2,8 @@ Summary: Graphical system installer Name: anaconda -Version: 21.48.22.121 -Release: 2%{?dist} +Version: 21.48.22.134 +Release: 3%{?dist} License: GPLv2+ and MIT Group: Applications/System URL: http://fedoraproject.org/wiki/Anaconda @@ -18,37 +18,38 @@ Patch0: 0001-Don-t-display-Alternate-Architectures-in-product-nam.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 @@ -320,12 +321,119 @@ update-desktop-database &> /dev/null || : %{_prefix}/libexec/anaconda/dd_* %changelog -* Thu Nov 09 2017 CentOS Sources - 21.48.22.121-2.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 Oct 04 2017 Radek Vykydal - 21.48.22.121-2 +* Wed Feb 16 2018 Radek Vykydal - 21.48.22.133-2 - Don't display "Alternate Architectures" in product name (rvykydal) - Resolves: rhbz#1498138 + Resolves: rhbz#1544556 + +* Wed Feb 14 2018 Radek Vykydal - 21.48.22.133-1 +- Fix mitigation toggling with kickstart (mkolman) + Related: rhbz#1534833 + +* Mon Feb 12 2018 Radek Vykydal - 21.48.22.132-1 +- Performance spoke related CI fixes (mkolman) + Related: rhbz#1534833 + +* Wed Feb 07 2018 Radek Vykydal - 21.48.22.131-1 +- UI support for configuring certain mitigations (mkolman) + Resolves: rhbz#1534833 + +* Mon Jan 08 2018 Radek Vykydal - 21.48.22.130-1 +- kickstart: use RHEL7_Firewall instead of F28_Firewall (dusty) + Related: rhbz#1526450 +- kickstart: support firewall --use-system-defaults (dusty) + Resolves: rhbz#1526450 +- Check payload is set before accessing its data (mkolman) + Resolves: rhbz#1524785 +- Fix bad bash '*' expansion when loading kernel modules (jkonecny) + Resolves: rhbz#1519220 + +* Fri Dec 08 2017 Radek Vykydal - 21.48.22.129-1 +- Update translations (ljanda) + Resolves: rhbz#1480523 + +* Wed Nov 15 2017 Radek Vykydal - 21.48.22.128-1 +- Add support for the new 'mount' kickstart command (vpodzime) + Resolves: rhbz#1450922 + +* Tue Nov 07 2017 Radek Vykydal - 21.48.22.127-1 +- Enable SE/HMC file access to repo (vponcova) + Resolves: rhbz#1289918 +- Support timeout and retries options in %%packages section (vponcova) + Resolves: rhbz#1448459 + +* Thu Oct 12 2017 Radek Vykydal - 21.48.22.126-1 +- Add support for the RHV branded help content variant (mkolman) + Resolves: rhbz#1378010 + +* Thu Oct 05 2017 Radek Vykydal - 21.48.22.125-1 +- Fix storage spoke completeness checking (rvykydal) + Resolves: rhbz#1496416 +- Missing dot in testing availability message (jkonecny) + Related: rhbz#1478970 + +* Thu Sep 07 2017 Radek Vykydal - 21.48.22.124-1 +- network: add support for kickstart --bindto=mac for virtual devices + (rvykydal) + Resolves: rhbz#1328576 +- network: support mac bound network settings as first class (rvykydal) + Related: rhbz#1328576 +- network: add support for kickstart --bindto=mac for wired devices (rvykydal) + Resolves: rhbz#1328576 + +* Mon Sep 04 2017 Radek Vykydal - 21.48.22.123-1 +- Skip temporarily unavailable checks in the source spoke (mkolman) + Resolves: rhbz#1365416 +- Fix restart payload thread in Network spoke GUI (jkonecny) + Related: rhbz#1478970 +- Add the boot option inst.xtimeout (vponcova) + Resolves: rhbz#1462035 +- Add missing gtk3 required version to spec file (jkonecny) + Resolves: rhbz#1445648 +- Sort spec required versions alphabetically (jkonecny) + Related: rhbz#1445648 +- Fix testing of the kickstart version (vponcova) + Related: rhbz#1412159 +- Add tests for the install class factory and the installclass command + (vponcova) + Related: rhbz#1412159 +- Support for the installclass kickstart command (vponcova) + Resolves: rhbz#1412159 +- Modules with install classes should define __all__ (vponcova) + Related: rhbz#1412159 +- Refactorization of the installclass.py (vponcova) + Related: rhbz#1412159 +- timezone: for kickstart allow also timezones not offered by GUI (rvykydal) + Resolves: rhbz#1452873 + +* Tue Aug 22 2017 Radek Vykydal - 21.48.22.122-1 +- Network spoke freeze when testing availability (jkonecny) + Related: rhbz#1478970 +- Fix proxy settings badly used when testing repos (jkonecny) + Resolves: rhbz#1478970 +- installclasses/rhelah: Bump default / to 15GB max (walters) + Resolves: rhbz#1481768 +- Prevent crash in GUI with incomplete IMSM array (mkolman) + Resolves: rhbz#1465944 +- Show IDs of DASDs to be formatted in TUI (vponcova) + Resolves: rhbz#1269174 +- rpmostreepayload: Rollup backport of Fedora patches (walters) + Resolves: rhbz#1459623 +- Use SHA256 instead of MD5 for repoMDHash (bcl) + Related: rhbz#1341280 +- Refactor imports in kickstart.py (jkonecny) + Related: rhbz#1463118 +- Use context manager to check KickstartError (jkonecny) + Resolves: rhbz#1463118 +- Use KickstartError instead of KickstartParseError (jkonecny) + Related: rhbz#1463118 * Wed Jun 21 2017 Radek Vykydal - 21.48.22.121-1 - rpmostreepayload: Stub out payload methods which use `import rpm` (walters)