- updated to 3.34.1 (note: new API/ABI)

diff --git a/sysprof.spec b/sysprof.spec
index 6ed7b44c1a9b92b4a6c5a099003327adde00576c..35c81bf9058b96f435cf7c19ac7abb3e34014667 100644 (file)
--- a/sysprof.spec
+++ b/sysprof.spec
@@ -5,32 +5,35 @@
 Summary:       Sampling CPU profiler for Linux
 Summary(pl.UTF-8):     Próbkujący profiler procesora dla Linuksa
 Name:          sysprof
-Version:       3.32.0
+Version:       3.34.1
 Release:       1
 License:       GPL v3+
 Group:         Applications/System
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/sysprof/3.32/%{name}-%{version}.tar.xz
-# Source0-md5: d1fa9ad216419d722770ca36713ad3af
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/sysprof/3.34/%{name}-%{version}.tar.xz
+# Source0-md5: cc32455277b31afb1965d627ae3e3629
 URL:           http://sysprof.com/
-BuildRequires: appstream-glib-devel
 # -std=gnu11 + C11 atomics
 BuildRequires: gcc >= 6:4.9
 BuildRequires: gdk-pixbuf2-devel >= 2.0
 BuildRequires: gettext-tools >= 0.19.6
-BuildRequires: glib2-devel >= 1:2.44.0
+BuildRequires: glib2-devel >= 1:2.61.3
 BuildRequires: gobject-introspection-devel >= 1.42.0
 BuildRequires: gtk+3-devel >= 3.22
-BuildRequires: libstdc++-devel >= 6:4.3
+BuildRequires: libdazzle-devel >= 3.30.0
+BuildRequires: libstdc++-devel >= 6:4.7
+BuildRequires: meson >= 0.50.0
+BuildRequires: ninja >= 1.5
 BuildRequires: pango-devel
 BuildRequires: pkgconfig >= 1:0.22
-%{?with_sysprofd:BuildRequires:        polkit-devel}
-BuildRequires: rpmbuild(macros) >= 1.644
+%{?with_sysprofd:BuildRequires:        polkit-devel >= 0.105}
+BuildRequires: rpmbuild(macros) >= 1.736
 %{?with_sysprofd:BuildRequires:        systemd-devel >= 1:222}
 BuildRequires: tar >= 1:1.22
 BuildRequires: vala
 BuildRequires: xz
 BuildRequires: yelp-tools
 Requires:      %{name}-libs = %{version}-%{release}
+%{?with_sysprofd:Requires:     polkit >= 0.105}
 %{?with_sysprofd:Requires:     systemd-units >= 1:222}
 Requires:      uname(release) >= 2.6.31
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -55,7 +58,7 @@ Wystarczy załadować moduł jądra i uruchomić sysprof.
 Summary:       The sysprof profiler library
 Summary(pl.UTF-8):     Biblioteka profilera sysprof
 Group:         Libraries
-Requires:      glib2 >= 1:2.44.0
+Requires:      glib2 >= 1:2.61.3
 
 %description libs
 The sysprof profiler library.
@@ -68,7 +71,7 @@ Summary:      Header files for sysprof library
 Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki sysprof
 Group:         Development/Libraries
 Requires:      %{name}-libs = %{version}-%{release}
-Requires:      glib2-devel >= 1:2.44.0
+Requires:      glib2-devel >= 1:2.61.3
 
 %description devel
 Header files for sysprof library.
@@ -81,7 +84,7 @@ Summary:      The sysprof graphical user interface
 Summary(pl.UTF-8):     Graficzny interfejs użytkownika profilera sysprof
 Group:         Applications/System
 Requires(post,postun): desktop-file-utils
-Requires(post,postun): glib2 >= 1:2.44.0
+Requires(post,postun): glib2 >= 1:2.61.3
 Requires(post,postun): gtk-update-icon-cache
 Requires:      %{name} = %{version}-%{release}
 Requires:      %{name}-ui-libs = %{version}-%{release}
@@ -100,6 +103,7 @@ Summary(pl.UTF-8):  Biblioteka sysprofa zawierająca widgety GTK+ wielokrotnego u
 Group:         X11/Libraries
 Requires:      %{name}-libs = %{version}-%{release}
 Requires:      gtk+3 >= 3.22
+Requires:      libdazzle >= 3.30.0
 
 %description ui-libs
 The sysprof library containing reusable GTK+ widgets.
@@ -126,14 +130,14 @@ Pliki nagłówkowe biblioteki sysprof-ui.
 
 %build
 %meson build \
-       %{?with_sysprofd:-Dwith_sysprofd=bundled}
+       %{!?with_sysprofd:-Dwith_sysprofd=host}
 
-%meson_build -C build
+%ninja_build -C build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%meson_install -C build
+%ninja_install -C build
 
 %find_lang %{name} -o %{name}-ui.lang --with-gnome --without-mo
 %find_lang %{name}
@@ -175,96 +179,89 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS NEWS TODO
 %attr(755,root,root) %{_bindir}/sysprof-cli
 %if %{with sysprofd}
