4 changed files with 113 additions and 70 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-SOURCES/trace-cmd-kernelshark-v1.2.tar.gz
+SOURCES/kernel-shark-kernelshark-v2.3.1.tar.gz
--- a/.kernelshark.metadata
+++ b/.kernelshark.metadata
@ -1 +1 @@
-8a9a124001207d349582190b6236dcac2eb639cc SOURCES/trace-cmd-kernelshark-v1.2.tar.gz
+e9bc23b99523b2e4bf1b59d85432ea17e399bc84 SOURCES/kernel-shark-kernelshark-v2.3.1.tar.gz
--- a/SOURCES/0001-Do-not-install-trace-cmd-when-only-building-kernelsh.patch
+++ b/SOURCES/0001-Do-not-install-trace-cmd-when-only-building-kernelsh.patch
@ -1,26 +0,0 @@
-From a0a28e0b5161203c7576a430ca12d11a16a88e74 Mon Sep 17 00:00:00 2001
-From: Zamir SUN <sztsian@gmail.com>
-Date: Thu, 24 Sep 2020 21:19:00 +0800
-Subject: [PATCH] Do not install trace-cmd when only building kernelshark
-
-Signed-off-by: Zamir SUN <sztsian@gmail.com>
---
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index bbdf15e..a489fe8 100644
--- a/Makefile
-+++ b/Makefile
-@@ -338,7 +338,7 @@ install: install_cmd
- 	@echo "Note: to install the gui, type \"make install_gui\""
- 	@echo "      to install man pages, type \"make install_doc\""
- 
-install_gui: install_cmd gui
-+install_gui: gui
- 	$(Q)$(MAKE) $(S) -C $(kshark-dir)/build install
- 
- install_libs: libs
-- 
-2.26.2
-
--- a/SPECS/kernelshark.spec
+++ b/SPECS/kernelshark.spec
@ -1,17 +1,18 @@
 Name: kernelshark
-Version: 1.2
-Release: 10%{?dist}
+Version: 2.3.1
+Release: 4%{?dist}
 Epoch: 1

-# As of 1.1, only kernelshark.cpp, kshark-record.cpp and examples are GPL-2.0. The rest of kernel-shark is LGPL-2.1.
+# As of 2.3.1, only kernelshark.cpp, kshark-record.cpp and examples are GPL-2.0. The rest of kernel-shark is LGPL-2.1.
 # See SPDX identifier for most accurate info
-License: GPLv2 and LGPLv2
+License: GPL-2.0-only AND LGPL-2.1-only
 Summary: GUI analysis for Ftrace data captured by trace-cmd

 URL: https://kernelshark.org
-Source0: https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot/trace-cmd-kernelshark-v%{version}.tar.gz
+Source0: https://git.kernel.org/pub/scm/utils/trace-cmd/kernel-shark.git/snapshot/kernel-shark-kernelshark-v%{version}.tar.gz
 Source1: %{name}.appdata.xml
-Patch0: 0001-Do-not-install-trace-cmd-when-only-building-kernelsh.patch
+
+ExcludeArch: %{ix86} %{arm}

 BuildRequires: cmake 
 BuildRequires: desktop-file-utils
@ -24,13 +25,26 @@ BuildRequires: pkgconf
 BuildRequires: pkgconfig(glut)
 BuildRequires: pkgconfig(json-c)
 BuildRequires: pkgconfig(libxml-2.0)
-BuildRequires: pkgconfig(Qt5Core)
-BuildRequires: libtracecmd
+BuildRequires: cmake(Qt6Network)
+BuildRequires: cmake(Qt6OpenGLWidgets)
+BuildRequires: cmake(Qt6StateMachine)
+BuildRequires: cmake(Qt6Widgets)
 BuildRequires: libtracecmd-devel
+BuildRequires: libtraceevent-devel
+BuildRequires: libtracefs-devel
+BuildRequires: libtracecmd >= 1.5.0
+BuildRequires: trace-cmd
 BuildRequires: xmlto
 BuildRequires: make
