Compare commits

...

No commits in common. 'c9' and 'i10c-beta' have entirely different histories.

3
.gitignore vendored

@ -1 +1,2 @@
SOURCES/sysprof-3.40.1.tar.xz SOURCES/libunwind-1.8.1.tar.gz
SOURCES/sysprof-46.0.tar.xz

@ -1 +1,2 @@
a2c1e951c4332a4efb0c702025d896ca175bb6fa SOURCES/sysprof-3.40.1.tar.xz 5c061a408d4b196dcb97212c819179a9983194ab SOURCES/libunwind-1.8.1.tar.gz
a6be0a296077e717c0e2c12b6107951e89998168 SOURCES/sysprof-46.0.tar.xz

@ -1,13 +1,23 @@
%global glib2_version 2.67.4 %global glib2_version 2.76.0
%global tarball_version %%(echo %{version} | tr '~' '.')
%global bundled_libunwind 1
%if 0%{?bundled_libunwind}
%global libunwind_version 1.8.1
%global _legacy_common_support 1
%endif
Name: sysprof Name: sysprof
Version: 3.40.1 Version: 46.0
Release: 3%{?dist} Release: 3%{?dist}
Summary: A system-wide Linux profiler Summary: A system-wide Linux profiler
License: GPLv3+ License: GPL-2.0-or-later AND GPL-3.0-or-later AND CC-BY-SA-4.0 AND BSD-2-Clause-Patent
URL: http://www.sysprof.com URL: http://www.sysprof.com
Source0: https://download.gnome.org/sources/sysprof/3.40/sysprof-%{version}.tar.xz Source0: https://download.gnome.org/sources/sysprof/46/sysprof-%{tarball_version}.tar.xz
%if 0%{?bundled_libunwind}
Source1: https://github.com/libunwind/libunwind/releases/download/v%{libunwind_version}/libunwind-%{libunwind_version}.tar.gz
%endif
BuildRequires: gcc BuildRequires: gcc
BuildRequires: gcc-c++ BuildRequires: gcc-c++
@ -18,19 +28,26 @@ BuildRequires: pkgconfig(gio-2.0) >= %{glib2_version}
BuildRequires: pkgconfig(gio-unix-2.0) >= %{glib2_version} BuildRequires: pkgconfig(gio-unix-2.0) >= %{glib2_version}
BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version} BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version}
BuildRequires: pkgconfig(gobject-2.0) BuildRequires: pkgconfig(gobject-2.0)
BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(gtk4)
BuildRequires: pkgconfig(json-glib-1.0) BuildRequires: pkgconfig(json-glib-1.0)
BuildRequires: pkgconfig(libdazzle-1.0) BuildRequires: pkgconfig(libadwaita-1)
BuildRequires: pkgconfig(libdex-1)
BuildRequires: pkgconfig(libpanel-1)
BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(libsystemd)
BuildRequires: pkgconfig(polkit-gobject-1) BuildRequires: pkgconfig(polkit-gobject-1)
BuildRequires: pkgconfig(systemd) BuildRequires: pkgconfig(systemd)
BuildRequires: /usr/bin/appstream-util BuildRequires: /usr/bin/appstream-util
BuildRequires: /usr/bin/desktop-file-validate BuildRequires: /usr/bin/desktop-file-validate
%if 0%{?bundled_libunwind}
BuildRequires: automake libtool autoconf make
%else
BuildRequires: pkgconfig(libunwind-generic)
%endif
Requires: glib2%{?_isa} >= %{glib2_version} Requires: glib2%{?_isa} >= %{glib2_version}
Requires: hicolor-icon-theme Requires: hicolor-icon-theme
Requires: %{name}-cli%{?_isa} = %{version}-%{release} Requires: %{name}-cli%{?_isa} = %{version}-%{release}
Requires: libsysprof-ui%{?_isa} = %{version}-%{release}
%description %description
Sysprof is a sampling CPU profiler for Linux that collects accurate, Sysprof is a sampling CPU profiler for Linux that collects accurate,
@ -38,6 +55,15 @@ high-precision data and provides efficient access to the sampled
calltrees. calltrees.
%package agent
Summary: Sysprof agent utility
%description agent
The %{name}-agent package contains the sysprof-agent program. It provides a P2P
D-Bus API to the process which can control subprocesses. It's used by IDE
tooling to have more control across container boundaries.
%package cli %package cli
Summary: Sysprof command line utility Summary: Sysprof command line utility
# sysprofd needs turbostat # sysprofd needs turbostat
@ -50,24 +76,20 @@ The %{name}-cli package contains the sysprof-cli command line utility.
%package -n libsysprof %package -n libsysprof
Summary: Sysprof libraries Summary: Sysprof libraries
# Subpackage removed/obsoleted in F39
Obsoletes: libsysprof-ui < 45.0
%if 0%{?bundled_libunwind}
Provides: bundled(libunwind) = %{libunwind_version}
%endif
%description -n libsysprof %description -n libsysprof
The libsysprof package contains the Sysprof libraries. The libsysprof package contains the Sysprof libraries.
%package -n libsysprof-ui
Summary: Sysprof UI library
%description -n libsysprof-ui
The libsysprof-ui package contains the Sysprof UI library.
%package capture-devel %package capture-devel
Summary: Development files for sysprof-capture static library Summary: Development files for sysprof-capture static library
License: BSD-2-Clause-Patent License: BSD-2-Clause-Patent
Provides: sysprof-capture-static = %{version}-%{release} Provides: sysprof-capture-static = %{version}-%{release}
# Split out in F34
Conflicts: %{name}-devel < 3.39.94-1
%description capture-devel %description capture-devel
The %{name}-capture-devel package contains the sysprof-capture static library and header files. The %{name}-capture-devel package contains the sysprof-capture static library and header files.
@ -77,7 +99,6 @@ The %{name}-capture-devel package contains the sysprof-capture static library an
Summary: Development files for %{name} Summary: Development files for %{name}
Requires: %{name}-capture-devel%{?_isa} = %{version}-%{release} Requires: %{name}-capture-devel%{?_isa} = %{version}-%{release}
Requires: libsysprof%{?_isa} = %{version}-%{release} Requires: libsysprof%{?_isa} = %{version}-%{release}
Requires: libsysprof-ui%{?_isa} = %{version}-%{release}
%description devel %description devel
The %{name}-devel package contains libraries and header files for The %{name}-devel package contains libraries and header files for
@ -85,17 +106,47 @@ developing applications that use %{name}.
%prep %prep
%autosetup -p1 %if 0%{?bundled_libunwind}
%setup -b 1 -n libunwind-%{libunwind_version}
%endif
%setup -n sysprof-%{tarball_version}
%build %build
%meson %if 0%{?bundled_libunwind}
# First build private libunwind
%global libunwind_install_dir %{buildroot}%{_builddir}/libunwind
pushd ../libunwind-%{libunwind_version}
mkdir -p %{_builddir}/libunwind/
aclocal
libtoolize --force
autoheader
automake --add-missing
autoconf
%configure --enable-static --disable-shared --enable-setjmp=no --disable-debug --disable-documentation --disable-ptrace --disable-coredump --disable-minidebuginfo --disable-zlibdebuginfo --with-pic
make %{?_smp_mflags} install DESTDIR=%{libunwind_install_dir}
popd
# Our "/usr" install to DESTDIR wont get picked up by the
# pkgconfig use in meson so ensure access to those include
# and linker directories manually.
export CFLAGS="$CFLAGS -I%{libunwind_install_dir}/usr/include"
export LDFLAGS="$LDFLAGS -L%{libunwind_install_dir}/usr/%{_lib}"
%global pkg_config_path_override --pkg-config-path %{libunwind_install_dir}/usr/%{_lib}/pkgconfig
%endif
# Now build sysprof
%meson %{?pkg_config_path_override}
%meson_build %meson_build
%install %install
%meson_install %meson_install
%find_lang %{name} --with-gnome %find_lang %{name} --with-gnome
%if 0%{?bundled_libunwind}
# Appease checks which would include buildroot paths for the
# libunwind-generic.a linked in.
strip -s %{buildroot}/usr/%{_lib}/libsysprof-*.so
%endif
%check %check
@ -107,69 +158,133 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
%license COPYING %license COPYING
%doc NEWS README.md AUTHORS %doc NEWS README.md AUTHORS
%{_bindir}/sysprof %{_bindir}/sysprof
%{_datadir}/applications/org.gnome.Sysprof3.desktop %{_datadir}/applications/org.gnome.Sysprof.desktop
%{_datadir}/glib-2.0/schemas/org.gnome.sysprof3.gschema.xml
%{_datadir}/icons/hicolor/*/*/* %{_datadir}/icons/hicolor/*/*/*
%{_datadir}/metainfo/org.gnome.Sysprof3.appdata.xml %{_datadir}/metainfo/org.gnome.Sysprof.appdata.xml
%{_datadir}/mime/packages/sysprof-mime.xml %{_datadir}/mime/packages/sysprof-mime.xml
%files agent
%license COPYING
%{_bindir}/sysprof-agent
%files cli -f %{name}.lang %files cli -f %{name}.lang
%license COPYING %license COPYING
%{_bindir}/sysprof-cli %{_bindir}/sysprof-cli
%{_libexecdir}/sysprofd %{_libexecdir}/sysprofd
%{_datadir}/dbus-1/system.d/org.gnome.Sysprof2.conf
%{_datadir}/dbus-1/system.d/org.gnome.Sysprof3.conf %{_datadir}/dbus-1/system.d/org.gnome.Sysprof3.conf
%{_datadir}/dbus-1/system-services/org.gnome.Sysprof2.service
%{_datadir}/dbus-1/system-services/org.gnome.Sysprof3.service %{_datadir}/dbus-1/system-services/org.gnome.Sysprof3.service
%{_datadir}/polkit-1/actions/org.gnome.sysprof3.policy %{_datadir}/polkit-1/actions/org.gnome.sysprof3.policy
%{_unitdir}/sysprof2.service
%{_unitdir}/sysprof3.service %{_unitdir}/sysprof3.service
%files -n libsysprof %files -n libsysprof
%license COPYING %license COPYING COPYING.gpl-2
%{_libdir}/libsysprof-4.so %{_libdir}/libsysprof-6.so.6*
%{_libdir}/libsysprof-memory-4.so %{_libdir}/libsysprof-memory-6.so
%{_libdir}/libsysprof-speedtrack-4.so %{_libdir}/libsysprof-speedtrack-6.so
%{_libdir}/libsysprof-tracer-6.so
%files -n libsysprof-ui
%license COPYING
%{_libdir}/libsysprof-ui-4.so
%files capture-devel %files capture-devel
%license src/libsysprof-capture/COPYING %license src/libsysprof-capture/COPYING
%dir %{_includedir}/sysprof-4 %dir %{_includedir}/sysprof-6
%{_includedir}/sysprof-4/sysprof-address.h %{_includedir}/sysprof-6/sysprof-address.h
%{_includedir}/sysprof-4/sysprof-capture-condition.h %{_includedir}/sysprof-6/sysprof-capture-condition.h
%{_includedir}/sysprof-4/sysprof-capture-cursor.h %{_includedir}/sysprof-6/sysprof-capture-cursor.h
%{_includedir}/sysprof-4/sysprof-capture.h %{_includedir}/sysprof-6/sysprof-capture.h
%{_includedir}/sysprof-4/sysprof-capture-reader.h %{_includedir}/sysprof-6/sysprof-capture-reader.h
%{_includedir}/sysprof-4/sysprof-capture-types.h %{_includedir}/sysprof-6/sysprof-capture-types.h
%{_includedir}/sysprof-4/sysprof-capture-writer.h %{_includedir}/sysprof-6/sysprof-capture-writer.h
%{_includedir}/sysprof-4/sysprof-clock.h %{_includedir}/sysprof-6/sysprof-clock.h
%{_includedir}/sysprof-4/sysprof-collector.h %{_includedir}/sysprof-6/sysprof-collector.h
%{_includedir}/sysprof-4/sysprof-macros.h %{_includedir}/sysprof-6/sysprof-macros.h
%{_includedir}/sysprof-4/sysprof-platform.h %{_includedir}/sysprof-6/sysprof-platform.h
%{_includedir}/sysprof-4/sysprof-version.h %{_includedir}/sysprof-6/sysprof-version.h
%{_includedir}/sysprof-4/sysprof-version-macros.h %{_includedir}/sysprof-6/sysprof-version-macros.h
%{_libdir}/libsysprof-capture-4.a %{_libdir}/libsysprof-capture-4.a
%{_libdir}/pkgconfig/sysprof-capture-4.pc %{_libdir}/pkgconfig/sysprof-capture-4.pc
%files devel %files devel
%{_includedir}/sysprof-4/ %{_includedir}/sysprof-6/
%{_libdir}/pkgconfig/sysprof-4.pc %{_libdir}/libsysprof-6.so
%{_libdir}/pkgconfig/sysprof-ui-4.pc %{_libdir}/pkgconfig/sysprof-6.pc
%{_datadir}/dbus-1/interfaces/org.gnome.Sysprof2.xml %{_datadir}/dbus-1/interfaces/org.gnome.Sysprof.Agent.xml
%{_datadir}/dbus-1/interfaces/org.gnome.Sysprof3.Profiler.xml %{_datadir}/dbus-1/interfaces/org.gnome.Sysprof3.Profiler.xml
%{_datadir}/dbus-1/interfaces/org.gnome.Sysprof3.Service.xml %{_datadir}/dbus-1/interfaces/org.gnome.Sysprof3.Service.xml
%changelog %changelog
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 3.40.1-3 * Tue Nov 26 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 46.0-3
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags - Rebuilt for MSVSphere 10
Related: rhbz#1991688
* Tue Jul 02 2024 Christian Hergert <chergert@redhat.com> - 46.0-3
- Use static libunwind for Sysprof tracers
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 46.0-2
- Bump release for June 2024 mass rebuild
* Sat Mar 16 2024 David King <amigadave@amigadave.com> - 46.0-1
- Update to 46.0
* Fri Mar 08 2024 David King <amigadave@amigadave.com> - 46~rc-1
- Update to 46.rc
* Mon Feb 19 2024 David King <amigadave@amigadave.com> - 46~beta-1
- Update to 46.beta
* Wed Feb 14 2024 David King <amigadave@amigadave.com> - 45.2-1
- Update to 45.2
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 45.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Tue Oct 24 2023 Kalev Lember <klember@redhat.com> - 45.1-1
- Update to 45.1
* Thu Sep 21 2023 Kalev Lember <klember@redhat.com> - 45.0-1
- Update to 45.0
- Remove and obsolete libsysprof-ui subpackage
- Drop RHEL libunwind build conditionals as it's no longer an optional dep
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.48.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Sat Mar 18 2023 David King <amigadave@amigadave.com> - 3.48.0-1
- Update to 3.48.0
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.46.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Tue Sep 20 2022 Kalev Lember <klember@redhat.com> - 3.46.0-1
- Update to 3.46.0
* Mon Aug 08 2022 Kalev Lember <klember@redhat.com> - 3.45.1-1
- Update to 3.45.1
- Add new -agent subpackage for sysprof-agent
* Thu Jul 28 2022 Kalev Lember <klember@redhat.com> - 3.45.0-1
- Update to 3.45.0
- Remove old conflicts
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.44.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Sat Mar 19 2022 David King <amigadave@amigadave.com> - 3.44.0-1
- Update to 3.44.0
* Wed Mar 09 2022 David King <amigadave@amigadave.com> - 3.43.90-1
- Update to 3.43.90
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.42.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Fri Nov 05 2021 Kalev Lember <klember@redhat.com> - 3.42.1-1
- Update to 3.42.1
- Build with libunwind support
* Tue Sep 21 2021 Kalev Lember <klember@redhat.com> - 3.42.0-1
- Update to 3.42.0
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 3.40.1-2 * Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.40.1-2
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Tue Mar 23 2021 Kalev Lember <klember@redhat.com> - 3.40.1-1 * Tue Mar 23 2021 Kalev Lember <klember@redhat.com> - 3.40.1-1
- Update to 3.40.1 - Update to 3.40.1

Loading…
Cancel
Save