From ae3bcb18dc9c846022e2eccadb600737b8864cd0 Mon Sep 17 00:00:00 2001 From: sagitter Date: Sep 29 2015 09:14:17 +0000 Subject: Commit #4b8703 --- diff --git a/.gitignore b/.gitignore index 998f86f..75b38cd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /engauge_5.2.tgz /digitizer-code-28de7dcffa2585192e3118a4861e9232fbb5a09b.zip /engauge6-a251020d73afdd675d8c15f167b20c7eafd9cb2a.zip +/engauge6-4b8703274398b3ccf4a2998131294fdcda2ff087.zip diff --git a/engauge-digitizer.spec b/engauge-digitizer.spec index e9c8ebc..9181f78 100644 --- a/engauge-digitizer.spec +++ b/engauge-digitizer.spec @@ -1,10 +1,10 @@ -%global checkout a251020d73afdd675d8c15f167b20c7eafd9cb2a -%global date 20150928 +%global checkout 4b8703274398b3ccf4a2998131294fdcda2ff087 +%global date 20150929 Name: engauge-digitizer Summary: Convert graphs or map files into numbers Version: 6 -Release: 0.2.%{date}git%(echo %{checkout} | cut -c-6)%{?dist} +Release: 0.3.%{date}git%(echo %{checkout} | cut -c-6)%{?dist} Group: Applications/Engineering License: GPLv2+ URL: http://digitizer.sourceforge.net/ @@ -14,9 +14,6 @@ Source0: https://github.com/markummitchell/engauge6/archive/%{checkout}.zip#/eng ##optimization flags for compilers Patch0: %{name}_fix_test_script.patch -##This patch re-sets the HELP menu path -Patch1: %{name}_help_path.patch - Epoch: 1 Provides: %{name} = 1:%{version}-%{release} Obsoletes: %{name} < 5.2.11 @@ -88,10 +85,13 @@ Engauge Digitizer (http://digitizer.sourceforge.net). These files are listed below, with comments: -- corners.png - Graph that lots of corners that would be painful to digitize manually +- corners.png - Graph that lots of corners that would be painful + to digitize manually - gridlines.gif - Graph with gridlines that are easily removed by Engauge -- gridlines_log.gif - Another graph with gridlines that are easily removed by Engauge -- gridlines_log.src - Creates gridlines_log.gif in gnuplot using 'load' command (not an image!) +- gridlines_log.gif - Another graph with gridlines that are easily + removed by Engauge +- gridlines_log.src - Creates gridlines_log.gif in gnuplot using 'load' + command (not an image!) - inverse.jpg - Image of y/x function - inverse.png - Same as inverse.jpg but in png format - linlog.jpg - Graph with linear/logarithmic coordinates @@ -100,16 +100,20 @@ These files are listed below, with comments: - loglog.png - Graph with logarithmic/logarithmic coordinates - normdist.jpg - Graph of normal distribution - normdist.png - Same as normdist.jpg but in png format -- pointmatch.jpg - Graph with fuzzy points for playing with Point Match feature of Engauge -- pointplot.bmp - Graph with points that are easily captured by Point Match feature of Engauge, if - the Discretize settings are set to "Intensity 90 to 99" for the triangles, and - "Intensity 10 to 50" for the diamonds -- polarcircles.jpg - Polar plot for experimenting. No coordinates are displayed, so not very useful +- pointmatch.jpg - Graph with fuzzy points for playing with Point Match + feature of Engauge +- pointplot.bmp - Graph with points that are easily captured by Point Match + feature of Engauge, if the Discretize settings are set to "Intensity 90 to 99" + for the triangles, and "Intensity 10 to 50" for the diamonds +- polarcircles.jpg - Polar plot for experimenting. No coordinates are displayed, + so not very useful - polarplot.jpg - Polar plot with cardioid pattern - polarplot.png - Same as polarplot.jpg but in png format -- testcase.jpg - Simple graph that serves as an excellent starting point for the new user +- testcase.jpg - Simple graph that serves as an excellent starting point for the + new user - testcase.png - Same as testcase.jpg but in png format -- testcoords.jpg - Advanced graph used by developers to check the affine transformations in Engauge +- testcoords.jpg - Advanced graph used by developers to check the affine + transformations in Engauge - testcoords.sxd - Open Office document used to create testcoords.jpg (not an image!) - usgs.png - Fictional map loosely based on U.S. Geological Survey topographic maps @@ -130,8 +134,6 @@ cp -p %{SOURCE4} LICENSE %patch0 -p0 sed -e 's|RPM_OPT_FLAGS|"%{optflags}"|g' -i src/build_and_run_all_tests -%patch1 -p0 - %build pushd src qmake-qt5 -makefile engauge.pro \ @@ -212,6 +214,9 @@ sed -e \ %if 0%{?fedora} appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*.appdata.xml %endif +desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop + +##Tests pushd src xvfb-run -s "-screen 0 640x480x24" -a sh -x ./build_and_run_all_tests @@ -247,6 +252,9 @@ xvfb-run -s "-screen 0 640x480x24" -a sh -x ./build_and_run_all_tests %license LICENSE %changelog +* Tue Sep 29 2015 Antonio Trande - 1:6-0.3.20150928git4b8703 +- Commit #4b8703 + * Mon Sep 28 2015 Antonio Trande - 1:6-0.2.20150928gita25102 - Commit #a25102 - Built HTML docs @@ -255,6 +263,12 @@ xvfb-run -s "-screen 0 640x480x24" -a sh -x ./build_and_run_all_tests * Thu Sep 24 2015 Antonio Trande - 1:6-0.1.20150921git4f0c92 - Bump to the new Engauge6 +* Wed Jun 17 2015 Fedora Release Engineering - 5.2-10.20150115git28de7d +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sat May 02 2015 Kalev Lember - 5.2-9.20150115git28de7d +- Rebuilt for GCC 5 C++11 ABI change + * Mon Feb 23 2015 Antonio Trande - 5.2-8.20150115git28de7d - Fixed Keywords key in .desktop file diff --git a/engauge-digitizer_help_path.patch b/engauge-digitizer_help_path.patch deleted file mode 100644 index 9a192cb..0000000 --- a/engauge-digitizer_help_path.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- src/Help/HelpWindow.orig.cpp 2015-09-28 04:36:59.000000000 +0200 -+++ src/Help/HelpWindow.cpp 2015-09-28 15:01:45.483084067 +0200 -@@ -17,7 +17,7 @@ - setMinimumWidth (MIN_WIDTH); - setMinimumHeight (MIN_HEIGHT); - -- QString path = QApplication::applicationDirPath() + "/documentation/engauge.qhc"; -+ QString path = QApplication::applicationDirPath() + "/../share/doc/engauge-digitizer/engauge.qhc"; - QHelpEngine *helpEngine = new QHelpEngine (path); - helpEngine->setupData(); - - diff --git a/sources b/sources index 33d199f..417c1ca 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6ee69a4e31c9d43c12d8466ad8b862b9 engauge6-a251020d73afdd675d8c15f167b20c7eafd9cb2a.zip +4f4f0074e0ea03208047a5ea01a3f2ed engauge6-4b8703274398b3ccf4a2998131294fdcda2ff087.zip