Update to pulseview 0.4.0

This release now includes an AppData file for fancy showing up in the
Almighty Software Center. But seriously, why is it installed in
/usr/share/metainfo instead of /usr/share/appdata?
This commit is contained in:
Alexandru Gagniuc 2017-06-15 10:37:34 -07:00
parent fe55f83ea9
commit 1fc65bc0c4
3 changed files with 21 additions and 35 deletions

1
.gitignore vendored
View File

@ -1,3 +1,4 @@
/pulseview-0.1.0.tar.gz
/pulseview-0.2.0.tar.gz
/pulseview-0.3.0.tar.gz
/pulseview-0.4.0.tar.gz

View File

@ -1,34 +1,18 @@
Name: pulseview
Version: 0.3.0
Release: 4%{?dist}
Version: 0.4.0
Release: 1%{?dist}
Summary: Signal acquisition and analysis GUI for sigrok
# Combined GPLv3+ (libsigrok and libsigrokdecode) and GPLv2+ (pulseview)
License: GPLv3+
URL: http://www.sigrok.org
Source0: %{url}/download/source/%{name}/%{name}-%{version}.tar.gz
# Zero-day patches after 0.3.0 release. Extract using:
# $ git clone git://sigrok.org/pulseview.git
# $ cd pulseview
# $ git checkout a1a3656b4e18cb9fc078a51bf4256066ee307620
# $ git format-patch pulseview-0.3.0
Patch0: 0001-View-Honor-ENABLE_DECODE-compiler-switch.patch
Patch1: 0002-Fix-733-Open-import-files-using-binary-mode.patch
Patch2: 0003-Fix-unit-tests-and-prevent-warnings.patch
Patch3: 0004-Fix-737-by-adding-the-override-specifier-where-neede.patch
Patch4: 0005-Fix-clang-warning-shifting-a-negative-signed-value-i.patch
Patch5: 0006-Fix-745-by-improving-the-draw_annotations-block-draw.patch
Patch6: 0007-DecodeTrace-Try-to-keep-annotation-labels-within-the.patch
Patch7: 0008-DecodeTrace-Let-annotation-labels-be-pushed-aside-by.patch
Patch8: 0009-DecodeTrace-Remove-unnecessary-parameters.patch
Patch9: 0010-MainWindow-Try-to-use-any-available-device-aside-fro.patch
Patch10: 0011-DecoderStack-Make-decoder-sessions-terminate-after-r.patch
Patch11: 0012-Fix-181-by-changing-the-global-decode-lock-into-an-S.patch
BuildRequires: libsigrok-cxx-devel
BuildRequires: libsigrokdecode-devel >= 0.4.0
BuildRequires: qt-devel
BuildRequires: pkgconfig(libsigrokcxx) >= 0.5.0
BuildRequires: pkgconfig(libsigrokdecode) >= 0.5.0
BuildRequires: qt5-devel
BuildRequires: boost-devel
BuildRequires: cmake
BuildRequires: desktop-file-utils
BuildRequires: libappstream-glib
Requires: hicolor-icon-theme
@ -42,24 +26,20 @@ libraries under the hood.
%prep
%autosetup -p1
# Disable warnings as errors (-DDISABLE_WERROR=ON) as a TEMPORARY!!! workaround
# to glibmm header madness
# error: dynamic exception specifications are deprecated in C++11; use 'noexcept' instead [-Werror=deprecated]
# Once glibmm fixes their stuff, re-enable Werror!
%build
%cmake -DCMAKE_BUILD_TYPE=Release -DDISABLE_WERROR=ON
%cmake -DCMAKE_BUILD_TYPE=Release
make %{?_smp_mflags}
%install
%make_install
desktop-file-install --dir=%{buildroot}%{_datadir}/applications \
contrib/pulseview.desktop
# Why you install appdata in bad location, you sigrok upstream?
mv %{buildroot}/%{_datadir}/metainfo %{buildroot}/%{_datadir}/appdata
desktop-file-validate %{buildroot}/%{_datadir}/applications/pulseview.desktop
desktop-file-validate \
%{buildroot}/%{_datadir}/applications/org.sigrok.PulseView.desktop
install -m 644 -D -p icons/sigrok-logo-notext.png \
%{buildroot}%{_datadir}/icons/hicolor/48x48/apps/sigrok-logo-notext.png
appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata.xml
%post
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
@ -80,10 +60,15 @@ update-desktop-database > /dev/null 2>&1 || :
%license COPYING
%{_mandir}/man1/%{name}.1*
%{_bindir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/48x48/apps/sigrok-logo-notext.png
%{_datadir}/applications/org.sigrok.PulseView.desktop
%{_datadir}/icons/hicolor/48x48/apps/pulseview.png
%{_datadir}/icons/hicolor/scalable/apps/pulseview.svg
%{_datadir}/appdata/org.sigrok.PulseView.appdata.xml
%changelog
* Wed Jun 14 2017 Alexandru Gagniuc <mr.nuke.me@gmail.com> - 0.4.0-1
- Update to PulseView 0.4.0
* Mon May 15 2017 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild

View File

@ -1 +1 @@
2cd76988cbf2a74b383e30de27744016 pulseview-0.3.0.tar.gz
SHA512 (pulseview-0.4.0.tar.gz) = 833a86681925fb4fb2118bb9d0044fc80174aef299b7e6ba2df83bff490511b91cd18f63f45e9a63f21c0df5d8aad3ec27ab35f45cd9959a42831b0b8a71da33