- up to 2.69.1

[packages/glib2.git] / glib2.spec

diff --git a/glib2.spec b/glib2.spec
index 2167e0d908ca0853466a2151c2578dc43953d6ed..48c5ce5e357ec9520ac91aa46dc0e537c5edccfe 100644 (file)
--- a/glib2.spec
+++ b/glib2.spec
@@ -1,9 +1,10 @@
 #
 # 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             # FAM filesystem monitoring support
 
 Summary:       Useful routines for 'C' programming
 Summary(cs.UTF-8):     Šikovná knihovna s funkcemi pro pomocné programy
@@ -18,33 +19,32 @@ 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.66.1
+Version:       2.69.1
 Release:       1
 Epoch:         1
 License:       LGPL v2+
 Group:         Libraries
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/glib/2.66/glib-%{version}.tar.xz
-# Source0-md5: 018d2954ecbef1cd9e25c9bbe75475ca
+Source0:       https://download.gnome.org/sources/glib/2.69/glib-%{version}.tar.xz
+# Source0-md5: 568d07cb33f506d55efab494f9b0fa34
 Patch0:                %{name}-python_shebang.patch
 URL:           https://www.gtk.org/
 BuildRequires: docbook-dtd412-xml
 BuildRequires: docbook-dtd45-xml
 BuildRequires: docbook-style-xsl-nons
 BuildRequires: elfutils-devel
-BuildRequires: fam-devel
+%{?with_fam:BuildRequires:     fam-devel}
 BuildRequires: gettext-tools
 %if %(locale -a | grep -q '^C\.utf8$'; echo $?)
 BuildRequires: glibc-localedb-all
 %endif
 %if %{with apidocs}
-# TODO: restore when released
-#BuildRequires:        gtk-doc >= 1.32.1
-BuildRequires: gtk-doc >= 1.32
+BuildRequires: gtk-doc >= 1.32.1
 BuildRequires: meson >= 0.52.0
 %endif
 BuildRequires: libffi-devel >= 3.0.0
 BuildRequires: libmount-devel >= 2.28
-%{?with_selinux:BuildRequires: libselinux-devel}
+%{?with_selinux:BuildRequires: libselinux-devel >= 2.2}
+BuildRequires: libxslt-progs
 BuildRequires: meson >= 0.49.2
 BuildRequires: ninja >= 1.5
 BuildRequires: pcre-devel >= 8.31
@@ -54,9 +54,10 @@ 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.745
+BuildRequires: rpmbuild(macros) >= 1.752
 BuildRequires: sed >= 4.0
 %{?with_systemtap:BuildRequires:       systemtap-sdt-devel}
 BuildRequires: tar >= 1:1.22
@@ -64,6 +65,7 @@ BuildRequires:        xz
 BuildRequires: zlib-devel
 Requires:      iconv
 Requires:      libmount >= 2.28
+%{?with_selinux:Requires:      libselinux >= 2.2}
 Requires:      pcre >= 8.31
 Suggests:      gvfs
 Provides:      glib2-libs
@@ -131,7 +133,7 @@ Requires:   libmount-devel >= 2.28
 Requires:      pcre-devel >= 8.31
 Requires:      python3-modules >= 1:3.5
 # gio only
-%{?with_selinux:Requires:      libselinux-devel}
+%{?with_selinux:Requires:      libselinux-devel >= 2.2}
 Requires:      zlib-devel
 
 %description devel
@@ -178,9 +180,7 @@ Summary:    GLib API documetation
 Summary(pl.UTF-8):     Dokumentacja API GLib
 Group:         Documentation
 Requires:      gtk-doc-common
-%if "%{_rpmversion}" >= "4.6"
 BuildArch:     noarch
-%endif
 
 %description apidocs
 GLib API documetation.
@@ -210,9 +210,7 @@ Summary(pl.UTF-8):  Bashowe uzupełnianie nazw dla narzędzi gio
 Group:         Applications/Shells
 Requires:      bash-completion >= 2.0
 Obsoletes:     bash-completion-gdbus
-%if "%{_rpmversion}" >= "4.6"
 BuildArch:     noarch
-%endif
 
 %description -n bash-completion-gio
 bash-completion for gio utilities: gdbus and gsettings.
@@ -237,9 +235,6 @@ Sondy systemtap/dtrace dla GLib 2.
 %setup -q -n glib-%{version}
 %patch0 -p1
 
-# TODO: drop when 1.32.1 is released
-%{__sed} -i -e 's/1.32.1/1.32/' docs/reference/meson.build
-
 %build
 %meson build \
        %{?debug:--debug} \
@@ -248,7 +243,7 @@ Sondy systemtap/dtrace dla GLib 2.
 %ifarch %{ix86}
        %{?with_systemtap:-Dtapset_install_dir=%{_datadir}/systemtap/tapset/i386} \
 %endif
-       -Dfam=true \
+       -Dfam=%{__true_false fam} \
        -Dgtk_doc=%{__true_false apidocs} \
        -Dselinux=%{?with_selinux:enabled}%{!?with_selinux:disabled} \
        -Dman=true \
@@ -259,6 +254,8 @@ Sondy systemtap/dtrace dla GLib 2.
 %install
 rm -rf $RPM_BUILD_ROOT
 
+install -d $RPM_BUILD_ROOT%{_libdir}/gio/modules
+
 %ninja_install -C build
 
 > $RPM_BUILD_ROOT%{_libdir}/gio/modules/giomodule.cache
@@ -305,19 +302,17 @@ umask 022
 %attr(755,root,root) %ghost %{_libdir}/libgthread-2.0.so.0
 %dir %{_libdir}/gio
 %dir %{_libdir}/gio/modules
-%attr(755,root,root) %{_libdir}/gio/modules/libgiofam.so
+%{?with_fam:%attr(755,root,root) %{_libdir}/gio/modules/libgiofam.so}
 %ghost %{_libdir}/gio/modules/giomodule.cache
 %dir %{_datadir}/glib-2.0
 %dir %{_datadir}/glib-2.0/schemas
 %ghost %{_datadir}/glib-2.0/schemas/gschemas.compiled
-%if %{with apidocs}
 %{_mandir}/man1/gapplication.1*
 %{_mandir}/man1/gdbus.1*
 %{_mandir}/man1/gio.1*
 %{_mandir}/man1/gio-querymodules.1*
 %{_mandir}/man1/glib-compile-schemas.1*
 %{_mandir}/man1/gsettings.1*
-%endif
 
 %files devel
 %defattr(644,root,root,755)
@@ -357,7 +352,6 @@ umask 022
 %{_aclocaldir}/glib-2.0.m4
 %{_aclocaldir}/glib-gettext.m4
 %{_aclocaldir}/gsettings.m4
-%if %{with apidocs}
 %{_mandir}/man1/gdbus-codegen.1*
 %{_mandir}/man1/glib-compile-resources.1*
 %{_mandir}/man1/glib-genmarshal.1*
@@ -367,7 +361,6 @@ umask 022
 %{_mandir}/man1/gresource.1*
 %{_mandir}/man1/gtester-report.1*
 %{_mandir}/man1/gtester.1*
-%endif
 
 %if %{with static_libs}
 %files static
@@ -395,11 +388,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