Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

.gitignore

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

engauge-digitizer-fix_path_variables.patch

@@ -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 \
+

engauge-digitizer.spec

@@ -1,44 +1,33 @@
-%if 0%{?rhel} < 7
-%{!?__global_ldflags: %global __global_ldflags -Wl,-z,relro}
-%endif
-
 Name:    engauge-digitizer
 Summary: Convert graphs or map files into numbers
-Version: 10.7
+Version: 12.1
-Release: 1%{?dist}
+Release: 10%{?dist}
 License: GPLv2+
 URL:     http://markummitchell.github.io/%{name}/
-Source0: https://github.com/markummitchell/engauge-digitizer/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
+Source0: https://github.com/markummitchell/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz
 Epoch: 1
 
-##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
 Source1: %{name}.appdata.xml
 Source2: %{name}.svg
 Source3: %{name}-with-name.svg
 
+## Fix variables for using correctly pkgconfig
+Patch0: %{name}-fix_path_variables.patch
+
 ## Main building
 BuildRequires: gcc, gcc-c++
-BuildRequires: qt5-qtbase-devel, qt5-qttools-devel
 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}
 BuildRequires: libappstream-glib
 BuildRequires: openjpeg2-devel
+BuildRequires: poppler-qt5-devel
 %endif
 
-Requires: qgnomeplatform%{?_isa}
-
 %description
 The Engauge Digitizer tool accepts image files
 (like PNG, JPEG and TIFF) containing graphs,
@@ -54,27 +43,36 @@ Work can be saved into an Engauge DIG file.
 
 New features already added to Engauge:
 
--  Grid lines are displayed for fine adjustments of the axis points that define the coordinate systems
+-  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
+-  Undo/redo of all operations means recovering from mistakes and experimenting
--  Installers for Windows and OSX operating systems, and repository packages for Linux make installation easy
+   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
+-  Wizard creates a checklist guide to interactively leads user through steps from
--  Cubic spline interpolation between points gives more accurate curves with fewer points
+   file import to file export
--  Axes Checker briefly highlights the axes when they are defined or modified, to reveal entry mistakes
+-  Cubic spline interpolation between points gives more accurate curves with
--  Graph coordinates can be specified as date and time values, or as degrees, minutes and seconds
+   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
+-  Test suite for regression testing minimizes code breakage as
--  Multiple coordinate systems in the same image can be digitized in advanced mode
+   new features are added
--  Axes with only one known coordinate (floating axes) can be digitized in advanced mode
+-  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
 
 
 %package samples
 Summary: Sample files for %{name}
-Group:   Applications/Engineering
 BuildArch: noarch
 %description samples
 This package contains several sample image files that may be imported into
@@ -100,14 +98,15 @@ These files are listed below, with comments:
  - 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"
+   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,
+ - 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.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
  - testcoords.jpg - Advanced graph used by developers to check the affine
    transformations in Engauge
@@ -118,52 +117,57 @@ These files are listed below, with comments:
 
 %package doc
 Summary: HTML documentation of %{name}
-Group:   Applications/Engineering
 BuildArch: noarch
+BuildRequires: texlive-epstopdf, ghostscript
+BuildRequires: doxygen
+BuildRequires: make
 %description doc
 HTML documentation of %{name}.
 
 %prep
-%setup -q -n %{name}-%{version}
+%autosetup -p0 -n %{name}-%{version}
 
-##Active support to jpeg2000
+## Remove default -O1 optimization
-##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
 
-##Remove spurious executable permissions
+## Set fftw library link-path
-for i in `find src -type f \( -name "*.cpp" -o -name "*.h" \)`; do
+sed -e 's|-L/$$(FFTW_HOME)/lib|-L$$(FFTW_HOME)/%{_libdir}|g' -i engauge.pro
-chmod a-x $i
+
-done
+## 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
+find . -type f -name "*.h" -exec chmod 0644 '{}' \;
+find . -type f -name "*.cpp" -exec chmod 0644 '{}' \;
 
 %build
-%if 0%{?fedora}
-export JPEG2000_INCLUDE=%{_includedir}/openjpeg-2.1
-export JPEG2000_LIB=%{_libdir}
-%endif
 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_CXXFLAGS_RELEASE="$RPM_OPT_FLAGS -pie -Wl,-z,now" \
  QMAKE_LFLAGS="$RPM_LD_FLAGS -pie -Wl,-z,now" \
  DEFINES+=HELPDIR=%{_datadir}/doc/%{name}/help
 %make_build
 
-##Build HELP files
+## Build HELP files
 pushd help
 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
 
-##Build HTML/Latex documentation files
+## Build HTML/Latex documentation files
 pushd src
 doxygen
 popd
@@ -173,7 +177,7 @@ mkdir -p %{buildroot}%{_datadir}/%{name}-%{version}/samples
 mkdir -p %{buildroot}%{_datadir}/%{name}-%{version}/img
 mkdir -p %{buildroot}%{_datadir}/applications
 mkdir -p %{buildroot}%{_datadir}/pixmaps
-mkdir -p %{buildroot}%{_datadir}/metainfo
+mkdir -p %{buildroot}%{_metainfodir}
 mkdir -p %{buildroot}%{_bindir}
 
 install -p -m 755 bin/engauge %{buildroot}%{_bindir}
@@ -186,10 +190,10 @@ install -p -m 644 src/img/* %{buildroot}%{_datadir}/%{name}-%{version}/img
 install -p -m 644 %{SOURCE2} %{buildroot}%{_datadir}/pixmaps/
 install -p -m 644 %{SOURCE3} %{buildroot}%{_datadir}/pixmaps/
 %if 0%{?fedora}
-install -p -m 644 %{SOURCE1} %{buildroot}%{_datadir}/metainfo/
+install -p -m 644 %{SOURCE1} %{buildroot}%{_metainfodir}/
 %endif
 
-##Make a .desktop file
+## Make a .desktop file
 mkdir -p %{buildroot}%{_datadir}/applications
 cat > %{buildroot}%{_datadir}/applications/%{name}.desktop <<EOF
 [Desktop Entry]
@@ -224,7 +228,7 @@ sed -e \
 appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata.xml
 %endif
 
-%if 0%{?rhel}
+%if 0%{?rhel} && 0%{?rhel} <= 7
 %post
 /usr/bin/update-desktop-database &> /dev/null || :
 
@@ -233,12 +237,12 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata
 %endif
 
 %files
-%doc README.md help bin/documentation/engauge.qhc bin/documentation/engauge.qch
+%doc README.md help
 %license LICENSE
 %{_bindir}/engauge
 %{_datadir}/pixmaps/%{name}*.svg
 %if 0%{?fedora}
-%{_datadir}/metainfo/*.appdata.xml
+%{_metainfodir}/*.appdata.xml
 %endif
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/%{name}-%{version}/
@@ -255,6 +259,66 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata
 %license LICENSE
 
 %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
 

sources

@@ -1 +1 @@
-SHA512 (engauge-digitizer-10.7.tar.gz) = f9760212572e8b466b52eee82937e8da44ea54b62e4fa011aaedbacb310f39eeec31fbd54bd7b6fefd3885b1ccc5aa89dc41fd6fd6c0360fbc69914942b7bb21
+SHA512 (engauge-digitizer-12.1.tar.gz) = 54ae573eb1e82ec3a81403c3c64af43207e139a2d97eb633993ffe31e03fedb1c1a5fe63157011851ad4a89822a3109b87a2c90a71f77865b3629a517a353a61