From 75ebe76fda05075a7b6b41ca57123b3658703942 Mon Sep 17 00:00:00 2001 From: han_hui_hui Date: Fri, 13 Jan 2023 01:53:57 +0000 Subject: [PATCH] adjust pcre2 requires (cherry picked from commit af478df02d55f0b31c5770161c5dde52f096d55a) --- glib2.spec | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/glib2.spec b/glib2.spec index 8a26ab2..4e66a9f 100644 --- a/glib2.spec +++ b/glib2.spec @@ -1,6 +1,6 @@ Name: glib2 Version: 2.72.2 -Release: 6 +Release: 7 Summary: The core library that forms the basis for projects such as GTK+ and GNOME License: LGPLv2+ URL: http://www.gtk.org @@ -61,7 +61,7 @@ Patch6050: backport-gregex-Remove-an-unreachable-return-statement.patch BuildRequires: chrpath gcc gcc-c++ gettext perl-interpreter BUildRequires: glibc-devel libattr-devel libselinux-devel meson BuildRequires: systemtap-sdt-devel pkgconfig(libelf) pkgconfig(libffi) -BuildRequires: pkgconfig(libpcre) pkgconfig(mount) pkgconfig(zlib) +BuildRequires: pkgconfig(libpcre2-8) pkgconfig(mount) pkgconfig(zlib) BuildRequires: python3-devel %ifnarch i686 BuildRequires: desktop-file-utils shared-mime-info gtk-doc @@ -97,6 +97,10 @@ Development for the GLib library. %package static Summary: glib static +Requires: pcre2-static +%if %{?openEuler:1}0 +Requires: sysprof-capture-static +%endif Requires: %{name}-devel = %{version}-%{release} Provides: %{name}-static = %{version}-%{release} Obsoletes: %{name}-static < %{version}-%{release} @@ -129,7 +133,6 @@ help document for the glib2 package. %autosetup -n glib-%{version} -p1 %build -rm -rf glib/pcre/*.[ch] %meson --default-library=both -Ddtrace=true \ %ifnarch i686 @@ -249,6 +252,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %endif %changelog +* Tue Jan 10 2023 hanhuihui - 2.72.2-7 +- adjust pcre2 requires + * Tue Dec 27 2022 hanhuihui - 2.72.2-6 - fix some pcre2 error -- Gitee