-BuildRequires: asciidoc
+BuildRequires: chrpath
+BuildRequires: freeglut-devel
+BuildRequires: font(notosans)
+BuildRequires: fontconfig
+BuildRequires: docbook-style-xsl
+BuildRequires: texlive-epstopdf
+BuildRequires: ghostscript
 Requires: polkit
+Requires: font(notosans)


 %description
@ -40,31 +54,33 @@ file. kernelshark can read this file and produce a graph and list
 view of its data. 

 %prep
-%autosetup -n trace-cmd-%{name}-v%{version}
+%autosetup -n kernel-shark-%{name}-v%{version}

 %build
-# MANPAGE_DOCBOOK_XSL define is hack to avoid using locate
-# -z muldefs to workaround the enforcing multi definition check of gcc10.
-#   and it need to be removed once upstream fixed the variable name
-# Do not use parallel compile because it makes compiling fail
-MANPAGE_DOCBOOK_XSL=`rpm -ql docbook-style-xsl | grep manpages/docbook.xsl`
-CFLAGS="%{optflags} -D_GNU_SOURCE" LDFLAGS="%{build_ldflags} -z muldefs" BUILD_TYPE=Release \
-  make -p V=9999999999 MANPAGE_DOCBOOK_XSL=$MANPAGE_DOCBOOK_XSL \
-  prefix=%{_prefix} libdir=%{_libdir} gui doc_gui
+cd build
+tt_font=`fc-list NotoSans:style=Regular | cut -d':' -f 1 -z`
+# To fix error: ‘for_each’ is not a member of ‘std’
+sed -i '/iostream/a #include <algorithm>' ../src/plugins/LatencyPlot.cpp
+cmake ..  -DCMAKE_BUILD_TYPE=Package -D_INSTALL_PREFIX=%{_prefix} -D_LIBDIR=%{_libdir} -DCMAKE_C_FLAGS_PACKAGE="%{optflags}" -DCMAKE_EXE_LINKER_FLAGS="%{build_ldflags}" -D_DOXYGEN_DOC=1 -DTT_FONT_FILE=${tt_font}
+
+make V=1 all doc

 %install
-make libdir=%{_libdir} prefix=%{_prefix} V=1 DESTDIR=%{buildroot}/ CFLAGS="%{optflags} -D_GNU_SOURCE" LDFLAGS="%{build_ldflags} -z muldefs " BUILD_TYPE=Release install_gui install_doc_gui
-find %{buildroot}%{_datadir} -type f | xargs chmod u-x,g-x,o-x
-find %{buildroot}%{_libdir} -type f -iname "*.so" | xargs chmod 0755
+cd build
+make libdir=%{_libdir} prefix=%{_prefix} V=1 DESTDIR=%{buildroot}/  install
 sed -i '/Version/d' %{buildroot}/%{_datadir}/applications/kernelshark.desktop
 desktop-file-validate %{buildroot}/%{_datadir}/applications/kernelshark.desktop
 mkdir -p %{buildroot}%{_metainfodir}/
 cp %{SOURCE1} %{buildroot}%{_metainfodir}/
 appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdata.xml

+#Remove all rpath
+find %{buildroot} -type f -perm 755 -name \*so\* -exec chrpath --delete {} \;
+chrpath --delete %{buildroot}/%{_bindir}/kernelshark
+chrpath --delete %{buildroot}/%{_bindir}/kshark-record
+
 %files
-%license COPYING
-%doc COPYING.LIB README
+%doc README
 %{_bindir}/kernelshark
 %{_bindir}/kshark-record
 %{_bindir}/kshark-su-record
