diff --git a/.gitignore b/.gitignore index f69c3ff..b8de2a6 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /kiwi-9.15.1.tar.gz /kiwi-9.16.0.tar.gz /kiwi-9.16.12.tar.gz +/kiwi-9.17.19.tar.gz diff --git a/kiwi.spec b/kiwi.spec index 3e6960b..7e3d055 100644 --- a/kiwi.spec +++ b/kiwi.spec @@ -8,6 +8,9 @@ # Enable Python dependency generation %{?python_enable_dependency_generator} +# Disable mangling shebangs for dracut module files as it breaks initramfs +%global __brp_mangle_shebangs_exclude_from ^%{_prefix}/lib/dracut/modules.d/.*$ + %global desc \ The KIWI Image System provides an operating system image builder \ for Linux supported hardware platforms as well as for virtualization \ @@ -15,8 +18,8 @@ and cloud systems like Xen, KVM, VMware, EC2 and more. Name: kiwi -Version: 9.16.12 -Release: 2%{?dist} +Version: 9.17.19 +Release: 1%{?dist} URL: http://suse.github.io/kiwi/ Summary: Flexible operating system image builder License: GPLv3+ @@ -42,8 +45,6 @@ BuildRequires: python3-setuptools BuildRequires: shadow-utils # doc build requirements -BuildRequires: %{_bindir}/sphinx-build-3 -BuildRequires: python3dist(sphinxcontrib-spelling) BuildRequires: python3dist(docopt) >= 0.6.2 BuildRequires: python3dist(future) BuildRequires: python3dist(lxml) @@ -223,6 +224,7 @@ Requires: e2fsprogs Requires: xorriso Requires: util-linux Requires: xfsprogs +Requires: parted BuildArch: noarch %description -n dracut-kiwi-live @@ -262,9 +264,6 @@ sed -e "s|#!/usr/bin/env python||" -i kiwi/xml_parse.py # Because there are some compiled stuff %set_build_flags -# Build the documentation before running the normal build process -%make_build -C doc man SPHINXBUILD=sphinx-build-3 - %if %{with python2} %py2_build %endif @@ -276,10 +275,12 @@ sed -e "s|#!/usr/bin/env python||" -i kiwi/xml_parse.py %endif %py3_install +# Install dracut modules (yes, the slash is needed!) +make buildroot=%{buildroot}/ install_dracut # Move the bash completion file to right place mkdir -p %{buildroot}%{_datadir}/bash-completion/completions -mv %{buildroot}%{_sysconfdir}/bash_completion.d/kiwi-ng-3.sh %{buildroot}%{_datadir}/bash-completion/completions/kiwi-ng +mv %{buildroot}%{_sysconfdir}/bash_completion.d/kiwi-ng.sh %{buildroot}%{_datadir}/bash-completion/completions/kiwi-ng # Erase redundant bash completion file rm -rf %{buildroot}%{_sysconfdir}/bash_completion.d @@ -358,6 +359,9 @@ done # Empty metapackage %changelog +* Sun Feb 17 2019 Neal Gompa - 9.17.19-1 +- Upgrade to 9.17.19 + * Fri Feb 01 2019 Fedora Release Engineering - 9.16.12-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index b3c949e..56add7a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kiwi-9.16.12.tar.gz) = 344a217c31861b754d7bbd0ae5390dde9ca1a592deaf3b3fe8c0275c8ee1bd58f1c83cd171e03004bad117d48a4c88b5aede89d5d5725713791b4bb5a26254af +SHA512 (kiwi-9.17.19.tar.gz) = de1a88ef4afcf4b8e227e7c05cae037ea79e52697c44377d1b1aebb5905c7c8746ef58663e2c355ef802e474a4c88fc5136688b4a8ab46c3df41d29bf332df0b