-%dir %{_libexecdir}/sysprof
-%attr(755,root,root) %{_libexecdir}/sysprof/sysprofd
+%attr(755,root,root) %{_libexecdir}/sysprofd
 %{systemdunitdir}/sysprof2.service
+%{systemdunitdir}/sysprof3.service
 %{_datadir}/dbus-1/system-services/org.gnome.Sysprof2.service
+%{_datadir}/dbus-1/system-services/org.gnome.Sysprof3.service
 %{_datadir}/dbus-1/system.d/org.gnome.Sysprof2.conf
-%{_datadir}/polkit-1/actions/org.gnome.sysprof2.policy
+%{_datadir}/dbus-1/system.d/org.gnome.Sysprof3.conf
+%{_datadir}/polkit-1/actions/org.gnome.sysprof3.policy
 %endif
 
 %files libs
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libsysprof-2.so
+%attr(755,root,root) %{_libdir}/libsysprof-3.so
 
 %files devel
 %defattr(644,root,root,755)
-%{_libdir}/libsysprof-capture-2.a
-%dir %{_includedir}/sysprof-2
-%{_includedir}/sysprof-2/sp-kallsyms.h
-%{_includedir}/sysprof-2/sp-address.h
-%{_includedir}/sysprof-2/sp-clock.h
-%{_includedir}/sysprof-2/sp-error.h
-%{_includedir}/sysprof-2/sysprof.h
-%{_includedir}/sysprof-2/sysprof-capture.h
-%{_includedir}/sysprof-2/sysprof-version.h
-%dir %{_includedir}/sysprof-2/callgraph
-%{_includedir}/sysprof-2/callgraph/sp-callgraph-profile.h
-%dir %{_includedir}/sysprof-2/capture
-%{_includedir}/sysprof-2/capture/sp-capture-condition.h
-%{_includedir}/sysprof-2/capture/sp-capture-cursor.h
-%{_includedir}/sysprof-2/capture/sp-capture-reader.h
-%{_includedir}/sysprof-2/capture/sp-capture-types.h
-%{_includedir}/sysprof-2/capture/sp-capture-writer.h
-%dir %{_includedir}/sysprof-2/profiler
-%{_includedir}/sysprof-2/profiler/sp-local-profiler.h
-%{_includedir}/sysprof-2/profiler/sp-profile.h
-%{_includedir}/sysprof-2/profiler/sp-profiler.h
-%dir %{_includedir}/sysprof-2/sources
-%{_includedir}/sysprof-2/sources/sp-gjs-source.h
-%{_includedir}/sysprof-2/sources/sp-hostinfo-source.h
-%{_includedir}/sysprof-2/sources/sp-memory-source.h
-%{_includedir}/sysprof-2/sources/sp-perf-source.h
-%{_includedir}/sysprof-2/sources/sp-proc-source.h
-%{_includedir}/sysprof-2/sources/sp-source.h
-%dir %{_includedir}/sysprof-2/symbols
-%{_includedir}/sysprof-2/symbols/sp-elf-symbol-resolver.h
-%{_includedir}/sysprof-2/symbols/sp-jitmap-symbol-resolver.h
-%{_includedir}/sysprof-2/symbols/sp-kernel-symbol-resolver.h
-%{_includedir}/sysprof-2/symbols/sp-kernel-symbol.h
-%{_includedir}/sysprof-2/symbols/sp-symbol-dirs.h
-%{_includedir}/sysprof-2/symbols/sp-symbol-resolver.h
-%dir %{_includedir}/sysprof-2/util
-%{_includedir}/sysprof-2/util/sp-map-lookaside.h
-%{_includedir}/sysprof-2/util/sp-model-filter.h
-%{_includedir}/sysprof-2/util/sp-process-model-item.h
-%{_includedir}/sysprof-2/util/sp-process-model.h
-%{_includedir}/sysprof-2/util/sp-selection.h
-%{_includedir}/sysprof-2/util/sp-zoom-manager.h
-%dir %{_includedir}/sysprof-2/visualizers
-%{_includedir}/sysprof-2/visualizers/sp-mark-visualizer-row.h
-%{_pkgconfigdir}/sysprof-2.pc
-%{_pkgconfigdir}/sysprof-capture-2.pc
+%{_libdir}/libsysprof-capture-3.a
+%dir %{_includedir}/sysprof-3
+%{_includedir}/sysprof-3/sysprof.h
+%{_includedir}/sysprof-3/sysprof-address.h
+%{_includedir}/sysprof-3/sysprof-battery-source.h
+%{_includedir}/sysprof-3/sysprof-callgraph-profile.h
+%{_includedir}/sysprof-3/sysprof-capture*.h
+%{_includedir}/sysprof-3/sysprof-check.h
+%{_includedir}/sysprof-3/sysprof-clock.h
+%{_includedir}/sysprof-3/sysprof-diskstat-source.h
+%{_includedir}/sysprof-3/sysprof-elf-symbol-resolver.h
+%{_includedir}/sysprof-3/sysprof-gjs-source.h
+%{_includedir}/sysprof-3/sysprof-governor-source.h
+%{_includedir}/sysprof-3/sysprof-hostinfo-source.h
+%{_includedir}/sysprof-3/sysprof-jitmap-symbol-resolver.h
+%{_includedir}/sysprof-3/sysprof-kernel-symbol.h
+%{_includedir}/sysprof-3/sysprof-kernel-symbol-resolver.h
+%{_includedir}/sysprof-3/sysprof-local-profiler.h
+%{_includedir}/sysprof-3/sysprof-memory-source.h
+%{_includedir}/sysprof-3/sysprof-model-filter.h
+%{_includedir}/sysprof-3/sysprof-netdev-source.h
+%{_includedir}/sysprof-3/sysprof-perf-counter.h
+%{_includedir}/sysprof-3/sysprof-perf-source.h
+%{_includedir}/sysprof-3/sysprof-platform.h
+%{_includedir}/sysprof-3/sysprof-proc-source.h
+%{_includedir}/sysprof-3/sysprof-process-model.h
+%{_includedir}/sysprof-3/sysprof-process-model-item.h
+%{_includedir}/sysprof-3/sysprof-profile.h
+%{_includedir}/sysprof-3/sysprof-profiler.h
+%{_includedir}/sysprof-3/sysprof-proxy-source.h
+%{_includedir}/sysprof-3/sysprof-selection.h
+%{_includedir}/sysprof-3/sysprof-source.h
+%{_includedir}/sysprof-3/sysprof-spawnable.h
+%{_includedir}/sysprof-3/sysprof-symbol-resolver.h
+%{_includedir}/sysprof-3/sysprof-symbols-source.h
+%{_includedir}/sysprof-3/sysprof-tracefd-source.h
+%{_includedir}/sysprof-3/sysprof-version.h
+%{_includedir}/sysprof-3/sysprof-version-macros.h
+%{_pkgconfigdir}/sysprof-3.pc
+%{_pkgconfigdir}/sysprof-capture-3.pc
+%{_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
 
 %files ui -f %{name}-ui.lang
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/sysprof
-%{_datadir}/glib-2.0/schemas/org.gnome.sysprof2.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.sysprof3.gschema.xml
+%{_datadir}/metainfo/org.gnome.Sysprof3.appdata.xml
 %{_datadir}/mime/packages/sysprof-mime.xml
-%{_desktopdir}/org.gnome.Sysprof2.desktop
+%{_desktopdir}/org.gnome.Sysprof3.desktop
+%{_iconsdir}/hicolor/scalable/actions/sysprof-trace-app.svg
 %{_iconsdir}/hicolor/scalable/apps/org.gnome.Sysprof.svg
 %{_iconsdir}/hicolor/symbolic/apps/org.gnome.Sysprof-symbolic.svg
-%{_datadir}/metainfo/org.gnome.Sysprof2.appdata.xml
 
 %files ui-libs
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libsysprof-ui-2.so
+%attr(755,root,root) %{_libdir}/libsysprof-ui-3.so
 
 %files ui-devel
 %defattr(644,root,root,755)
-%{_includedir}/sysprof-2/sysprof-ui.h
-%{_pkgconfigdir}/sysprof-ui-2.pc
-%{_includedir}/sysprof-2/callgraph/sp-callgraph-view.h
-%dir %{_includedir}/sysprof-2/visualizers
-%{_includedir}/sysprof-2/visualizers/sp-cpu-visualizer-row.h
-%{_includedir}/sysprof-2/visualizers/sp-line-visualizer-row.h
-%{_includedir}/sysprof-2/visualizers/sp-visualizer-row.h
-%{_includedir}/sysprof-2/visualizers/sp-visualizer-view.h
-%dir %{_includedir}/sysprof-2/widgets
-%{_includedir}/sysprof-2/widgets/sp-cell-renderer-percent.h
-%{_includedir}/sysprof-2/widgets/sp-empty-state-view.h
-%{_includedir}/sysprof-2/widgets/sp-failed-state-view.h
-%{_includedir}/sysprof-2/widgets/sp-multi-paned.h
-%{_includedir}/sysprof-2/widgets/sp-process-model-row.h
-%{_includedir}/sysprof-2/widgets/sp-profiler-menu-button.h
-%{_includedir}/sysprof-2/widgets/sp-recording-state-view.h
+%{_includedir}/sysprof-3/sysprof-display.h
+%{_includedir}/sysprof-3/sysprof-notebook.h
+%{_includedir}/sysprof-3/sysprof-page.h
+%{_includedir}/sysprof-3/sysprof-process-model-row.h
+%{_includedir}/sysprof-3/sysprof-ui.h
+%{_includedir}/sysprof-3/sysprof-visualizer.h
+%{_includedir}/sysprof-3/sysprof-visualizer-group.h
+%{_includedir}/sysprof-3/sysprof-zoom-manager.h
+%{_pkgconfigdir}/sysprof-ui-3.pc