From 1152ea379788e2ad3322f3d969743369041c543444fea9f5e4242370f00e5450 Mon Sep 17 00:00:00 2001
From: Thomas Zimmermann <bugs@vdm-design.de>
Date: Wed, 14 Jun 2017 17:06:20 +0000
Subject: [PATCH] This is an update to libsigrok, libsigrokdecode and its
 frontends pulseview and sigrok-cli

OBS-URL: https://build.opensuse.org/package/show/electronics/pulseview?expand=0&rev=12
---
 org.sigrok.Pulseview.appdata.xml | 28 -----------------------
 pulseview-0.3.0.tar.gz           |  3 ---
 pulseview-0.4.0.tar.gz           |  3 +++
 pulseview.changes                | 16 ++++++++++++++
 pulseview.spec                   | 38 ++++++++++++++------------------
 5 files changed, 35 insertions(+), 53 deletions(-)
 delete mode 100644 org.sigrok.Pulseview.appdata.xml
 delete mode 100644 pulseview-0.3.0.tar.gz
 create mode 100644 pulseview-0.4.0.tar.gz

diff --git a/org.sigrok.Pulseview.appdata.xml b/org.sigrok.Pulseview.appdata.xml
deleted file mode 100644
index 9b012f9..0000000
--- a/org.sigrok.Pulseview.appdata.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" ?>
-<component type="desktop">
-  <id>org.sigrok.Pulseview.desktop</id>
-  <metadata_license>CC0-1.0</metadata_license>
-  <project_license>GPL-3.0+</project_license>
-  <name>Pulseview</name>
-  <summary>Logic analyzer, oscilloscope and MSO GUI</summary>
-  <description>
-    <p>PulseView is a Qt based logic analyzer, oscilloscope and MSO GUI for sigrok.</p>
-    <p>Features:</p>
-    <ul>
-      <li>Fast O(log N) signal rendering at all zoom levels</li>
-      <li>Protocol decoder support</li>
-      <li>Trace groups support</li>
-    </ul>
-  </description>
-  <url type="homepage">http://www.sigrok.org/wiki/Pulseview</url>
-  <url type="bugtracker">http://sigrok.org/bugzilla/enter_bug.cgi?format=guided&amp;product=Pulseview</url>
-  <screenshots>
-    <screenshot type="default">
-      <image>http://sigrok.org/wimg/e/ee/PulseView_I2C_DS1307_Decode.png</image>
-    </screenshot>
-  </screenshots>
-  <project_group>Sigrok</project_group>
-  <provides>
-    <binary>pulseview</binary>
-  </provides>
-</component>
diff --git a/pulseview-0.3.0.tar.gz b/pulseview-0.3.0.tar.gz
deleted file mode 100644
index 06d54c7..0000000
--- a/pulseview-0.3.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5ffe2cb7a602fcdc60933d400c77bcd66e6ce529bc4f6e97d6a5e5a86f2f530e
-size 188602
diff --git a/pulseview-0.4.0.tar.gz b/pulseview-0.4.0.tar.gz
new file mode 100644
index 0000000..c3c2e9e
--- /dev/null
+++ b/pulseview-0.4.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:78f8291045c6f65b4827b12e83c8e68cea2d5e7268b15a51aaca9726c8100eb9
+size 226656
diff --git a/pulseview.changes b/pulseview.changes
index 524564b..3847cc6 100644
--- a/pulseview.changes
+++ b/pulseview.changes
@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Tue Jun 13 20:52:15 UTC 2017 - stefan.bruens@rwth-aachen.de
+
+- Update to version 0.4.0
+  * Add the concepts of sessions and views to PulseView:
+    - Sessions represent individual files/device instances.
+      Each session is represented as a tab in PulseView.
+    - Views are different data representations of one specific session.
+      For example, different views of a session can have different zoom levels,
+      can be scrolled to different positions, etc. etc.
+      Each view is a dock window within the respective session's tab.
+    - The view docks can be repositioned, resized and extracted out into their
+      own individual windows.
+  * Add support for saving analog data to .sr files.
+  * Lots of fixes and improvements
+
 -------------------------------------------------------------------
 Thu Feb  2 11:46:14 UTC 2017 - adam.majer@suse.de
 
