- updated to 3.22.3 (now part of GNOME >= 3.20)

- added pc patch (fix libdir in .pc files)
- added library subpackages

diff --git a/sysprof-pc.patch b/sysprof-pc.patch
new file mode 100644 (file)
index 0000000..15751ff
--- /dev/null
+++ b/sysprof-pc.patch
@@ -0,0 +1,20 @@
+--- sysprof-3.22.3/data/sysprof.pc.in.orig     2016-04-14 08:28:05.000000000 +0200
++++ sysprof-3.22.3/data/sysprof.pc.in  2016-12-26 17:43:14.556721159 +0100
+@@ -1,6 +1,6 @@
+ prefix=@prefix@
+ exec_prefix=${prefix}
+-libdir=${exec_prefix}/lib
++libdir=@libdir@
+ includedir=${exec_prefix}/include
+ 
+ Name: libsysprof-@API_VERSION@
+--- sysprof-3.22.3/data/sysprof-ui.pc.in.orig  2016-04-14 08:28:05.000000000 +0200
++++ sysprof-3.22.3/data/sysprof-ui.pc.in       2016-12-26 17:43:26.163387694 +0100
+@@ -1,6 +1,6 @@
+ prefix=@prefix@
+ exec_prefix=${prefix}
+-libdir=${exec_prefix}/lib
++libdir=@libdir@
+ includedir=${exec_prefix}/include
+ 
+ Name: libsysprof-ui-@API_VERSION@

diff --git a/sysprof.spec b/sysprof.spec
index 6010c068eff8d048c177bacbb3e12b138b5125e5..8b5d42c64f4d87647e74466188f6f23e73087776 100644 (file)
--- a/sysprof.spec
+++ b/sysprof.spec
@@ -1,25 +1,38 @@
+#
+# Conditional build:
+%bcond_with    sysprofd        # daemon to run UI without root permissions [requires systemd >= 222]
+#
 Summary:       Sampling CPU profiler for Linux
 Summary(pl.UTF-8):     Próbkujący profiler procesora dla Linuksa
 Name:          sysprof
-Version:       1.2.0
+Version:       3.22.3
 Release:       1
-License:       GPL v2
+License:       GPL v3+
 Group:         Applications/System
-Source0:       http://sysprof.com/%{name}-%{version}.tar.gz
-# Source0-md5: a81808d847732f8dafb59d26ec2eebbf
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/sysprof/3.22/%{name}-%{version}.tar.xz
+# Source0-md5: 9514065dc752105240e5567c13708af4
+Patch0:                %{name}-pc.patch
 URL:           http://sysprof.com/
-BuildRequires: binutils-devel
+# -std=gnu11 + C11 atomics
+BuildRequires: gcc >= 6:4.9
 BuildRequires: gdk-pixbuf2-devel >= 2.0
-BuildRequires: glib2-devel >= 1:2.6.0
-BuildRequires: gtk+2-devel >= 1:2.6.1
-BuildRequires: libglade2-devel >= 2.0
+BuildRequires: gettext-tools >= 0.19.6
+BuildRequires: glib2-devel >= 1:2.44.0
+BuildRequires: gobject-introspection-devel >= 1.42.0
+BuildRequires: gtk+3-devel >= 3.22
+BuildRequires: libstdc++-devel >= 6:4.0
 BuildRequires: pango-devel
-BuildRequires: pkgconfig
-BuildRequires: rpmbuild(macros) >= 1.217
-Requires:      glib2 >= 1:2.6.0
-Requires:      gtk+2 >= 1:2.6.1
+BuildRequires: pkgconfig >= 1:0.22
+%{?with_sysprofd:BuildRequires:        polkit-devel}
+BuildRequires: rpmbuild(macros) >= 1.644
+%{?with_sysprofd:BuildRequires:        systemd-devel >= 1:222}
+BuildRequires: tar >= 1:1.22
+BuildRequires: vala
+BuildRequires: yelp-tools
+BuildRequires: xz
+Requires:      %{name}-libs = %{version}-%{release}
+%{?with_sysprofd:Requires:     systemd-units >= 1:222}
 Requires:      uname(release) >= 2.6.31
