Accepting request 51911 from home:vuntz:branches:GNOME:Factory

Forwarding to openSUSE:Factory

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

glib2.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Nov  1 11:05:30 EDT 2010 - vuntz@opensuse.org
+
+- Add a with_systemtap define to easily switch between building
+  with and without systemtap support, and set it to 0 for now: it
+  creates a build loop.
+
 -------------------------------------------------------------------
 Wed Oct 13 11:11:20 CEST 2010 - vuntz@opensuse.org
 

glib2.spec

@@ -17,6 +17,7 @@
 
 # norootforbuild
 
+%define with_systemtap 0
 
 Name:           glib2
 %define _name glib
@@ -52,11 +53,13 @@ BuildRequires:  fdupes
 BuildRequires:  gcc-c++
 BuildRequires:  libselinux-devel
 BuildRequires:  pkg-config
+%if 0%{?with_systemtap}
 # systemtap-sdt-devel on openSUSE 11.3 was missing a Requires: python.
 %if %{?suse_version} <= 1130
 BuildRequires:  python
 %endif
 BuildRequires:  systemtap-sdt-devel
+%endif
 BuildRequires:  translation-update-upstream
 BuildRequires:  zlib-devel
 BuildRequires:  pkgconfig(libpcre)
@@ -253,7 +256,9 @@ fi
     --enable-static \
     --enable-selinux \
     --with-pcre=system \
+%if 0%{?with_systemtap}
     --enable-systemtap \
+%endif
     --with-runtime-libdir=../../%{_lib}
 %{__make} %{?_smp_mflags}
 
@@ -439,7 +444,9 @@ rm -rf %{buildroot}
 %{_datadir}/gtk-doc/html/glib
 %{_datadir}/gtk-doc/html/gobject
 %{_datadir}/gdb/auto-load/%{_lib}/*-gdb.py
+%if 0%{?with_systemtap}
 %{_datadir}/systemtap/tapset/*.stp
+%endif
 %{_sysconfdir}/rpm/macros.glib2
 # Own these directories to not depend on gtk-doc while building:
 %dir %{_datadir}/gtk-doc