Compare commits

...

53 Commits
f22 ... rawhide

Author SHA1 Message Date
Fedora Release Engineering
3b7541f408 Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-07-21 02:04:07 +00:00
Sandro Mani
40551cc365 Rebuild for gdal-3.5.0 and/or openjpeg-2.5.0 2022-05-21 00:11:21 +02:00
Fedora Release Engineering
3de600f939 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-01-20 02:00:37 +00:00
Fedora Release Engineering
c4fe000360 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-07-21 22:00:49 +00:00
Fedora Release Engineering
97f3427e11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-01-26 04:37:24 +00:00
Tom Stellard
55b11d94cd Add BuildRequires: make
https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot
2020-12-17 05:06:12 +00:00
Fedora Release Engineering
1647fa7cb6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-07-27 16:34:32 +00:00
sagitter
825eb46a21 Drop bogus runtime dependency (rhbz#1797268) 2020-02-02 10:16:17 +01:00
Fedora Release Engineering
e6f0895bc7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-01-28 17:20:56 +00:00
Marek Kasik
50c4f7f6fa Rebuild for poppler-0.84.0 2020-01-17 12:30:03 +01:00
sagitter
73a9dfc020 Release 12.1 2019-11-30 18:42:47 +01:00
sagitter
f1ca767e1c SPEC file enhancements 2019-08-24 14:36:25 +02:00
sagitter
60b8361695 Release 12.0 2019-08-23 19:50:59 +02:00
Fedora Release Engineering
b210960b07 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-07-24 23:30:36 +00:00
sagitter
91e8e5a0aa Release 11.3 2019-07-20 19:24:21 +02:00
sagitter
338a760444 Release 11.2 2019-05-02 20:12:36 +02:00
sagitter
4059231a6f Release 10.12 2019-03-07 12:10:20 +01:00
Fedora Release Engineering
6c6c83e833 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-01-31 18:40:46 +00:00
Igor Gnatenko
8ec4d2ad6b Remove obsolete scriptlets
References: https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2019-01-29 06:15:45 +01:00
Igor Gnatenko
86fc826246 Remove obsolete Group tag
References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag
2019-01-28 20:24:01 +01:00
sagitter
3623e4c86a Update to 10.11 2018-10-28 12:16:58 +01:00
sagitter
e89dbe27bc Fix variables for using correctly pkgconfig 2018-08-18 11:19:19 +02:00
sagitter
d9f01cd025 Update to 10.9 2018-08-17 21:23:19 +02:00
Fedora Release Engineering
1202b9bec1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-07-12 23:53:22 +00:00
sagitter
35638396c3 Update to 10.7 2018-07-04 18:33:53 +02:00
sagitter
b4f53235b1 Update to 10.6 2018-05-05 23:44:57 +02:00
sagitter
9d2d9cbcda Add gcc gcc-c++ BR 2018-02-22 17:38:54 +01:00
Fedora Release Engineering
4bd9438204 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-02-07 08:30:05 +00:00
sagitter
62c0fafa8b Appdata file moved into metainfo data directory 2017-12-21 19:25:07 +01:00
sagitter
e82d504c2e Update to 10.4 2017-10-21 13:05:03 +02:00
sagitter
79da84757b Update to 10.2 2017-08-21 11:38:08 +02:00
Fedora Release Engineering
6f9a2b2780 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild 2017-08-02 20:03:44 +00:00
Fedora Release Engineering
99a078e6e1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild 2017-07-26 07:27:28 +00:00
sagitter
991946bebc Update to 10.1 2017-07-20 11:34:51 +02:00
Fedora Release Engineering
f775f0431b - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild 2017-05-15 20:14:39 +00:00
sagitter
f3533f2aa4 Update to 10.0 2017-04-03 12:25:40 +02:00
Fedora Release Engineering
a5438cb010 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild 2017-02-10 09:12:48 +00:00
sagitter
1e24238345 Conformed to new rules for scriptlets 2017-01-05 20:56:23 +01:00
sagitter
87e9afb2fd Update to 9.8 2016-12-11 11:31:51 +01:00
sagitter
0b4c0b0920 Update to 9.7 2016-12-01 15:27:27 +01:00
sagitter
742e923610 Update to 9.6 2016-11-22 11:48:33 +01:00
sagitter
c3769b66dc Update to 9.5 2016-10-10 11:56:40 +02:00
sagitter
c66e8648e6 Update to 9.4 2016-10-01 19:49:25 +02:00
sagitter
942c45e589 Update to 9.3 2016-09-20 21:16:46 +02:00
sagitter
0cddf0d041 Update to 9.2 2016-08-28 11:26:51 +02:00
sagitter
c765533798 Update to 9.1 2016-07-31 11:38:05 +02:00
sagitter
27061ba811 Update to 9.0 2016-07-19 12:13:57 +02:00
sagitter
307cd2c388 Update to 8.2 2016-06-09 20:41:57 +02:00
sagitter
62ada1d390 Update to 8.1 2016-05-31 11:40:09 +02:00
sagitter
1d5331a8ed Update to 7.2 2016-04-25 12:36:26 +02:00
sagitter
6041425589 Update to 7.1 2016-03-24 14:22:51 +01:00
sagitter
9fdd0cd0f6 Update of appdata file 2016-03-06 17:19:15 +01:00
sagitter
7d2914d540 Update to 7.0 2016-03-06 14:07:17 +01:00
6 changed files with 395 additions and 216 deletions

27
.gitignore vendored
View File

@ -7,3 +7,30 @@
/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

View File

@ -0,0 +1,48 @@
--- 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 \

View File

@ -1,56 +1,55 @@
<?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> -->
<application> <component type="desktop">
<id type="desktop">engauge-digitizer.desktop</id> <id>engauge-digitizer.desktop</id>
<metadata_license>CC0</metadata_license> <metadata_license>CC0-1.0</metadata_license>
<project_license>GPL-2.0+</project_license> <project_license>GPL-2.0+</project_license>
<name>Engauge Digitizer 6</name> <name>Engauge Digitizer 10</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>
Engauge6 is rewritten with Qt5. The Engauge Digitizer tool accepts image files
This digitizing software converts an image file (like PNG, JPEG and TIFF) containing graphs,
showing a graph or map, into numbers. and recovers the data points from those graphs.
The image file can come from a scanner, digital camera The resulting data points are usually used as input
or screen-shot. The numbers can be read on the screen, to other software applications.
and written or copied to a spreadsheet. Conceptually, Engauge Digitizer is the opposite of
The process starts with an image file containing a graph or map. a graphing tool that converts data points to graphs.
The final result is digitized data that can be used by other tools The process is shown below - an image file is imported,
such as Gnumeric. digitized within Engauge, and exported as a table of
numeric data to a text file.
Work can be saved into an Engauge DIG file.
</p> </p>
<p> <p>
New features already added to Engauge6: New features already added to Engauge:
</p> </p>
<p> <p>
- Older Engauge files (before version 6) can be loaded - Grid lines are displayed for fine adjustments of the axis points that define the coordinate systems
- Undo/redo of all operations means recovering from mistakes and experimenting - Automated line and point extraction rapidly digitizes data
with options is painless - 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 provides an interactive tutorial to explain the basic steps
- Wizard creates a checklist guide to interactively leads user through steps - Wizard creates a checklist guide to interactively leads user through steps from file import to file export
from file import to file export - Cubic spline interpolation between points gives more accurate curves with fewer points
- Cubic spline interpolation between points gives more accurate curves with - Axes Checker briefly highlights the axes when they are defined or modified, to reveal entry mistakes
fewer points - Graph coordinates can be specified as date and time values, or as degrees, minutes and seconds
- Axes Checker briefly highlights the axes when they are defined or modified, - File import and data export by drag-and-drop and copy/paste
to reveal entry mistakes - Test suite for regression testing minimizes code breakage as new features are added
- Graph coordinates can be specified as date and time value, or as degrees, - Multiple coordinate systems in the same image can be digitized in advanced mode
minutes and seconds - Axes with only one known coordinate (floating axes) can be digitized in advanced mode
- All settings dialogs are resizable so they can be enlarged as necessary to - Geometry Window displays geometric information about the selected curve
display more information - Curve Fitting Window fits a polynomial function to the selected curve
- 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
</p> </p>
</description> </description>
<screenshots> <screenshots>
<screenshot type="default">https://sagitter.fedorapeople.org/engauge-screenshots/engauge-screenshot-map-points.png</screenshot> <screenshot type="default">
<screenshot>https://sagitter.fedorapeople.org/engauge-screenshots/engauge-screenshot-points-save-as.png</screenshot> <image>https://sagitter.fedorapeople.org/engauge-screenshots/engauge-screenshot1.png</image>
</screenshot>
<screenshot>
<image>https://sagitter.fedorapeople.org/engauge-screenshots/engauge-screenshot2.png</image>
</screenshot>
</screenshots> </screenshots>
<url type="homepage">http://digitizer.sourceforge.net/</url> <url type="homepage">https://github.com/markummitchell/engauge-digitizer</url>
<updatecontact>zbyszek@in.waw.pl</updatecontact> <updatecontact>sagitter_at_fedoraproject.org</updatecontact>
</application> </component>

View File

@ -1,97 +1,78 @@
%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: 6.2 Version: 12.1
Release: 4.%{date}git%(echo %{checkout} | cut -c-6)%{?dist} Release: 10%{?dist}
Group: Applications/Engineering
License: GPLv2+ License: GPLv2+
URL: https://github.com/markummitchell/engauge6 URL: http://markummitchell.github.io/%{name}/
Source0: https://github.com/markummitchell/engauge6/archive/%{checkout}.zip#/engauge6-%{checkout}.zip Source0: https://github.com/markummitchell/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz
##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: qt5-qtbase-devel, qt5-qttools-devel BuildRequires: gcc, gcc-c++
BuildRequires: fftw-devel, log4cpp-devel, desktop-file-utils BuildRequires: fftw-devel, log4cpp-devel, desktop-file-utils
BuildRequires: qt5-qtbase-devel, qt5-qttools-devel
##Xvfb is needed to run a virtual X server used by tests %{?fedora:BuildRequires: pkgconf-pkg-config}
BuildRequires: xorg-x11-server-Xvfb %{?rhel:BuildRequires: pkgconfig}
##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
Engauge6 is rewritten with Qt5. The Engauge Digitizer tool accepts image files
This digitizing software converts an image file (like PNG, JPEG and TIFF) containing graphs,
showing a graph or map, into numbers. and recovers the data points from those graphs.
The image file can come from a scanner, digital camera The resulting data points are usually used as input
or screen-shot. The numbers can be read on the screen, to other software applications.
and written or copied to a spreadsheet. Conceptually, Engauge Digitizer is the opposite of
The process starts with an image file containing a graph or map. a graphing tool that converts data points to graphs.
The final result is digitized data that can be used by other tools The process is shown below - an image file is imported,
such as Gnumeric. digitized within Engauge, and exported as a table of
numeric data to a text file.
Work can be saved into an Engauge DIG file.
New features already added to Engauge6: New features already added to Engauge:
- Older Engauge files (before version 6) can be loaded - 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 - Undo/redo of all operations means recovering from mistakes and experimenting
with options is painless 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 provides an interactive tutorial to explain the basic steps
- Wizard creates a checklist guide to interactively leads user through steps - Wizard creates a checklist guide to interactively leads user through steps from
from file import to file export 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, - Axes Checker briefly highlights the axes when they are defined or modified,
to reveal entry mistakes to reveal entry mistakes
- Graph coordinates can be specified as date and time value, or as degrees, - Graph coordinates can be specified as date and time values, or as degrees,
minutes and seconds minutes and seconds
- All settings dialogs are resizable so they can be enlarged as necessary to - File import and data export by drag-and-drop and copy/paste
display more information - Test suite for regression testing minimizes code breakage as
- Import by drag-and-drop new features are added
- Replacement of Qt3 (which is at its end of life) by Qt5 - Multiple coordinate systems in the same image can be digitized in
- Much better zooming, with a fill mode that automatically zooms in on image advanced mode
features, and rezooms when the application window is resized - Axes with only one known coordinate (floating axes) can be digitized in
- Color picking straight from the original image advanced mode
- Uploadable error report generated when a programming error is encountered, - Geometry Window displays geometric information about the selected curve
for identifying problems and improving user support - Curve Fitting Window fits a polynomial function to the selected curve
- 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
@ -117,14 +98,15 @@ These files are listed below, with comments:
- 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 "Intensity 90 to 99" 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 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
@ -135,54 +117,54 @@ These files are listed below, with comments:
%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
%setup -q -n engauge6-%{checkout} %autosetup -p0 -n %{name}-%{version}
##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 ## 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
sed -e 's|-L/$$(FFTW_HOME)/lib|-L$$(FFTW_HOME)/%{_libdir}|g' -i engauge.pro
## Remove post-link task
sed --in-place '/QMAKE_POST_LINK/d' engauge.pro
## Remove rpath link
sed --in-place '/QMAKE_LFLAGS/d' engauge.pro
## Remove spurious executable permissions ## Remove spurious executable permissions
for i in `find src -type f \( -name "*.cpp" -o -name "*.h" \)`; do find . -type f -name "*.h" -exec chmod 0644 '{}' \;
chmod a-x $i find . -type f -name "*.cpp" -exec chmod 0644 '{}' \;
done
%build %build
%if 0%{?fedora}
export JPEG2000_INCLUDE=%{_includedir}/openjpeg-2.1
export JPEG2000_LIB=%{_libdir}
%endif
export ENGAUGE_RELEASE=1 export ENGAUGE_RELEASE=1
## Flags set by hand for EPEL6 %if 0%{?fedora}
%{qmake_qt5} engauge.pro \ export OPENJPEG_INCLUDE=`pkg-config --cflags libopenjp2 | sed 's/-I//'`
export OPENJPEG_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
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 %{?_smp_mflags} %make_build
## Build HELP files ## Build HELP files
pushd help pushd help
qcollectiongenerator-qt5 engauge.qhcp -o engauge.qhc qcollectiongenerator-qt5 engauge.qhcp -o engauge.qhc
mv engauge.qch ../bin/documentation rm -f build build.*
mv engauge.qhc ../bin/documentation rm -rf .gitignore
rm -f build
popd popd
## Build HTML/Latex documentation files ## Build HTML/Latex documentation files
@ -195,7 +177,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}%{_datadir}/appdata mkdir -p %{buildroot}%{_metainfodir}
mkdir -p %{buildroot}%{_bindir} mkdir -p %{buildroot}%{_bindir}
install -p -m 755 bin/engauge %{buildroot}%{_bindir} install -p -m 755 bin/engauge %{buildroot}%{_bindir}
@ -205,10 +187,10 @@ 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}%{_datadir}/appdata install -p -m 644 %{SOURCE1} %{buildroot}%{_metainfodir}/
%endif %endif
## Make a .desktop file ## Make a .desktop file
@ -221,7 +203,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
@ -243,45 +225,191 @@ sed -e \
%check %check
%if 0%{?fedora} %if 0%{?fedora}
appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*.appdata.xml appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata.xml
%endif %endif
##Tests %if 0%{?rhel} && 0%{?rhel} <= 7
#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
%{!?_licensedir:%global license %doc} %doc README.md help
%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}
%{_datadir}/appdata/*.appdata.xml %{_metainfodir}/*.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

View File

@ -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 ]

View File

@ -1 +1 @@
3882357aa4ff1f347f85bea09b7f1482 engauge6-b6ad5b0cd3be30c52f17bf8917fe39fb28a60549.zip SHA512 (engauge-digitizer-12.1.tar.gz) = 54ae573eb1e82ec3a81403c3c64af43207e139a2d97eb633993ffe31e03fedb1c1a5fe63157011851ad4a89822a3109b87a2c90a71f77865b3629a517a353a61