-ExclusiveArch: %{ix86} %{x8664}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -38,28 +51,236 @@ wymagają rekompilacji. Właściwie nawet nie trzeba ich restartować.
 
 Wystarczy załadować moduł jądra i uruchomić sysprof.
 
+%package libs
+Summary:       The sysprof profiler library
+Summary(pl.UTF-8):     Biblioteka profilera sysprof
+Group:         Libraries
+Requires:      glib2 >= 1:2.44.0
+
+%description libs
+The sysprof profiler library.
+
+%description libs -l pl.UTF-8
+Biblioteka profilera sysprof.
+
+%package devel
+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
+
+%description devel
+Header files for sysprof library.
+
+%description devel -l pl.UTF-8
+Pliki nagłówkowe biblioteki sysprof.
+
+%package static
+Summary:       Static sysprof library
+Summary(pl.UTF-8):     Statyczna biblioteka sysprof
+Group:         Development/Libraries
+Requires:      %{name}-devel = %{version}-%{release}
+
+%description static
+Static sysprof library.
+
+%description static -l pl.UTF-8
+Statyczna biblioteka sysprof.
+
+%package ui
+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): gtk-update-icon-cache
+Requires:      %{name} = %{version}-%{release}
+Requires:      %{name}-ui-libs = %{version}-%{release}
+Requires:      hicolor-icon-theme
+Requires:      shared-mime-info
+
+%description ui
+The sysprof graphical user interface.
+
+%description ui -l pl.UTF-8
+Graficzny interfejs użytkownika profilera sysprof.
+
+%package ui-libs
+Summary:       The sysprof library containing reusable GTK+ widgets
+Summary(pl.UTF-8):     Biblioteka sysprofa zawierająca widgety GTK+ wielokrotnego użytku
+Group:         X11/Libraries
+Requires:      %{name}-libs = %{version}-%{release}
+Requires:      gtk+3 >= 3.22
+
+%description ui-libs
+The sysprof library containing reusable GTK+ widgets.
+
+%description ui-libs -l pl.UTF-8
+Biblioteka sysprofa zawierająca widgety GTK+ wielokrotnego użytku.
+
+%package ui-devel
+Summary:       Header files for sysprof-ui library
+Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki sysprof-ui
+Group:         X11/Development/Libraries
+Requires:      %{name}-devel = %{version}-%{release}
+Requires:      %{name}-ui-libs = %{version}-%{release}
+Requires:      gtk+3-devel >= 3.22
+
+%description ui-devel
+Header files for sysprof-ui library.
+
+%description ui-devel -l pl.UTF-8
+Pliki nagłówkowe biblioteki sysprof-ui.
+
+%package ui-static
+Summary:       Static sysprof-ui library
+Summary(pl.UTF-8):     Statyczna biblioteka sysprof-ui
+Group:         X11/Development/Libraries
+Requires:      %{name}-ui-devel = %{version}-%{release}
+
+%description ui-static
+Static sysprof-ui library.
+
+%description ui-static -l pl.UTF-8
+Statyczna biblioteka sysprof-ui.
+
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure \
-       --disable-silent-rules
+       --disable-schemas-compile \
+       --disable-silent-rules \
+       %{?with_sysprofd:--with-sysprofd}
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
 %{__make} install \
-       udevdir=/lib/udev/rules.d \
        DESTDIR=$RPM_BUILD_ROOT
 
+# obsoleted by pkg-config
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libsysprof-*.la
+
+%find_lang %{name} -o %{name}-ui.lang --with-gnome --without-mo
+%find_lang %{name}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files
+%if %{with sysprofd}
+%post
+%systemd_post sysprof2.service
+
+%preun
+%systemd_preun sysprof2.service
+
+%postun
+%systemd_reload
+%endif
+
+%post  libs -p /sbin/ldconfig
+%postun        libs -p /sbin/ldconfig
+
+%post ui
+%glib_compile_schemas
+%update_icon_cache hicolor
+%update_mime_database
+%update_desktop_database
+
+%postun ui
+%glib_compile_schemas
+%update_icon_cache hicolor
+%update_mime_database
+%update_desktop_database
+
+%post  ui-libs -p /sbin/ldconfig
+%postun        ui-libs -p /sbin/ldconfig
+
+%files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog README TODO
-%attr(755,root,root) %{_bindir}/sysprof
+%doc AUTHORS ChangeLog NEWS README TODO
 %attr(755,root,root) %{_bindir}/sysprof-cli
