From 56e99baf80bcbc843cd0fb90e72c0cd5c70a1dc22d62b4604e4c816aa36c7360 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= <adrian@suse.de>
Date: Tue, 25 Feb 2025 16:11:41 +0100
Subject: [PATCH] Sync from SUSE:SLFO:Main ocaml revision
 34565f8809a8d0acb2bea787198d726e

---
 ocaml.changes | 5 +++++
 ocaml.spec    | 8 +++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/ocaml.changes b/ocaml.changes
index f7aa3a6..3699adf 100644
--- a/ocaml.changes
+++ b/ocaml.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Feb  7 07:07:07 UTC 2025 - ohering@suse.de
+
+- Require unversioned gcc package (bsc#1232663)
+
 -------------------------------------------------------------------
 Thu Mar 14 14:14:14 UTC 2024 - ohering@suse.de
 
diff --git a/ocaml.spec b/ocaml.spec
index 08c473e..f8488e6 100644
--- a/ocaml.spec
+++ b/ocaml.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package ocaml
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 # Copyright (c) 2010 Andrew Psaltis <ampsaltis at gmail dot com>
 # Copyright (c) 2011 Andrew Psaltis <ampsaltis at gmail dot com>
 #
@@ -59,14 +59,14 @@ Patch0:         ocaml-configure-Allow-user-defined-C-compiler-flags.patch
 BuildRequires:  autoconf >= 2.69
 BuildRequires:  fdupes
 BuildRequires:  ncurses-devel
-BuildRequires:  ocaml-rpm-macros >= 20231101
+BuildRequires:  ocaml-rpm-macros >= 20240909
 BuildRequires:  pkgconfig
 Requires:       ncurses-devel
 Requires:       ocaml(runtime) = %version-%release
 Obsoletes:      ocaml-docs
 Provides:       ocaml(compiler) = %ocaml_base_version
 Provides:       ocaml(ocaml_base_version) = %ocaml_base_version
-Requires:       %(type -P gcc | xargs readlink -f | xargs rpm -qf --qf '%%{NAME}\n')
+Requires:       gcc
 Provides:       ocaml(ocaml.opt) = %ocaml_base_version
 Obsoletes:      ocaml-seq < %version-%release
 Obsoletes:      ocaml-seq-debuginfo < %version-%release
@@ -153,8 +153,6 @@ applications that use Ocaml.
 echo %version > VERSION
 export CC='gcc'
 export AS='as'
-test -x "$(type -P gcc | xargs readlink -f)" && export CC="$_"
-test -x "$(type -P as  | xargs readlink -f)" && export AS="$_"
 export ASPP="$CC -c"
 configure_target=
 extra_cflags=()