diff --git a/.gitignore b/.gitignore index 4286886..5e2b230 100644 --- a/.gitignore +++ b/.gitignore @@ -125,3 +125,4 @@ /anaconda-28.12.tar.bz2 /anaconda-28.13.tar.bz2 /anaconda-28.14.tar.bz2 +/anaconda-28.15.tar.bz2 diff --git a/0001-Restore-fix-for-RHBZ-1323012-set_name-not-setName.patch b/0001-Restore-fix-for-RHBZ-1323012-set_name-not-setName.patch deleted file mode 100644 index 3fe8bc1..0000000 --- a/0001-Restore-fix-for-RHBZ-1323012-set_name-not-setName.patch +++ /dev/null @@ -1,34 +0,0 @@ -From e4d336b9c005f5b74bf46f4534f7884f9daeadbf Mon Sep 17 00:00:00 2001 -From: Adam Williamson -Date: Tue, 19 Dec 2017 14:57:14 -0800 -Subject: [PATCH] Restore fix for RHBZ #1323012 (`set_name` not `setName`) - -This was initially fixed in blivet by -https://github.com/rhinstaller/blivet/pull/354 , but the fix -was inadvertently reversed by a refactoring commit that -landed shortly afterwards: -https://github.com/storaged-project/blivet/commit/d3ac10d8 -The wrong code was then subsequently moved to anaconda, still -with the wrong method name. So, let's fix it again. - -Signed-off-by: Adam Williamson ---- - pyanaconda/storage/osinstall.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/pyanaconda/storage/osinstall.py b/pyanaconda/storage/osinstall.py -index 251bae338..6ad6a80b0 100644 ---- a/pyanaconda/storage/osinstall.py -+++ b/pyanaconda/storage/osinstall.py -@@ -1247,7 +1247,7 @@ class InstallerStorage(Blivet): - # Set the boot partition's name on disk labels that support it - if dev.parted_partition.disk.supportsFeature(parted.DISK_TYPE_PARTITION_NAME): - ped_partition = dev.parted_partition.getPedPartition() -- ped_partition.setName(dev.format.name) -+ ped_partition.set_name(dev.format.name) - log.info("Setting label on %s to '%s'", dev, dev.format.name) - - dev.disk.setup() --- -2.15.1 - diff --git a/anaconda.spec b/anaconda.spec index 51d11bc..46b6fea 100644 --- a/anaconda.spec +++ b/anaconda.spec @@ -2,8 +2,8 @@ Summary: Graphical system installer Name: anaconda -Version: 28.14 -Release: 2%{?dist} +Version: 28.15 +Release: 1%{?dist} License: GPLv2+ and MIT Group: Applications/System URL: http://fedoraproject.org/wiki/Anaconda @@ -15,11 +15,6 @@ URL: http://fedoraproject.org/wiki/Anaconda # make dist Source0: %{name}-%{version}.tar.bz2 -# Downstream patch as no anaconda devs are around and Rawhide is -# busted: re-fix RHBZ #1323012, see -# https://github.com/rhinstaller/anaconda/pull/1281 -Patch0: 0001-Restore-fix-for-RHBZ-1323012-set_name-not-setName.patch - # Versions of required components (done so we make sure the buildrequires # match the requires versions of things). @@ -244,7 +239,6 @@ runtime on NFS/HTTP/FTP servers or local disks. %prep %setup -q -%patch0 -p1 %build # use actual build-time release number, not tarball creation time release number @@ -341,8 +335,19 @@ update-desktop-database &> /dev/null || : %{_prefix}/libexec/anaconda/dd_* %changelog -* Tue Dec 19 2017 Adam Williamson - 28.14-2 -- Backport #1281 to re-fix RHBZ #1323012 (crash in UEFI installs) +* Wed Dec 20 2017 Martin Kolman - 28.15-1 +- Remove spurious echo call from tmux service file (#1526861) (mkolman) +- Restore fix for RHBZ #1323012 (`set_name` not `setName`) (awilliam) +- Fix Makefile for modules/[foo,bar]/tasks and for install_manager (rvykydal) +- Make passing kickstart to boss more visible. (rvykydal) +- Add tests for KickstartManager. (rvykydal) +- Add kickstart dispatching to anaconda. (rvykydal) +- Add kickstart dispatching to local boss run script (rvykydal) +- Add KickstartManager for Boss. (rvykydal) +- Add method for getting line mapping from kickstart elements to kickstart + (rvykydal) +- Add info about handled kickstart commands to modules (rvykydal) +- Add missing Makefile for kickstart_dispatcher (rvykydal) * Mon Dec 18 2017 Martin Kolman - 28.14-1 - Use observers in the install manager (vponcova) diff --git a/sources b/sources index b65223c..ec5f5a5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (anaconda-28.14.tar.bz2) = 08edf3a260b1b2705a2cdd4e537a3215ab8fbf93e4c4c03776b518267f1aeecab9372e66f6cad833e252c0e33524f869146c23435ead7985aa422ff47bc8000e +SHA512 (anaconda-28.15.tar.bz2) = b6f81e357701d3da217e83dc6c8b1793baba1ac292efedb3d49b16a9e100711872891843557b09f6afc0ff59c7a17776e83b263ce1dec356e6b46b38e4fd2815