Accepting request 669462 from home:dimstar:branches:GNOME:Factory

- Conditionalize enabling of systemtap, default disabled: it
  creates a build loop.

OBS-URL: https://build.opensuse.org/request/show/669462
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/glib2?expand=0&rev=378

glib2.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jan 29 07:21:15 UTC 2019 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Conditionalize enabling of systemtap, default disabled: it
+  creates a build loop.
+
 -------------------------------------------------------------------
 Mon Jan 21 15:53:13 UTC 2019 - bjorn.lie@gmail.com
 

glib2.spec

@@ -16,6 +16,8 @@
 #
 
 
+# systemtap is only offered as build-option, but not enabled, as it causes a build cycle
+%bcond_with     systemtap
 # Meson is still not recommended by upstream and openQA has having many
 # suspicious failures that seems to point to Glib.
 %bcond_with     meson
@@ -26,7 +28,6 @@ Summary:        General-Purpose Utility Library
 License:        LGPL-2.1-or-later
 Group:          Development/Libraries/C and C++
 URL:            https://wiki.gnome.org/Projects/GLib
-
 Source0:        https://download.gnome.org/sources/glib/2.58/glib-%{version}.tar.xz
 Source1:        glib2.sh
 Source2:        glib2.csh
@@ -39,7 +40,6 @@ Source6:        macros.glib2
 Source8:        gsettings.zsh
 Source98:       glib2-rpmlintrc
 Source99:       baselibs.conf
-
 # PATCH-FEATURE-UPSTREAM glib2-bgo569829-gettext-gkeyfile.patch fate300461 bgo569829 vuntz@novell.com -- Look for translation of desktop entry strings via gettext, part that we share with Ubuntu and try to push upstream
 Patch0:         glib2-bgo569829-gettext-gkeyfile.patch
 # PATCH-FEATURE-OPENSUSE glib2-fate300461-gettext-gkeyfile-suse.patch fate300461 vuntz@novell.com -- Look for translation of desktop entry strings via gettext, part that deals with the openSUSE specific infrastructure (with desktop_translations)
@@ -50,7 +50,6 @@ Patch2:         glib2-suppress-schema-deprecated-path-warning.patch
 Patch3:         glib2-dbus-socket-path.patch
 # PATCH-FIX-OPENSUSE glib2-gdbus-codegen-version.patch  olaf@aepfle.de -- Remove version string from files generated by gdbus-codegen
 Patch4:         glib2-gdbus-codegen-version.patch
-
 BuildRequires:  docbook-xsl-stylesheets
 BuildRequires:  fdupes
 BuildRequires:  gamin-devel
@@ -75,7 +74,9 @@ BuildRequires:  meson
 %else
 BuildRequires:  libtool
 %endif
+%if %{with systemtap}
 BuildRequires:  systemtap-sdt-devel
+%endif
 
 %description
 GLib is a general-purpose utility library, which provides many useful
@@ -180,10 +181,10 @@ object files (commonly known as 'plug-ins').
 
 %package -n libgio-2_0-0
 Summary:        A virtual file system library API
-# The tools are useful for people having libgio
+Group:          System/Libraries
 # bnc#555605: shared-mime-info is required by libgio to properly detect mime types, but not during build
 #!BuildIgnore:  shared-mime-info
-Group:          System/Libraries
+# The tools are useful for people having libgio
 Requires:       %{name}-tools
 # bnc#678518: libgio interacts with others by means of dbus-launch
 Requires:       dbus-launch
@@ -266,7 +267,9 @@ grep "%{_bindir}/env @PYTHON@" . -rl | xargs sed -i "s|%{_bindir}/env @PYTHON@|%
     -Dman=true \
     -Dgtk_doc=true \
     -Dfam=true \
+%if %{with systemtap}
     -Dsystemtap=true \
+%endif
     -Ddtrace=true \
     -Dinternal_pcre=false
 %meson_build
@@ -281,7 +284,9 @@ autoreconf -fi
     --enable-gtk-doc \
     --enable-man \
     --with-python=%{_bindir}/python3 \
+%if %{with systemtap}
     --enable-systemtap \
+%endif
     --with-pcre=system
 %make_build
 %endif
@@ -479,10 +484,12 @@ done
 %{_datadir}/gtk-doc/html/glib
 %{_datadir}/gtk-doc/html/gobject
 %{_datadir}/gdb/auto-load/%{_libdir}/*-gdb.py
+%if %{with systemtap}
 %dir %{_datadir}/systemtap/tapset/*
 %{_datadir}/systemtap/tapset/*/libgio-*.so.*.stp
 %{_datadir}/systemtap/tapset/*/libglib-*.so.*.stp
 %{_datadir}/systemtap/tapset/*/libgobject-*.so.*.stp
+%endif
 %{_sysconfdir}/rpm/macros.glib2
 # Own these directories to not avoid breakages throughout the project
 %dir %{_datadir}/gtk-doc