From cf162106159235dee56193481c570273b3fa85fc Mon Sep 17 00:00:00 2001
From: Alexandru Gagniuc <mr.nuke.me@gmail.com>
Date: Sat, 6 Feb 2016 14:46:02 -0800
Subject: [PATCH] Update to pulseview 0.3.0

---
 .gitignore        |  1 +
 pulseview.desktop |  8 --------
 pulseview.spec    | 22 +++++++++++++++-------
 sources           |  2 +-
 4 files changed, 17 insertions(+), 16 deletions(-)
 delete mode 100644 pulseview.desktop

diff --git a/.gitignore b/.gitignore
index 87ba5ea..9c3447f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /pulseview-0.1.0.tar.gz
 /pulseview-0.2.0.tar.gz
+/pulseview-0.3.0.tar.gz
diff --git a/pulseview.desktop b/pulseview.desktop
deleted file mode 100644
index 1f6f733..0000000
--- a/pulseview.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=PulseView
-GenericName=Signal acquisition GUI for sigrok
-Categories=Electronics;
-Comment=Control your Logic Analyzer, Oscilloscope, or MSO
-Exec=pulseview
-Icon=sigrok-logo-notext
-Type=Application
diff --git a/pulseview.spec b/pulseview.spec
index bc099ed..3dfcaf0 100644
--- a/pulseview.spec
+++ b/pulseview.spec
@@ -1,16 +1,14 @@
 Name:           pulseview
-Version:        0.2.0
-Release:        10%{?dist}
+Version:        0.3.0
+Release:        0%{?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
-# Upstream does not (yet) provide a .desktop file
-Source1:        %{name}.desktop
 
-BuildRequires:  libsigrok-devel       >= 0.3.0
-BuildRequires:  libsigrokdecode-devel >= 0.3.0
+BuildRequires:  libsigrok-cxx-devel
+BuildRequires:  libsigrokdecode-devel >= 0.4.0
 BuildRequires:  qt-devel
 BuildRequires:  boost-devel
 BuildRequires:  cmake
@@ -36,7 +34,10 @@ make %{?_smp_mflags}
 %install
 %make_install
 
-desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}
+desktop-file-install --dir=%{buildroot}%{_datadir}/applications \
+    contrib/pulseview.desktop
+
+desktop-file-validate %{buildroot}/%{_datadir}/applications/pulseview.desktop
 
 install -m 644 -D -p icons/sigrok-logo-notext.png \
     %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/sigrok-logo-notext.png
@@ -63,6 +64,13 @@ update-desktop-database > /dev/null 2>&1 || :
 %{_datadir}/icons/hicolor/48x48/apps/sigrok-logo-notext.png
 
 %changelog
+* Sat Feb 06 2016 Alexandru Gagniuc <mr.nuke.me@gmail.com> - 0.3.0-0
+- Update to pulseview 0.3.0
+- Bump libsigrokdecode-devel requirement to 0.4.0
+- Replace libsigrok-devel dependency with libsigrok-cxx-devel
+- Use pulseview.desktop file provided with the pulseview sources
+- Call desktop-file-validate on pulseview.desktop file
+
 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.0-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 
diff --git a/sources b/sources
index 8608968..3e2f3b1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fe5586212671226afafe9d8d80ed10c6  pulseview-0.2.0.tar.gz
+2cd76988cbf2a74b383e30de27744016  pulseview-0.3.0.tar.gz