diff --git a/.gitignore b/.gitignore
index 82a02bd..c8b390b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
/engauge6-6.1.tar.gz
/engauge6-6.2.tar.gz
/engauge6-b6ad5b0cd3be30c52f17bf8917fe39fb28a60549.zip
+/engauge-digitizer-7.0.tar.gz
diff --git a/engauge-digitizer.appdata.xml b/engauge-digitizer.appdata.xml
index 96a534d..5ab89a1 100644
--- a/engauge-digitizer.appdata.xml
+++ b/engauge-digitizer.appdata.xml
@@ -1,6 +1,6 @@
-
+
engauge-digitizer.desktop
CC0
GPL-2.0+
@@ -53,4 +53,4 @@
http://digitizer.sourceforge.net/
zbyszek@in.waw.pl
-
+
diff --git a/engauge-digitizer.spec b/engauge-digitizer.spec
index 72fff51..35bc829 100644
--- a/engauge-digitizer.spec
+++ b/engauge-digitizer.spec
@@ -6,21 +6,17 @@
%{!?__global_ldflags: %global __global_ldflags -Wl,-z,relro}
%endif
-%global checkout b6ad5b0cd3be30c52f17bf8917fe39fb28a60549
-%global date 20160204
+#%%global checkout b6ad5b0cd3be30c52f17bf8917fe39fb28a60549
+#%%global date 20160204
Name: engauge-digitizer
Summary: Convert graphs or map files into numbers
-Version: 6.2
-Release: 4.%{date}git%(echo %{checkout} | cut -c-6)%{?dist}
+Version: 7.0
+Release: 1%{?dist}
Group: Applications/Engineering
License: GPLv2+
URL: https://github.com/markummitchell/engauge6
-Source0: https://github.com/markummitchell/engauge6/archive/%{checkout}.zip#/engauge6-%{checkout}.zip
-
-##Patch the test build script to use qmake-qt5 and default Fedora
-##optimization flags for compilers
-Patch0: %{name}_fix_test_script.patch
+Source0: https://github.com/markummitchell/engauge-digitizer/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
Epoch: 1
Provides: %{name} = 1:%{version}-%{release}
@@ -53,7 +49,7 @@ BuildRequires: openjpeg2-devel
%endif
%description
-Engauge6 is rewritten with Qt5.
+Engauge 7 is rewritten with Qt5.
This digitizing software converts an image file
showing a graph or map, into numbers.
The image file can come from a scanner, digital camera
@@ -63,31 +59,34 @@ The process starts with an image file containing a graph or map.
The final result is digitized data that can be used by other tools
such as Gnumeric.
-New features already added to Engauge6:
+New features already added to Engauge:
-- Older Engauge files (before version 6) can be loaded
-- Undo/redo of all operations means recovering from mistakes and experimenting
- with options is painless
-- Wizard provides an interactive tutorial to explain the basic steps
-- Wizard creates a checklist guide to interactively leads user through steps
- from file import to file export
-- Cubic spline interpolation between points gives more accurate curves with
- fewer points
-- Axes Checker briefly highlights the axes when they are defined or modified,
- to reveal entry mistakes
-- Graph coordinates can be specified as date and time value, or as degrees,
- minutes and seconds
-- All settings dialogs are resizable so they can be enlarged as necessary to
- display more information
-- Import by drag-and-drop
-- Replacement of Qt3 (which is at its end of life) by Qt5
-- Much better zooming, with a fill mode that automatically zooms in on image
- features, and rezooms when the application window is resized
-- Color picking straight from the original image
-- Uploadable error report generated when a programming error is encountered,
- for identifying problems and improving user support
-- Test suite for regression testing minimizes code breakage
- as new features are added
+ - Older Engauge files (before version 6) can be loaded
+ - Undo/redo of all operations means recovering from mistakes and experimenting
+ with options is painless
+ - Wizard provides an interactive tutorial to explain the basic steps
+ - Wizard creates a checklist guide to interactively leads user through steps
+ from file import to file export
+ - Cubic spline interpolation between points gives more accurate curves with
+ fewer points
+ - Axes Checker briefly highlights the axes when they are defined or modified,
+ to reveal entry mistakes
+ - Graph coordinates can be specified as date and time value, or as degrees,
+ minutes and seconds
+ - All settings dialogs are resizable so they can be enlarged as necessary to
+ display more information
+ - Import by drag-and-drop
+ - Replacement of Qt3 (which is at its end of life) by Qt5
+ - Much better zooming, with a fill mode that automatically zooms in on image
+ features, and rezooms when the application window is resized
+ - Color picking straight from the original image
+ - Uploadable error report generated when a programming error is encountered,
+ for identifying problems and improving user support
+ - Test suite for regression testing minimizes code breakage
+ as new features are added
+ - Multiple coordinate systems in the same image can be digitized in advanced mode
+ - Axes with only one known coordinate (floating axes) can be digitized in advanced mode
+ - File import by pasting
%package samples
Summary: Sample files for %{name}
@@ -99,39 +98,39 @@ 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
-- 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!)
-- inverse.jpg - Image of y/x function
-- inverse.png - Same as inverse.jpg but in png format
-- linlog.jpg - Graph with linear/logarithmic coordinates
-- linlog.png - Same as linlog.jpg but in png format
-- loglin.png - Graph with logarithmic/linear coordinates
-- 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
-- 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.png - Same as testcase.jpg but in png format
-- 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
+ - 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!)
+ - inverse.jpg - Image of y/x function
+ - inverse.png - Same as inverse.jpg but in png format
+ - linlog.jpg - Graph with linear/logarithmic coordinates
+ - linlog.png - Same as linlog.jpg but in png format
+ - loglin.png - Graph with logarithmic/linear coordinates
+ - 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
+ - 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.png - Same as testcase.jpg but in png format
+ - 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
%package doc
Summary: HTML documentation of %{name}
@@ -141,12 +140,7 @@ BuildArch: noarch
HTML documentation of %{name}.
%prep
-%setup -q -n engauge6-%{checkout}
-
-##Patch the test build script to use qmake-qt5 and default Fedora
-##optimization flags for compilers
-%patch0 -p0
-sed -e 's|RPM_OPT_FLAGS|"%{optflags}"|g' -i src/build_and_run_all_tests
+%setup -q -n %{name}-%{version}
##Active support to jpeg2000
##jpeg2000 libraries not available on EPEL
@@ -246,10 +240,6 @@ sed -e \
appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*.appdata.xml
%endif
-##Tests
-#pushd src
-#xvfb-run -s "-screen 0 640x480x24" -a sh -x ./build_and_run_all_tests
-
%post
/usr/bin/update-desktop-database &> /dev/null || :
@@ -282,6 +272,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*.appdata.
%license LICENSE
%changelog
+* Sun Mar 06 2016 Antonio Trande - 1:7.0-1
+- Update to 7.0
+
* Thu Feb 04 2016 Antonio Trande - 1:6.2-4.20160204gitb6ad5b
- Update to commit #b6ad5b
diff --git a/engauge-digitizer_fix_test_script.patch b/engauge-digitizer_fix_test_script.patch
deleted file mode 100644
index c4c585b..0000000
--- a/engauge-digitizer_fix_test_script.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/build_and_run_all_tests.orig 2015-09-28 04:36:59.000000000 +0200
-+++ src/build_and_run_all_tests 2015-09-28 11:08:36.319383842 +0200
-@@ -34,7 +34,7 @@
- echo "Rebuilding..."
-
- # Make sure correct qt installation is being used, by looking for '5.' in the version number
--VERSION5=`qmake -v | grep '5\.'`
-+VERSION5=`qmake-qt5 -v | grep '5\.'`
- if [ -z "$VERSION5" ]
- then
- echo "Need Qt5";
-@@ -47,7 +47,9 @@
- for t in "${tests[@]}"
- do
- sed "s/TEST/$t/g" engauge_test_template.pro >engauge_test.pro
-- qmake engauge_test.pro
-+ qmake-qt5 -makefile engauge_test.pro \
-+ QMAKE_CFLAGS=RPM_OPT_FLAGS \
-+ QMAKE_CXXFLAGS=$RPM_OPT_FLAGS
- make all 2>>$LOGFILE >/dev/null
- ../bin/$t
- if [ $argcount -ne 1 ]
-
diff --git a/sources b/sources
index e633c8e..f889c7d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3882357aa4ff1f347f85bea09b7f1482 engauge6-b6ad5b0cd3be30c52f17bf8917fe39fb28a60549.zip
+06e0af0b78053f90d6569dc36e43c651 engauge-digitizer-7.0.tar.gz