-%{_pixmapsdir}/sysprof-icon-*.png
-%{_datadir}/%{name}
-/lib/udev/rules.d/60-sysprof.rules
+%if %{with sysprofd}
+%dir %{_libexecdir}/sysprof
+%attr(755,root,root) %{_libexecdir}/sysprof/sysprofd
+%{systemdunitdir}/sysprof2.service
+%{_datadir}/dbus-1/system-services/org.gnome.Sysprof2.service
+%{_datadir}/dbus-1/system.d/org.gnome.Sysprof2.conf
+%{_datadir}/polkit-1/actions/org.gnome.sysprof2.policy
+%endif
+
+%files libs
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libsysprof-2.so
+
+%files devel
+%defattr(644,root,root,755)
+%dir %{_includedir}/sysprof-2
+%{_includedir}/sysprof-2/sp-address.h
+%{_includedir}/sysprof-2/sp-callgraph-profile.h
+%{_includedir}/sysprof-2/sp-capture-*.h
+%{_includedir}/sysprof-2/sp-clock.h
+%{_includedir}/sysprof-2/sp-elf-symbol-resolver.h
+%{_includedir}/sysprof-2/sp-error.h
+%{_includedir}/sysprof-2/sp-gjs-source.h
+%{_includedir}/sysprof-2/sp-hostinfo-source.h
+%{_includedir}/sysprof-2/sp-jitmap-symbol-resolver.h
+%{_includedir}/sysprof-2/sp-kernel-symbol.h
+%{_includedir}/sysprof-2/sp-kernel-symbol-resolver.h
+%{_includedir}/sysprof-2/sp-local-profiler.h
+%{_includedir}/sysprof-2/sp-map-lookaside.h
+%{_includedir}/sysprof-2/sp-model-filter.h
+%{_includedir}/sysprof-2/sp-perf-source.h
+%{_includedir}/sysprof-2/sp-proc-source.h
+%{_includedir}/sysprof-2/sp-process-model.h
+%{_includedir}/sysprof-2/sp-process-model-item.h
+%{_includedir}/sysprof-2/sp-profile.h
+%{_includedir}/sysprof-2/sp-profiler.h
+%{_includedir}/sysprof-2/sp-selection.h
+%{_includedir}/sysprof-2/sp-source.h
+%{_includedir}/sysprof-2/sp-symbol-resolver.h
+%{_includedir}/sysprof-2/sp-zoom-manager.h
+%{_includedir}/sysprof-2/sysprof.h
+%{_includedir}/sysprof-2/sysprof-version.h
+%{_pkgconfigdir}/sysprof-2.pc
+
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/libsysprof-2.a
+
+%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}/mime/packages/sysprof-mime.xml
+%{_desktopdir}/org.gnome.Sysprof2.desktop
+%{_iconsdir}/hicolor/*x*/apps/sysprof.png
+%{_iconsdir}/hicolor/scalable/apps/sysprof-symbolic.svg
+
+%files ui-libs
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libsysprof-ui-2.so
+
+%files ui-devel
+%defattr(644,root,root,755)
+%{_includedir}/sysprof-2/sp-callgraph-view.h
+%{_includedir}/sysprof-2/sp-cell-renderer-percent.h
+%{_includedir}/sysprof-2/sp-cpu-visualizer-row.h
+%{_includedir}/sysprof-2/sp-empty-state-view.h
+%{_includedir}/sysprof-2/sp-failed-state-view.h
+%{_includedir}/sysprof-2/sp-line-visualizer-row.h
+%{_includedir}/sysprof-2/sp-multi-paned.h
+%{_includedir}/sysprof-2/sp-process-model-row.h
+%{_includedir}/sysprof-2/sp-profiler-menu-button.h
+%{_includedir}/sysprof-2/sp-recording-state-view.h
+%{_includedir}/sysprof-2/sp-visualizer-*.h
+%{_includedir}/sysprof-2/sysprof-ui.h
+%{_pkgconfigdir}/sysprof-ui-2.pc
+
+%files ui-static
+%defattr(644,root,root,755)
+%{_libdir}/libsysprof-ui-2.a