diff --git a/.gitignore b/.gitignore index 1a17cf5..3c82a5f 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,23 @@ /xournalpp-1.0.20.tar.gz /xournalpp-1.1.0.tar.gz /xournalpp-1.1.1.tar.gz +/xournalpp-1.1.2.tar.gz +/xournalpp-1.1.3.tar.gz +/xournalpp-1.2.0.tar.gz +/xournalpp-1.2.1.tar.gz +/xournalpp-1.2.2.tar.gz +/xournalpp-1.2.3.tar.gz +/xournalpp-1.2.4.tar.gz +/xournalpp-1.2.5.tar.gz +/xournalpp-1.2.6.tar.gz +/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 1290dc9..8ad1f7c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xournalpp-1.1.1.tar.gz) = efba97d26f624e3a1b8164ef6333a0f1d2992d0245414bdb51692d845965f6c37071f687520b43a94f713465796a16cbafd8929fd3bf8e6c3face847df92251d +SHA512 (xournalpp-1.3.7.tar.gz) = 119f11d9a6a22c616b104b559a56fa960047a898e016c22987d44fadcae5659896f7d7ecb110b86bd3bce8d5bdfb5b78849233e96bfa3905b6c750ce80ea3c5d diff --git a/xournalpp.spec b/xournalpp.spec index 78f3d06..b2284fd 100644 --- a/xournalpp.spec +++ b/xournalpp.spec @@ -1,35 +1,55 @@ -%global __cmake_in_source_build 0 -%global _with_cppunit 1 +%global cppunit 1 +%global gtest 1 +%global profiling 1 + +# qpdf is not available with the required version on RHEL ≤ 9 +%if 0%{?rhel} && 0%{?rhel} <= 9 +%global qpdf 0 +%else +%global qpdf 1 +%endif + +%global forgeurl https://github.com/xournalpp/xournalpp Name: xournalpp -Version: 1.1.1 +Version: 1.3.7 Release: %autorelease -Summary: Handwriting note-taking software +Summary: Handwriting note-taking software with PDF annotation support +License: GPL-2.0-or-later +%forgemeta +URL: %{forgeurl} +Source: %{forgesource} -License: GPLv2+ -URL: https://github.com/%{name}/%{name} -Source: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz BuildRequires: cmake >= 3.10 BuildRequires: desktop-file-utils BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: gettext +BuildRequires: git +BuildRequires: help2man BuildRequires: libappstream-glib - -%{?_with_cppunit: -BuildRequires: pkgconfig(cppunit) >= 1.12-0 -} -BuildRequires: pkgconfig(glib-2.0) -BuildRequires: pkgconfig(gtk+-3.0) +%if %{with cppunit} +BuildRequires: pkgconfig(cppunit) >= 1.12 +%endif +BuildRequires: pkgconfig(glib-2.0) >= 2.32.0 +%if 0%{?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) -BuildRequires: pkgconfig(libxml-2.0) -BuildRequires: pkgconfig(libzip) -BuildRequires: pkgconfig(lua) -BuildRequires: pkgconfig(poppler-glib) +%if 0%{?profiling} +BuildRequires: pkgconfig(libprofiler) >= 2.5 +BuildRequires: pkgconfig(libtcmalloc) >= 2.5 +%endif +BuildRequires: pkgconfig(libxml-2.0) >= 2.0.0 +BuildRequires: pkgconfig(libzip) >= 1.0.1 +BuildRequires: pkgconfig(lua) >= 5.3 +BuildRequires: pkgconfig(poppler-glib) >= 0.41.0 BuildRequires: pkgconfig(portaudiocpp) >= 12 -BuildRequires: pkgconfig(sndfile) -BuildRequires: tex-latex-bin +BuildRequires: pkgconfig(sndfile) >= 1.0.25 +Recommends: texlive-latex-bin Requires: hicolor-icon-theme Requires: %{name}-plugins = %{version}-%{release} Requires: %{name}-ui = %{version}-%{release} @@ -54,32 +74,37 @@ The %{name}-ui package contains a graphical user interface for %{name}. %prep -%autosetup +%forgeautosetup %build %cmake \ - %{?_with_cppunit: -DENABLE_CPPUNIT=ON} \ - -DENABLE_MATHTEX=ON \ - -DMAC_INTEGRATION=OFF + -DCMAKE_BUILD_TYPE="Release" \ + -DDISTRO_CODENAME="Fedora Linux" \ + -DENABLE_GTEST=%{gtest} \ + -DENABLE_QPDF=%{qpdf} \ + -DENABLE_PROFILING=%{profiling} %cmake_build %install %cmake_install -#Remove depreciated key from desktop file -#Fix desktop file associated with application -desktop-file-install \ - --remove-key="Encoding" \ - --set-key="StartupWMClass" \ - --set-value="xournalpp" \ - %{buildroot}%{_datadir}/applications/com.github.%{name}.%{name}.desktop %find_lang %{name} -# REMOVE UNNECESSARY SCRIPTS -find %{buildroot}%{_datadir}/%{name} -name update-icon-cache.sh -delete -print +# 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 -%fdupes %{buildroot}%{_datadir} +# Remove unnecessary scripts and duplicate files +find %{buildroot} -name "*.sh" -delete +%fdupes %{buildroot} %check desktop-file-validate %{buildroot}%{_datadir}/applications/com.github.%{name}.%{name}.desktop @@ -88,114 +113,25 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/com.github.%{n %files -f %{name}.lang %license LICENSE %doc README.md AUTHORS -%{_bindir}/%{name}-thumbnailer -%{_bindir}/%{name} +%{_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 -%exclude %{_datadir}/mimelnk/application/* %{_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 -* Tue Mar 15 2022 Luya Tshimbalanga - 1.1.1-1 -- Update to 1.1.1 (#1983495) - -* Mon Jul 19 2021 Fedora Release Monitoring - 1.1.0-1 -- Update to 1.1.0 (#1983495) - -* Sun Feb 28 2021 Luya Tshimbalanga - 1.0.20-3 -- Enable math tex support -- Add fdupes for build requirement -- Simplify summary - -* Thu Jan 28 2021 Fedora Release Engineering - 1.0.20-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Fri Dec 18 2020 Fedora Release Monitoring - 1.0.20-1 -- Update to 1.0.20 (#1908932) -- Work around firefox carrying bogus Provides - -* Fri Oct 23 2020 Luya Tshimbalanga - 1.0.19-2 -- Replace old xournal thumbnail with xournalpp version - -* Thu Oct 22 2020 Fedora Release Monitoring - 1.0.19-1 -- Update to 1.0.19 (#1890463) - -* Sat Aug 01 2020 Fedora Release Engineering - 1.0.18-4 -- Second attempt - Rebuilt for - https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 1.0.18-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue Apr 21 2020 Luya Tshimbalanga - 1.0.18-2 -- Set value key on desktop file associated with application (#1826395) - -* Thu Apr 16 2020 Fedora Release Monitoring - 1.0.18-1 -- Update to 1.0.18 (#1824351) - -* Tue Feb 04 2020 Luya Tshimbalanga - 1.0.17-1 -- Update to 1.0.17 (#1798239) -- Drop unneeded texlive dependencies -- Fix build with translations parameter - -* Fri Jan 31 2020 Fedora Release Engineering - 1.0.16-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Fri Jan 17 2020 Marek Kasik - 1.0.16-9 -- Rebuild for poppler-0.84.0 - -* Sun Jan 12 2020 Luya Tshimbalanga - 1.0.16-8 -- Remove depreciate key in desktop file - -* Mon Dec 16 2019 Luya Tshimbalanga - 1.0.16-7 -- Remove architecture requirement for plugins and ui - -* Mon Dec 16 2019 Luya Tshimbalanga - 1.0.16-6 -- Fix typos - -* Mon Dec 16 2019 Luya Tshimbalanga - 1.0.16-5 -- Fix architecture requirement for ui - -* Wed Dec 11 2019 Luya Tshimbalanga - 1.0.16-4 -- Review fixes - -* Wed Dec 11 2019 Luya Tshimbalanga - 1.0.16-3 -- Add hicolor-icon-theme to requirement -- Use desktop file validation -- Split xournal data share into subpackages -- Review fixes - -* Sun Nov 17 2019 Luya Tshimbalanga 1.0.16-2 -- Remove scripts from ui icons directory -- Relocate tlh locale directory - -* Sun Nov 17 2019 Luya Tshimbalanga 1.0.16-1 -- Release 1.0.16 -- Enable cppunit - -* Sun Nov 10 2019 Luya Tshimbalanga 1.0.15-2 -- Update spec file based on review -- Include appstream data - -* Sun Nov 10 2019 Luya Tshimbalanga 1.0.15-1 -- Release 1.0.15 - -* Tue Aug 13 2019 dfas - 1.0.13-2.git7349762 -- Release 1.0.13-current - -* Tue Jun 25 2019 dfas - 1.0.13-1.gita7f0275 -- Release 1.0.13-current - -* Fri May 3 2019 Francisco Gonzalez - 1.0.10-1 -- First attempt at packaging xournalpp +%autochangelog