From 2af5f9ab928e47552d9f10a457618f09de64c1ff Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Fri, 5 Jan 2024 23:06:53 +0100
Subject: [PATCH] rebuilt with static library plus dtrace and systemtap
 [release 2.60.5-2mamba;Tue Jul 16 2019]

---
 glib.spec | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/glib.spec b/glib.spec
index 27dc379..b0f32a8 100644
--- a/glib.spec
+++ b/glib.spec
@@ -1,4 +1,4 @@
-%define with_systemtap 0
+%define with_systemtap 1
 %if "%{stage1}" == "1"
 # Don't depend on pkg-config to resolve circular build dependency
    %define LIBFFI_CFLAGS %(libdir=%{_libdir} eval `grep includedir= %{_libdir}/pkgconfig/libffi.pc`; echo "LIBFFI_CFLAGS=-I$includedir LIBFFI_LIBS='-L%{_libdir} -lffi'")
@@ -6,7 +6,7 @@
 %define        majver %(echo %version | cut -d. -f 1-2)
 Name:          glib
 Version:       2.60.5
-Release:       1mamba
+Release:       2mamba
 Epoch:         2
 Summary:       A handy library of utility functions
 Group:         System/Libraries
@@ -22,7 +22,6 @@ Patch0:        glib-2.36.1-fix-skype.patch
 License:       LGPL
 ## AUTOBUILDREQ-BEGIN
 BuildRequires: glibc-devel
-%if "%{stage1}" != "1"
 BuildRequires: libelf-devel
 BuildRequires: libffi-devel
 BuildRequires: libmount-devel
@@ -158,8 +157,13 @@ sed -i "s|python3|python3.6|" meson.build
 %build
 #:<< _EOF
 %meson \
+   --default-library=both \
    -Dman=true \
-   -Dgtk_doc=true
+   -Dgtk_doc=true \
+   -Ddtrace=true \
+%if "%{with_systemtap}" == "1"
+   -Dsystemtap=true
+%endif
 
 %meson_build
 
@@ -271,15 +275,15 @@ _EOF
 %{_datadir}/gettext/its/gschema.*
 %{_datadir}/aclocal/glib-?.?.m4
 %if "%{with_systemtap}" == "1"
-%{_datadir}/systemtap/tapset/*.stp
+%{_datadir}/systemtap/tapset/*/lib*.stp
 %endif
 %{_datadir}/glib-2.0/valgrind/glib.supp
 %{_libdir}/pkgconfig/*
 %{_mandir}/man1/*
 
-#%files -n libglib-static
-#%defattr(-,root,root)
-#%{_libdir}/libg*.a
+%files -n libglib-static
+%defattr(-,root,root)
+%{_libdir}/libg*.a
 
 %files -n python-glib
 %defattr(-,root,root)
@@ -334,6 +338,9 @@ _EOF
 %endif
 
 %changelog
+* Tue Jul 16 2019 Silvan Calarco <silvan.calarco@mambasoft.it> 2.60.5-2mamba
+- rebuilt with static library plus dtrace and systemtap
+
 * Sat Jul 13 2019 Silvan Calarco <silvan.calarco@mambasoft.it> 2.60.5-1mamba
 - update to 2.60.5