adjust pcre2 requires

This commit is contained in:
han_hui_hui 2023-01-13 01:53:57 +00:00
parent 5fb28c0b3b
commit af478df02d

View File

@ -1,6 +1,6 @@
Name: glib2 Name: glib2
Version: 2.72.2 Version: 2.72.2
Release: 6 Release: 7
Summary: The core library that forms the basis for projects such as GTK+ and GNOME Summary: The core library that forms the basis for projects such as GTK+ and GNOME
License: LGPLv2+ License: LGPLv2+
URL: http://www.gtk.org 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: chrpath gcc gcc-c++ gettext perl-interpreter
BUildRequires: glibc-devel libattr-devel libselinux-devel meson BUildRequires: glibc-devel libattr-devel libselinux-devel meson
BuildRequires: systemtap-sdt-devel pkgconfig(libelf) pkgconfig(libffi) 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 BuildRequires: python3-devel
%ifnarch i686 %ifnarch i686
BuildRequires: desktop-file-utils shared-mime-info gtk-doc BuildRequires: desktop-file-utils shared-mime-info gtk-doc
@ -97,6 +97,10 @@ Development for the GLib library.
%package static %package static
Summary: glib static Summary: glib static
Requires: pcre2-static
%if %{?openEuler:1}0
Requires: sysprof-capture-static
%endif
Requires: %{name}-devel = %{version}-%{release} Requires: %{name}-devel = %{version}-%{release}
Provides: %{name}-static = %{version}-%{release} Provides: %{name}-static = %{version}-%{release}
Obsoletes: %{name}-static < %{version}-%{release} Obsoletes: %{name}-static < %{version}-%{release}
@ -129,7 +133,6 @@ help document for the glib2 package.
%autosetup -n glib-%{version} -p1 %autosetup -n glib-%{version} -p1
%build %build
rm -rf glib/pcre/*.[ch]
%meson --default-library=both -Ddtrace=true \ %meson --default-library=both -Ddtrace=true \
%ifnarch i686 %ifnarch i686
@ -249,6 +252,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
%endif %endif
%changelog %changelog
* Tue Jan 10 2023 hanhuihui <hanhuihui5@huawei.com> - 2.72.2-7
- adjust pcre2 requires
* Tue Dec 27 2022 hanhuihui <hanhuihui5@huawei.com> - 2.72.2-6 * Tue Dec 27 2022 hanhuihui <hanhuihui5@huawei.com> - 2.72.2-6
- fix some pcre2 error - fix some pcre2 error