@ -75,33 +91,86 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat
 %{_datadir}/icons/kernelshark/*
 %{_datadir}/polkit-1/actions/org.freedesktop.kshark-record.policy
 %{_metainfodir}/%{name}.appdata.xml
-%docdir %{_datadir}/%{name}/html
-%{_datadir}/%{name}/html/*
-%{_mandir}/man1/*
+%{_libdir}/libkshark-gui.so.*
+%{_libdir}/libkshark-plot.so.*
+%{_libdir}/libkshark.so
+%{_libdir}/libkshark.so.*
+%{_libdir}/pkgconfig/libkshark.pc
+%{_includedir}/%{name}

 %changelog
-* Mon Dec 12 2022 Jerome Marchand <jmarchan@redhat.com> - 1:1.2-10
- Add html documentation and man page
+* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1:2.3.1-4
+- Bump release for October 2024 mass rebuild:
+  Resolves: RHEL-64018

-* Mon Nov 22 2021 Jerome Marchand <jmarchan@redhat.com> - 1:1.2-9
- Rebuild with latest json-c
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1:2.3.1-3
+- Bump release for June 2024 mass rebuild

-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com>
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
+* Fri Jun 14 2024 Jerome Marchand <jmarchan@redhat.com> - 1:2.3.1-1
+- Update the license and convert it to SPDX 3.0 (-only -or-later prefix)

-* Mon May 03 21 Jerome Marchand <jmarchan@redhat.com> - 1:1.2-7
- libtracecmd is a subpackage of trace-cmd for now
+* Tue Jun 11 2024 Jerome Marchand <jmarchan@redhat.com> - 1:2.3.1-1
+- Update to 2.3.1
+- Build with NotoSans font and remove gnu-free-sans-fonts dependency

-* Thu Apr 22 2021 Jerome Marchand <jmarchan@redhat.com> - 1:1.2-6
- libtracecmd is not yet available on c9s/el9
+* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.3.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

-* Mon Apr 19 2021 Jerome Marchand <jmarchan@redhat.com> - 1:1.2-5
- Rebuild with external tracing libs
- Misc cleanup
+* Tue Jan 23 2024 Zamir SUN <sztsian@gmail.com> - 1:2.3.0-3
+- Rebuild for libtrace* update
+
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.3.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Jan 05 2024 Yaakov Selkowitz <yselkowi@redhat.com> - 1:2.3.0-1
+- Update to 2.3.0
+
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.2.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Mon Jun 05 2023 Zamir SUN <sztsian@gmail.com> - 1:2.2.0-3
+- SPDX migration
+
+* Fri Jun 02 2023 Zamir SUN <sztsian@gmail.com> - 1:2.2.0-2
+- Add gnu-free-sans-fonts to dependency
+- Fixes: RHBZ#2211613
+
+* Tue Apr 18 2023 Zamir SUN <sztsian@gmail.com> - 1:2.2.0-1
+- Update to 2.2.0
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.1.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1:1.2-4
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+* Tue Oct 11 2022 Zamir SUN <sztsian@gmail.com> - 1:2.1.1-1
+- Update to 2.1.1
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.1.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Fri Apr 15 2022 Zamir SUN <sztsian@gmail.com> - 1:2.1.0-1
+- Update to 2.1.0
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.3-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Sat Jul 10 2021 Björn Esser <besser82@fedoraproject.org> - 1:1.3-2
+- Rebuild for versioned symbols in json-c
+
+* Tue May 11 2021 Zamir SUN <sztsian@gmail.coom> - 1.3-1
+- Update to 1.3
+
+* Mon May 10 2021 Jonathan Wakely <jwakely@redhat.com> - 1:1.2-6
+- Rebuilt for removed libstdc++ symbols (#1937698)
+
+* Wed Mar 31 2021 Jonathan Wakely <jwakely@redhat.com> - 1:1.2-5
+- Rebuilt for removed libstdc++ symbols (#1937698)
+
+* Wed Mar 24 2021 Jerome Marchand <jmarchan@redhat.com> - 1.2-3
+- Rebuild with external libtracefs and libtraceevent
+- Misc cleanup

 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild