up to 2.70.5

[packages/glib2.git] / glib2.spec

diff --git a/glib2.spec b/glib2.spec
index 40a98b50cfab93e7557206ad1723f5f4f44e546e..f91328bb5acb97f1af789eab86b4f62832744540 100644 (file)
--- a/glib2.spec
+++ b/glib2.spec
@@ -1,10 +1,11 @@
 #
 # Conditional build:
-%bcond_without apidocs         # disable gtk-doc
+%bcond_without apidocs         # gtk-doc based API documentation
 %bcond_without static_libs     # static library
 %bcond_without selinux         # SELinux support in gio
-%bcond_without systemtap       # systemtap/dtrace probes
-%bcond_without fam             # disable fam filesystem monitoring support
+%bcond_with    sysprof         # sysprof tracing support
+%bcond_without systemtap       # systemtap/dtrace tracing support
+%bcond_without fam             # FAM filesystem monitoring support
 
 Summary:       Useful routines for 'C' programming
 Summary(cs.UTF-8):     Šikovná knihovna s funkcemi pro pomocné programy
@@ -19,14 +20,15 @@ Summary(pt_BR.UTF-8):       Conjunto de funções gráficas utilitárias
 Summary(tr.UTF-8):     Yararlı ufak yordamlar kitaplığı
 Summary(zh_CN.UTF-8):  实用工具函数库
 Name:          glib2
-Version:       2.68.0
+Version:       2.70.5
 Release:       1
 Epoch:         1
 License:       LGPL v2+
 Group:         Libraries
-Source0:       https://download.gnome.org/sources/glib/2.68/glib-%{version}.tar.xz
-# Source0-md5: 7d06a0b20454ec17052572dcf8cd7cea
+Source0:       https://download.gnome.org/sources/glib/2.70/glib-%{version}.tar.xz
+# Source0-md5: c59d43d79902312311cb7e6a1f449035
 Patch0:                %{name}-python_shebang.patch
+Patch1:                gtk-doc-build.patch
 URL:           https://www.gtk.org/
 BuildRequires: docbook-dtd412-xml
 BuildRequires: docbook-dtd45-xml
@@ -54,10 +56,12 @@ BuildRequires:      pkgconfig >= 1:0.16
 #BuildRequires:        pkgconfig(libelf) >= 0.8.12
 BuildRequires: pkgconfig(libffi) >= 3.0.0
 BuildRequires: python3 >= 1:3.5
+BuildRequires: rpm-build >= 4.6
 BuildRequires: rpm-perlprov
 BuildRequires: rpm-pythonprov
 BuildRequires: rpmbuild(macros) >= 1.752
 BuildRequires: sed >= 4.0
+%{?with_sysprof:BuildRequires: sysprof-devel >= 3.38.0}
 %{?with_systemtap:BuildRequires:       systemtap-sdt-devel}
 BuildRequires: tar >= 1:1.22
 BuildRequires: xz
@@ -68,7 +72,7 @@ Requires:     libmount >= 2.28
 Requires:      pcre >= 8.31
 Suggests:      gvfs
 Provides:      glib2-libs
-Obsoletes:     glib2-libs
+Obsoletes:     glib2-libs < 1:2.12.11-3
 # see https://bugzilla.xfce.org/show_bug.cgi?id=9709
 Conflicts:     xfce4-session < 4.10.0-5
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -233,6 +237,7 @@ Sondy systemtap/dtrace dla GLib 2.
 %prep
 %setup -q -n glib-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
 %meson build \
@@ -245,8 +250,8 @@ Sondy systemtap/dtrace dla GLib 2.
        -Dfam=%{__true_false fam} \
        -Dgtk_doc=%{__true_false apidocs} \
        -Dselinux=%{?with_selinux:enabled}%{!?with_selinux:disabled} \
-       -Dman=true \
-       -Dinternal_pcre=false
+       %{?with_sysprof:-Dsysprof=enabled} \
+       -Dman=true
 
 %ninja_build -C build
 
@@ -387,11 +392,11 @@ umask 022
 
 %files -n bash-completion-gio
 %defattr(644,root,root,755)
-%{_datadir}/bash-completion/completions/gapplication
-%{_datadir}/bash-completion/completions/gdbus
-%{_datadir}/bash-completion/completions/gio
-%{_datadir}/bash-completion/completions/gresource
-%{_datadir}/bash-completion/completions/gsettings
+%{bash_compdir}/gapplication
+%{bash_compdir}/gdbus
+%{bash_compdir}/gio
+%{bash_compdir}/gresource
+%{bash_compdir}/gsettings
 
 %if %{with systemtap}
 %files -n systemtap-glib2