Compare commits
No commits in common. "rawhide" and "f22" have entirely different histories.
27
.gitignore
vendored
27
.gitignore
vendored
@ -7,30 +7,3 @@
|
|||||||
/engauge6-6.1.tar.gz
|
/engauge6-6.1.tar.gz
|
||||||
/engauge6-6.2.tar.gz
|
/engauge6-6.2.tar.gz
|
||||||
/engauge6-b6ad5b0cd3be30c52f17bf8917fe39fb28a60549.zip
|
/engauge6-b6ad5b0cd3be30c52f17bf8917fe39fb28a60549.zip
|
||||||
/engauge-digitizer-7.0.tar.gz
|
|
||||||
/engauge-digitizer-7.1.tar.gz
|
|
||||||
/engauge-digitizer-7.2.tar.gz
|
|
||||||
/engauge-digitizer-8.1.tar.gz
|
|
||||||
/engauge-digitizer-8.2.tar.gz
|
|
||||||
/engauge-digitizer-9.0.tar.gz
|
|
||||||
/engauge-digitizer-9.1.tar.gz
|
|
||||||
/engauge-digitizer-9.2.tar.gz
|
|
||||||
/engauge-digitizer-9.3.tar.gz
|
|
||||||
/engauge-digitizer-9.4.tar.gz
|
|
||||||
/engauge-digitizer-9.5.tar.gz
|
|
||||||
/engauge-digitizer-9.6.tar.gz
|
|
||||||
/engauge-digitizer-9.7.tar.gz
|
|
||||||
/engauge-digitizer-9.8.tar.gz
|
|
||||||
/engauge-digitizer-10.0.tar.gz
|
|
||||||
/engauge-digitizer-10.1.tar.gz
|
|
||||||
/engauge-digitizer-10.2.tar.gz
|
|
||||||
/engauge-digitizer-10.4.tar.gz
|
|
||||||
/engauge-digitizer-10.6.tar.gz
|
|
||||||
/engauge-digitizer-10.7.tar.gz
|
|
||||||
/engauge-digitizer-10.9.tar.gz
|
|
||||||
/engauge-digitizer-10.11.tar.gz
|
|
||||||
/engauge-digitizer-10.12.tar.gz
|
|
||||||
/engauge-digitizer-11.2.tar.gz
|
|
||||||
/engauge-digitizer-11.3.tar.gz
|
|
||||||
/engauge-digitizer-12.tar.gz
|
|
||||||
/engauge-digitizer-12.1.tar.gz
|
|
||||||
|
|||||||
@ -1,48 +0,0 @@
|
|||||||
--- engauge.orig.pro 2018-08-18 11:09:30.376816000 +0200
|
|
||||||
+++ engauge.pro 2018-08-18 11:11:20.963693884 +0200
|
|
||||||
@@ -848,8 +848,8 @@
|
|
||||||
|
|
||||||
jpeg2000 {
|
|
||||||
message("JPEG2000 support: yes")
|
|
||||||
- _OPENJPEG_INCLUDE = $$(OPENJPEG_INCLUDE)
|
|
||||||
- _OPENJPEG_LIB = $$(OPENJPEG_LIB)
|
|
||||||
+ _OPENJPEG_INCLUDE = $(OPENJPEG_INCLUDE)
|
|
||||||
+ _OPENJPEG_LIB = $(OPENJPEG_LIB)
|
|
||||||
isEmpty(_OPENJPEG_INCLUDE) {
|
|
||||||
error("OPENJPEG_INCLUDE and OPENJPEG_LIB environment variables must be defined")
|
|
||||||
} else {
|
|
||||||
@@ -858,9 +858,9 @@
|
|
||||||
}
|
|
||||||
}
|
|
||||||
DEFINES += "ENGAUGE_JPEG2000"
|
|
||||||
- INCLUDEPATH += $$(OPENJPEG_INCLUDE) \
|
|
||||||
+ INCLUDEPATH += $(OPENJPEG_INCLUDE) \
|
|
||||||
src/Jpeg2000
|
|
||||||
- LIBS += -L$$(OPENJPEG_LIB) -lopenjp2
|
|
||||||
+ LIBS += -L$(OPENJPEG_LIB) -lopenjp2
|
|
||||||
HEADERS += src/Jpeg2000/Jpeg2000.h \
|
|
||||||
src/Jpeg2000/Jpeg2000Callbacks.h \
|
|
||||||
src/Jpeg2000/Jpeg2000Color.h \
|
|
||||||
@@ -877,8 +877,8 @@
|
|
||||||
|
|
||||||
pdf {
|
|
||||||
message("PDF support: yes")
|
|
||||||
- _POPPLER_INCLUDE = $$(POPPLER_INCLUDE)
|
|
||||||
- _POPPLER_LIB = $$(POPPLER_LIB)
|
|
||||||
+ _POPPLER_INCLUDE = $(POPPLER_INCLUDE)
|
|
||||||
+ _POPPLER_LIB = $(POPPLER_LIB)
|
|
||||||
isEmpty(_POPPLER_INCLUDE) {
|
|
||||||
error("POPPLER_INCLUDE and POPPLER_LIB environment variables must be defined")
|
|
||||||
} else {
|
|
||||||
@@ -887,8 +887,8 @@
|
|
||||||
}
|
|
||||||
}
|
|
||||||
DEFINES += "ENGAUGE_PDF"
|
|
||||||
- LIBS += -L$$(POPPLER_LIB) -lpoppler-qt5
|
|
||||||
- INCLUDEPATH += $$(POPPLER_INCLUDE)
|
|
||||||
+ LIBS += -L$(POPPLER_LIB) -lpoppler-qt5
|
|
||||||
+ INCLUDEPATH += $(POPPLER_INCLUDE)
|
|
||||||
HEADERS += src/Dlg/DlgImportCroppingPdf.h \
|
|
||||||
src/Import/ImportCroppingUtilPdf.h \
|
|
||||||
src/Pdf/Pdf.h \
|
|
||||||
|
|
||||||
@ -1,55 +1,56 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<!-- Copyright 2015 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> -->
|
<!-- Copyright 2015 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> -->
|
||||||
<component type="desktop">
|
<application>
|
||||||
<id>engauge-digitizer.desktop</id>
|
<id type="desktop">engauge-digitizer.desktop</id>
|
||||||
<metadata_license>CC0-1.0</metadata_license>
|
<metadata_license>CC0</metadata_license>
|
||||||
<project_license>GPL-2.0+</project_license>
|
<project_license>GPL-2.0+</project_license>
|
||||||
<name>Engauge Digitizer 10</name>
|
<name>Engauge Digitizer 6</name>
|
||||||
<summary>Convert an image file showing a graph or map into numbers</summary>
|
<summary>Convert an image file showing a graph or map into numbers</summary>
|
||||||
<description>
|
<description>
|
||||||
<p>
|
<p>
|
||||||
The Engauge Digitizer tool accepts image files
|
Engauge6 is rewritten with Qt5.
|
||||||
(like PNG, JPEG and TIFF) containing graphs,
|
This digitizing software converts an image file
|
||||||
and recovers the data points from those graphs.
|
showing a graph or map, into numbers.
|
||||||
The resulting data points are usually used as input
|
The image file can come from a scanner, digital camera
|
||||||
to other software applications.
|
or screen-shot. The numbers can be read on the screen,
|
||||||
Conceptually, Engauge Digitizer is the opposite of
|
and written or copied to a spreadsheet.
|
||||||
a graphing tool that converts data points to graphs.
|
The process starts with an image file containing a graph or map.
|
||||||
The process is shown below - an image file is imported,
|
The final result is digitized data that can be used by other tools
|
||||||
digitized within Engauge, and exported as a table of
|
such as Gnumeric.
|
||||||
numeric data to a text file.
|
|
||||||
Work can be saved into an Engauge DIG file.
|
|
||||||
</p>
|
</p>
|
||||||
<p>
|
<p>
|
||||||
New features already added to Engauge:
|
New features already added to Engauge6:
|
||||||
</p>
|
</p>
|
||||||
<p>
|
<p>
|
||||||
- Grid lines are displayed for fine adjustments of the axis points that define the coordinate systems
|
- Older Engauge files (before version 6) can be loaded
|
||||||
- Automated line and point extraction rapidly digitizes data
|
- Undo/redo of all operations means recovering from mistakes and experimenting
|
||||||
- Image processing for separating important details from background information
|
with options is painless
|
||||||
- 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
|
||||||
- Installers for Windows and OSX operating systems, and repository packages for Linux make installation easy
|
- Wizard creates a checklist guide to interactively leads user through steps
|
||||||
- Wizard provides an interactive tutorial to explain the basic steps
|
from file import to file export
|
||||||
- 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
|
||||||
- Cubic spline interpolation between points gives more accurate curves with fewer points
|
fewer points
|
||||||
- Axes Checker briefly highlights the axes when they are defined or modified, to reveal entry mistakes
|
- Axes Checker briefly highlights the axes when they are defined or modified,
|
||||||
- Graph coordinates can be specified as date and time values, or as degrees, minutes and seconds
|
to reveal entry mistakes
|
||||||
- File import and data export by drag-and-drop and copy/paste
|
- Graph coordinates can be specified as date and time value, or as degrees,
|
||||||
- Test suite for regression testing minimizes code breakage as new features are added
|
minutes and seconds
|
||||||
- Multiple coordinate systems in the same image can be digitized in advanced mode
|
- All settings dialogs are resizable so they can be enlarged as necessary to
|
||||||
- Axes with only one known coordinate (floating axes) can be digitized in advanced mode
|
display more information
|
||||||
- Geometry Window displays geometric information about the selected curve
|
- Import by drag-and-drop
|
||||||
- Curve Fitting Window fits a polynomial function to the selected curve
|
- 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
|
||||||
</p>
|
</p>
|
||||||
</description>
|
</description>
|
||||||
<screenshots>
|
<screenshots>
|
||||||
<screenshot type="default">
|
<screenshot type="default">https://sagitter.fedorapeople.org/engauge-screenshots/engauge-screenshot-map-points.png</screenshot>
|
||||||
<image>https://sagitter.fedorapeople.org/engauge-screenshots/engauge-screenshot1.png</image>
|
<screenshot>https://sagitter.fedorapeople.org/engauge-screenshots/engauge-screenshot-points-save-as.png</screenshot>
|
||||||
</screenshot>
|
|
||||||
<screenshot>
|
|
||||||
<image>https://sagitter.fedorapeople.org/engauge-screenshots/engauge-screenshot2.png</image>
|
|
||||||
</screenshot>
|
|
||||||
</screenshots>
|
</screenshots>
|
||||||
<url type="homepage">https://github.com/markummitchell/engauge-digitizer</url>
|
<url type="homepage">http://digitizer.sourceforge.net/</url>
|
||||||
<updatecontact>sagitter_at_fedoraproject.org</updatecontact>
|
<updatecontact>zbyszek@in.waw.pl</updatecontact>
|
||||||
</component>
|
</application>
|
||||||
|
|||||||
@ -1,78 +1,97 @@
|
|||||||
|
%if 0%{?fedora} <= 22
|
||||||
|
%global _hardened_build 1
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if 0%{?rhel} < 7
|
||||||
|
%{!?__global_ldflags: %global __global_ldflags -Wl,-z,relro}
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%global checkout b6ad5b0cd3be30c52f17bf8917fe39fb28a60549
|
||||||
|
%global date 20160204
|
||||||
|
|
||||||
Name: engauge-digitizer
|
Name: engauge-digitizer
|
||||||
Summary: Convert graphs or map files into numbers
|
Summary: Convert graphs or map files into numbers
|
||||||
Version: 12.1
|
Version: 6.2
|
||||||
Release: 10%{?dist}
|
Release: 4.%{date}git%(echo %{checkout} | cut -c-6)%{?dist}
|
||||||
|
Group: Applications/Engineering
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
URL: http://markummitchell.github.io/%{name}/
|
URL: https://github.com/markummitchell/engauge6
|
||||||
Source0: https://github.com/markummitchell/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz
|
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
|
||||||
|
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
|
Provides: %{name} = 1:%{version}-%{release}
|
||||||
|
Obsoletes: %{name} <= 0:5.2.11
|
||||||
|
Obsoletes: %{name}-transpose <= 0:5.2.11
|
||||||
|
|
||||||
|
##Excluding this arch because of missing BR packages (log4cpp)
|
||||||
|
%if 0%{?rhel} < 7
|
||||||
|
ExcludeArch: ppc64
|
||||||
|
%endif
|
||||||
|
|
||||||
## Proposed in https://bugzilla.redhat.com/show_bug.cgi?id=1182409
|
## Proposed in https://bugzilla.redhat.com/show_bug.cgi?id=1182409
|
||||||
Source1: %{name}.appdata.xml
|
Source1: %{name}.appdata.xml
|
||||||
Source2: %{name}.svg
|
Source2: %{name}.svg
|
||||||
Source3: %{name}-with-name.svg
|
Source3: %{name}-with-name.svg
|
||||||
|
|
||||||
## Fix variables for using correctly pkgconfig
|
|
||||||
Patch0: %{name}-fix_path_variables.patch
|
|
||||||
|
|
||||||
## Main building
|
## Main building
|
||||||
BuildRequires: gcc, gcc-c++
|
|
||||||
BuildRequires: fftw-devel, log4cpp-devel, desktop-file-utils
|
|
||||||
BuildRequires: qt5-qtbase-devel, qt5-qttools-devel
|
BuildRequires: qt5-qtbase-devel, qt5-qttools-devel
|
||||||
%{?fedora:BuildRequires: pkgconf-pkg-config}
|
BuildRequires: fftw-devel, log4cpp-devel, desktop-file-utils
|
||||||
%{?rhel:BuildRequires: pkgconfig}
|
|
||||||
|
##Xvfb is needed to run a virtual X server used by tests
|
||||||
|
BuildRequires: xorg-x11-server-Xvfb
|
||||||
|
|
||||||
|
##Doxygen for documentation
|
||||||
|
BuildRequires: doxygen
|
||||||
|
|
||||||
%if 0%{?fedora}
|
%if 0%{?fedora}
|
||||||
BuildRequires: libappstream-glib
|
BuildRequires: libappstream-glib
|
||||||
BuildRequires: openjpeg2-devel
|
BuildRequires: openjpeg2-devel
|
||||||
BuildRequires: poppler-qt5-devel
|
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%description
|
%description
|
||||||
The Engauge Digitizer tool accepts image files
|
Engauge6 is rewritten with Qt5.
|
||||||
(like PNG, JPEG and TIFF) containing graphs,
|
This digitizing software converts an image file
|
||||||
and recovers the data points from those graphs.
|
showing a graph or map, into numbers.
|
||||||
The resulting data points are usually used as input
|
The image file can come from a scanner, digital camera
|
||||||
to other software applications.
|
or screen-shot. The numbers can be read on the screen,
|
||||||
Conceptually, Engauge Digitizer is the opposite of
|
and written or copied to a spreadsheet.
|
||||||
a graphing tool that converts data points to graphs.
|
The process starts with an image file containing a graph or map.
|
||||||
The process is shown below - an image file is imported,
|
The final result is digitized data that can be used by other tools
|
||||||
digitized within Engauge, and exported as a table of
|
such as Gnumeric.
|
||||||
numeric data to a text file.
|
|
||||||
Work can be saved into an Engauge DIG file.
|
|
||||||
|
|
||||||
New features already added to Engauge:
|
New features already added to Engauge6:
|
||||||
|
|
||||||
- Grid lines are displayed for fine adjustments of the axis points
|
|
||||||
that define the coordinate systems
|
|
||||||
- Automated line and point extraction rapidly digitizes data
|
|
||||||
- Image processing for separating important details from background information
|
|
||||||
- Undo/redo of all operations means recovering from mistakes and experimenting
|
|
||||||
with options is painless
|
|
||||||
- Installers for Windows and OSX operating systems, and repository packages for
|
|
||||||
Linux make installation easy
|
|
||||||
- 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 values, or as degrees,
|
|
||||||
minutes and seconds
|
|
||||||
- File import and data export by drag-and-drop and copy/paste
|
|
||||||
- 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
|
|
||||||
- Geometry Window displays geometric information about the selected curve
|
|
||||||
- Curve Fitting Window fits a polynomial function to the selected curve
|
|
||||||
|
|
||||||
|
- 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
|
||||||
|
|
||||||
%package samples
|
%package samples
|
||||||
Summary: Sample files for %{name}
|
Summary: Sample files for %{name}
|
||||||
|
Group: Applications/Engineering
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
%description samples
|
%description samples
|
||||||
This package contains several sample image files that may be imported into
|
This package contains several sample image files that may be imported into
|
||||||
@ -80,94 +99,93 @@ Engauge Digitizer (http://digitizer.sourceforge.net).
|
|||||||
|
|
||||||
These files are listed below, with comments:
|
These files are listed below, with comments:
|
||||||
|
|
||||||
- corners.png - Graph that lots of corners that would be painful
|
- corners.png - Graph that lots of corners that would be painful
|
||||||
to digitize manually
|
to digitize manually
|
||||||
- gridlines.gif - Graph with gridlines that are easily removed by Engauge
|
- gridlines.gif - Graph with gridlines that are easily removed by Engauge
|
||||||
- gridlines_log.gif - Another graph with gridlines that are easily
|
- gridlines_log.gif - Another graph with gridlines that are easily
|
||||||
removed by Engauge
|
removed by Engauge
|
||||||
- gridlines_log.src - Creates gridlines_log.gif in gnuplot using 'load'
|
- gridlines_log.src - Creates gridlines_log.gif in gnuplot using 'load'
|
||||||
command (not an image!)
|
command (not an image!)
|
||||||
- inverse.jpg - Image of y/x function
|
- inverse.jpg - Image of y/x function
|
||||||
- inverse.png - Same as inverse.jpg but in png format
|
- inverse.png - Same as inverse.jpg but in png format
|
||||||
- linlog.jpg - Graph with linear/logarithmic coordinates
|
- linlog.jpg - Graph with linear/logarithmic coordinates
|
||||||
- linlog.png - Same as linlog.jpg but in png format
|
- linlog.png - Same as linlog.jpg but in png format
|
||||||
- loglin.png - Graph with logarithmic/linear coordinates
|
- loglin.png - Graph with logarithmic/linear coordinates
|
||||||
- loglog.png - Graph with logarithmic/logarithmic coordinates
|
- loglog.png - Graph with logarithmic/logarithmic coordinates
|
||||||
- normdist.jpg - Graph of normal distribution
|
- normdist.jpg - Graph of normal distribution
|
||||||
- normdist.png - Same as normdist.jpg but in png format
|
- normdist.png - Same as normdist.jpg but in png format
|
||||||
- pointmatch.jpg - Graph with fuzzy points for playing with Point Match
|
- pointmatch.jpg - Graph with fuzzy points for playing with Point Match
|
||||||
feature of Engauge
|
feature of Engauge
|
||||||
- pointplot.bmp - Graph with points that are easily captured by Point Match
|
- pointplot.bmp - Graph with points that are easily captured by Point Match
|
||||||
feature of Engauge, if the Discretize settings are set to
|
feature of Engauge, if the Discretize settings are set to "Intensity 90 to 99"
|
||||||
"Intensity 90 to 99"
|
for the triangles, and "Intensity 10 to 50" for the diamonds
|
||||||
for the triangles, and "Intensity 10 to 50" for the diamonds
|
- polarcircles.jpg - Polar plot for experimenting. No coordinates are displayed,
|
||||||
- polarcircles.jpg - Polar plot for experimenting. No coordinates are
|
so not very useful
|
||||||
displayed, so not very useful
|
- polarplot.jpg - Polar plot with cardioid pattern
|
||||||
- polarplot.jpg - Polar plot with cardioid pattern
|
- polarplot.png - Same as polarplot.jpg but in png format
|
||||||
- polarplot.png - Same as polarplot.jpg but in png format
|
- testcase.jpg - Simple graph that serves as an excellent starting point for the
|
||||||
- testcase.jpg - Simple graph that serves as an excellent starting point
|
new user
|
||||||
for the new user
|
- testcase.png - Same as testcase.jpg but in png format
|
||||||
- testcase.png - Same as testcase.jpg but in png format
|
- testcoords.jpg - Advanced graph used by developers to check the affine
|
||||||
- testcoords.jpg - Advanced graph used by developers to check the affine
|
transformations in Engauge
|
||||||
transformations in Engauge
|
- testcoords.sxd - Open Office document used to create testcoords.jpg
|
||||||
- testcoords.sxd - Open Office document used to create testcoords.jpg
|
(not an image!)
|
||||||
(not an image!)
|
- usgs.png - Fictional map loosely based on U.S. Geological Survey
|
||||||
- usgs.png - Fictional map loosely based on U.S. Geological Survey
|
topographic maps
|
||||||
topographic maps
|
|
||||||
|
|
||||||
%package doc
|
%package doc
|
||||||
Summary: HTML documentation of %{name}
|
Summary: HTML documentation of %{name}
|
||||||
|
Group: Applications/Engineering
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
BuildRequires: texlive-epstopdf, ghostscript
|
|
||||||
BuildRequires: doxygen
|
|
||||||
BuildRequires: make
|
|
||||||
%description doc
|
%description doc
|
||||||
HTML documentation of %{name}.
|
HTML documentation of %{name}.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -p0 -n %{name}-%{version}
|
%setup -q -n engauge6-%{checkout}
|
||||||
|
|
||||||
## Remove default -O1 optimization
|
##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
|
||||||
|
|
||||||
|
##Active support to jpeg2000
|
||||||
|
##jpeg2000 libraries not available on EPEL
|
||||||
|
%if 0%{?fedora}
|
||||||
|
sed -e 's|CONFIG = qt warn_on thread debug|CONFIG = qt warn_on thread jpeg2000 debug|g' -i engauge.pro
|
||||||
|
sed -e 's|INCLUDEPATH += Jpeg2000|INCLUDEPATH += src/Jpeg2000|g' -i engauge.pro
|
||||||
|
%endif
|
||||||
|
|
||||||
|
##Remove default -O1 optimization
|
||||||
sed -e 's|-O1||g' -i engauge.pro
|
sed -e 's|-O1||g' -i engauge.pro
|
||||||
|
|
||||||
## Set fftw library link-path
|
##Remove spurious executable permissions
|
||||||
sed -e 's|-L/$$(FFTW_HOME)/lib|-L$$(FFTW_HOME)/%{_libdir}|g' -i engauge.pro
|
for i in `find src -type f \( -name "*.cpp" -o -name "*.h" \)`; do
|
||||||
|
chmod a-x $i
|
||||||
## Remove post-link task
|
done
|
||||||
sed --in-place '/QMAKE_POST_LINK/d' engauge.pro
|
|
||||||
|
|
||||||
## Remove rpath link
|
|
||||||
sed --in-place '/QMAKE_LFLAGS/d' engauge.pro
|
|
||||||
|
|
||||||
## Remove spurious executable permissions
|
|
||||||
find . -type f -name "*.h" -exec chmod 0644 '{}' \;
|
|
||||||
find . -type f -name "*.cpp" -exec chmod 0644 '{}' \;
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
export ENGAUGE_RELEASE=1
|
|
||||||
%if 0%{?fedora}
|
%if 0%{?fedora}
|
||||||
export OPENJPEG_INCLUDE=`pkg-config --cflags libopenjp2 | sed 's/-I//'`
|
export JPEG2000_INCLUDE=%{_includedir}/openjpeg-2.1
|
||||||
export OPENJPEG_LIB=%{_libdir}
|
export JPEG2000_LIB=%{_libdir}
|
||||||
export POPPLER_INCLUDE=`pkg-config --cflags poppler-qt5 | sed 's/-I//'`
|
|
||||||
export POPPLER_LIB=%{_libdir}
|
|
||||||
%{qmake_qt5} engauge.pro "CONFIG+=pdf jpeg2000" QT_SELECT=qt5 \
|
|
||||||
%else
|
|
||||||
%{qmake_qt5} engauge.pro "CONFIG+=log4cpp_null" QT_SELECT=qt5 \
|
|
||||||
%endif
|
%endif
|
||||||
|
export ENGAUGE_RELEASE=1
|
||||||
|
## Flags set by hand for EPEL6
|
||||||
|
%{qmake_qt5} engauge.pro \
|
||||||
QMAKE_CFLAGS_RELEASE="$RPM_OPT_FLAGS -pie -Wl,-z,now" \
|
QMAKE_CFLAGS_RELEASE="$RPM_OPT_FLAGS -pie -Wl,-z,now" \
|
||||||
QMAKE_CXXFLAGS_RELEASE="$RPM_OPT_FLAGS -pie -Wl,-z,now" \
|
QMAKE_CXXFLAGS_RELEASE="$RPM_OPT_FLAGS -pie -Wl,-z,now" \
|
||||||
QMAKE_LFLAGS="$RPM_LD_FLAGS -pie -Wl,-z,now" \
|
QMAKE_LFLAGS="$RPM_LD_FLAGS -pie -Wl,-z,now" \
|
||||||
DEFINES+=HELPDIR=%{_datadir}/doc/%{name}/help
|
DEFINES+=HELPDIR=%{_datadir}/doc/%{name}/help
|
||||||
%make_build
|
make %{?_smp_mflags}
|
||||||
|
|
||||||
## Build HELP files
|
##Build HELP files
|
||||||
pushd help
|
pushd help
|
||||||
qcollectiongenerator-qt5 engauge.qhcp -o engauge.qhc
|
qcollectiongenerator-qt5 engauge.qhcp -o engauge.qhc
|
||||||
rm -f build build.*
|
mv engauge.qch ../bin/documentation
|
||||||
rm -rf .gitignore
|
mv engauge.qhc ../bin/documentation
|
||||||
|
rm -f build
|
||||||
popd
|
popd
|
||||||
|
|
||||||
## Build HTML/Latex documentation files
|
##Build HTML/Latex documentation files
|
||||||
pushd src
|
pushd src
|
||||||
doxygen
|
doxygen
|
||||||
popd
|
popd
|
||||||
@ -177,7 +195,7 @@ mkdir -p %{buildroot}%{_datadir}/%{name}-%{version}/samples
|
|||||||
mkdir -p %{buildroot}%{_datadir}/%{name}-%{version}/img
|
mkdir -p %{buildroot}%{_datadir}/%{name}-%{version}/img
|
||||||
mkdir -p %{buildroot}%{_datadir}/applications
|
mkdir -p %{buildroot}%{_datadir}/applications
|
||||||
mkdir -p %{buildroot}%{_datadir}/pixmaps
|
mkdir -p %{buildroot}%{_datadir}/pixmaps
|
||||||
mkdir -p %{buildroot}%{_metainfodir}
|
mkdir -p %{buildroot}%{_datadir}/appdata
|
||||||
mkdir -p %{buildroot}%{_bindir}
|
mkdir -p %{buildroot}%{_bindir}
|
||||||
|
|
||||||
install -p -m 755 bin/engauge %{buildroot}%{_bindir}
|
install -p -m 755 bin/engauge %{buildroot}%{_bindir}
|
||||||
@ -187,13 +205,13 @@ install -p -m 644 *.gif *.jp* *.png *.bmp %{buildroot}%{_datadir}/%{name}-%{vers
|
|||||||
popd
|
popd
|
||||||
|
|
||||||
install -p -m 644 src/img/* %{buildroot}%{_datadir}/%{name}-%{version}/img
|
install -p -m 644 src/img/* %{buildroot}%{_datadir}/%{name}-%{version}/img
|
||||||
install -p -m 644 %{SOURCE2} %{buildroot}%{_datadir}/pixmaps/
|
install -p -m 644 %{SOURCE2} %{buildroot}%{_datadir}/pixmaps
|
||||||
install -p -m 644 %{SOURCE3} %{buildroot}%{_datadir}/pixmaps/
|
install -p -m 644 %{SOURCE3} %{buildroot}%{_datadir}/pixmaps
|
||||||
%if 0%{?fedora}
|
%if 0%{?fedora}
|
||||||
install -p -m 644 %{SOURCE1} %{buildroot}%{_metainfodir}/
|
install -p -m 644 %{SOURCE1} %{buildroot}%{_datadir}/appdata
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
## Make a .desktop file
|
##Make a .desktop file
|
||||||
mkdir -p %{buildroot}%{_datadir}/applications
|
mkdir -p %{buildroot}%{_datadir}/applications
|
||||||
cat > %{buildroot}%{_datadir}/applications/%{name}.desktop <<EOF
|
cat > %{buildroot}%{_datadir}/applications/%{name}.desktop <<EOF
|
||||||
[Desktop Entry]
|
[Desktop Entry]
|
||||||
@ -203,7 +221,7 @@ Comment=Extract data from graphs
|
|||||||
TryExec=engauge
|
TryExec=engauge
|
||||||
Exec=engauge
|
Exec=engauge
|
||||||
MimeType=text/plain
|
MimeType=text/plain
|
||||||
Categories=Education;Science;DataVisualization;
|
Categories=Education;Science;DataVisualization
|
||||||
Icon=/usr/share/pixmaps/engauge-digitizer.xpm
|
Icon=/usr/share/pixmaps/engauge-digitizer.xpm
|
||||||
Keywords=Analog-Digital Converter;
|
Keywords=Analog-Digital Converter;
|
||||||
EOF
|
EOF
|
||||||
@ -225,191 +243,45 @@ sed -e \
|
|||||||
|
|
||||||
%check
|
%check
|
||||||
%if 0%{?fedora}
|
%if 0%{?fedora}
|
||||||
appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata.xml
|
appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*.appdata.xml
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if 0%{?rhel} && 0%{?rhel} <= 7
|
##Tests
|
||||||
|
#pushd src
|
||||||
|
#xvfb-run -s "-screen 0 640x480x24" -a sh -x ./build_and_run_all_tests
|
||||||
|
|
||||||
%post
|
%post
|
||||||
/usr/bin/update-desktop-database &> /dev/null || :
|
/usr/bin/update-desktop-database &> /dev/null || :
|
||||||
|
|
||||||
%postun
|
%postun
|
||||||
/usr/bin/update-desktop-database &> /dev/null || :
|
/usr/bin/update-desktop-database &> /dev/null || :
|
||||||
%endif
|
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%doc README.md help
|
%{!?_licensedir:%global license %doc}
|
||||||
|
%doc README.md help bin/documentation/engauge.qhc bin/documentation/engauge.qch
|
||||||
%license LICENSE
|
%license LICENSE
|
||||||
%{_bindir}/engauge
|
%{_bindir}/engauge
|
||||||
%{_datadir}/pixmaps/%{name}*.svg
|
%{_datadir}/pixmaps/%{name}*.svg
|
||||||
%if 0%{?fedora}
|
%if 0%{?fedora}
|
||||||
%{_metainfodir}/*.appdata.xml
|
%{_datadir}/appdata/*.appdata.xml
|
||||||
%endif
|
%endif
|
||||||
%{_datadir}/applications/%{name}.desktop
|
%{_datadir}/applications/%{name}.desktop
|
||||||
%{_datadir}/%{name}-%{version}/
|
%{_datadir}/%{name}-%{version}/
|
||||||
%exclude %{_datadir}/%{name}-%{version}/samples
|
%exclude %{_datadir}/%{name}-%{version}/samples
|
||||||
|
|
||||||
%files samples
|
%files samples
|
||||||
|
%{!?_licensedir:%global license %doc}
|
||||||
%doc samples/README
|
%doc samples/README
|
||||||
%license LICENSE
|
%license LICENSE
|
||||||
%dir %{_datadir}/%{name}-%{version}
|
%dir %{_datadir}/%{name}-%{version}
|
||||||
%{_datadir}/%{name}-%{version}/samples
|
%{_datadir}/%{name}-%{version}/samples
|
||||||
|
|
||||||
%files doc
|
%files doc
|
||||||
|
%{!?_licensedir:%global license %doc}
|
||||||
%doc README.md doc/doxygen/html
|
%doc README.md doc/doxygen/html
|
||||||
%license LICENSE
|
%license LICENSE
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:12.1-10
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
|
||||||
|
|
||||||
* Fri May 20 2022 Sandro Mani <manisandro@gmail.com> - 1:12.1-9
|
|
||||||
- Rebuild for gdal-3.5.0 and/or openjpeg-2.5.0
|
|
||||||
|
|
||||||
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:12.1-8
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
|
||||||
|
|
||||||
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:12.1-7
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
|
||||||
|
|
||||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:12.1-6
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
|
||||||
|
|
||||||
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:12.1-5
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
|
||||||
|
|
||||||
* Sun Feb 02 2020 Antonio Trande <sagitter@fedoraproject.org> - 1:12.1-4
|
|
||||||
- Drop bogus runtime dependency (rhbz#1797268)
|
|
||||||
|
|
||||||
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:12.1-3
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
|
||||||
|
|
||||||
* Fri Jan 17 2020 Marek Kasik <mkasik@redhat.com> - 1:12.1-2
|
|
||||||
- Rebuild for poppler-0.84.0
|
|
||||||
|
|
||||||
* Sat Nov 30 2019 Antonio Trande <sagitter@fedoraproject.org> - 1:12.1-1
|
|
||||||
- Release 12.1
|
|
||||||
|
|
||||||
* Sat Aug 24 2019 Antonio Trande <sagitter@fedoraproject.org> - 1:12-2
|
|
||||||
- SPEC file enhancements
|
|
||||||
|
|
||||||
* Fri Aug 23 2019 Antonio Trande <sagitter@fedoraproject.org> - 1:12-1
|
|
||||||
- Release 12.0
|
|
||||||
|
|
||||||
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:11.3-2
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
|
||||||
|
|
||||||
* Sat Jul 20 2019 Antonio Trande <sagitter@fedoraproject.org> - 1:11.3-1
|
|
||||||
- Release 11.3
|
|
||||||
|
|
||||||
* Thu May 02 2019 Antonio Trande <sagitter@fedoraproject.org> - 1:11.2-1
|
|
||||||
- Release 11.2
|
|
||||||
|
|
||||||
* Thu Mar 07 2019 Antonio Trande <sagitter@fedoraproject.org> - 1:10.12-1
|
|
||||||
- Release 10.12
|
|
||||||
|
|
||||||
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:10.11-2
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
|
||||||
|
|
||||||
* Sun Oct 28 2018 Antonio Trande <sagitter@fedoraproject.org> - 1:10.11-1
|
|
||||||
- Update to 10.11
|
|
||||||
|
|
||||||
* Mon Aug 13 2018 Antonio Trande <sagitter@fedoraproject.org> - 1:10.9-1
|
|
||||||
- Update to 10.9
|
|
||||||
|
|
||||||
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:10.7-2
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
|
||||||
|
|
||||||
* Wed Jul 04 2018 Antonio Trande <sagitter@fedoraproject.org> - 1:10.7-1
|
|
||||||
- Update to 10.7
|
|
||||||
|
|
||||||
* Sat May 05 2018 Antonio Trande <sagitter@fedoraproject.org> - 1:10.6-1
|
|
||||||
- Update to 10.6
|
|
||||||
|
|
||||||
* Thu Feb 22 2018 Antonio Trande <sagitter@fedoraproject.org> - 1:10.4-4
|
|
||||||
- Add gcc gcc-c++ BR
|
|
||||||
|
|
||||||
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:10.4-3
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
|
||||||
|
|
||||||
* Thu Dec 21 2017 Antonio Trande <sagitter@fedoraproject.org> - 1:10.4-2
|
|
||||||
- Appdata file moved into metainfo data directory
|
|
||||||
|
|
||||||
* Sat Oct 21 2017 Antonio Trande <sagitter@fedoraproject.org> - 1:10.4-1
|
|
||||||
- Update to 10.4
|
|
||||||
|
|
||||||
* Mon Aug 21 2017 Antonio Trande <sagitter@fedoraproject.org> - 1:10.2-1
|
|
||||||
- Update to 10.2
|
|
||||||
|
|
||||||
* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1:10.1-3
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
|
||||||
|
|
||||||
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1:10.1-2
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
|
||||||
|
|
||||||
* Thu Jul 20 2017 Antonio Trande <sagitter@fedoraproject.org> - 1:10.1-1
|
|
||||||
- Update to 10.1
|
|
||||||
|
|
||||||
* Mon May 15 2017 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:10.0-2
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild
|
|
||||||
|
|
||||||
* Mon Apr 03 2017 Antonio Trande <sagitter@fedoraproject.org> - 1:10.0-1
|
|
||||||
- Update to 10.0
|
|
||||||
|
|
||||||
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1:9.8-3
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
|
||||||
|
|
||||||
* Thu Jan 05 2017 Antonio Trande <sagitterATfedoraproject.org> 1:9.8-2
|
|
||||||
- Conformed to new rules for scriptlets
|
|
||||||
|
|
||||||
* Sun Dec 11 2016 Antonio Trande <sagitter@fedoraproject.org> - 1:9.8-1
|
|
||||||
- Update to 9.8
|
|
||||||
|
|
||||||
* Thu Dec 01 2016 Antonio Trande <sagitter@fedoraproject.org> - 1:9.7-1
|
|
||||||
- Update to 9.7
|
|
||||||
- qgnomeplatform required on f25+
|
|
||||||
|
|
||||||
* Tue Nov 22 2016 Antonio Trande <sagitter@fedoraproject.org> - 1:9.6-1
|
|
||||||
- Update to 9.6
|
|
||||||
|
|
||||||
* Mon Oct 10 2016 Antonio Trande <sagitter@fedoraproject.org> - 1:9.5-1
|
|
||||||
- Update to 9.5
|
|
||||||
|
|
||||||
* Sat Oct 01 2016 Antonio Trande <sagitter@fedoraproject.org> - 1:9.4-1
|
|
||||||
- Update to 9.4
|
|
||||||
|
|
||||||
* Tue Sep 20 2016 Antonio Trande <sagitter@fedoraproject.org> - 1:9.3-1
|
|
||||||
- Update to 9.3
|
|
||||||
|
|
||||||
* Sun Aug 28 2016 Antonio Trande <sagitter@fedoraproject.org> - 1:9.2-1
|
|
||||||
- Update to 9.2
|
|
||||||
|
|
||||||
* Sun Jul 31 2016 Antonio Trande <sagitter@fedoraproject.org> - 1:9.1-1
|
|
||||||
- Update to 9.1
|
|
||||||
|
|
||||||
* Tue Jul 19 2016 Antonio Trande <sagitter@fedoraproject.org> - 1:9.0-2
|
|
||||||
- Fix appdata file's tags
|
|
||||||
|
|
||||||
* Tue Jul 19 2016 Antonio Trande <sagitter@fedoraproject.org> - 1:9.0-1
|
|
||||||
- Update to 9.0
|
|
||||||
|
|
||||||
* Thu Jun 09 2016 Antonio Trande <sagitter@fedoraproject.org> - 1:8.2-1
|
|
||||||
- Update to 8.2
|
|
||||||
|
|
||||||
* Tue May 31 2016 Antonio Trande <sagitter@fedoraproject.org> - 1:8.1-1
|
|
||||||
- Update to 8.1
|
|
||||||
|
|
||||||
* Mon Apr 25 2016 Antonio Trande <sagitter@fedoraproject.org> - 1:7.2-1
|
|
||||||
- Update to 7.2
|
|
||||||
|
|
||||||
* Thu Mar 24 2016 Antonio Trande <sagitter@fedoraproject.org> - 1:7.1-1
|
|
||||||
- Update to 7.1
|
|
||||||
|
|
||||||
* Sun Mar 06 2016 Antonio Trande <sagitter@fedoraproject.org> - 1:7.0-2
|
|
||||||
- Update of appdata file
|
|
||||||
|
|
||||||
* Sun Mar 06 2016 Antonio Trande <sagitter@fedoraproject.org> - 1:7.0-1
|
|
||||||
- Update to 7.0
|
|
||||||
|
|
||||||
* Thu Feb 04 2016 Antonio Trande <sagitter@fedoraproject.org> - 1:6.2-4.20160204gitb6ad5b
|
* Thu Feb 04 2016 Antonio Trande <sagitter@fedoraproject.org> - 1:6.2-4.20160204gitb6ad5b
|
||||||
- Update to commit #b6ad5b
|
- Update to commit #b6ad5b
|
||||||
|
|
||||||
|
|||||||
23
engauge-digitizer_fix_test_script.patch
Normal file
23
engauge-digitizer_fix_test_script.patch
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
--- 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 ]
|
||||||
|
|
||||||
Loading…
Reference in New Issue
Block a user