From 4e6fc5d5777204c21c4b0ba96ede5d376c524b8b Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Mon, 16 Dec 2019 07:29:23 -0800 Subject: [PATCH 01/74] Review fixes --- .gitignore | 1 + sources | 1 + xournalpp.spec | 130 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 132 insertions(+) create mode 100644 .gitignore create mode 100644 sources create mode 100644 xournalpp.spec diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..c2e018a --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/xournalpp-1.0.16.tar.gz diff --git a/sources b/sources new file mode 100644 index 0000000..f7ebb9a --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (xournalpp-1.0.16.tar.gz) = cbfd528a1aa4f0d58bf8ceeede47e6dd94258fafb7c57e11031783e8c98eb037a561ff8bdf699455908d86886ca52ceba21bad7ac372e5eb2205b0382fd2c520 diff --git a/xournalpp.spec b/xournalpp.spec new file mode 100644 index 0000000..58aaf6d --- /dev/null +++ b/xournalpp.spec @@ -0,0 +1,130 @@ +Name: xournalpp +Version: 1.0.16 +Release: 4%{?dist} +Summary: Handwriting note-taking software with PDF annotation support + +License: GPLv2+ +URL: https://github.com/%{name}/%{name} +Source: %{url}/archive/%{version}/%{name}-%{version}.tar.gz + +BuildRequires: cmake3 >= 3.10 +BuildRequires: desktop-file-utils +BuildRequires: cppunit-devel >= 1.12-0 +BuildRequires: gcc-c++ +BuildRequires: gettext +BuildRequires: libappstream-glib +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: pkgconfig(libxml-2.0) +BuildRequires: pkgconfig(libzip) +BuildRequires: pkgconfig(lua) +BuildRequires: pkgconfig(poppler-glib) +BuildRequires: pkgconfig(portaudiocpp) >= 12 +BuildRequires: pkgconfig(sndfile) +Requires: hicolor-icon-theme +Requires: kde-filesystem +Requires: texlive-scheme-basic +Requires: texlive-dvipng +Requires: texlive-standalone +Requires: %{name}-plugins +Requires: %{name}-ui + +%description +Xournal++ is a handwriting note-taking software with PDF annotation support. +Supports Pen input like Wacom Tablets + +%package plugins +Summary: Default plugin for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} +BuildArch: noarch + +%description plugins +The %{name}-plugins package contains sample plugins for %{name}. + +%package ui +Summary: User interface for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} +BuildArch: noarch + +%description ui +The %{name}-ui package contains a graphical user interface for %{name}. + + +%prep +%autosetup + +#Fix tlh aka klingon language +mv po/tlh_AA.po po/tlh.po +sed -i 's|tlh-AA|tlh|g' po/tlh.po + +%build +%cmake3 \ + -DENABLE_CPPUNIT=ON \ + . +%make_build + +%install +%make_install +%find_lang %{name} + +#Remove scripts from icons interface +rm -r %{buildroot}%{_datadir}/%{name}/ui/icons/hicolor/update-icon-cache.sh +rm -r %{buildroot}%{_datadir}/%{name}/ui/iconsDark/hicolor/update-icon-cache.sh + +%check +desktop-file-validate %{buildroot}%{_datadir}/applications/com.github.%{name}.%{name}.desktop +appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/com.github.%{name}.%{name}.appdata.xml + +%files -f %{name}.lang +%license LICENSE +%doc README.md AUTHORS +%{_bindir}/xournal-thumbnailer +%{_bindir}/%{name} +%{_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} +%{_metainfodir}/com.github.%{name}.%{name}.appdata.xml + +%files plugins +%{_datadir}/%{name}/plugins + +%files ui +%{_datadir}/%{name}/ui + +%changelog +* 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. From 58e9762eea51d5395c649dfcf6303bb34c5d5d8a Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Mon, 16 Dec 2019 16:27:03 -0800 Subject: [PATCH 02/74] Fix architecture requirement for ui --- xournalpp.spec | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/xournalpp.spec b/xournalpp.spec index 58aaf6d..362c810 100644 --- a/xournalpp.spec +++ b/xournalpp.spec @@ -1,6 +1,6 @@ Name: xournalpp Version: 1.0.16 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Handwriting note-taking software with PDF annotation support License: GPLv2+ @@ -26,8 +26,8 @@ Requires: kde-filesystem Requires: texlive-scheme-basic Requires: texlive-dvipng Requires: texlive-standalone -Requires: %{name}-plugins -Requires: %{name}-ui +Requires: %{name}-plugins%{?_isa} = %{version}-%{release} +Requires: %{name}-ui}%{?_isa} = %{version}-%{release} %description Xournal++ is a handwriting note-taking software with PDF annotation support. @@ -35,7 +35,6 @@ Supports Pen input like Wacom Tablets %package plugins Summary: Default plugin for %{name} -Requires: %{name}%{?_isa} = %{version}-%{release} BuildArch: noarch %description plugins @@ -43,7 +42,6 @@ The %{name}-plugins package contains sample plugins for %{name}. %package ui Summary: User interface for %{name} -Requires: %{name}%{?_isa} = %{version}-%{release} BuildArch: noarch %description ui @@ -96,6 +94,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/com.github.%{n %{_datadir}/%{name}/ui %changelog +* 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 From d880a25164e56fc264a6b03361ccfca86e00d468 Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Mon, 16 Dec 2019 19:37:07 -0800 Subject: [PATCH 03/74] Fix typos --- xournalpp.spec | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/xournalpp.spec b/xournalpp.spec index 362c810..2e2c198 100644 --- a/xournalpp.spec +++ b/xournalpp.spec @@ -1,6 +1,6 @@ Name: xournalpp Version: 1.0.16 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Handwriting note-taking software with PDF annotation support License: GPLv2+ @@ -27,21 +27,21 @@ Requires: texlive-scheme-basic Requires: texlive-dvipng Requires: texlive-standalone Requires: %{name}-plugins%{?_isa} = %{version}-%{release} -Requires: %{name}-ui}%{?_isa} = %{version}-%{release} +Requires: %{name}-ui%{?_isa} = %{version}-%{release} %description Xournal++ is a handwriting note-taking software with PDF annotation support. Supports Pen input like Wacom Tablets %package plugins -Summary: Default plugin for %{name} +Summary: Default plugin for %{name} BuildArch: noarch %description plugins The %{name}-plugins package contains sample plugins for %{name}. %package ui -Summary: User interface for %{name} +Summary: User interface for %{name} BuildArch: noarch %description ui @@ -57,7 +57,7 @@ sed -i 's|tlh-AA|tlh|g' po/tlh.po %build %cmake3 \ - -DENABLE_CPPUNIT=ON \ + -DENABLE_CPPUNIT=ON \ . %make_build @@ -94,6 +94,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/com.github.%{n %{_datadir}/%{name}/ui %changelog +* 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 From 37c825040d08d322f862001284c7e7704871ff14 Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Mon, 16 Dec 2019 21:00:38 -0800 Subject: [PATCH 04/74] Remove architecture requirement for plugins and ui --- xournalpp.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/xournalpp.spec b/xournalpp.spec index 2e2c198..e417b77 100644 --- a/xournalpp.spec +++ b/xournalpp.spec @@ -1,6 +1,6 @@ Name: xournalpp Version: 1.0.16 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Handwriting note-taking software with PDF annotation support License: GPLv2+ @@ -26,8 +26,8 @@ Requires: kde-filesystem Requires: texlive-scheme-basic Requires: texlive-dvipng Requires: texlive-standalone -Requires: %{name}-plugins%{?_isa} = %{version}-%{release} -Requires: %{name}-ui%{?_isa} = %{version}-%{release} +Requires: %{name}-plugins = %{version}-%{release} +Requires: %{name}-ui = %{version}-%{release} %description Xournal++ is a handwriting note-taking software with PDF annotation support. @@ -94,6 +94,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/com.github.%{n %{_datadir}/%{name}/ui %changelog +* 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 From f34663e647870bf7ec19554f22358574ad51464b Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Sun, 12 Jan 2020 13:17:13 -0800 Subject: [PATCH 05/74] Remove depreciate key in desktop file --- xournalpp.spec | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/xournalpp.spec b/xournalpp.spec index e417b77..dd1ac87 100644 --- a/xournalpp.spec +++ b/xournalpp.spec @@ -1,6 +1,8 @@ +%global _with_cppunit 1 + Name: xournalpp Version: 1.0.16 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Handwriting note-taking software with PDF annotation support License: GPLv2+ @@ -9,7 +11,9 @@ Source: %{url}/archive/%{version}/%{name}-%{version}.tar.gz BuildRequires: cmake3 >= 3.10 BuildRequires: desktop-file-utils +%{?_with_cppunit: BuildRequires: cppunit-devel >= 1.12-0 +} BuildRequires: gcc-c++ BuildRequires: gettext BuildRequires: libappstream-glib @@ -57,12 +61,17 @@ sed -i 's|tlh-AA|tlh|g' po/tlh.po %build %cmake3 \ - -DENABLE_CPPUNIT=ON \ + %{_with_cppunit: -DENABLE_CPPUNIT=ON} \ . %make_build %install %make_install + +#Remove depreciated key from desktop file +desktop-file-install \ + --remove-key="Encoding" \ + %{buildroot}%{_datadir}/applications/com.github.%{name}.%{name}.desktop %find_lang %{name} #Remove scripts from icons interface @@ -94,6 +103,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/com.github.%{n %{_datadir}/%{name}/ui %changelog +* 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 From 72ada665a4a40a636e2ec59be0cdcf547632f58f Mon Sep 17 00:00:00 2001 From: Marek Kasik Date: Fri, 17 Jan 2020 12:30:04 +0100 Subject: [PATCH 06/74] Rebuild for poppler-0.84.0 --- xournalpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xournalpp.spec b/xournalpp.spec index dd1ac87..ef45226 100644 --- a/xournalpp.spec +++ b/xournalpp.spec @@ -2,7 +2,7 @@ Name: xournalpp Version: 1.0.16 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Handwriting note-taking software with PDF annotation support License: GPLv2+ @@ -103,6 +103,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/com.github.%{n %{_datadir}/%{name}/ui %changelog +* 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 From ff36d946e34909800c9eba22acb19f9191973c94 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 04:51:07 +0000 Subject: [PATCH 07/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xournalpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xournalpp.spec b/xournalpp.spec index ef45226..3596160 100644 --- a/xournalpp.spec +++ b/xournalpp.spec @@ -2,7 +2,7 @@ Name: xournalpp Version: 1.0.16 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Handwriting note-taking software with PDF annotation support License: GPLv2+ @@ -103,6 +103,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/com.github.%{n %{_datadir}/%{name}/ui %changelog +* 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 From 068454d309201201e8ad87ac8538690156d91643 Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Tue, 4 Feb 2020 14:01:27 -0800 Subject: [PATCH 08/74] Update to 1.0.17 Drop unneeded texlive dependencies Fix build with translations parameter --- xournalpp.spec | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/xournalpp.spec b/xournalpp.spec index 3596160..5c6483e 100644 --- a/xournalpp.spec +++ b/xournalpp.spec @@ -1,8 +1,8 @@ %global _with_cppunit 1 Name: xournalpp -Version: 1.0.16 -Release: 10%{?dist} +Version: 1.0.17 +Release: 1%{?dist} Summary: Handwriting note-taking software with PDF annotation support License: GPLv2+ @@ -26,10 +26,6 @@ BuildRequires: pkgconfig(poppler-glib) BuildRequires: pkgconfig(portaudiocpp) >= 12 BuildRequires: pkgconfig(sndfile) Requires: hicolor-icon-theme -Requires: kde-filesystem -Requires: texlive-scheme-basic -Requires: texlive-dvipng -Requires: texlive-standalone Requires: %{name}-plugins = %{version}-%{release} Requires: %{name}-ui = %{version}-%{release} @@ -63,7 +59,10 @@ sed -i 's|tlh-AA|tlh|g' po/tlh.po %cmake3 \ %{_with_cppunit: -DENABLE_CPPUNIT=ON} \ . -%make_build + +# Add translations parameter +# https://github.com/xournalpp/xournalpp/issues/1596 +%make_build translations %install %make_install @@ -75,8 +74,8 @@ desktop-file-install \ %find_lang %{name} #Remove scripts from icons interface -rm -r %{buildroot}%{_datadir}/%{name}/ui/icons/hicolor/update-icon-cache.sh -rm -r %{buildroot}%{_datadir}/%{name}/ui/iconsDark/hicolor/update-icon-cache.sh +#rm -r %%{buildroot}%%{_datadir}/%%{name}/ui/icons/hicolor/update-icon-cache.sh +#rm -r %%{buildroot}%%{_datadir}/%%{name}/ui/iconsDark/hicolor/update-icon-cache.sh %check desktop-file-validate %{buildroot}%{_datadir}/applications/com.github.%{name}.%{name}.desktop @@ -103,6 +102,11 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/com.github.%{n %{_datadir}/%{name}/ui %changelog +* Tue Feb 04 2020 Luya Tshimbalanga - 1.0.17-1 +- Update to 1.0.17 +- 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 From 7500d7573231f12f1131cee9fadc854602066d92 Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Sat, 11 Apr 2020 09:06:16 -0700 Subject: [PATCH 09/74] Update to 1.0.17 (#1798239) Drop unneeded texlive dependencies Fix build with translations parameter --- xournalpp.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xournalpp.spec b/xournalpp.spec index 5c6483e..067ed6d 100644 --- a/xournalpp.spec +++ b/xournalpp.spec @@ -103,7 +103,7 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/com.github.%{n %changelog * Tue Feb 04 2020 Luya Tshimbalanga - 1.0.17-1 -- Update to 1.0.17 +- Update to 1.0.17 (#1798239) - Drop unneeded texlive dependencies - Fix build with translations parameter From aa79b7720662c60481a3ca803debb7cd23a8f21a Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Sat, 11 Apr 2020 09:12:02 -0700 Subject: [PATCH 10/74] Update to 1.0.17 (#1798239) Drop unneeded texlive dependencies Fix build with translations parameter --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index c2e018a..f9902f1 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /xournalpp-1.0.16.tar.gz +/xournalpp-1.0.17.tar.gz diff --git a/sources b/sources index f7ebb9a..ae8c118 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xournalpp-1.0.16.tar.gz) = cbfd528a1aa4f0d58bf8ceeede47e6dd94258fafb7c57e11031783e8c98eb037a561ff8bdf699455908d86886ca52ceba21bad7ac372e5eb2205b0382fd2c520 +SHA512 (xournalpp-1.0.17.tar.gz) = cc3568ce22fd42f0e8458f1428c102d2fc18a9650d8c5968cadd6693fc19374780beb3c7f6206f2f494439296a883b2a5160da37e3a0e10d6fe3654084967ab9 From dfdbec6fc6132772445cd9ae555905bbd5db185b Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Sun, 19 Apr 2020 10:52:18 -0700 Subject: [PATCH 11/74] Update to 1.0.18 (#1824351) --- .gitignore | 1 + sources | 2 +- xournalpp.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index f9902f1..ff79b5d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /xournalpp-1.0.16.tar.gz /xournalpp-1.0.17.tar.gz +/xournalpp-1.0.18.tar.gz diff --git a/sources b/sources index ae8c118..bfa4e5c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xournalpp-1.0.17.tar.gz) = cc3568ce22fd42f0e8458f1428c102d2fc18a9650d8c5968cadd6693fc19374780beb3c7f6206f2f494439296a883b2a5160da37e3a0e10d6fe3654084967ab9 +SHA512 (xournalpp-1.0.18.tar.gz) = 90568a2674a18ff711ecef5f1a66ea1c5746d7f1fde271b36342d9bf48e096e63075cf7fd8b69e39e144273a4d1b922c415eee929eba94b2fa515a0bb481815a diff --git a/xournalpp.spec b/xournalpp.spec index 067ed6d..d190142 100644 --- a/xournalpp.spec +++ b/xournalpp.spec @@ -1,7 +1,7 @@ %global _with_cppunit 1 Name: xournalpp -Version: 1.0.17 +Version: 1.0.18 Release: 1%{?dist} Summary: Handwriting note-taking software with PDF annotation support @@ -102,6 +102,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/com.github.%{n %{_datadir}/%{name}/ui %changelog +* 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 From b1b6b92cf34bce3927f7241d9a5ae5d5556d72f4 Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Tue, 21 Apr 2020 22:29:07 -0700 Subject: [PATCH 12/74] Set value key on desktop file associated with application (#1826395) --- xournalpp.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/xournalpp.spec b/xournalpp.spec index d190142..ef3f6a4 100644 --- a/xournalpp.spec +++ b/xournalpp.spec @@ -2,7 +2,7 @@ Name: xournalpp Version: 1.0.18 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Handwriting note-taking software with PDF annotation support License: GPLv2+ @@ -68,8 +68,11 @@ sed -i 's|tlh-AA|tlh|g' po/tlh.po %make_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} @@ -102,6 +105,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/com.github.%{n %{_datadir}/%{name}/ui %changelog +* 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) From fc10648f5d295018ac5adb3b0b4641c6966941f6 Mon Sep 17 00:00:00 2001 From: Igor Raits Date: Sun, 5 Jul 2020 20:45:10 +0200 Subject: [PATCH 13/74] Improve compatibility with new CMake macro Signed-off-by: Igor Raits --- xournalpp.spec | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/xournalpp.spec b/xournalpp.spec index ef3f6a4..4b602fc 100644 --- a/xournalpp.spec +++ b/xournalpp.spec @@ -1,3 +1,4 @@ +%global __cmake_in_source_build 1 %global _with_cppunit 1 Name: xournalpp @@ -57,15 +58,16 @@ sed -i 's|tlh-AA|tlh|g' po/tlh.po %build %cmake3 \ - %{_with_cppunit: -DENABLE_CPPUNIT=ON} \ - . + %{?_with_cppunit: -DENABLE_CPPUNIT=ON} \ + %{nil} +%cmake3_build # Add translations parameter # https://github.com/xournalpp/xournalpp/issues/1596 -%make_build translations +%cmake3_build --target translations %install -%make_install +%cmake3_install #Remove depreciated key from desktop file #Fix desktop file associated with application From 38df5432cb47e2737d2dc5f7ce078996f1bde847 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 15:01:59 +0000 Subject: [PATCH 14/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xournalpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xournalpp.spec b/xournalpp.spec index 4b602fc..b0f6d4b 100644 --- a/xournalpp.spec +++ b/xournalpp.spec @@ -3,7 +3,7 @@ Name: xournalpp Version: 1.0.18 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Handwriting note-taking software with PDF annotation support License: GPLv2+ @@ -107,6 +107,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/com.github.%{n %{_datadir}/%{name}/ui %changelog +* 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) From f42a1e02bdde25101b547a28d5c3e1e5368946eb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 1 Aug 2020 09:47:38 +0000 Subject: [PATCH 15/74] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xournalpp.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/xournalpp.spec b/xournalpp.spec index b0f6d4b..5e145ce 100644 --- a/xournalpp.spec +++ b/xournalpp.spec @@ -3,7 +3,7 @@ Name: xournalpp Version: 1.0.18 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Handwriting note-taking software with PDF annotation support License: GPLv2+ @@ -107,6 +107,10 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/com.github.%{n %{_datadir}/%{name}/ui %changelog +* 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 From a1c8e527fef8cfa83c758b8b3cbdd9440ef60e2d Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Fri, 23 Oct 2020 00:09:28 -0700 Subject: [PATCH 16/74] Update to 1.0.19 (#1890463) --- .gitignore | 1 + sources | 2 +- xournalpp.spec | 27 +++++++++++++++------------ 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index ff79b5d..4ec0a8e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /xournalpp-1.0.16.tar.gz /xournalpp-1.0.17.tar.gz /xournalpp-1.0.18.tar.gz +/xournalpp-1.0.19.tar.gz diff --git a/sources b/sources index bfa4e5c..705439c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xournalpp-1.0.18.tar.gz) = 90568a2674a18ff711ecef5f1a66ea1c5746d7f1fde271b36342d9bf48e096e63075cf7fd8b69e39e144273a4d1b922c415eee929eba94b2fa515a0bb481815a +SHA512 (xournalpp-1.0.19.tar.gz) = 72d29158b620c0500d94890077e35fe36ef090e3f203ddeb252a659de57c40723f29404e1eb453ed5b4ac8265b8786ebf8e92c8ab67287c5e586955240c0a121 diff --git a/xournalpp.spec b/xournalpp.spec index 5e145ce..249d562 100644 --- a/xournalpp.spec +++ b/xournalpp.spec @@ -1,23 +1,23 @@ -%global __cmake_in_source_build 1 +%global __cmake_in_source_build 0 %global _with_cppunit 1 Name: xournalpp -Version: 1.0.18 -Release: 4%{?dist} +Version: 1.0.19 +Release: 1%{?dist} Summary: Handwriting note-taking software with PDF annotation support License: GPLv2+ URL: https://github.com/%{name}/%{name} Source: %{url}/archive/%{version}/%{name}-%{version}.tar.gz -BuildRequires: cmake3 >= 3.10 +BuildRequires: cmake >= 3.10 BuildRequires: desktop-file-utils -%{?_with_cppunit: -BuildRequires: cppunit-devel >= 1.12-0 -} BuildRequires: gcc-c++ BuildRequires: gettext BuildRequires: libappstream-glib +%{?_with_cppunit: +BuildRequires: pkgconfig(cppunit) >= 1.12-0 +} BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(libxml-2.0) @@ -57,17 +57,17 @@ mv po/tlh_AA.po po/tlh.po sed -i 's|tlh-AA|tlh|g' po/tlh.po %build -%cmake3 \ +%cmake \ %{?_with_cppunit: -DENABLE_CPPUNIT=ON} \ - %{nil} + -DMAC_INTEGRATION=OFF -%cmake3_build +%cmake_build # Add translations parameter # https://github.com/xournalpp/xournalpp/issues/1596 -%cmake3_build --target translations +# %%cmake3_build --target translations %install -%cmake3_install +%cmake_install #Remove depreciated key from desktop file #Fix desktop file associated with application @@ -107,6 +107,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/com.github.%{n %{_datadir}/%{name}/ui %changelog +* 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 From f9bd367acf861d7f88a53a8afefd5aa392eeebf3 Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Fri, 23 Oct 2020 17:34:01 -0700 Subject: [PATCH 17/74] Replace old xournal thumbnail with xournalpp version --- xournalpp.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xournalpp.spec b/xournalpp.spec index 249d562..a09ba21 100644 --- a/xournalpp.spec +++ b/xournalpp.spec @@ -3,7 +3,7 @@ Name: xournalpp Version: 1.0.19 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Handwriting note-taking software with PDF annotation support License: GPLv2+ @@ -89,7 +89,7 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/com.github.%{n %files -f %{name}.lang %license LICENSE %doc README.md AUTHORS -%{_bindir}/xournal-thumbnailer +%{_bindir}/%{name}-thumbnailer %{_bindir}/%{name} %{_datadir}/applications/com.github.%{name}.%{name}.desktop %{_datadir}/icons/hicolor/scalable/apps/com.github.%{name}.%{name}.svg @@ -107,6 +107,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/com.github.%{n %{_datadir}/%{name}/ui %changelog +* 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) From 7228448529945401175b51bf83e98fcff0839dd6 Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Thu, 17 Dec 2020 18:47:39 -0800 Subject: [PATCH 18/74] Update to 1.0.20 (#1908932) --- .gitignore | 1 + sources | 2 +- xournalpp.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 4ec0a8e..b9e0cc5 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /xournalpp-1.0.17.tar.gz /xournalpp-1.0.18.tar.gz /xournalpp-1.0.19.tar.gz +/xournalpp-1.0.20.tar.gz diff --git a/sources b/sources index 705439c..3509b88 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xournalpp-1.0.19.tar.gz) = 72d29158b620c0500d94890077e35fe36ef090e3f203ddeb252a659de57c40723f29404e1eb453ed5b4ac8265b8786ebf8e92c8ab67287c5e586955240c0a121 +SHA512 (xournalpp-1.0.20.tar.gz) = c73783d5e40262b2c6f7f6be372839c73a19ab25fc258a7524660654526a3a35a6ba16ba282f793e7982ff97d006703c103fdd579fc16a3e636bf6daf94fe346 diff --git a/xournalpp.spec b/xournalpp.spec index a09ba21..7d32eb6 100644 --- a/xournalpp.spec +++ b/xournalpp.spec @@ -2,8 +2,8 @@ %global _with_cppunit 1 Name: xournalpp -Version: 1.0.19 -Release: 2%{?dist} +Version: 1.0.20 +Release: 1%{?dist} Summary: Handwriting note-taking software with PDF annotation support License: GPLv2+ @@ -107,6 +107,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/com.github.%{n %{_datadir}/%{name}/ui %changelog +* Fri Dec 18 2020 Fedora Release Monitoring - 1.0.20-1 +- Update to 1.0.20 (#1908932) + * Fri Oct 23 2020 Luya Tshimbalanga - 1.0.19-2 - Replace old xournal thumbnail with xournalpp version From e45c85a3f6b1ca4fc593e810ee6cc483a8742582 Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Thu, 17 Dec 2020 22:56:13 -0800 Subject: [PATCH 19/74] Update to 1.0.20 (#1908932) --- xournalpp.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xournalpp.spec b/xournalpp.spec index 7d32eb6..bc9a911 100644 --- a/xournalpp.spec +++ b/xournalpp.spec @@ -89,7 +89,7 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/com.github.%{n %files -f %{name}.lang %license LICENSE %doc README.md AUTHORS -%{_bindir}/%{name}-thumbnailer +%{_bindir}/xournal-thumbnailer %{_bindir}/%{name} %{_datadir}/applications/com.github.%{name}.%{name}.desktop %{_datadir}/icons/hicolor/scalable/apps/com.github.%{name}.%{name}.svg From cebf08c994cf00aacd0d9c1c910e3a6e22329b12 Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Fri, 18 Dec 2020 17:46:25 -0800 Subject: [PATCH 20/74] Update to 1.0.20 (#1908932) Work around firefox carrying bogus Provides --- xournalpp.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/xournalpp.spec b/xournalpp.spec index bc9a911..5f6fab4 100644 --- a/xournalpp.spec +++ b/xournalpp.spec @@ -15,6 +15,11 @@ BuildRequires: desktop-file-utils BuildRequires: gcc-c++ BuildRequires: gettext BuildRequires: libappstream-glib + +# Work around firefox carrying bogus Provides: +# https://bugzilla.redhat.com/show_bug.cgi?id=1908018#c12 +BuildRequires: nss nspr + %{?_with_cppunit: BuildRequires: pkgconfig(cppunit) >= 1.12-0 } @@ -109,6 +114,7 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/com.github.%{n %changelog * 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 From 333410a0e67848e4a5c9462d8f50d80ccba933a6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 28 Jan 2021 00:20:42 +0000 Subject: [PATCH 21/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xournalpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xournalpp.spec b/xournalpp.spec index 5f6fab4..0e8c3f0 100644 --- a/xournalpp.spec +++ b/xournalpp.spec @@ -3,7 +3,7 @@ Name: xournalpp Version: 1.0.20 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Handwriting note-taking software with PDF annotation support License: GPLv2+ @@ -112,6 +112,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/com.github.%{n %{_datadir}/%{name}/ui %changelog +* 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 From 4c849371672bf21405a5f5c14e46101db002a454 Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Sun, 28 Feb 2021 12:11:44 -0800 Subject: [PATCH 22/74] Enable math tex support Add fduples for build requirement Simplify summary --- xournalpp.spec | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/xournalpp.spec b/xournalpp.spec index 0e8c3f0..ffbe7cd 100644 --- a/xournalpp.spec +++ b/xournalpp.spec @@ -4,7 +4,7 @@ Name: xournalpp Version: 1.0.20 Release: 2%{?dist} -Summary: Handwriting note-taking software with PDF annotation support +Summary: Handwriting note-taking software License: GPLv2+ URL: https://github.com/%{name}/%{name} @@ -12,6 +12,7 @@ Source: %{url}/archive/%{version}/%{name}-%{version}.tar.gz BuildRequires: cmake >= 3.10 BuildRequires: desktop-file-utils +BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: gettext BuildRequires: libappstream-glib @@ -31,6 +32,7 @@ BuildRequires: pkgconfig(lua) BuildRequires: pkgconfig(poppler-glib) BuildRequires: pkgconfig(portaudiocpp) >= 12 BuildRequires: pkgconfig(sndfile) +BuildRequires: tex-latex-bin Requires: hicolor-icon-theme Requires: %{name}-plugins = %{version}-%{release} Requires: %{name}-ui = %{version}-%{release} @@ -64,12 +66,10 @@ sed -i 's|tlh-AA|tlh|g' po/tlh.po %build %cmake \ %{?_with_cppunit: -DENABLE_CPPUNIT=ON} \ + -DENABLE_MATHTEX=ON \ -DMAC_INTEGRATION=OFF %cmake_build -# Add translations parameter -# https://github.com/xournalpp/xournalpp/issues/1596 -# %%cmake3_build --target translations %install %cmake_install @@ -83,9 +83,10 @@ desktop-file-install \ %{buildroot}%{_datadir}/applications/com.github.%{name}.%{name}.desktop %find_lang %{name} -#Remove scripts from icons interface -#rm -r %%{buildroot}%%{_datadir}/%%{name}/ui/icons/hicolor/update-icon-cache.sh -#rm -r %%{buildroot}%%{_datadir}/%%{name}/ui/iconsDark/hicolor/update-icon-cache.sh +# REMOVE UNNECESSARY SCRIPTS +find %{buildroot}%{_datadir}/%{name} -name update-icon-cache.sh -delete -print + +%fdupes %{buildroot}%{_datadir} %check desktop-file-validate %{buildroot}%{_datadir}/applications/com.github.%{name}.%{name}.desktop @@ -112,6 +113,11 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/com.github.%{n %{_datadir}/%{name}/ui %changelog +* Sun Feb 28 2021 Luya Tshimbalanga - 1.0.20-2 +- Enable math tex support +- Add fduples 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 From d909de114fc342b55378029d66ff6412adce5db4 Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Sun, 28 Feb 2021 12:12:44 -0800 Subject: [PATCH 23/74] Enable math tex support Add fdupes for build requirement Simplify summary --- xournalpp.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xournalpp.spec b/xournalpp.spec index ffbe7cd..19b3a93 100644 --- a/xournalpp.spec +++ b/xournalpp.spec @@ -115,7 +115,7 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/com.github.%{n %changelog * Sun Feb 28 2021 Luya Tshimbalanga - 1.0.20-2 - Enable math tex support -- Add fduples for build requirement +- Add fdupes for build requirement - Simplify summary * Thu Jan 28 2021 Fedora Release Engineering - 1.0.20-2 From 89dfd79bf4e485f9d7b7f061e9e51eef5c13529b Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Sun, 28 Feb 2021 13:36:48 -0800 Subject: [PATCH 24/74] Enable math tex support Add fdupes for build requirement Simplify summary --- xournalpp.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xournalpp.spec b/xournalpp.spec index 19b3a93..5be61fb 100644 --- a/xournalpp.spec +++ b/xournalpp.spec @@ -3,7 +3,7 @@ Name: xournalpp Version: 1.0.20 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Handwriting note-taking software License: GPLv2+ @@ -113,7 +113,7 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/com.github.%{n %{_datadir}/%{name}/ui %changelog -* Sun Feb 28 2021 Luya Tshimbalanga - 1.0.20-2 +* Sun Feb 28 2021 Luya Tshimbalanga - 1.0.20-3 - Enable math tex support - Add fdupes for build requirement - Simplify summary From 5ecbc86d3c7e501b70e82044d9f0def66e71621e Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Mon, 19 Jul 2021 08:13:04 -0700 Subject: [PATCH 25/74] Update to 1.1.0 (#1983495) --- .gitignore | 1 + sources | 2 +- xournalpp.spec | 17 +++++++++-------- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index b9e0cc5..82bfe74 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /xournalpp-1.0.18.tar.gz /xournalpp-1.0.19.tar.gz /xournalpp-1.0.20.tar.gz +/xournalpp-1.1.0.tar.gz diff --git a/sources b/sources index 3509b88..99174b0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xournalpp-1.0.20.tar.gz) = c73783d5e40262b2c6f7f6be372839c73a19ab25fc258a7524660654526a3a35a6ba16ba282f793e7982ff97d006703c103fdd579fc16a3e636bf6daf94fe346 +SHA512 (xournalpp-1.1.0.tar.gz) = 823d2561caa45bd7deb994bd71df0df35b6f279e04c4e8bb5d3f05f2fff2a68af8ea572f42095a9f28da5b2fdbe6b9b465aeca758d36ab29a24c62ea68c99c56 diff --git a/xournalpp.spec b/xournalpp.spec index 5be61fb..bf6718d 100644 --- a/xournalpp.spec +++ b/xournalpp.spec @@ -2,8 +2,8 @@ %global _with_cppunit 1 Name: xournalpp -Version: 1.0.20 -Release: 3%{?dist} +Version: 1.1.0 +Release: %autorelease Summary: Handwriting note-taking software License: GPLv2+ @@ -26,6 +26,7 @@ BuildRequires: pkgconfig(cppunit) >= 1.12-0 } BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: pkgconfig(librsvg-2.0) BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(libzip) BuildRequires: pkgconfig(lua) @@ -59,10 +60,6 @@ The %{name}-ui package contains a graphical user interface for %{name}. %prep %autosetup -#Fix tlh aka klingon language -mv po/tlh_AA.po po/tlh.po -sed -i 's|tlh-AA|tlh|g' po/tlh.po - %build %cmake \ %{?_with_cppunit: -DENABLE_CPPUNIT=ON} \ @@ -95,7 +92,7 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/com.github.%{n %files -f %{name}.lang %license LICENSE %doc README.md AUTHORS -%{_bindir}/xournal-thumbnailer +%{_bindir}/%{name}-thumbnailer %{_bindir}/%{name} %{_datadir}/applications/com.github.%{name}.%{name}.desktop %{_datadir}/icons/hicolor/scalable/apps/com.github.%{name}.%{name}.svg @@ -104,6 +101,7 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/com.github.%{n %exclude %{_datadir}/mimelnk/application/* %{_datadir}/thumbnailers/com.github.%{name}.%{name}.thumbnailer %dir %{_datadir}/%{name} +%{_datadir}/%{name}/resources/*_template.tex %{_metainfodir}/com.github.%{name}.%{name}.appdata.xml %files plugins @@ -113,6 +111,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/com.github.%{n %{_datadir}/%{name}/ui %changelog +* 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 @@ -198,4 +199,4 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/com.github.%{n - Release 1.0.13-current * Fri May 3 2019 Francisco Gonzalez - 1.0.10-1 -- First attempt at packaging xournalpp. +- First attempt at packaging xournalpp From 99afe6f78dccdd1981d07c546294cfcd814ead05 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 21:53:42 +0000 Subject: [PATCH 26/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering From b608ed5032d2c04f4fb36d56cd9d6ff946152fb8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 05:26:56 +0000 Subject: [PATCH 27/74] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 44a30f016bcb4c733a73f86540afdb2a2e5661c5 Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Tue, 15 Mar 2022 20:01:46 -0700 Subject: [PATCH 28/74] Update to 1.1.1 (#1983495) --- .gitignore | 1 + sources | 2 +- xournalpp.spec | 11 +++++------ 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 82bfe74..1a17cf5 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /xournalpp-1.0.19.tar.gz /xournalpp-1.0.20.tar.gz /xournalpp-1.1.0.tar.gz +/xournalpp-1.1.1.tar.gz diff --git a/sources b/sources index 99174b0..1290dc9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xournalpp-1.1.0.tar.gz) = 823d2561caa45bd7deb994bd71df0df35b6f279e04c4e8bb5d3f05f2fff2a68af8ea572f42095a9f28da5b2fdbe6b9b465aeca758d36ab29a24c62ea68c99c56 +SHA512 (xournalpp-1.1.1.tar.gz) = efba97d26f624e3a1b8164ef6333a0f1d2992d0245414bdb51692d845965f6c37071f687520b43a94f713465796a16cbafd8929fd3bf8e6c3face847df92251d diff --git a/xournalpp.spec b/xournalpp.spec index bf6718d..78f3d06 100644 --- a/xournalpp.spec +++ b/xournalpp.spec @@ -2,13 +2,13 @@ %global _with_cppunit 1 Name: xournalpp -Version: 1.1.0 +Version: 1.1.1 Release: %autorelease Summary: Handwriting note-taking software License: GPLv2+ URL: https://github.com/%{name}/%{name} -Source: %{url}/archive/%{version}/%{name}-%{version}.tar.gz +Source: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz BuildRequires: cmake >= 3.10 BuildRequires: desktop-file-utils @@ -17,10 +17,6 @@ BuildRequires: gcc-c++ BuildRequires: gettext BuildRequires: libappstream-glib -# Work around firefox carrying bogus Provides: -# https://bugzilla.redhat.com/show_bug.cgi?id=1908018#c12 -BuildRequires: nss nspr - %{?_with_cppunit: BuildRequires: pkgconfig(cppunit) >= 1.12-0 } @@ -111,6 +107,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/com.github.%{n %{_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) From 906dd71027e6dfec516b6a70497d0b93ed628281 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 13:28:01 +0000 Subject: [PATCH 29/74] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 24c8caca387f0d4cc4b011f19ca04bb1aee7b99a Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Sun, 30 Oct 2022 13:43:07 -0700 Subject: [PATCH 30/74] Update to 1.1.2 (#2136012) --- .gitignore | 1 + sources | 2 +- xournalpp.spec | 129 +++++++++---------------------------------------- 3 files changed, 26 insertions(+), 106 deletions(-) diff --git a/.gitignore b/.gitignore index 1a17cf5..0727d62 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /xournalpp-1.0.20.tar.gz /xournalpp-1.1.0.tar.gz /xournalpp-1.1.1.tar.gz +/xournalpp-1.1.2.tar.gz diff --git a/sources b/sources index 1290dc9..b59de8f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xournalpp-1.1.1.tar.gz) = efba97d26f624e3a1b8164ef6333a0f1d2992d0245414bdb51692d845965f6c37071f687520b43a94f713465796a16cbafd8929fd3bf8e6c3face847df92251d +SHA512 (xournalpp-1.1.2.tar.gz) = 51022df1750390c17eb57a77e37c4224f227728aa49f90c9733a68c1f6c3c06f2e2634cb0b70add9a1d92525afe50fe317c12b879d2e5ed0f954360145359a89 diff --git a/xournalpp.spec b/xournalpp.spec index 78f3d06..5b8ff3b 100644 --- a/xournalpp.spec +++ b/xournalpp.spec @@ -1,12 +1,13 @@ %global __cmake_in_source_build 0 %global _with_cppunit 1 +%global _gtest 1 +#%%global profiling 0 Name: xournalpp -Version: 1.1.1 +Version: 1.1.2 Release: %autorelease -Summary: Handwriting note-taking software - -License: GPLv2+ +Summary: Handwriting note-taking software with PDF annotation support +License: GPLv2+ URL: https://github.com/%{name}/%{name} Source: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz @@ -15,21 +16,29 @@ BuildRequires: desktop-file-utils BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: gettext +BuildRequires: help2man BuildRequires: libappstream-glib %{?_with_cppunit: BuildRequires: pkgconfig(cppunit) >= 1.12-0 } -BuildRequires: pkgconfig(glib-2.0) -BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: pkgconfig(glib-2.0) >= 2.32.0 +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) +%{?profiling: +BuildRequires: pkgconfig(libprofiler) >= 2.5 +BuildRequires: pkgconfig(libtcmalloc) >= 2.5 +} +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-scheme-basic +Recommends: texlive-dvipng +Recommends: texlive-standalone Requires: hicolor-icon-theme Requires: %{name}-plugins = %{version}-%{release} Requires: %{name}-ui = %{version}-%{release} @@ -58,6 +67,7 @@ The %{name}-ui package contains a graphical user interface for %{name}. %build %cmake \ + -DDISTRO_CODENAME="Fedora Linux" \ %{?_with_cppunit: -DENABLE_CPPUNIT=ON} \ -DENABLE_MATHTEX=ON \ -DMAC_INTEGRATION=OFF @@ -78,7 +88,6 @@ desktop-file-install \ # REMOVE UNNECESSARY SCRIPTS find %{buildroot}%{_datadir}/%{name} -name update-icon-cache.sh -delete -print - %fdupes %{buildroot}%{_datadir} %check @@ -98,6 +107,7 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/com.github.%{n %{_datadir}/thumbnailers/com.github.%{name}.%{name}.thumbnailer %dir %{_datadir}/%{name} %{_datadir}/%{name}/resources/*_template.tex +%{_mandir}/man1/%{name}*.gz %{_metainfodir}/com.github.%{name}.%{name}.appdata.xml %files plugins @@ -107,95 +117,4 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/com.github.%{n %{_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 From 0725aac31b105f3e332a2720c8dcb05ec997a39a Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Mon, 28 Nov 2022 09:10:05 -0800 Subject: [PATCH 31/74] Update to 1.1.3 --- .gitignore | 1 + sources | 2 +- xournalpp.spec | 6 ++---- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 0727d62..c949aed 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /xournalpp-1.1.0.tar.gz /xournalpp-1.1.1.tar.gz /xournalpp-1.1.2.tar.gz +/xournalpp-1.1.3.tar.gz diff --git a/sources b/sources index b59de8f..76bba8a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xournalpp-1.1.2.tar.gz) = 51022df1750390c17eb57a77e37c4224f227728aa49f90c9733a68c1f6c3c06f2e2634cb0b70add9a1d92525afe50fe317c12b879d2e5ed0f954360145359a89 +SHA512 (xournalpp-1.1.3.tar.gz) = 7b3f1507a8f7b2b5ebef093e319008d4bc14b961ab528af490d133bc64176b85b14a4002753f5444f8fd96c326e7c6cf5d1bad443ad7ce2ea56e9f465aacae3d diff --git a/xournalpp.spec b/xournalpp.spec index 5b8ff3b..72e3d2e 100644 --- a/xournalpp.spec +++ b/xournalpp.spec @@ -4,7 +4,7 @@ #%%global profiling 0 Name: xournalpp -Version: 1.1.2 +Version: 1.1.3 Release: %autorelease Summary: Handwriting note-taking software with PDF annotation support License: GPLv2+ @@ -36,9 +36,7 @@ BuildRequires: pkgconfig(lua) >= 5.3 BuildRequires: pkgconfig(poppler-glib) >= 0.41.0 BuildRequires: pkgconfig(portaudiocpp) >= 12 BuildRequires: pkgconfig(sndfile) >= 1.0.25 -Recommends: texlive-scheme-basic -Recommends: texlive-dvipng -Recommends: texlive-standalone +Recommends: texlive-latex-bin Requires: hicolor-icon-theme Requires: %{name}-plugins = %{version}-%{release} Requires: %{name}-ui = %{version}-%{release} From 2dce52f68e33e121ee8cc79da33f6f04eef7ac7f Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Sun, 15 Jan 2023 20:55:01 -0500 Subject: [PATCH 32/74] Remove obsolete desktop file modification The desktop file was fixed upstream, and using desktop-file-install instead of desktop-file-edit breaks the flatpak build. --- xournalpp.spec | 7 ------- 1 file changed, 7 deletions(-) diff --git a/xournalpp.spec b/xournalpp.spec index 72e3d2e..57e3d06 100644 --- a/xournalpp.spec +++ b/xournalpp.spec @@ -75,13 +75,6 @@ The %{name}-ui package contains a graphical user interface for %{name}. %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 From 6651bee830977ed19260df852b5612eac1afc012 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 07:48:09 +0000 Subject: [PATCH 33/74] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering From a0817d75a469834cce9b6b0b70184087c127b7ca Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sat, 21 Jan 2023 21:47:32 -0700 Subject: [PATCH 34/74] Add patch for missing include with gcc 13 --- xournalpp-include.patch | 11 +++++++++++ xournalpp.spec | 4 +++- 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 xournalpp-include.patch diff --git a/xournalpp-include.patch b/xournalpp-include.patch new file mode 100644 index 0000000..7388b51 --- /dev/null +++ b/xournalpp-include.patch @@ -0,0 +1,11 @@ +diff -up xournalpp-1.1.3/src/view/background/BackgroundConfig.h.include xournalpp-1.1.3/src/view/background/BackgroundConfig.h +--- xournalpp-1.1.3/src/view/background/BackgroundConfig.h.include 2022-11-25 23:09:30.000000000 -0700 ++++ xournalpp-1.1.3/src/view/background/BackgroundConfig.h 2023-01-21 21:25:33.487219643 -0700 +@@ -11,6 +11,7 @@ + + #pragma once + ++#include + #include + #include + diff --git a/xournalpp.spec b/xournalpp.spec index 57e3d06..cd33603 100644 --- a/xournalpp.spec +++ b/xournalpp.spec @@ -10,6 +10,8 @@ Summary: Handwriting note-taking software with PDF annotation support License: GPLv2+ URL: https://github.com/%{name}/%{name} Source: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz +# Add missing include for gcc 13 +Patch: xournalpp-include.patch BuildRequires: cmake >= 3.10 BuildRequires: desktop-file-utils @@ -61,7 +63,7 @@ The %{name}-ui package contains a graphical user interface for %{name}. %prep -%autosetup +%autosetup -p1 %build %cmake \ From 094b132024708d8197896ef63b9850be72df2fb0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 19:13:47 +0000 Subject: [PATCH 35/74] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering From cb62e820a38eafb749b2d2e2cbdeed984e25ecf6 Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Sun, 30 Jul 2023 10:59:44 -0700 Subject: [PATCH 36/74] Update to 1.2.0 --- .gitignore | 1 + sources | 2 +- xournalpp.spec | 6 ++---- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index c949aed..105050c 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /xournalpp-1.1.1.tar.gz /xournalpp-1.1.2.tar.gz /xournalpp-1.1.3.tar.gz +/xournalpp-1.2.0.tar.gz diff --git a/sources b/sources index 76bba8a..3c413f2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xournalpp-1.1.3.tar.gz) = 7b3f1507a8f7b2b5ebef093e319008d4bc14b961ab528af490d133bc64176b85b14a4002753f5444f8fd96c326e7c6cf5d1bad443ad7ce2ea56e9f465aacae3d +SHA512 (xournalpp-1.2.0.tar.gz) = 9b8a1d0cb3502ea81008d00310731b10946608e5d73ddb4c785e30012389d788ccf1958e9e36875937b9c1475f562275a4e301fd641b3e9eb72c10466804d42b diff --git a/xournalpp.spec b/xournalpp.spec index cd33603..c740ed9 100644 --- a/xournalpp.spec +++ b/xournalpp.spec @@ -4,14 +4,13 @@ #%%global profiling 0 Name: xournalpp -Version: 1.1.3 +Version: 1.2.0 Release: %autorelease Summary: Handwriting note-taking software with PDF annotation support License: GPLv2+ URL: https://github.com/%{name}/%{name} Source: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz -# Add missing include for gcc 13 -Patch: xournalpp-include.patch + BuildRequires: cmake >= 3.10 BuildRequires: desktop-file-utils @@ -96,7 +95,6 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/com.github.%{n %{_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}/resources/*_template.tex From 136311ada1f3560e38784166eeeea5b27ff5148e Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Sun, 27 Aug 2023 13:12:49 -0700 Subject: [PATCH 37/74] Update to 1.2.1 (rhbz#2234873) --- .gitignore | 1 + sources | 2 +- xournalpp.spec | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 105050c..987fbad 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /xournalpp-1.1.2.tar.gz /xournalpp-1.1.3.tar.gz /xournalpp-1.2.0.tar.gz +/xournalpp-1.2.1.tar.gz diff --git a/sources b/sources index 3c413f2..97ebc20 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xournalpp-1.2.0.tar.gz) = 9b8a1d0cb3502ea81008d00310731b10946608e5d73ddb4c785e30012389d788ccf1958e9e36875937b9c1475f562275a4e301fd641b3e9eb72c10466804d42b +SHA512 (xournalpp-1.2.1.tar.gz) = c5376f6e1b32b9f0ab2e00a4d34436aaef326791fedd173a45c0d3c0b26c450a7876262d634018c6d9a402eaf4dff41afa3137f2b7c8bda0346d64e9eb463640 diff --git a/xournalpp.spec b/xournalpp.spec index c740ed9..13a8eae 100644 --- a/xournalpp.spec +++ b/xournalpp.spec @@ -4,7 +4,7 @@ #%%global profiling 0 Name: xournalpp -Version: 1.2.0 +Version: 1.2.1 Release: %autorelease Summary: Handwriting note-taking software with PDF annotation support License: GPLv2+ From 500b7df5c2ef84279cb5189d674ebabdaab9e8d7 Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Sat, 14 Oct 2023 09:27:58 -0700 Subject: [PATCH 38/74] Update to 1.2.2 (rhbz#2244196) --- .gitignore | 1 + sources | 2 +- xournalpp-include.patch | 11 ----------- xournalpp.spec | 2 +- 4 files changed, 3 insertions(+), 13 deletions(-) delete mode 100644 xournalpp-include.patch diff --git a/.gitignore b/.gitignore index 987fbad..be16b5a 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /xournalpp-1.1.3.tar.gz /xournalpp-1.2.0.tar.gz /xournalpp-1.2.1.tar.gz +/xournalpp-1.2.2.tar.gz diff --git a/sources b/sources index 97ebc20..6b704a8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xournalpp-1.2.1.tar.gz) = c5376f6e1b32b9f0ab2e00a4d34436aaef326791fedd173a45c0d3c0b26c450a7876262d634018c6d9a402eaf4dff41afa3137f2b7c8bda0346d64e9eb463640 +SHA512 (xournalpp-1.2.2.tar.gz) = fee29d29036a2ef59bbc98812571ce06a234380e9122e46bf89285f4e92e871c7e2ae4a086a080649775f4d6f7d497bd00fc91fb30f80e790f5a3106fa72725a diff --git a/xournalpp-include.patch b/xournalpp-include.patch deleted file mode 100644 index 7388b51..0000000 --- a/xournalpp-include.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up xournalpp-1.1.3/src/view/background/BackgroundConfig.h.include xournalpp-1.1.3/src/view/background/BackgroundConfig.h ---- xournalpp-1.1.3/src/view/background/BackgroundConfig.h.include 2022-11-25 23:09:30.000000000 -0700 -+++ xournalpp-1.1.3/src/view/background/BackgroundConfig.h 2023-01-21 21:25:33.487219643 -0700 -@@ -11,6 +11,7 @@ - - #pragma once - -+#include - #include - #include - diff --git a/xournalpp.spec b/xournalpp.spec index 13a8eae..ae37405 100644 --- a/xournalpp.spec +++ b/xournalpp.spec @@ -4,7 +4,7 @@ #%%global profiling 0 Name: xournalpp -Version: 1.2.1 +Version: 1.2.2 Release: %autorelease Summary: Handwriting note-taking software with PDF annotation support License: GPLv2+ From b351786c78b1b6b3f2f11c07bcac3c3efa7b22f5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 10:04:08 +0000 Subject: [PATCH 39/74] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From f3463c248f6f4bb89489ac65fba1085f7f14721f Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Sun, 3 Mar 2024 12:17:31 -0800 Subject: [PATCH 40/74] Update to 1.2.3 (#2267430) ... - Clean up spec file --- .gitignore | 1 + sources | 2 +- xournalpp.spec | 26 +++++++++++++------------- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index be16b5a..349db41 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /xournalpp-1.2.0.tar.gz /xournalpp-1.2.1.tar.gz /xournalpp-1.2.2.tar.gz +/xournalpp-1.2.3.tar.gz diff --git a/sources b/sources index 6b704a8..0927c32 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xournalpp-1.2.2.tar.gz) = fee29d29036a2ef59bbc98812571ce06a234380e9122e46bf89285f4e92e871c7e2ae4a086a080649775f4d6f7d497bd00fc91fb30f80e790f5a3106fa72725a +SHA512 (xournalpp-1.2.3.tar.gz) = 17303314d49001f492469d855155a019659cdafc67509d4e176f60a93322f4ee1d4b999e8a25a9a23bde27b878012c06aa11f15bc2a54a730098964053834d1f diff --git a/xournalpp.spec b/xournalpp.spec index ae37405..ce6d065 100644 --- a/xournalpp.spec +++ b/xournalpp.spec @@ -1,17 +1,16 @@ %global __cmake_in_source_build 0 -%global _with_cppunit 1 -%global _gtest 1 -#%%global profiling 0 +%global with_cppunit 1 +%global gtest 1 +%global profiling 1 Name: xournalpp -Version: 1.2.2 +Version: 1.2.3 Release: %autorelease Summary: Handwriting note-taking software with PDF annotation support 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 @@ -19,18 +18,20 @@ BuildRequires: gcc-c++ BuildRequires: gettext BuildRequires: help2man BuildRequires: libappstream-glib - -%{?_with_cppunit: +%if 0%{?with_cppunit} BuildRequires: pkgconfig(cppunit) >= 1.12-0 -} +%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) -%{?profiling: +%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 @@ -67,9 +68,8 @@ The %{name}-ui package contains a graphical user interface for %{name}. %build %cmake \ -DDISTRO_CODENAME="Fedora Linux" \ - %{?_with_cppunit: -DENABLE_CPPUNIT=ON} \ - -DENABLE_MATHTEX=ON \ - -DMAC_INTEGRATION=OFF + -DENABLE_GTEST=%{gtest} \ + -DENABLE_PROFILING=%{profiling} %cmake_build From 4fc7308f51f88e9e980cc1c209d7bd8b0bb4e23d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 10:24:00 +0000 Subject: [PATCH 41/74] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 93a0b47b85c237c4ef3a09a1317d5c17da7f492e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Fri, 26 Jul 2024 03:59:06 +0200 Subject: [PATCH 42/74] convert GPLv2+ license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- xournalpp.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xournalpp.spec b/xournalpp.spec index ce6d065..5a7dec3 100644 --- a/xournalpp.spec +++ b/xournalpp.spec @@ -7,7 +7,8 @@ Name: xournalpp Version: 1.2.3 Release: %autorelease Summary: Handwriting note-taking software with PDF annotation support -License: GPLv2+ +# Automatically converted from old format: GPLv2+ - review is highly recommended. +License: GPL-2.0-or-later URL: https://github.com/%{name}/%{name} Source: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz From 37f66486b4484f331b2eca1a02b7d193de9b7692 Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Mon, 21 Oct 2024 17:40:22 -0700 Subject: [PATCH 43/74] Update to 1.2.4 (rhbz#2052951) --- .gitignore | 1 + sources | 2 +- xournalpp.spec | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 349db41..bc5f773 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /xournalpp-1.2.1.tar.gz /xournalpp-1.2.2.tar.gz /xournalpp-1.2.3.tar.gz +/xournalpp-1.2.4.tar.gz diff --git a/sources b/sources index 0927c32..f0eeb0e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xournalpp-1.2.3.tar.gz) = 17303314d49001f492469d855155a019659cdafc67509d4e176f60a93322f4ee1d4b999e8a25a9a23bde27b878012c06aa11f15bc2a54a730098964053834d1f +SHA512 (xournalpp-1.2.4.tar.gz) = 45f09757f8dba67f64d53cd05c400bd563e5168eb24d1a0b5a4c407427dc4427adf54d22c5cae6a56945cef71016ff23cad077994dcb20f262082380dd284094 diff --git a/xournalpp.spec b/xournalpp.spec index 5a7dec3..5e5e495 100644 --- a/xournalpp.spec +++ b/xournalpp.spec @@ -4,7 +4,7 @@ %global profiling 1 Name: xournalpp -Version: 1.2.3 +Version: 1.2.4 Release: %autorelease Summary: Handwriting note-taking software with PDF annotation support # Automatically converted from old format: GPLv2+ - review is highly recommended. From 0ee7098c4566f6d03a37519b11ceb5dbf4ff7e95 Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Mon, 21 Oct 2024 18:03:55 -0700 Subject: [PATCH 44/74] Initial import --- .gitignore | 1 + sources | 1 + xournalpp.spec | 112 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 114 insertions(+) create mode 100644 .gitignore create mode 100644 sources create mode 100644 xournalpp.spec diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..f2dfbf8 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/xournalpp-1.2.4.tar.gz diff --git a/sources b/sources new file mode 100644 index 0000000..f0eeb0e --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (xournalpp-1.2.4.tar.gz) = 45f09757f8dba67f64d53cd05c400bd563e5168eb24d1a0b5a4c407427dc4427adf54d22c5cae6a56945cef71016ff23cad077994dcb20f262082380dd284094 diff --git a/xournalpp.spec b/xournalpp.spec new file mode 100644 index 0000000..5e5e495 --- /dev/null +++ b/xournalpp.spec @@ -0,0 +1,112 @@ +%global __cmake_in_source_build 0 +%global with_cppunit 1 +%global gtest 1 +%global profiling 1 + +Name: xournalpp +Version: 1.2.4 +Release: %autorelease +Summary: Handwriting note-taking software with PDF annotation support +# Automatically converted from old format: GPLv2+ - review is highly recommended. +License: GPL-2.0-or-later +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: help2man +BuildRequires: libappstream-glib +%if 0%{?with_cppunit} +BuildRequires: pkgconfig(cppunit) >= 1.12-0 +%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) +%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) >= 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 + +%package plugins +Summary: Default plugin for %{name} +BuildArch: noarch + +%description plugins +The %{name}-plugins package contains sample plugins for %{name}. + +%package ui +Summary: User interface for %{name} +BuildArch: noarch + +%description ui +The %{name}-ui package contains a graphical user interface for %{name}. + + +%prep +%autosetup -p1 + +%build +%cmake \ + -DDISTRO_CODENAME="Fedora Linux" \ + -DENABLE_GTEST=%{gtest} \ + -DENABLE_PROFILING=%{profiling} + +%cmake_build + +%install +%cmake_install + +%find_lang %{name} + +# REMOVE UNNECESSARY SCRIPTS +find %{buildroot}%{_datadir}/%{name} -name update-icon-cache.sh -delete -print +%fdupes %{buildroot}%{_datadir} + +%check +desktop-file-validate %{buildroot}%{_datadir}/applications/com.github.%{name}.%{name}.desktop +appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/com.github.%{name}.%{name}.appdata.xml + +%files -f %{name}.lang +%license LICENSE +%doc README.md AUTHORS +%{_bindir}/%{name}-thumbnailer +%{_bindir}/%{name} +%{_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}/resources/*_template.tex +%{_mandir}/man1/%{name}*.gz +%{_metainfodir}/com.github.%{name}.%{name}.appdata.xml + +%files plugins +%{_datadir}/%{name}/plugins + +%files ui +%{_datadir}/%{name}/ui + +%changelog +%autochangelog From 1c2c515ca2d2e66ca0b7b89f0e2dbe749053b060 Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Thu, 5 Dec 2024 20:12:49 -0800 Subject: [PATCH 45/74] Update to 1.2.5 (rhbz#2330518) --- .gitignore | 1 + sources | 2 +- xournalpp.spec | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index bc5f773..10fa9e0 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /xournalpp-1.2.2.tar.gz /xournalpp-1.2.3.tar.gz /xournalpp-1.2.4.tar.gz +/xournalpp-1.2.5.tar.gz diff --git a/sources b/sources index f0eeb0e..42b63bc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xournalpp-1.2.4.tar.gz) = 45f09757f8dba67f64d53cd05c400bd563e5168eb24d1a0b5a4c407427dc4427adf54d22c5cae6a56945cef71016ff23cad077994dcb20f262082380dd284094 +SHA512 (xournalpp-1.2.5.tar.gz) = c95854b73b3b63fbb154e5c952a15fe94bfb8e71a52f0cf0b606a5be792c1375d540dd820bfbda182d38ad8627afc4eb10c9b636d1be0fe6e77a462e2e6b6b9f diff --git a/xournalpp.spec b/xournalpp.spec index 5e5e495..46fa280 100644 --- a/xournalpp.spec +++ b/xournalpp.spec @@ -4,7 +4,7 @@ %global profiling 1 Name: xournalpp -Version: 1.2.4 +Version: 1.2.5 Release: %autorelease Summary: Handwriting note-taking software with PDF annotation support # Automatically converted from old format: GPLv2+ - review is highly recommended. From 38c78fc42d14a6182341d210a5dcea57a8ee87b1 Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Thu, 5 Dec 2024 20:15:42 -0800 Subject: [PATCH 46/74] Update to 1.2.5 (rhbz#2330518) --- .gitignore | 1 + sources | 2 +- xournalpp.spec | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index f2dfbf8..54b9a1a 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /xournalpp-1.2.4.tar.gz +/xournalpp-1.2.5.tar.gz diff --git a/sources b/sources index f0eeb0e..42b63bc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xournalpp-1.2.4.tar.gz) = 45f09757f8dba67f64d53cd05c400bd563e5168eb24d1a0b5a4c407427dc4427adf54d22c5cae6a56945cef71016ff23cad077994dcb20f262082380dd284094 +SHA512 (xournalpp-1.2.5.tar.gz) = c95854b73b3b63fbb154e5c952a15fe94bfb8e71a52f0cf0b606a5be792c1375d540dd820bfbda182d38ad8627afc4eb10c9b636d1be0fe6e77a462e2e6b6b9f diff --git a/xournalpp.spec b/xournalpp.spec index 5e5e495..46fa280 100644 --- a/xournalpp.spec +++ b/xournalpp.spec @@ -4,7 +4,7 @@ %global profiling 1 Name: xournalpp -Version: 1.2.4 +Version: 1.2.5 Release: %autorelease Summary: Handwriting note-taking software with PDF annotation support # Automatically converted from old format: GPLv2+ - review is highly recommended. From b4e211c354bb6d83618e081227a73981185793f0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 16:13:14 +0000 Subject: [PATCH 47/74] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From fd2990cc16d88d469933ccf6cf76dcbc39bfa364 Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Sat, 22 Feb 2025 13:10:56 -0800 Subject: [PATCH 48/74] "Update to 1.2.6" * Fixed compass outline drawing * Exposed selected text to the windowing system Details on [release notes](https://github.com/xournalpp/xournalpp/releases/tag/v1.2.6) --- .gitignore | 1 + sources | 2 +- xournalpp.spec | 3 +-- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 10fa9e0..08789ba 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /xournalpp-1.2.3.tar.gz /xournalpp-1.2.4.tar.gz /xournalpp-1.2.5.tar.gz +/xournalpp-1.2.6.tar.gz diff --git a/sources b/sources index 42b63bc..7beca6f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xournalpp-1.2.5.tar.gz) = c95854b73b3b63fbb154e5c952a15fe94bfb8e71a52f0cf0b606a5be792c1375d540dd820bfbda182d38ad8627afc4eb10c9b636d1be0fe6e77a462e2e6b6b9f +SHA512 (xournalpp-1.2.6.tar.gz) = 8e74d19414a35d10bcea16594ec08077c864c119e9c4d6069a1fa9ab95f0ce518aa7db08063280890dd7711f8d7b68c2e41cf55ba0b083ecf03e2c2f6b030c4f diff --git a/xournalpp.spec b/xournalpp.spec index 46fa280..d5803b5 100644 --- a/xournalpp.spec +++ b/xournalpp.spec @@ -4,10 +4,9 @@ %global profiling 1 Name: xournalpp -Version: 1.2.5 +Version: 1.2.6 Release: %autorelease Summary: Handwriting note-taking software with PDF annotation support -# Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later URL: https://github.com/%{name}/%{name} Source: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz From 2c6e51db2cc071ae004b91d0e550b8194e162be3 Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Sat, 22 Feb 2025 13:26:22 -0800 Subject: [PATCH 49/74] Update to 1.2.6 --- xournalpp.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/xournalpp.spec b/xournalpp.spec index 46fa280..d5803b5 100644 --- a/xournalpp.spec +++ b/xournalpp.spec @@ -4,10 +4,9 @@ %global profiling 1 Name: xournalpp -Version: 1.2.5 +Version: 1.2.6 Release: %autorelease Summary: Handwriting note-taking software with PDF annotation support -# Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later URL: https://github.com/%{name}/%{name} Source: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz From 2664407cffb8a0b6f629133abd3edd283a8d2b5e Mon Sep 17 00:00:00 2001 From: Cristian Le Date: Wed, 30 Apr 2025 12:07:00 +0200 Subject: [PATCH 50/74] Rebuild with CMake Ninja generator proposal Signed-off-by: Cristian Le --- xournalpp.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/xournalpp.spec b/xournalpp.spec index d5803b5..34ed1ba 100644 --- a/xournalpp.spec +++ b/xournalpp.spec @@ -1,4 +1,3 @@ -%global __cmake_in_source_build 0 %global with_cppunit 1 %global gtest 1 %global profiling 1 @@ -11,6 +10,9 @@ License: GPL-2.0-or-later URL: https://github.com/%{name}/%{name} Source: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz +# Building with Ninja generator fails, further investigation needed +%global _cmake_generator "Unix Makefiles" +BuildRequires: make BuildRequires: cmake >= 3.10 BuildRequires: desktop-file-utils BuildRequires: fdupes From 4ac0c985c1672e92a39c1440db9fd28456cd57fe Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Sun, 11 May 2025 10:10:28 -0700 Subject: [PATCH 51/74] Update to 1.2.7 (rhbz#2365399) --- .gitignore | 1 + sources | 2 +- xournalpp.spec | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 08789ba..0b674db 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /xournalpp-1.2.4.tar.gz /xournalpp-1.2.5.tar.gz /xournalpp-1.2.6.tar.gz +/xournalpp-1.2.7.tar.gz diff --git a/sources b/sources index 7beca6f..88a8c03 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xournalpp-1.2.6.tar.gz) = 8e74d19414a35d10bcea16594ec08077c864c119e9c4d6069a1fa9ab95f0ce518aa7db08063280890dd7711f8d7b68c2e41cf55ba0b083ecf03e2c2f6b030c4f +SHA512 (xournalpp-1.2.7.tar.gz) = cbec828769405ccbe753e63279c3faabf253678543281c9da8ea67e665bafac43cebcd50a5d6588a123c6956e9d672be25e66a2231e9d44fa0640a379eabb70c diff --git a/xournalpp.spec b/xournalpp.spec index 34ed1ba..a691827 100644 --- a/xournalpp.spec +++ b/xournalpp.spec @@ -3,7 +3,7 @@ %global profiling 1 Name: xournalpp -Version: 1.2.6 +Version: 1.2.7 Release: %autorelease Summary: Handwriting note-taking software with PDF annotation support License: GPL-2.0-or-later From f725dcc1a1368ffa849df3e7675c8cc896dbfd3a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 21:02:12 +0000 Subject: [PATCH 52/74] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 40660a86db5fc7a39bc771a723965d5791776e24 Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Sun, 11 May 2025 10:30:30 -0700 Subject: [PATCH 53/74] Update to 1.2.7 (#2365399) --- .gitignore | 1 + sources | 2 +- xournalpp.spec | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 54b9a1a..1cd448a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /xournalpp-1.2.4.tar.gz /xournalpp-1.2.5.tar.gz +/xournalpp-1.2.7.tar.gz diff --git a/sources b/sources index 42b63bc..88a8c03 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xournalpp-1.2.5.tar.gz) = c95854b73b3b63fbb154e5c952a15fe94bfb8e71a52f0cf0b606a5be792c1375d540dd820bfbda182d38ad8627afc4eb10c9b636d1be0fe6e77a462e2e6b6b9f +SHA512 (xournalpp-1.2.7.tar.gz) = cbec828769405ccbe753e63279c3faabf253678543281c9da8ea67e665bafac43cebcd50a5d6588a123c6956e9d672be25e66a2231e9d44fa0640a379eabb70c diff --git a/xournalpp.spec b/xournalpp.spec index d5803b5..cb77d64 100644 --- a/xournalpp.spec +++ b/xournalpp.spec @@ -4,7 +4,7 @@ %global profiling 1 Name: xournalpp -Version: 1.2.6 +Version: 1.2.7 Release: %autorelease Summary: Handwriting note-taking software with PDF annotation support License: GPL-2.0-or-later From 8b23116989f7bccbfc591c0ccdacb418e55671a1 Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Wed, 3 Sep 2025 22:19:39 -0700 Subject: [PATCH 54/74] Update to 1.2.8 This update also modernize the spec file using forge format --- .gitignore | 1 + sources | 2 +- xournalpp.spec | 74 +++++++++++++++++++++++++------------------------- 3 files changed, 39 insertions(+), 38 deletions(-) diff --git a/.gitignore b/.gitignore index 0b674db..bf53741 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /xournalpp-1.2.5.tar.gz /xournalpp-1.2.6.tar.gz /xournalpp-1.2.7.tar.gz +/xournalpp-1.2.8.tar.gz diff --git a/sources b/sources index 88a8c03..8c4109c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xournalpp-1.2.7.tar.gz) = cbec828769405ccbe753e63279c3faabf253678543281c9da8ea67e665bafac43cebcd50a5d6588a123c6956e9d672be25e66a2231e9d44fa0640a379eabb70c +SHA512 (xournalpp-1.2.8.tar.gz) = 1f9e7e80b62728043d09db00d9c0ec1e827c2ee4ebc196269c18155240fa47d72f367fc0f40fe41e22044518e23fe4c5360c6e24bdc9d100506ed871998b6998 diff --git a/xournalpp.spec b/xournalpp.spec index a691827..f3b4eae 100644 --- a/xournalpp.spec +++ b/xournalpp.spec @@ -1,18 +1,17 @@ -%global with_cppunit 1 -%global gtest 1 -%global profiling 1 +%bcond_without cppunit +%bcond_without gtest +%bcond_without profiling +%global forgeurl https://github.com/xournalpp/xournalpp Name: xournalpp -Version: 1.2.7 +Version: 1.2.8 Release: %autorelease Summary: Handwriting note-taking software with PDF annotation support -License: GPL-2.0-or-later -URL: https://github.com/%{name}/%{name} -Source: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz +License: GPL-2.0-or-later +%forgemeta +URL: %{forgeurl} +Source: %{forgesource} -# Building with Ninja generator fails, further investigation needed -%global _cmake_generator "Unix Makefiles" -BuildRequires: make BuildRequires: cmake >= 3.10 BuildRequires: desktop-file-utils BuildRequires: fdupes @@ -20,69 +19,69 @@ BuildRequires: gcc-c++ BuildRequires: gettext BuildRequires: help2man BuildRequires: libappstream-glib -%if 0%{?with_cppunit} -BuildRequires: pkgconfig(cppunit) >= 1.12-0 + +%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 +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 -%autosetup -p1 +%forgeautosetup -p1 %build %cmake \ - -DDISTRO_CODENAME="Fedora Linux" \ - -DENABLE_GTEST=%{gtest} \ - -DENABLE_PROFILING=%{profiling} + -DDISTRO_CODENAME="Fedora Linux" \ + -DENABLE_GTEST=%{with gtest} \ + -DENABLE_PROFILING=%{with profiling} %cmake_build %install %cmake_install - %find_lang %{name} -# REMOVE UNNECESSARY SCRIPTS -find %{buildroot}%{_datadir}/%{name} -name update-icon-cache.sh -delete -print -%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 @@ -91,8 +90,8 @@ 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 %{_datadir}/applications/com.github.%{name}.%{name}.desktop %{_datadir}/icons/hicolor/scalable/apps/com.github.%{name}.%{name}.svg %{_datadir}/icons/hicolor/scalable/mimetypes/* @@ -111,3 +110,4 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/com.github.%{n %changelog %autochangelog + From 857d1948f62bf7e57c44956b845e6585d140f983 Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Wed, 3 Sep 2025 22:31:01 -0700 Subject: [PATCH 55/74] Update to 1.2.8 --- .gitignore | 1 + sources | 2 +- xournalpp.spec | 71 +++++++++++++++++++++++++------------------------- 3 files changed, 38 insertions(+), 36 deletions(-) diff --git a/.gitignore b/.gitignore index 1cd448a..8914e80 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /xournalpp-1.2.4.tar.gz /xournalpp-1.2.5.tar.gz /xournalpp-1.2.7.tar.gz +/xournalpp-1.2.8.tar.gz diff --git a/sources b/sources index 88a8c03..8c4109c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xournalpp-1.2.7.tar.gz) = cbec828769405ccbe753e63279c3faabf253678543281c9da8ea67e665bafac43cebcd50a5d6588a123c6956e9d672be25e66a2231e9d44fa0640a379eabb70c +SHA512 (xournalpp-1.2.8.tar.gz) = 1f9e7e80b62728043d09db00d9c0ec1e827c2ee4ebc196269c18155240fa47d72f367fc0f40fe41e22044518e23fe4c5360c6e24bdc9d100506ed871998b6998 diff --git a/xournalpp.spec b/xournalpp.spec index cb77d64..0a214d5 100644 --- a/xournalpp.spec +++ b/xournalpp.spec @@ -1,15 +1,16 @@ -%global __cmake_in_source_build 0 -%global with_cppunit 1 -%global gtest 1 -%global profiling 1 +%bcond_without cppunit +%bcond_without gtest +%bcond_without profiling +%global forgeurl https://github.com/xournalpp/xournalpp Name: xournalpp -Version: 1.2.7 +Version: 1.2.8 Release: %autorelease Summary: Handwriting note-taking software with PDF annotation support -License: GPL-2.0-or-later -URL: https://github.com/%{name}/%{name} -Source: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz +License: GPL-2.0-or-later +%forgemeta +URL: %{forgeurl} +Source: %{forgesource} BuildRequires: cmake >= 3.10 BuildRequires: desktop-file-utils @@ -18,69 +19,69 @@ BuildRequires: gcc-c++ BuildRequires: gettext BuildRequires: help2man BuildRequires: libappstream-glib -%if 0%{?with_cppunit} -BuildRequires: pkgconfig(cppunit) >= 1.12-0 + +%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 +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 -%autosetup -p1 +%forgeautosetup -p1 %build %cmake \ - -DDISTRO_CODENAME="Fedora Linux" \ - -DENABLE_GTEST=%{gtest} \ - -DENABLE_PROFILING=%{profiling} + -DDISTRO_CODENAME="Fedora Linux" \ + -DENABLE_GTEST=%{with gtest} \ + -DENABLE_PROFILING=%{with profiling} %cmake_build %install %cmake_install - %find_lang %{name} -# REMOVE UNNECESSARY SCRIPTS -find %{buildroot}%{_datadir}/%{name} -name update-icon-cache.sh -delete -print -%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 @@ -89,8 +90,8 @@ 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 %{_datadir}/applications/com.github.%{name}.%{name}.desktop %{_datadir}/icons/hicolor/scalable/apps/com.github.%{name}.%{name}.svg %{_datadir}/icons/hicolor/scalable/mimetypes/* From 00cc2e5fb216ee9ba3ef1ce1e990f6745f6d65ee Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Sun, 7 Dec 2025 10:07:22 -0800 Subject: [PATCH 56/74] Update to 1.2.10 --- .gitignore | 1 + sources | 2 +- xournalpp.spec | 12 ++++++++---- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index bf53741..bbd92e1 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /xournalpp-1.2.6.tar.gz /xournalpp-1.2.7.tar.gz /xournalpp-1.2.8.tar.gz +/xournalpp-1.2.10.tar.gz diff --git a/sources b/sources index 8c4109c..21be706 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xournalpp-1.2.8.tar.gz) = 1f9e7e80b62728043d09db00d9c0ec1e827c2ee4ebc196269c18155240fa47d72f367fc0f40fe41e22044518e23fe4c5360c6e24bdc9d100506ed871998b6998 +SHA512 (xournalpp-1.2.10.tar.gz) = 1bdbbc53b31e295ced095667dfb1935c624ec967d2aaa29ccf244f9e0a661bc5397a5bc66365e8d250071c0393695b404616ceee68438c2cb282ffb6a895ff02 diff --git a/xournalpp.spec b/xournalpp.spec index f3b4eae..5ea54ea 100644 --- a/xournalpp.spec +++ b/xournalpp.spec @@ -1,10 +1,11 @@ -%bcond_without cppunit -%bcond_without gtest -%bcond_without profiling +%bcond cppunit 1 +%bcond gtest 1 +%bcond profiling 1 +%bcond qpdf 1 %global forgeurl https://github.com/xournalpp/xournalpp Name: xournalpp -Version: 1.2.8 +Version: 1.2.10 Release: %autorelease Summary: Handwriting note-taking software with PDF annotation support License: GPL-2.0-or-later @@ -34,6 +35,9 @@ BuildRequires: pkgconfig(librsvg-2.0) BuildRequires: pkgconfig(libprofiler) >= 2.5 BuildRequires: pkgconfig(libtcmalloc) >= 2.5 %endif +%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 From 4c6d72e1042781fd2bc281c5a51f7172f1251228 Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Sun, 7 Dec 2025 10:07:22 -0800 Subject: [PATCH 57/74] Update to 1.2.10 --- .gitignore | 1 + sources | 2 +- xournalpp.spec | 12 ++++++++---- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 8914e80..289c89a 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /xournalpp-1.2.5.tar.gz /xournalpp-1.2.7.tar.gz /xournalpp-1.2.8.tar.gz +/xournalpp-1.2.10.tar.gz diff --git a/sources b/sources index 8c4109c..21be706 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xournalpp-1.2.8.tar.gz) = 1f9e7e80b62728043d09db00d9c0ec1e827c2ee4ebc196269c18155240fa47d72f367fc0f40fe41e22044518e23fe4c5360c6e24bdc9d100506ed871998b6998 +SHA512 (xournalpp-1.2.10.tar.gz) = 1bdbbc53b31e295ced095667dfb1935c624ec967d2aaa29ccf244f9e0a661bc5397a5bc66365e8d250071c0393695b404616ceee68438c2cb282ffb6a895ff02 diff --git a/xournalpp.spec b/xournalpp.spec index 0a214d5..2be3666 100644 --- a/xournalpp.spec +++ b/xournalpp.spec @@ -1,10 +1,11 @@ -%bcond_without cppunit -%bcond_without gtest -%bcond_without profiling +%bcond cppunit 1 +%bcond gtest 1 +%bcond profiling 1 +%bcond qpdf 1 %global forgeurl https://github.com/xournalpp/xournalpp Name: xournalpp -Version: 1.2.8 +Version: 1.2.10 Release: %autorelease Summary: Handwriting note-taking software with PDF annotation support License: GPL-2.0-or-later @@ -34,6 +35,9 @@ BuildRequires: pkgconfig(librsvg-2.0) BuildRequires: pkgconfig(libprofiler) >= 2.5 BuildRequires: pkgconfig(libtcmalloc) >= 2.5 %endif +%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 From 8b8640307c97d51e7260d337446ff36e69d566dc Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Sat, 13 Dec 2025 00:43:14 -0800 Subject: [PATCH 58/74] Update to 1.3.0 --- xournalpp.spec | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/xournalpp.spec b/xournalpp.spec index 5ea54ea..763e7ae 100644 --- a/xournalpp.spec +++ b/xournalpp.spec @@ -5,7 +5,7 @@ %global forgeurl https://github.com/xournalpp/xournalpp Name: xournalpp -Version: 1.2.10 +Version: 1.3.0 Release: %autorelease Summary: Handwriting note-taking software with PDF annotation support License: GPL-2.0-or-later @@ -18,8 +18,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,6 +75,7 @@ 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} @@ -83,6 +86,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,22 +108,24 @@ 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 From 53d0687aed6a21831135da76dfeda0264e2d373e Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Sat, 13 Dec 2025 00:49:03 -0800 Subject: [PATCH 59/74] Upload source --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index bbd92e1..11fc8b9 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /xournalpp-1.2.7.tar.gz /xournalpp-1.2.8.tar.gz /xournalpp-1.2.10.tar.gz +/xournalpp-1.3.0.tar.gz diff --git a/sources b/sources index 21be706..ae73a51 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xournalpp-1.2.10.tar.gz) = 1bdbbc53b31e295ced095667dfb1935c624ec967d2aaa29ccf244f9e0a661bc5397a5bc66365e8d250071c0393695b404616ceee68438c2cb282ffb6a895ff02 +SHA512 (xournalpp-1.3.0.tar.gz) = 35de6577261f07d0213551c1869af114ae4dfd295d414de78c4c209a78963a6aa5ffe322a4ba15b2f3240aac092b86635965b776a16a9417bd350eecfd87be40 From 0de6b44d8f76f31964d906ed83f0b07c22ee2078 Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Sat, 13 Dec 2025 00:49:03 -0800 Subject: [PATCH 60/74] Upload source --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 289c89a..7b19a10 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /xournalpp-1.2.7.tar.gz /xournalpp-1.2.8.tar.gz /xournalpp-1.2.10.tar.gz +/xournalpp-1.3.0.tar.gz diff --git a/sources b/sources index 21be706..ae73a51 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xournalpp-1.2.10.tar.gz) = 1bdbbc53b31e295ced095667dfb1935c624ec967d2aaa29ccf244f9e0a661bc5397a5bc66365e8d250071c0393695b404616ceee68438c2cb282ffb6a895ff02 +SHA512 (xournalpp-1.3.0.tar.gz) = 35de6577261f07d0213551c1869af114ae4dfd295d414de78c4c209a78963a6aa5ffe322a4ba15b2f3240aac092b86635965b776a16a9417bd350eecfd87be40 From e5d30de8c9c4935afc97d863a3080fd66cd5f2fb Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Sat, 13 Dec 2025 00:43:14 -0800 Subject: [PATCH 61/74] Update to 1.3.0 --- xournalpp.spec | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/xournalpp.spec b/xournalpp.spec index 2be3666..05cd75d 100644 --- a/xournalpp.spec +++ b/xournalpp.spec @@ -5,7 +5,7 @@ %global forgeurl https://github.com/xournalpp/xournalpp Name: xournalpp -Version: 1.2.10 +Version: 1.3.0 Release: %autorelease Summary: Handwriting note-taking software with PDF annotation support License: GPL-2.0-or-later @@ -18,8 +18,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,6 +75,7 @@ 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} @@ -83,6 +86,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,22 +108,24 @@ 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 From 0bd18f65d27670e3108fe03b06fb998a9284ccb0 Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Mon, 22 Dec 2025 08:39:15 -0800 Subject: [PATCH 62/74] Update to 1.3.1 (rhbz#2424237) --- .gitignore | 1 + sources | 2 +- xournalpp.spec | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 11fc8b9..edf7222 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /xournalpp-1.2.8.tar.gz /xournalpp-1.2.10.tar.gz /xournalpp-1.3.0.tar.gz +/xournalpp-1.3.1.tar.gz diff --git a/sources b/sources index ae73a51..5af3675 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xournalpp-1.3.0.tar.gz) = 35de6577261f07d0213551c1869af114ae4dfd295d414de78c4c209a78963a6aa5ffe322a4ba15b2f3240aac092b86635965b776a16a9417bd350eecfd87be40 +SHA512 (xournalpp-1.3.1.tar.gz) = b8febeb5a1c74cf02b490f92165e776fe52f4683b627e905f22bc2ea6de6c8482dc1639546a41edd433c2125d6657084ea04dc125320c099d2f04cd0d5795f4b diff --git a/xournalpp.spec b/xournalpp.spec index 763e7ae..70f1135 100644 --- a/xournalpp.spec +++ b/xournalpp.spec @@ -5,7 +5,7 @@ %global forgeurl https://github.com/xournalpp/xournalpp Name: xournalpp -Version: 1.3.0 +Version: 1.3.1 Release: %autorelease Summary: Handwriting note-taking software with PDF annotation support License: GPL-2.0-or-later From 62be5aa039531884df262f443ba56b27029059f2 Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Mon, 22 Dec 2025 08:39:15 -0800 Subject: [PATCH 63/74] Update to 1.3.1 (rhbz#2424237) --- .gitignore | 1 + sources | 2 +- xournalpp.spec | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 7b19a10..fc36afa 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /xournalpp-1.2.8.tar.gz /xournalpp-1.2.10.tar.gz /xournalpp-1.3.0.tar.gz +/xournalpp-1.3.1.tar.gz diff --git a/sources b/sources index ae73a51..5af3675 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xournalpp-1.3.0.tar.gz) = 35de6577261f07d0213551c1869af114ae4dfd295d414de78c4c209a78963a6aa5ffe322a4ba15b2f3240aac092b86635965b776a16a9417bd350eecfd87be40 +SHA512 (xournalpp-1.3.1.tar.gz) = b8febeb5a1c74cf02b490f92165e776fe52f4683b627e905f22bc2ea6de6c8482dc1639546a41edd433c2125d6657084ea04dc125320c099d2f04cd0d5795f4b diff --git a/xournalpp.spec b/xournalpp.spec index 05cd75d..aecf323 100644 --- a/xournalpp.spec +++ b/xournalpp.spec @@ -5,7 +5,7 @@ %global forgeurl https://github.com/xournalpp/xournalpp Name: xournalpp -Version: 1.3.0 +Version: 1.3.1 Release: %autorelease Summary: Handwriting note-taking software with PDF annotation support License: GPL-2.0-or-later From 9579ebb820a46c018c2646d814445b8c10c91692 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 20:51:38 +0000 Subject: [PATCH 64/74] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From f74c393d40cbe91f6c767887e70dd1285c5644a7 Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Tue, 3 Feb 2026 16:04:17 -0800 Subject: [PATCH 65/74] Update to 1.3.2 (rhbz#2436551) --- .gitignore | 1 + sources | 2 +- xournalpp.spec | 3 +-- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index edf7222..e7d3444 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ /xournalpp-1.2.10.tar.gz /xournalpp-1.3.0.tar.gz /xournalpp-1.3.1.tar.gz +/xournalpp-1.3.2.tar.gz diff --git a/sources b/sources index 5af3675..fcb1cac 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xournalpp-1.3.1.tar.gz) = b8febeb5a1c74cf02b490f92165e776fe52f4683b627e905f22bc2ea6de6c8482dc1639546a41edd433c2125d6657084ea04dc125320c099d2f04cd0d5795f4b +SHA512 (xournalpp-1.3.2.tar.gz) = 64cd0b7a9e030da8f1c655527556918d0a9d9010153ef565044020180af375b6a71a8ae7f8d91e85634f541cb3a25727c306b1d929bce9017fb4346af5b5baa1 diff --git a/xournalpp.spec b/xournalpp.spec index 70f1135..bced8de 100644 --- a/xournalpp.spec +++ b/xournalpp.spec @@ -5,7 +5,7 @@ %global forgeurl https://github.com/xournalpp/xournalpp Name: xournalpp -Version: 1.3.1 +Version: 1.3.2 Release: %autorelease Summary: Handwriting note-taking software with PDF annotation support License: GPL-2.0-or-later @@ -130,4 +130,3 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/com.github.%{n %changelog %autochangelog - From dae0d2ae2714074ecda9ea05b20373c5abaa932e Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Tue, 3 Feb 2026 16:04:17 -0800 Subject: [PATCH 66/74] Update to 1.3.2 (rhbz#2436551) --- .gitignore | 1 + sources | 2 +- xournalpp.spec | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index fc36afa..5d224dc 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /xournalpp-1.2.10.tar.gz /xournalpp-1.3.0.tar.gz /xournalpp-1.3.1.tar.gz +/xournalpp-1.3.2.tar.gz diff --git a/sources b/sources index 5af3675..fcb1cac 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xournalpp-1.3.1.tar.gz) = b8febeb5a1c74cf02b490f92165e776fe52f4683b627e905f22bc2ea6de6c8482dc1639546a41edd433c2125d6657084ea04dc125320c099d2f04cd0d5795f4b +SHA512 (xournalpp-1.3.2.tar.gz) = 64cd0b7a9e030da8f1c655527556918d0a9d9010153ef565044020180af375b6a71a8ae7f8d91e85634f541cb3a25727c306b1d929bce9017fb4346af5b5baa1 diff --git a/xournalpp.spec b/xournalpp.spec index aecf323..bced8de 100644 --- a/xournalpp.spec +++ b/xournalpp.spec @@ -5,7 +5,7 @@ %global forgeurl https://github.com/xournalpp/xournalpp Name: xournalpp -Version: 1.3.1 +Version: 1.3.2 Release: %autorelease Summary: Handwriting note-taking software with PDF annotation support License: GPL-2.0-or-later From f2486c82404a7bbe14789e9ab7ed17d425752136 Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Sat, 28 Feb 2026 10:42:31 -0800 Subject: [PATCH 67/74] Update to 1.3.3 (rhbz#2443564) --- xournalpp.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xournalpp.spec b/xournalpp.spec index bced8de..a8a8772 100644 --- a/xournalpp.spec +++ b/xournalpp.spec @@ -5,7 +5,7 @@ %global forgeurl https://github.com/xournalpp/xournalpp Name: xournalpp -Version: 1.3.2 +Version: 1.3.3 Release: %autorelease Summary: Handwriting note-taking software with PDF annotation support License: GPL-2.0-or-later From 5631a8dcd402864d9c1ac823736dcc51e0b01410 Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Sat, 28 Feb 2026 10:50:09 -0800 Subject: [PATCH 68/74] Upload new source --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index e7d3444..1ec96c7 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ /xournalpp-1.3.0.tar.gz /xournalpp-1.3.1.tar.gz /xournalpp-1.3.2.tar.gz +/xournalpp-1.3.3.tar.gz diff --git a/sources b/sources index fcb1cac..1e3088d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xournalpp-1.3.2.tar.gz) = 64cd0b7a9e030da8f1c655527556918d0a9d9010153ef565044020180af375b6a71a8ae7f8d91e85634f541cb3a25727c306b1d929bce9017fb4346af5b5baa1 +SHA512 (xournalpp-1.3.3.tar.gz) = d93e05c073495e31fac128b88b44772286fe312df1b1eef8fbd79e71e5d4859f2733d667eaa653b4d550660f7de7a99ebe2c51466b73b949d29b4c86c6744733 From fae7f5064baaf591f96c41f8604136da203c8e41 Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Sun, 29 Mar 2026 11:29:34 -0700 Subject: [PATCH 69/74] Update to 1.3.4 (rhbz#2452801) --- xournalpp.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xournalpp.spec b/xournalpp.spec index a8a8772..3f089e7 100644 --- a/xournalpp.spec +++ b/xournalpp.spec @@ -5,7 +5,7 @@ %global forgeurl https://github.com/xournalpp/xournalpp Name: xournalpp -Version: 1.3.3 +Version: 1.3.4 Release: %autorelease Summary: Handwriting note-taking software with PDF annotation support License: GPL-2.0-or-later From 23d951cb8b73020e17559151db4609da2d35788b Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Sun, 29 Mar 2026 11:33:09 -0700 Subject: [PATCH 70/74] Upload source --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 1ec96c7..89dab92 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ /xournalpp-1.3.1.tar.gz /xournalpp-1.3.2.tar.gz /xournalpp-1.3.3.tar.gz +/xournalpp-1.3.4.tar.gz diff --git a/sources b/sources index 1e3088d..e40c86a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xournalpp-1.3.3.tar.gz) = d93e05c073495e31fac128b88b44772286fe312df1b1eef8fbd79e71e5d4859f2733d667eaa653b4d550660f7de7a99ebe2c51466b73b949d29b4c86c6744733 +SHA512 (xournalpp-1.3.4.tar.gz) = bc2c925d084722d3418b3de0c0131518fa2dab1563acd6636ab3a2c5a358962e71feea339a248341f57cadf83733a1f0532f0993287da9d56eb9b0e5ab203578 From 6e9bed52992a700434f35728782b599e4770b5fa Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Tue, 9 Jun 2026 08:41:06 -0700 Subject: [PATCH 71/74] Update to 1.3.5 (#2486189) --- .gitignore | 1 + sources | 2 +- xournalpp.spec | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 89dab92..4831843 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ /xournalpp-1.3.2.tar.gz /xournalpp-1.3.3.tar.gz /xournalpp-1.3.4.tar.gz +/xournalpp-1.3.5.tar.gz diff --git a/sources b/sources index e40c86a..c94c393 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xournalpp-1.3.4.tar.gz) = bc2c925d084722d3418b3de0c0131518fa2dab1563acd6636ab3a2c5a358962e71feea339a248341f57cadf83733a1f0532f0993287da9d56eb9b0e5ab203578 +SHA512 (xournalpp-1.3.5.tar.gz) = 0906cbf40ec9b12493c1b021ca3dd7fa123934b4cd97a36a78960d3af38fbec25b8097a9d9a1610e392132caeac40e34065b87b769872f93afa999b08ac8724d diff --git a/xournalpp.spec b/xournalpp.spec index 3f089e7..7516510 100644 --- a/xournalpp.spec +++ b/xournalpp.spec @@ -5,7 +5,7 @@ %global forgeurl https://github.com/xournalpp/xournalpp Name: xournalpp -Version: 1.3.4 +Version: 1.3.5 Release: %autorelease Summary: Handwriting note-taking software with PDF annotation support License: GPL-2.0-or-later From 09b0f126389c1d91075b24f0a5b08981613a77cd Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Tue, 14 Jul 2026 17:19:17 -0700 Subject: [PATCH 72/74] Update to upstream 1.3.6 --- .gitignore | 1 + sources | 2 +- xournalpp.spec | 12 ++++++++++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 4831843..6059c29 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ /xournalpp-1.3.3.tar.gz /xournalpp-1.3.4.tar.gz /xournalpp-1.3.5.tar.gz +/xournalpp-1.3.6.tar.gz diff --git a/sources b/sources index c94c393..bf8ddfc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xournalpp-1.3.5.tar.gz) = 0906cbf40ec9b12493c1b021ca3dd7fa123934b4cd97a36a78960d3af38fbec25b8097a9d9a1610e392132caeac40e34065b87b769872f93afa999b08ac8724d +SHA512 (xournalpp-1.3.6.tar.gz) = 8530920b197343a80607e44759bf46f3deb274781de0509e30e49a9728896e3d96e7749f0e7025fdabb4be3969146d26ede215583ac1fb67043d73476fd00d89 diff --git a/xournalpp.spec b/xournalpp.spec index 7516510..2071c61 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.3.5 +Version: 1.3.6 Release: %autorelease Summary: Handwriting note-taking software with PDF annotation support License: GPL-2.0-or-later @@ -78,7 +85,8 @@ This package contains user interface resources for %{name}. -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 From c62f5e44694bf614094fe7d89eaf7c2588253474 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 09:24:13 +0000 Subject: [PATCH 73/74] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild From 72216be6bce48b747a1d94772594f70ad78d6215 Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Tue, 11 Aug 2026 08:41:13 -0700 Subject: [PATCH 74/74] Update to upstream 1.3.7 Resolves: rhbz#2512924 --- .gitignore | 1 + sources | 2 +- xournalpp.spec | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 6059c29..3c82a5f 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ /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 bf8ddfc..8ad1f7c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xournalpp-1.3.6.tar.gz) = 8530920b197343a80607e44759bf46f3deb274781de0509e30e49a9728896e3d96e7749f0e7025fdabb4be3969146d26ede215583ac1fb67043d73476fd00d89 +SHA512 (xournalpp-1.3.7.tar.gz) = 119f11d9a6a22c616b104b559a56fa960047a898e016c22987d44fadcae5659896f7d7ecb110b86bd3bce8d5bdfb5b78849233e96bfa3905b6c750ce80ea3c5d diff --git a/xournalpp.spec b/xournalpp.spec index 2071c61..c2389af 100644 --- a/xournalpp.spec +++ b/xournalpp.spec @@ -12,7 +12,7 @@ %global forgeurl https://github.com/xournalpp/xournalpp Name: xournalpp -Version: 1.3.6 +Version: 1.3.7 Release: %autorelease Summary: Handwriting note-taking software with PDF annotation support License: GPL-2.0-or-later