diff --git a/libostree-2024.5.tar.xz b/libostree-2024.4.tar.xz similarity index 54% rename from libostree-2024.5.tar.xz rename to libostree-2024.4.tar.xz index 3ed96960eeb2ac2fa88acd2f13024a7086ed8608..a4dc3d74a3de897279912f8984fe7ab8673f29c4 100644 Binary files a/libostree-2024.5.tar.xz and b/libostree-2024.4.tar.xz differ diff --git a/ostree.spec b/ostree.spec index 43e53854391f1657c8d0914d82fd1983f6be625a..7fd91a6b130380b86fd9a37ebdd91856591feb76 100644 --- a/ostree.spec +++ b/ostree.spec @@ -1,21 +1,19 @@ #needsrootforbuild Name: ostree -Version: 2024.5 +Version: 2024.4 Release: 1 -Summary: A tool like git for operating system binaries -License: LGPLv2+ +Summary: Tool for managing bootable, immutable filesystem trees +License: LGPL-2.0-or-later URL: https://ostree.readthedocs.io/en/latest/ Source0: https://github.com/ostreedev/%{name}/releases/download/v%{version}/libostree-%{version}.tar.xz +Patch01: remove-specific-cc-in-automake.patch -BuildRequires: bison autoconf automake libtool gobject-introspection-devel pkgconfig(liblzma) docbook-xsl -BuildRequires: pkgconfig(e2p) pkgconfig(zlib) pkgconfig(libcurl) pkgconfig(libsoup-2.4) gpgme-devel -BuildRequires: pkgconfig(libselinux) pkgconfig(libcrypto) pkgconfig(fuse) pkgconfig(libsystemd) -BuildRequires: dracut openssl-devel pkgconfig(mount) pkgconfig(libarchive) python3-pyyaml libxslt -BuildRequires: gtk-doc elfutils-extra -BuildRequires: make git libsoup3-devel libattr-devel attr libcap-devel gobject-introspection-devel - - +BuildRequires: bison autoconf automake libtool pkgconfig(liblzma) +BuildRequires: pkgconfig(e2p) pkgconfig(zlib) pkgconfig(libcurl) pkgconfig(libsoup-3.0) gpgme-devel +BuildRequires: pkgconfig(libselinux) pkgconfig(fuse3) pkgconfig(libsystemd) +BuildRequires: dracut openssl-devel pkgconfig(mount) pkgconfig(libarchive) +BuildRequires: gtk-doc attr libattr-devel Requires: dracut systemd-units gnupg2 %ifarch x86_64 Requires: grub2 @@ -50,16 +48,13 @@ The %{name}-devel package includes the header files for the %{name} library. %build env NOCONFIGURE=1 ./autogen.sh %configure --with-selinux --with-curl --with-openssl --disable-silent-rules \ - --with-dracut=yesbutnoconf + --with-soup3 --with-dracut=yesbutnoconf %make_build %install %make_install %delete_la -%check -make check - %post %systemd_post ostree-remount.service @@ -96,6 +91,9 @@ make check %{_mandir}/man*/{ostree,rofiles}*.gz %changelog +* Tue Apr 16 2024 duyiwei - 2024.4-1 +- fix upgrade error and downgrade version to 2024.4 + * Fri Mar 15 2024 xuhe - 2024.5-1 - update to 2024.5 diff --git a/remove-specific-cc-in-automake.patch b/remove-specific-cc-in-automake.patch new file mode 100644 index 0000000000000000000000000000000000000000..250e23705a51896fbdb91a6b52327defa05653d8 --- /dev/null +++ b/remove-specific-cc-in-automake.patch @@ -0,0 +1,11 @@ +diff -up libostree-2022.2/Makefile-libostree.am.orig2 libostree-2022.2/Makefile-libostree.am +--- libostree-2022.2/Makefile-libostree.am.orig2 2023-04-19 19:03:26.663366592 +0800 ++++ libostree-2022.2/Makefile-libostree.am 2023-04-19 19:03:48.391512904 +0800 +@@ -267,7 +267,4 @@ endif # USE_LIBSODIUM + +-# XXX: work around clang being passed -fstack-clash-protection which it doesn't understand +-# See: https://bugzilla.redhat.com/show_bug.cgi?id=1672012 +-INTROSPECTION_SCANNER_ENV = CC=gcc + + if BUILDOPT_INTROSPECTION + OSTree-1.0.gir: libostree-1.la Makefile