HG_REPOSITORIES/LPP/INSTRUMENTATION/SocExplorer Commit - r104:15a9528f5add

Updated rpm spec files for Fedora 23

Alexis Jeandet -

r104:15a9528f5add socexplorer-0.6-4 0.6

parent child

Context file:

r104:15a9528f5add

Add another comment

Collapse all files

src/SocExplorerEngine/SocExplorerEngine.pro +2 -2

             SOCEXPLORER_CHAGESETNUM=$$system(hg id)
             isEmpty(SOCEXPLORER_CHAGESETNUM){
-                SOCEXPLORER_CHAGESETNUM=3440ba47d0f1+
+                SOCEXPLORER_CHAGESETNUM=c258386c3c39+
             }
             SOCEXPLORER_CHAGESETNUMSTR = '\\"$${SOCEXPLORER_CHAGESETNUM}\\"'
             SOCEXPLORER_BRANCH=$$system(hg 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}\"

unixcfg/SocExplorer.spec +17 -5

-            %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+
             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
             Requires(post): elfutils-libelf
             Requires(post): qt5-pythonqt
-            Provides:  socexplorer = 0.6-3
+            Provides:  socexplorer = 0.6-4
-            Obsoletes: socexplorer < 0.6-2
             %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.
             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
             %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
             %changelog
+            * Fri Jan 22  2016 Alexis Jeandet <alexis.jeandet@member.fsf.org> - 0.6
+            - Added Fedora 23 support.
             * Mon Oct 26  2015 Alexis Jeandet <alexis.jeandet@member.fsf.org> - 0.6
             - Updated LPP IPs registers definition list(LPP.xml).

unixcfg/socexplorer.appdata.xml +1 -1

               </p>
              </description>
              <screenshots>
-              <screenshot type="default" width="800" height="600">https://hephaistos.lpp.polytechnique.fr/redmine/attachments/download/384/SocExplorer_ScreenShot1.png</screenshot>
+              <screenshot type="default" width="1920" height="1079">https://hephaistos.lpp.polytechnique.fr/redmine/attachments/download/384/SocExplorer_ScreenShot1.png</screenshot>
              </screenshots>
              <url type="homepage">http://www.gnome.org/projects/en_US/gnome-power-manager</url>
              <updatecontact>alexis.jeandet@member.fsf.org</updatecontact>

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages