diff --git a/.gitignore b/.gitignore index bbd92e1..3c82a5f 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,11 @@ /xournalpp-1.2.7.tar.gz /xournalpp-1.2.8.tar.gz /xournalpp-1.2.10.tar.gz +/xournalpp-1.3.0.tar.gz +/xournalpp-1.3.1.tar.gz +/xournalpp-1.3.2.tar.gz +/xournalpp-1.3.3.tar.gz +/xournalpp-1.3.4.tar.gz +/xournalpp-1.3.5.tar.gz +/xournalpp-1.3.6.tar.gz +/xournalpp-1.3.7.tar.gz diff --git a/sources b/sources index 21be706..8ad1f7c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xournalpp-1.2.10.tar.gz) = 1bdbbc53b31e295ced095667dfb1935c624ec967d2aaa29ccf244f9e0a661bc5397a5bc66365e8d250071c0393695b404616ceee68438c2cb282ffb6a895ff02 +SHA512 (xournalpp-1.3.7.tar.gz) = 119f11d9a6a22c616b104b559a56fa960047a898e016c22987d44fadcae5659896f7d7ecb110b86bd3bce8d5bdfb5b78849233e96bfa3905b6c750ce80ea3c5d diff --git a/xournalpp.spec b/xournalpp.spec index 5ea54ea..c2389af 100644 --- a/xournalpp.spec +++ b/xournalpp.spec @@ -1,11 +1,18 @@ %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 +%bcond qpdf 0 +%else %bcond qpdf 1 +%endif + %global forgeurl https://github.com/xournalpp/xournalpp Name: xournalpp -Version: 1.2.10 +Version: 1.3.7 Release: %autorelease Summary: Handwriting note-taking software with PDF annotation support License: GPL-2.0-or-later @@ -18,8 +25,10 @@ BuildRequires: desktop-file-utils BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: gettext +BuildRequires: git BuildRequires: help2man BuildRequires: libappstream-glib +BuildRequires: ninja-build %if %{with cppunit} BuildRequires: pkgconfig(cppunit) >= 1.12 @@ -73,9 +82,11 @@ This package contains user interface resources for %{name}. %build %cmake \ + -DCMAKE_BUILD_TYPE="Release" \ -DDISTRO_CODENAME="Fedora Linux" \ -DENABLE_GTEST=%{with gtest} \ - -DENABLE_PROFILING=%{with profiling} + -DENABLE_PROFILING=%{with profiling} \ + -DENABLE_QPDF=%{with qpdf} %cmake_build @@ -83,6 +94,17 @@ This package contains user interface resources for %{name}. %cmake_install %find_lang %{name} +# Generate and install man pages. +install -d '%{buildroot}%{_mandir}/man1' +for cmd in %{buildroot}%{_bindir}/* +do + LD_LIBRARY_PATH='%{buildroot}%{_libdir}' \ + help2man \ + --no-info --no-discard-stderr --version-string='%{version}' \ + --output="%{buildroot}%{_mandir}/man1/$(basename "${cmd}").1" \ + "${cmd}" +done + # Remove unnecessary scripts and duplicate files find %{buildroot} -name "*.sh" -delete %fdupes %{buildroot} @@ -94,24 +116,25 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/com.github.%{n %files -f %{name}.lang %license LICENSE %doc README.md AUTHORS -%{_bindir}/%{name} -%{_bindir}/%{name}-thumbnailer +%{_bindir}/%{name}{,-thumbnailer,-wrapper} %{_datadir}/applications/com.github.%{name}.%{name}.desktop %{_datadir}/icons/hicolor/scalable/apps/com.github.%{name}.%{name}.svg %{_datadir}/icons/hicolor/scalable/mimetypes/* %{_datadir}/mime/packages/com.github.%{name}.%{name}.xml %{_datadir}/thumbnailers/com.github.%{name}.%{name}.thumbnailer %dir %{_datadir}/%{name} +%{_datadir}/%{name}/palettes/*.gpl %{_datadir}/%{name}/resources/*_template.tex %{_mandir}/man1/%{name}*.gz %{_metainfodir}/com.github.%{name}.%{name}.appdata.xml %files plugins +%doc README.md %{_datadir}/%{name}/plugins %files ui +%doc README.md %{_datadir}/%{name}/ui %changelog %autochangelog -