Update to upstream 1.3.7

Resolves: rhbz#2512924

xournalpp.spec

@@ -1,12 +1,12 @@
-%global cppunit  1
-%global gtest 1
-%global profiling 1
+%bcond cppunit  1
+%bcond gtest 1
+%bcond profiling 1
 
 # qpdf is not available with the required version on RHEL ≤ 9
 %if 0%{?rhel} && 0%{?rhel} <= 9
-%global qpdf 0
+%bcond qpdf 0
 %else
-%global qpdf 1
+%bcond qpdf 1
 %endif
 
 %global forgeurl https://github.com/xournalpp/xournalpp
@@ -15,12 +15,11 @@ Name:           xournalpp
 Version:        1.3.7
 Release:        %autorelease
 Summary:        Handwriting note-taking software with PDF annotation support
-License:	GPL-2.0-or-later
+License:        GPL-2.0-or-later
 %forgemeta
 URL:            %{forgeurl}
 Source:         %{forgesource}
 
-
 BuildRequires:  cmake >= 3.10
 BuildRequires:  desktop-file-utils
 BuildRequires:  fdupes
@@ -29,66 +28,70 @@ BuildRequires:  gettext
 BuildRequires:  git
 BuildRequires:  help2man
 BuildRequires:  libappstream-glib
+BuildRequires:  ninja-build
+
 %if %{with cppunit}
 BuildRequires:  pkgconfig(cppunit) >= 1.12
 %endif
-BuildRequires:  pkgconfig(glib-2.0) >= 2.32.0
-%if 0%{?gtest}
+BuildRequires:  pkgconfig(glib-2.0) >= 2.32
+%if %{with gtest}
 BuildRequires:  pkgconfig(gtest)
 %endif
 BuildRequires:  pkgconfig(gtk+-3.0) >= 3.19.9
 BuildRequires:  pkgconfig(gtksourceview-4) >= 4.0.0
 BuildRequires:  pkgconfig(librsvg-2.0)
-%if 0%{?profiling}
+%if %{with profiling}
 BuildRequires:  pkgconfig(libprofiler) >= 2.5
 BuildRequires:  pkgconfig(libtcmalloc) >= 2.5
 %endif
-BuildRequires:  pkgconfig(libxml-2.0) >= 2.0.0
+%if %{with qpdf}
+BuildRequires:  pkgconfig(libqpdf) >= 10.6.0
+%endif
+BuildRequires:  pkgconfig(libxml-2.0) >= 2.0
 BuildRequires:  pkgconfig(libzip) >= 1.0.1
 BuildRequires:  pkgconfig(lua) >= 5.3
-BuildRequires:  pkgconfig(poppler-glib) >= 0.41.0
+BuildRequires:  pkgconfig(poppler-glib) >= 0.41
 BuildRequires:  pkgconfig(portaudiocpp) >= 12
 BuildRequires:  pkgconfig(sndfile) >= 1.0.25
+
 Recommends:     texlive-latex-bin
 Requires:       hicolor-icon-theme
 Requires:       %{name}-plugins = %{version}-%{release}
 Requires:       %{name}-ui = %{version}-%{release}
 
 %description
-Xournal++ is a handwriting note-taking software with PDF annotation support.
-Supports Pen input like Wacom Tablets
+Xournal++ is a handwriting note-taking application with PDF annotation support.
+It is optimized for pen input such as Wacom tablets.
 
-%package	plugins
-Summary:        Default plugin for %{name}
+%package plugins
+Summary:        Default plugins for %{name}
 BuildArch:      noarch
 
-%description	plugins
-The %{name}-plugins package contains sample plugins for  %{name}.
+%description plugins
+This package contains sample plugins for %{name}.
 
-%package	ui
-Summary:        User interface for %{name}
+%package ui
+Summary:        User interface files for %{name}
 BuildArch:      noarch
 
-%description	ui
-The %{name}-ui package contains a graphical user interface for  %{name}.
-
+%description ui
+This package contains user interface resources for %{name}.
 
 %prep
-%forgeautosetup
+%forgeautosetup -p1
 
 %build
 %cmake \
     -DCMAKE_BUILD_TYPE="Release" \
     -DDISTRO_CODENAME="Fedora Linux" \
-    -DENABLE_GTEST=%{gtest} \
-    -DENABLE_QPDF=%{qpdf} \
-    -DENABLE_PROFILING=%{profiling}
+    -DENABLE_GTEST=%{with gtest} \
+    -DENABLE_PROFILING=%{with profiling} \
+    -DENABLE_QPDF=%{with qpdf}
 
 %cmake_build
 
 %install
 %cmake_install
-
 %find_lang %{name}
 
 # Generate and install man pages.