# HG changeset patch
# User Alexis Jeandet
# Date 2016-04-08 18:05:55
# Node ID 15a9528f5addef8d82972ef8c0c5a70c7d3dc563
# Parent 6dde6ec29a40faf5ca6e6822f156509ea9372029
Updated rpm spec files for Fedora 23
diff --git a/src/SocExplorerEngine/SocExplorerEngine.pro b/src/SocExplorerEngine/SocExplorerEngine.pro
--- a/src/SocExplorerEngine/SocExplorerEngine.pro
+++ b/src/SocExplorerEngine/SocExplorerEngine.pro
@@ -10,7 +10,7 @@ SOCEXPLORER_PLUGIN_LOADER="custom"
SOCEXPLORER_CHAGESETNUM=$$system(hg id)
isEmpty(SOCEXPLORER_CHAGESETNUM){
- SOCEXPLORER_CHAGESETNUM=3440ba47d0f1+
+ SOCEXPLORER_CHAGESETNUM=c258386c3c39+
}
SOCEXPLORER_CHAGESETNUMSTR = '\\"$${SOCEXPLORER_CHAGESETNUM}\\"'
SOCEXPLORER_BRANCH=$$system(hg branch)
@@ -19,7 +19,7 @@ isEmpty(SOCEXPLORER_BRANCH){
}
SOCEXPLORER_BRANCHSTR = '\\"$${SOCEXPLORER_BRANCH}\\"'
-DEFINES += SOCEXPLORER_VERSION="\"\\\"0.6.0"\\\"\"
+DEFINES += SOCEXPLORER_VERSION="\"\\\"0.6.4"\\\"\"
DEFINES += SOCEXPLORER_CHAGESET=\"$${SOCEXPLORER_CHAGESETNUMSTR}\"
DEFINES += SOCEXPLORER_BRANCH=\"$${SOCEXPLORER_BRANCHSTR}\"
diff --git a/unixcfg/SocExplorer.spec b/unixcfg/SocExplorer.spec
--- a/unixcfg/SocExplorer.spec
+++ b/unixcfg/SocExplorer.spec
@@ -1,8 +1,8 @@
-%global upstream_name socexplorer-0.6-3
+%global upstream_name socexplorer-0.6-4
Name: socexplorer
Version: 0.6
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: SocExplorer is an open source generic System On Chip testing software/framework.
Group: Development/Tools
License: GPLv2+
@@ -20,7 +20,12 @@ BuildRequires: qt5-qtmultimedia-devel
BuildRequires: elfutils-libelf-devel
BuildRequires: qt5-pythonqt-devel
BuildRequires: mercurial
+%if 0%{?fedora} <= 22
BuildRequires: appdata-tools
+%endif
+%if 0%{?fedora} >= 23
+BuildRequires: libappstream-glib
+%endif
BuildRequires: desktop-file-utils
Requires(post): python2
@@ -31,8 +36,7 @@ Requires(post): qt5-qtxmlpatterns
Requires(post): elfutils-libelf
Requires(post): qt5-pythonqt
-Provides: socexplorer = 0.6-3
-Obsoletes: socexplorer < 0.6-2
+Provides: socexplorer = 0.6-4
%description
SocExplorer is an open source generic System On Chip testing software/framework. We write this software for the development and the validation of our instrument, the Low Frequency Receiver(LFR) for the Solar Orbiter mission. This instrument is based on an actel FPGA hosting a LEON3FT processor and some peripherals. To make it more collaborative, we use a plugin based system, the main executable is SocExplorer then all the functionality are provided by plugins. Like this everybody can provide his set of plugins to handle a new SOC or just a new peripheral. SocExplorer uses PythonQt to allow user to automate some tasks such as loading some plugins, configuring them and talking with his device.
@@ -52,7 +56,12 @@ Requires: qt5-qtmultimedia-devel
Requires: elfutils-libelf-devel
Requires: qt5-pythonqt-devel
Requires: mercurial
+%if 0%{?fedora} <= 22
Requires: appdata-tools
+%endif
+%if 0%{?fedora} >= 23
+Requires: libappstream-glib
+%endif
Requires: desktop-file-utils
%description devel
@@ -70,7 +79,7 @@ make %{?_smp_mflags}
%install
make install INSTALL_ROOT=%{buildroot}
-appdata-validate --nonet %{buildroot}/%{_datadir}/appdata/socexplorer.appdata.xml
+appstream-util validate-relax %{buildroot}/%{_datadir}/appdata/socexplorer.appdata.xml
desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/socexplorer.desktop
%post -p /sbin/ldconfig
@@ -317,6 +326,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_
%changelog
+* Fri Jan 22 2016 Alexis Jeandet