diff --git a/.gitignore b/.gitignore index e324ce0..ba7af5b 100644 --- a/.gitignore +++ b/.gitignore @@ -396,3 +396,4 @@ /anaconda-40.18.tar.bz2 /anaconda-40.20.tar.bz2 /anaconda-40.21.tar.bz2 +/anaconda-40.22.1.tar.bz2 diff --git a/.packit.yml b/.packit.yml index 8527817..b284e24 100644 --- a/.packit.yml +++ b/.packit.yml @@ -38,26 +38,24 @@ jobs: - job: propose_downstream trigger: release - dist_git_branches: main + dist_git_branches: f40 - job: tests trigger: pull_request targets: - - fedora-rawhide - - - job: copr_build - trigger: pull_request - targets: - - fedora-rawhide - - fedora-eln + - fedora-40 - job: copr_build trigger: commit targets: - - fedora-rawhide - - fedora-eln - branch: master + - fedora-40 + branch: fedora-40 owner: "@rhinstaller" - project: Anaconda + project: Anaconda-devel preserve_project: True + additional_repos: + - "copr://@storage/blivet-daily" + # This repository contains fixup of Rawhide broken environment. + # Mainly useful when there is a package which is not yet in Rawhide but build is available. + - "https://fedorapeople.org/groups/anaconda/repos/anaconda_fixup_repo/" diff --git a/README.packit b/README.packit index 29cc7d8..f592284 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.90.0.post1.dev9+g1f0325d1. +The file was generated using packit 0.91.0.post1.dev4+ge6fd4a25. diff --git a/anaconda.spec b/anaconda.spec index 6f60f46..53e317a 100644 --- a/anaconda.spec +++ b/anaconda.spec @@ -1,7 +1,7 @@ Summary: Graphical system installer Name: anaconda -Version: 40.21 -Release: 2%{?dist} +Version: 40.22.1 +Release: 1%{?dist} License: GPL-2.0-or-later URL: http://fedoraproject.org/wiki/Anaconda @@ -12,11 +12,6 @@ URL: http://fedoraproject.org/wiki/Anaconda # make dist Source0: https://github.com/rhinstaller/%{name}/releases/download/%{name}-%{version}-1/%{name}-%{version}.tar.bz2 -# https://github.com/rhinstaller/anaconda/pull/5460 -# https://bugzilla.redhat.com/show_bug.cgi?id=2262892 -# Fix ostree installs to btrfs with util-linux 2.40+ -Patch: 0001-Resolve-symlinks-in-ostree-install-bind-mount-destin.patch - # Versions of required components (done so we make sure the buildrequires # match the requires versions of things). @@ -45,7 +40,7 @@ Patch: 0001-Resolve-symlinks-in-ostree-install-bind-mount-destin.patch %define nmver 1.0 %define pykickstartver 3.52-1 %define pypartedver 2.5-2 -%define pythonblivetver 1:3.8.2-2 +%define pythonblivetver 1:3.9.0-1 %define rpmver 4.15.0 %define simplelinever 1.9.0-1 %define subscriptionmanagerver 1.26 @@ -470,6 +465,9 @@ rm -rf \ %{_prefix}/libexec/anaconda/dd_* %changelog +* Thu Feb 15 2024 Packit - 40.22.1-1 +- Set up the fedora-40 branch (mkolman) + * Tue Feb 06 2024 Adam Williamson - 40.21-2 - Backport PR #5460 to fix ostree btrfs installs with new util-linux (#2262892) diff --git a/sources b/sources index c2128df..58e409a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (anaconda-40.21.tar.bz2) = dccb68285b4fc233edffda6242541879971f32b76a4e53d3a4253675c7541fe6d2a7eb59ad28bd627133c16347a8e641a9004ac4081051a23d618d796b025cf0 +SHA512 (anaconda-40.22.1.tar.bz2) = 455260d804436bd41e08b0d9d07b3c25d7dd962682b7c25cd5a152dcf9c87c8612607d811c7180902797b4a36a3340fc9d65ea9b21ad1c13a04c40d9cbf80198