From 4dd252236cc20c2f03d1ee3306d948fac45ebdb9 Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Sun, 11 May 2025 10:10:28 -0700 Subject: [PATCH 01/14] 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 ee1d01fe41d65a7b1fe3bb98c9bb158f705f33b8 Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Wed, 3 Sep 2025 22:19:39 -0700 Subject: [PATCH 02/14] 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 6475e96ecdc33320f687f07c891404650311ec44 Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Sun, 7 Dec 2025 10:07:22 -0800 Subject: [PATCH 03/14] 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 3e6a53586034e7065ab42fd8f3b6466acc2c89d4 Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Sat, 13 Dec 2025 00:49:03 -0800 Subject: [PATCH 04/14] 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 43e39c917df64257b8866fe6dc036b5eee903a01 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 21:02:12 +0000 Subject: [PATCH 05/14] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 07a147ae882c62d3e5c0613da5e8c87f7461598a Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Sat, 13 Dec 2025 00:43:14 -0800 Subject: [PATCH 06/14] 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 1d25387b3eb5498a86a6270cfe6819e53dd5df08 Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Mon, 22 Dec 2025 08:39:15 -0800 Subject: [PATCH 07/14] 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 c87cdfac62b7130ea65ea0425440f3a66be57f23 Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Tue, 3 Feb 2026 16:04:17 -0800 Subject: [PATCH 08/14] 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 f0446a9fbabea9b440bd134cf601eb0848423143 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 21:02:12 +0000 Subject: [PATCH 09/14] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From f6fccb858ae87a48f75faacb5169196ecb8ab138 Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Sat, 28 Feb 2026 10:50:09 -0800 Subject: [PATCH 10/14] 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 6c4aa08b4cf9e60884327d72197a37c3fe54fdb5 Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Sat, 28 Feb 2026 10:53:20 -0800 Subject: [PATCH 11/14] 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 3be8c30994d631c246d1423425c075a469443d37 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 21:02:12 +0000 Subject: [PATCH 12/14] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 3b7044d42fcf3418b83dd4a8c89af3af7807c4dd Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Sun, 29 Mar 2026 11:29:34 -0700 Subject: [PATCH 13/14] 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 e65d8115a6ad6cda9614f38c3cc937c75c15d36a Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Sun, 29 Mar 2026 11:33:09 -0700 Subject: [PATCH 14/14] 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