diff --git a/README.en.md b/README.en.md deleted file mode 100644 index 4fec8b5..0000000 --- a/README.en.md +++ /dev/null @@ -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/) diff --git a/README.md b/README.md deleted file mode 100644 index 9277a8f..0000000 --- a/README.md +++ /dev/null @@ -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/) diff --git a/sysprof-3.36.0.tar.xz b/sysprof-3.36.0.tar.xz deleted file mode 100644 index d237a3f..0000000 Binary files a/sysprof-3.36.0.tar.xz and /dev/null differ diff --git a/sysprof-3.38.1.tar.xz b/sysprof-3.38.1.tar.xz new file mode 100644 index 0000000..ec26dcb Binary files /dev/null and b/sysprof-3.38.1.tar.xz differ diff --git a/sysprof.spec b/sysprof.spec index b9f29ef..becd6da 100644 --- a/sysprof.spec +++ b/sysprof.spec @@ -1,16 +1,14 @@ Name: sysprof -Version: 3.36.0 +Version: 3.38.1 Release: 1 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 -# 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 +Source0: https://download.gnome.org/sources/sysprof/3.38/sysprof-%{version}.tar.xz -BuildRequires: gcc gcc-c++ gettext itstool meson glib2-devel >= 2.61.3 +BuildRequires: gcc gcc-c++ gettext itstool meson glib2-devel >= 2.61.3 pkgconfig(gtk+-3.0) >= 3.22.0 BuildRequires: libdazzle-devel systemd-devel polkit-devel libappstream-glib desktop-file-utils +Buildrequires: libsysprof-ui sysprof-cli Requires: glib2 >= 2.61.3 hicolor-icon-theme %{name}-cli = %{version}-%{release} Requires: libsysprof-ui = %{version}-%{release} @@ -36,6 +34,7 @@ The libsysprof-ui package contains the Sysprof UI library. %package devel Summary: Development files for %{name} Requires: %{name} = %{version}-%{release} +Requires: libsysprof-ui%{?_isa} = %{version}-%{release} %description devel The %{name}-devel package contains libraries and header files for @@ -53,6 +52,10 @@ developing applications that use %{name}. %install %meson_install %find_lang %{name} --with-gnome +cp -a %{_libdir}/libsysprof-3.so $RPM_BUILD_ROOT%{_libdir} +cp -a %{_libdir}/libsysprof-ui-3.so $RPM_BUILD_ROOT%{_libdir} +cp -a %{_libdir}/libsysprof-memory-3.so $RPM_BUILD_ROOT%{_libdir} + %check appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata.xml @@ -73,6 +76,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop %{_bindir}/sysprof-cli %{_libdir}/libsysprof-3.so %{_libdir}/libsysprof-memory-3.so +%{_libdir}/libsysprof-4.so +%{_libdir}/libsysprof-memory-4.so +%{_libdir}/libsysprof-speedtrack-4.so %{_libexecdir}/sysprofd %{_datadir}/dbus-1/interfaces/org.gnome.Sysprof2.xml %{_datadir}/dbus-1/interfaces/org.gnome.Sysprof3.Profiler.xml @@ -88,17 +94,21 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop %files -n libsysprof-ui %license COPYING %{_libdir}/libsysprof-ui-3.so +%{_libdir}/libsysprof-ui-4.so %files devel -%{_includedir}/sysprof-3/ -%{_libdir}/pkgconfig/sysprof-3.pc -%{_libdir}/pkgconfig/sysprof-capture-3.pc -%{_libdir}/pkgconfig/sysprof-ui-3.pc -%{_libdir}/libsysprof-capture-3.a +%{_includedir}/sysprof-4/ +%{_libdir}/pkgconfig/sysprof-4.pc +%{_libdir}/pkgconfig/sysprof-capture-4.pc +%{_libdir}/pkgconfig/sysprof-ui-4.pc +%{_libdir}/libsysprof-capture-4.a %files help %doc README.md %changelog +* Mon Nov 09 2020 chengguipeng - 3.38.1-1 +- upgrade to 3.38.1 + * Sat Sep 19 2020 chengguipeng - 3.36.0-1 - Package init diff --git a/use-G_GSIZE_FORMAT-instead-of-G_GUINT64_FORMAT-for-gsize.patch b/use-G_GSIZE_FORMAT-instead-of-G_GUINT64_FORMAT-for-gsize.patch deleted file mode 100644 index a8a423e..0000000 --- a/use-G_GSIZE_FORMAT-instead-of-G_GUINT64_FORMAT-for-gsize.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 5dea152c7728f5a37370ad8a229115833e36b4f6 Mon Sep 17 00:00:00 2001 -From: Rasmus Thomsen -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 -