up to 2.80.2

[packages/glib2.git] / glib2.spec

diff --git a/glib2.spec b/glib2.spec
index 4c35b5fe699a9f0884d83c91a481a2c6e9072a5e..958a147d4024e3e7f918ef483f7e4a3f3a4b1d47 100644 (file)
--- a/glib2.spec
+++ b/glib2.spec
@@ -4,7 +4,7 @@
 # Conditional build:
 %bcond_without apidocs         # gi-docgen based API documentation
 %bcond_without introspection   # gi modules
-%bcond_without static_libs     # static library
+%bcond_without static_libs     # static libraries
 %bcond_without selinux         # SELinux support in gio
 %bcond_with    sysprof         # sysprof tracing support
 %bcond_without systemtap       # systemtap/dtrace tracing support
@@ -22,19 +22,20 @@ 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.80.0
+Version:       2.80.2
 Release:       1
 Epoch:         1
 License:       LGPL v2+
 Group:         Libraries
 Source0:       https://download.gnome.org/sources/glib/2.80/glib-%{version}.tar.xz
-# Source0-md5: 3a51e2803ecd22c2dadcd07d9475ebe3
+# Source0-md5: 399162c4e5f46e3f331a1f9c7478e4c5
 Patch0:                %{name}-python_shebang.patch
 URL:           https://www.gtk.org/
 BuildRequires: automake
 BuildRequires: docbook-dtd412-xml
 BuildRequires: docbook-dtd45-xml
 BuildRequires: docbook-style-xsl-nons
+BuildRequires: docutils >= 0.13.1
 BuildRequires: elfutils-devel
 BuildRequires: gettext-tools
 %if %(locale -a | grep -q '^C\.utf8$'; echo $?)
@@ -69,7 +70,6 @@ BuildRequires:        tar >= 1:1.22
 BuildRequires: xz
 BuildRequires: zlib-devel
 %if %{with apidocs}
-BuildRequires: docutils >= 0.13.1
 BuildRequires: gi-docgen >= 2023.1
 %endif
 Requires:      iconv
@@ -79,7 +79,7 @@ Requires:     pcre2-8 >= 10.32
 Suggests:      gvfs
 Provides:      glib2-libs
 Obsoletes:     glib2-libs < 1:2.12.11-3
-Conflicts:     gobject-introspection < 1.79
+%{?with_introspection:Conflicts:       gobject-introspection < 1.79}
 # 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)
@@ -142,10 +142,11 @@ Requires: libffi-devel >= 3.0.0
 Requires:      libmount-devel >= 2.28
 Requires:      pcre2-8-devel >= 10.32
 Requires:      python3-modules >= 1:3.7
+Requires:      python3-packaging
 # gio only
 %{?with_selinux:Requires:      libselinux-devel >= 2.2}
 Requires:      zlib-devel
-Conflicts:     gobject-introspection-devel < 1.79
+%{?with_introspection:Conflicts:       gobject-introspection-devel < 1.79}
 
 %description devel
 Header files for the support library for the GIMP's X libraries, which
@@ -274,7 +275,8 @@ install -d $RPM_BUILD_ROOT{%{_libdir}/girepository-1.0,%{_datadir}/gir-1.0}
 
 %if %{with apidocs}
 install -d $RPM_BUILD_ROOT%{_gidocdir}
-%{__mv} $RPM_BUILD_ROOT%{_docdir}/glib-2.0 $RPM_BUILD_ROOT%{_gidocdir}
+%{__rm} $RPM_BUILD_ROOT%{_docdir}/glib-2.0/{gvariant-specification-1.0.html,gvariant*.svg}
+%{__mv} $RPM_BUILD_ROOT%{_docdir}/{gio,gio-unix,girepository,glib,glib-unix,gmodule,gobject}-2.0 $RPM_BUILD_ROOT%{_gidocdir}
 %endif
 
 > $RPM_BUILD_ROOT%{_libdir}/gio/modules/giomodule.cache
@@ -429,7 +431,14 @@ umask 022
 %if %{with apidocs}
 %files apidocs
 %defattr(644,root,root,755)
+%doc build/docs/reference/glib/gvariant-specification-1.0.html docs/reference/glib/gvariant*.svg
+%{_gidocdir}/gio-2.0
+%{_gidocdir}/gio-unix-2.0
+%{_gidocdir}/girepository-2.0
 %{_gidocdir}/glib-2.0
+%{_gidocdir}/glib-unix-2.0
+%{_gidocdir}/gmodule-2.0
+%{_gidocdir}/gobject-2.0
 %endif
 
 %files gdb