!17 rebuild for glib2 without sysprof

From: @han_hui_hui 
Reviewed-by: @t_feng 
Signed-off-by: @t_feng

README.en.md

@@ -1,36 +0,0 @@
-# sysprof
-
-#### Description
-Sysprof is a sampling CPU profiler for Linux that collects accurate
-
-#### Software Architecture
-Software architecture description
-
-#### Installation
-
-1.  xxxx
-2.  xxxx
-3.  xxxx
-
-#### Instructions
-
-1.  xxxx
-2.  xxxx
-3.  xxxx
-
-#### Contribution
-
-1.  Fork the repository
-2.  Create Feat_xxx branch
-3.  Commit your code
-4.  Create Pull Request
-
-
-#### Gitee Feature
-
-1.  You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md
-2.  Gitee blog [blog.gitee.com](https://blog.gitee.com)
-3.  Explore open source project [https://gitee.com/explore](https://gitee.com/explore)
-4.  The most valuable open source project [GVP](https://gitee.com/gvp)
-5.  The manual of Gitee [https://gitee.com/help](https://gitee.com/help)
-6.  The most popular members  [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)

README.md

@@ -1,37 +0,0 @@
-# sysprof
-
-#### 介绍
-Sysprof is a sampling CPU profiler for Linux that collects accurate
-
-#### 软件架构
-软件架构说明
-
-
-#### 安装教程
-
-1.  xxxx
-2.  xxxx
-3.  xxxx
-
-#### 使用说明
-
-1.  xxxx
-2.  xxxx
-3.  xxxx
-
-#### 参与贡献
-
-1.  Fork 本仓库
-2.  新建 Feat_xxx 分支
-3.  提交代码
-4.  新建 Pull Request
-
-
-#### 码云特技
-
-1.  使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md
-2.  码云官方博客 [blog.gitee.com](https://blog.gitee.com)
-3.  你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解码云上的优秀开源项目
-4.  [GVP](https://gitee.com/gvp) 全称是码云最有价值开源项目，是码云综合评定出的优秀开源项目
-5.  码云官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help)
-6.  码云封面人物是一档用来展示码云会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)

sysprof.spec

@@ -1,26 +1,44 @@
+%global glib2_version 2.73.0
+
 Name:           sysprof
-Version:        3.36.0
+Version:        3.46.0
-Release:        1
+Release:        2
 Summary:        A system-wide Linux profiler
 License:        GPLv3+
 URL:            http://www.sysprof.com
-Source0:        https://download.gnome.org/sources/sysprof/3.36/sysprof-%{version}.tar.xz
+Source0:        https://download.gnome.org/sources/sysprof/3.46/sysprof-%{version}.tar.xz
-# Fix the build on 32 bit hosts
-# https://gitlab.gnome.org/GNOME/sysprof/-/merge_requests/24
-Patch0:         use-G_GSIZE_FORMAT-instead-of-G_GUINT64_FORMAT-for-gsize.patch
 
-BuildRequires:  gcc gcc-c++ gettext itstool meson glib2-devel >= 2.61.3  
+BuildRequires:  gcc
-BuildRequires:	libdazzle-devel systemd-devel polkit-devel libappstream-glib desktop-file-utils
+BuildRequires:  gcc-c++
+BuildRequires:  gettext
+BuildRequires:  itstool
+BuildRequires:  meson
+BuildRequires:  pkgconfig(gio-2.0) >= %{glib2_version}
+BuildRequires:  pkgconfig(gio-unix-2.0) >= %{glib2_version}
+BuildRequires:  pkgconfig(glib-2.0) >= %{glib2_version}
+BuildRequires:  pkgconfig(gobject-2.0)
+BuildRequires:  pkgconfig(gtk4)
+BuildRequires:  pkgconfig(json-glib-1.0)
+BuildRequires:  pkgconfig(libadwaita-1)
+BuildRequires:  pkgconfig(libdazzle-1.0)
+BuildRequires:  pkgconfig(libsystemd)
+BuildRequires:  pkgconfig(libunwind-generic)
+BuildRequires:  pkgconfig(polkit-gobject-1)
+BuildRequires:  pkgconfig(systemd)
+BuildRequires:  libappstream-glib desktop-file-utils
 
-Requires:       glib2 >= 2.61.3 hicolor-icon-theme %{name}-cli = %{version}-%{release}
+Requires:       glib2%{?_isa} >= %{glib2_version}
-Requires:       libsysprof-ui = %{version}-%{release}
+Requires:       hicolor-icon-theme
+Requires:       %{name}-cli%{?_isa} = %{version}-%{release}
+Requires:       libsysprof-ui%{?_isa} = %{version}-%{release}
+
+Provides:       %{name}-agent%{?_isa} = %{version}-%{release}
 
 %description
 Sysprof is a sampling CPU profiler for Linux that collects accurate.
 
 %package        cli
 Summary:        Sysprof command line utility
-# sysprofd needs turbostat
 Requires:       kernel-tools
 
 %description    cli
@@ -28,7 +46,6 @@ The %{name}-cli package contains the sysprof-cli command line utility.
 
 %package     -n libsysprof-ui
 Summary:        Sysprof UI library
-BuildRequires:  gtk3-devel >= 3.22.0
 
 %description -n libsysprof-ui
 The libsysprof-ui package contains the Sysprof UI library.
@@ -36,6 +53,7 @@ The libsysprof-ui package contains the Sysprof UI library.
 %package        devel
 Summary:        Development files for %{name}
 Requires:       %{name} = %{version}-%{release}
+Provides:       sysprof-capture-static = %{version}-%{release}
 
 %description    devel
 The %{name}-devel package contains libraries and header files for
@@ -46,6 +64,7 @@ developing applications that use %{name}.
 %prep
 %autosetup -p1
 
+
 %build
 %meson
 %meson_build
@@ -62,18 +81,21 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %license COPYING
 %doc NEWS AUTHORS
 %{_bindir}/sysprof
-%{_datadir}/applications/org.gnome.Sysprof3.desktop
+%{_bindir}/sysprof-agent
-%{_datadir}/glib-2.0/schemas/org.gnome.sysprof3.gschema.xml
+%{_datadir}/applications/org.gnome.Sysprof.desktop
+#%%{_datadir}/glib-2.0/schemas/org.gnome.sysprof3.gschema.xml
 %{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/metainfo/org.gnome.Sysprof3.appdata.xml
+%{_datadir}/metainfo/org.gnome.Sysprof.appdata.xml
 %{_datadir}/mime/packages/sysprof-mime.xml
 
 %files cli -f %{name}.lang
 %license COPYING
 %{_bindir}/sysprof-cli
-%{_libdir}/libsysprof-3.so
+%{_libdir}/libsysprof-4.so
-%{_libdir}/libsysprof-memory-3.so
+%{_libdir}/libsysprof-memory-4.so
+%{_libdir}/libsysprof-speedtrack-4.so
 %{_libexecdir}/sysprofd
+%{_datadir}/dbus-1/interfaces/org.gnome.Sysprof.Agent.xml
 %{_datadir}/dbus-1/interfaces/org.gnome.Sysprof2.xml
 %{_datadir}/dbus-1/interfaces/org.gnome.Sysprof3.Profiler.xml
 %{_datadir}/dbus-1/interfaces/org.gnome.Sysprof3.Service.xml
@@ -87,18 +109,36 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 
 %files -n libsysprof-ui
 %license COPYING
-%{_libdir}/libsysprof-ui-3.so
+%{_libdir}/libsysprof-ui-5.so
 
 %files devel
-%{_includedir}/sysprof-3/
+%license src/libsysprof-capture/COPYING
-%{_libdir}/pkgconfig/sysprof-3.pc
+%{_includedir}/sysprof-4/
-%{_libdir}/pkgconfig/sysprof-capture-3.pc
+%{_includedir}/sysprof-ui-5/
-%{_libdir}/pkgconfig/sysprof-ui-3.pc
+%{_libdir}/pkgconfig/sysprof-4.pc
-%{_libdir}/libsysprof-capture-3.a
+%{_libdir}/pkgconfig/sysprof-capture-4.pc
+#%%{_libdir}/pkgconfig/sysprof-ui-4.pc
+%{_libdir}/pkgconfig/sysprof-ui-5.pc
+%{_libdir}/libsysprof-capture-4.a
 
 %files help
 %doc README.md
 
 %changelog
+* Mon Feb 19 2024 hanhuihui <hanhuihui5@huawei.com> - 3.46.0-2
+- rebuild for glib2 without sysprof
+
+* Mon Jan 02 2023 lin zhang <lin.zhang@turbolinux.com.cn> - 3.46.0-1
+- Update to 3.46.0
+
+* Wed Apr 20 2022 dillon chen <dillon.chen@gmail.com> - 3.44.0-1
+- Update to 3.44.0
+
+* Tue Jul 20 2021 hanhui<hanhui15@huawei.com> - 3.38.1-2
+- delete rely on low version of the file
+
+* Mon Nov 09 2020 chengguipeng<chengguipeng1@huawei.com> - 3.38.1-1
+- upgrade to 3.38.1
+
 * Sat Sep 19 2020 chengguipeng<chengguipeng1@huawei.com> - 3.36.0-1
-- Package init 
+- Package init

use-G_GSIZE_FORMAT-instead-of-G_GUINT64_FORMAT-for-gsize.patch

@@ -1,31 +0,0 @@
-From 5dea152c7728f5a37370ad8a229115833e36b4f6 Mon Sep 17 00:00:00 2001
-From: Rasmus Thomsen <oss@cogitri.dev>
-Date: Sat, 7 Mar 2020 10:44:16 +0100
-Subject: [PATCH] tests: use G_GSIZE_FORMAT instead of G_GUINT64_FORMAT for
- gsize
-
-This fixes the build on 32-bit platforms with -Werror-format
-
-https://gitlab.gnome.org/GNOME/sysprof/-/commit/5dea152c7728f5a37370ad8a229115833e36b4f6
-
-fixes #32
----
- src/tests/allocs-by-size.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/tests/allocs-by-size.c b/src/tests/allocs-by-size.c
-index 666113a..6260d4b 100644
---- a/src/tests/allocs-by-size.c
-+++ b/src/tests/allocs-by-size.c
-@@ -109,7 +109,7 @@ allocs_by_size (SysprofCaptureReader *reader)
-     {
-       const Item *item = &g_array_index (ar, Item, i);
- 
--      g_print ("%"G_GUINT64_FORMAT",%"G_GUINT64_FORMAT",%"G_GUINT64_FORMAT"\n",
-+      g_print ("%"G_GSIZE_FORMAT",%"G_GSIZE_FORMAT",%"G_GSIZE_FORMAT"\n",
-                item->size, item->cmp, item->count);
-     }
- }
--- 
-2.24.1
-