diff --git a/0001-ostree-fix-cc.patch b/0001-ostree-fix-cc.patch new file mode 100644 index 0000000000000000000000000000000000000000..d9e5b29bb81d7db28fcbbb43fb0242b2351bff9a --- /dev/null +++ b/0001-ostree-fix-cc.patch @@ -0,0 +1,25 @@ +From 9ac9bf0a79743daea4eeeddd4156370d7a6d41bf Mon Sep 17 00:00:00 2001 +From: zhangchao13 +Date: Sat, 6 May 2023 10:52:34 +0800 +Subject: [PATCH] ostree-fix-cc + +--- + Makefile-libostree.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile-libostree.am b/Makefile-libostree.am +index 98e3770..c60f8c1 100644 +--- a/Makefile-libostree.am ++++ b/Makefile-libostree.am +@@ -258,7 +258,7 @@ 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 ++INTROSPECTION_SCANNER_ENV = CC?=gcc + + if BUILDOPT_INTROSPECTION + OSTree-1.0.gir: libostree-1.la Makefile +-- +2.33.0 + diff --git a/ostree.spec b/ostree.spec index 177c9e8772571bc3c78a9be8d7bac1976e4f83ab..0cc907d1fa625ec720cd92f516098505c04ee711 100644 --- a/ostree.spec +++ b/ostree.spec @@ -1,7 +1,7 @@ #needsrootforbuild Name: ostree Version: 2022.7 -Release: 1 +Release: 2 Summary: A tool like git for operating system binaries License: LGPLv2+ URL: https://ostree.readthedocs.io/en/latest/ @@ -10,6 +10,7 @@ Source0: https://github.com/ostreedev/%{name}/releases/download/v%{versio Patch9000: Do-not-run-testcase-test-libarvhive-import-because-selinux-is-off.patch Patch9001: skip-updating-the-preference.patch Patch9002: skip-if-etc-mtab-is-not-a-symlink-of-proc-self-mounts.patch +Patch9003: 0001-ostree-fix-cc.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 @@ -25,7 +26,7 @@ Requires: grub2-efi Provides: ostree-libs ostree-grub2 Provides: ostree-libs%{?_isa} = %{version}-%{release} -Obsoletes: ostree-libs ostree-grub2 +#Obsoletes: ostree-libs ostree-grub2 %description This project is now known as "libostree", though it is still appropriate to use the previous name: "OSTree" @@ -94,6 +95,9 @@ make check %{_mandir}/man*/{ostree,rofiles}*.gz %changelog +* Sat May 6 2023 Zhang Chao - 2022.7-2 +- Fix CC compiler support + * Sun Jan 29 2023 jiangchuangang - 2022.7-1 - Type:enhancement - ID:NA