diff --git a/.gitignore b/.gitignore index 8edcdad..ed3a68e 100644 --- a/.gitignore +++ b/.gitignore @@ -91,3 +91,5 @@ /rpm-ostree-2020.4.tar.xz /rpm-ostree-2020.4.15.g8b0bcd7b.tar.xz /rpm-ostree-2020.5.tar.xz +/rpm-ostree-2020.6.tar.xz +/rpm-ostree-2020.7.tar.xz diff --git a/rpm-ostree-gcc11.patch b/rpm-ostree-gcc11.patch new file mode 100644 index 0000000..307b951 --- /dev/null +++ b/rpm-ostree-gcc11.patch @@ -0,0 +1,13 @@ +diff --git a/src/daemon/rpmostree-sysroot-upgrader.c b/src/daemon/rpmostree-sysroot-upgrader.c +index 7b160e4..af48122 100644 +--- a/src/daemon/rpmostree-sysroot-upgrader.c ++++ b/src/daemon/rpmostree-sysroot-upgrader.c +@@ -1712,7 +1712,7 @@ rpmostree_sysroot_upgrader_deploy (RpmOstreeSysrootUpgrader *self, + GType + rpmostree_sysroot_upgrader_flags_get_type (void) + { +- static volatile gsize g_define_type_id__volatile = 0; ++ static gsize g_define_type_id__volatile = 0; + + if (g_once_init_enter (&g_define_type_id__volatile)) + { diff --git a/rpm-ostree.spec b/rpm-ostree.spec index 6847d77..186bd05 100644 --- a/rpm-ostree.spec +++ b/rpm-ostree.spec @@ -3,14 +3,14 @@ Summary: Hybrid image/package system Name: rpm-ostree -Version: 2020.5 +Version: 2020.7 Release: 1%{?dist} -#VCS: https://github.com/cgwalters/rpm-ostree +License: LGPLv2+ +URL: https://github.com/coreos/rpm-ostree # This tarball is generated via "cd packaging && make -f Makefile.dist-packaging dist-snapshot" # in the upstream git. If rust is enabled, it contains vendored sources. -Source0: rpm-ostree-%{version}.tar.xz -License: LGPLv2+ -URL: https://github.com/projectatomic/rpm-ostree +Source0: https://github.com/coreos/rpm-ostree/releases/download/v%{version}/rpm-ostree-%{version}.tar.xz +Patch0: %{name}-gcc11.patch ExclusiveArch: %{rust_arches} @@ -194,6 +194,19 @@ $PYTHON autofiles.py > files.devel \ %files devel -f files.devel %changelog +* Mon Nov 02 2020 Luca BRUNO - 2020.7-1 +- New upstream version + https://github.com/coreos/rpm-ostree/releases/tag/v2020.7 + +* Mon Nov 02 2020 Jeff Law - 2020.6-2 +- Fix invalid use of volatile caught by gcc-11 + +* Fri Oct 30 16:48:43 UTC 2020 Colin Walters - 2020.6-1 +- https://github.com/coreos/rpm-ostree/releases/tag/v2020.6 + +* Wed Oct 28 2020 Peter Robinson - 2020.5-2 +- sysroot: Fix usage of sd_journal_send on 32 bit (gh#2276) + * Tue Sep 15 2020 Jonathan Lebon - 2020.5-1 - New upstream version https://github.com/coreos/rpm-ostree/releases/tag/v2020.5 @@ -216,7 +229,7 @@ $PYTHON autofiles.py > files.devel \ * Tue Jun 30 2020 Jeff Law - 2020.3-2 - Disable LTO -* Wed Feb 05 2020 Jonathan Lebon - 2020.3-1 +* Fri Jun 19 2020 Jonathan Lebon - 2020.3-1 - New upstream version https://github.com/coreos/rpm-ostree/releases/tag/v2020.3 diff --git a/sources b/sources index 6d71e5a..7074641 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rpm-ostree-2020.5.tar.xz) = a7b2fabec124983c7eded63650adeff9a5c328b91f261c66582a2b4ba0bb9ed5b766b5ee773bbaeedaa797aba4975645f90e880de601950dc0dd53a2723c1987 +SHA512 (rpm-ostree-2020.7.tar.xz) = e8056f58d396b906642624bb55f48e618e95193a026761cccd0d33bb56524ddec5012f7b922f51504c5c2e0cb2757b758636cb8aebeace5aae3d24dc864f16f2