pool/glib2
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 762949 from GNOME:Next

Browse Source 
- Drop gtk-doc BuildRequires: eliminate a build cycle. In a 2nd
  step we will try to provide a glib2-devel-doc package as part of
  a _multibuild. Also drop -Dgtk_doc=true meson parameter.

OBS-URL: https://build.opensuse.org/request/show/762949
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/glib2?expand=0&rev=415
This commit is contained in:
Dominique Leuenberger 2020-01-11 00:52:46 +00:00 committed by Git OBS Bridge
parent 6adada5191
commit e17b205128
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
glib2.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Sat Jan 11 00:37:22 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
- Drop gtk-doc BuildRequires: eliminate a build cycle. In a 2nd
step we will try to provide a glib2-devel-doc package as part of
a _multibuild. Also drop -Dgtk_doc=true meson parameter.
-------------------------------------------------------------------
Thu Dec 19 17:45:31 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com>

12
glib2.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package glib2
#
# Copyright (c) 2019 SUSE LLC
# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -51,7 +51,6 @@ BuildRequires: docbook-xsl-stylesheets
BuildRequires: fdupes
BuildRequires: gamin-devel
BuildRequires: gcc-c++
BuildRequires: gtk-doc
BuildRequires: libselinux-devel
BuildRequires: m4
BuildRequires: meson >= 0.49.2
@ -67,8 +66,6 @@ BuildRequires: pkgconfig(libffi) >= 3.0.0
BuildRequires: pkgconfig(libpcre) >= 8.31
BuildRequires: pkgconfig(mount) >= 2.28
BuildRequires: pkgconfig(zlib)
# gtk-doc requires glib2-devel, but we will only be building this here; break up a cycle
#!BuildIgnore: glib2-devel
%if %{with systemtap}
BuildRequires: systemtap-dtrace
BuildRequires: systemtap-headers
@ -271,7 +268,6 @@ grep "%{_bindir}/env @PYTHON@" . -rl | xargs sed -i "s|%{_bindir}/env @PYTHON@|%
--default-library=both \
-Dselinux=enabled \
-Dman=true \
-Dgtk_doc=true \
-Dfam=true \
%if %{with systemtap}
-Dsystemtap=true \
@ -489,9 +485,6 @@ done
%dir %{_libdir}/glib-2.0/
%{_libdir}/glib-2.0/include/
%{_libdir}/pkgconfig/*.pc
%{_datadir}/gtk-doc/html/gio
%{_datadir}/gtk-doc/html/glib
%{_datadir}/gtk-doc/html/gobject
%{_datadir}/gdb/auto-load/%{_libdir}/*-gdb.py
%if %{with systemtap}
%dir %{_datadir}/systemtap
@ -502,9 +495,6 @@ done
%{_datadir}/systemtap/tapset/*/libgobject-*.so.*.stp
%endif
%{_rpmmacrodir}/macros.glib2
# Own these directories to not avoid breakages throughout the project
%dir %{_datadir}/gtk-doc
%dir %{_datadir}/gtk-doc/html
# Own these directories to avoid build requirement on gdb
# only for directories ownership
%dir %{_datadir}/gdb