diff --git a/pulseview.spec b/pulseview.spec
index ecf211d..d55cdb2 100644
--- a/pulseview.spec
+++ b/pulseview.spec
@@ -17,33 +17,29 @@
 
 
 Name:           pulseview
-Version:        0.3.0
+Version:        0.4.0
 Release:        0
 Summary:        Qt-based GUI for sigrok
 License:        GPL-3.0+
 Group:          Productivity/Scientific/Electronics
 Url:            http://sigrok.org
 Source0:        http://sigrok.org/download/source/pulseview/%{name}-%{version}.tar.gz
-Source1:        org.sigrok.Pulseview.appdata.xml
+BuildRequires:  cmake
+BuildRequires:  glib2-devel
 %if 0%{?suse_version} > 1325
 BuildRequires:  libboost_filesystem-devel
+BuildRequires:  libboost_serialization-devel
 BuildRequires:  libboost_test-devel
 BuildRequires:  libboost_thread-devel
 %else
-BuildRequires:  boost-devel >= 1.53.0
-%endif
-BuildRequires:  cmake
-BuildRequires:  glib2-devel
-%if 0%{?suse_version} > 1320
-BuildRequires:  cmake(Qt5Gui)
-BuildRequires:  cmake(Qt5Svg)
-BuildRequires:  cmake(Qt5Widgets)
-%else
-BuildRequires:  libqt4-devel
+BuildRequires:  boost-devel >= 1.55.0
 %endif
 BuildRequires:  libsigrok-devel >= 0.4.0
 BuildRequires:  libsigrokdecode-devel >= 0.4.0
 BuildRequires:  update-desktop-files
+BuildRequires:  cmake(Qt5Gui)
+BuildRequires:  cmake(Qt5Svg)
+BuildRequires:  cmake(Qt5Widgets)
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -66,17 +62,15 @@ make %{?_smp_mflags}
 %cmake_install
 find %{buildroot} -type f -name "*.la" -delete -print
 
-install -m 644 -D icons/sigrok-logo-notext.png %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/pulseview.png
-install -m 644 -D icons/sigrok-logo-notext.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/pulseview.svg
+install -m 644 -D icons/pulseview.png %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/pulseview.png
+install -m 644 -D icons/pulseview.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/pulseview.svg
 
 install -m 755 -d %{buildroot}%{_datadir}/applications/
-install -m 644 contrib/pulseview.desktop %{buildroot}%{_datadir}/applications/org.sigrok.Pulseview.desktop
-sed -i -e 's/Icon=.*/Icon=pulseview/' %{buildroot}%{_datadir}/applications/org.sigrok.Pulseview.desktop
-sed -i -e 's/\(Icon.*\)/\1\nMimeType=application\/x-sigrok-dump;/' %{buildroot}%{_datadir}/applications/org.sigrok.Pulseview.desktop
-%suse_update_desktop_file -r org.sigrok.Pulseview Education Engineering
+install -m 644 contrib/org.sigrok.PulseView.desktop %{buildroot}%{_datadir}/applications/org.sigrok.PulseView.desktop
+%suse_update_desktop_file -r org.sigrok.PulseView Education Engineering
 
-install -m 755 -d %{buildroot}%{_datadir}/appdata/
-install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/appdata/org.sigrok.Pulseview.appdata.xml
+install -m 755 -d %{buildroot}%{_datadir}/metainfo/
+install -m 644 contrib/org.sigrok.PulseView.appdata.xml %{buildroot}%{_datadir}/metainfo/org.sigrok.PulseView.appdata.xml
 
 %files
 %defattr(-,root,root,-)
@@ -85,7 +79,7 @@ install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/appdata/org.sigrok.Pulseview.a
 %{_mandir}/man1/pulseview.*
 %{_datadir}/applications/*
 %{_datadir}/icons/hicolor/*/apps/pulseview*
-%dir %{_datadir}/appdata
-%{_datadir}/appdata/org.sigrok.Pulseview.appdata.xml
+%dir %{_datadir}/metainfo
+%{_datadir}/metainfo/org.sigrok.PulseView.appdata.xml
 
 %changelog