From 3f9a7d5af195b4bf4921b492023e3e72cd72bafb Mon Sep 17 00:00:00 2001 From: Igor Raits Date: Tue, 23 Jun 2020 14:54:11 +0200 Subject: [PATCH 01/11] "Adding package.cfg file" --- package.cfg | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 package.cfg diff --git a/package.cfg b/package.cfg new file mode 100644 index 0000000..66ea79d --- /dev/null +++ b/package.cfg @@ -0,0 +1,2 @@ +[koji] +targets = epel8 epel8-playground \ No newline at end of file From b4068192f3672cc217b10258fe175cb009e8682d Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 7 Jul 2020 12:09:10 -0600 Subject: [PATCH 02/11] Revert "Improve compatibility with new CMake macro" This reverts commit fc10648f5d295018ac5adb3b0b4641c6966941f6. --- xournalpp.spec | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/xournalpp.spec b/xournalpp.spec index 4b602fc..ef3f6a4 100644 --- a/xournalpp.spec +++ b/xournalpp.spec @@ -1,4 +1,3 @@ -%global __cmake_in_source_build 1 %global _with_cppunit 1 Name: xournalpp @@ -58,16 +57,15 @@ sed -i 's|tlh-AA|tlh|g' po/tlh.po %build %cmake3 \ - %{?_with_cppunit: -DENABLE_CPPUNIT=ON} \ - %{nil} + %{_with_cppunit: -DENABLE_CPPUNIT=ON} \ + . -%cmake3_build # Add translations parameter # https://github.com/xournalpp/xournalpp/issues/1596 -%cmake3_build --target translations +%make_build translations %install -%cmake3_install +%make_install #Remove depreciated key from desktop file #Fix desktop file associated with application From 7fdce931ced1ed594536ce27c78f0dbd47395891 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Thu, 24 Sep 2020 16:08:16 +0000 Subject: [PATCH 03/11] remove package.cfg per new epel-playground policy --- package.cfg | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 package.cfg diff --git a/package.cfg b/package.cfg deleted file mode 100644 index 66ea79d..0000000 --- a/package.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[koji] -targets = epel8 epel8-playground \ No newline at end of file From 161072a0ce17967ff63a510d0ce3d0b621689cdc Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Thu, 17 Dec 2020 19:35:40 -0800 Subject: [PATCH 04/11] 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 f3ffaed9696747411a0ac2728e2fbbb25be8e5c0 Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Sun, 28 Feb 2021 15:09:15 -0800 Subject: [PATCH 05/11] Enable math tex support Add fdupes for build requirement Simplify summary --- xournalpp.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/xournalpp.spec b/xournalpp.spec index 5be61fb..ebc9555 100644 --- a/xournalpp.spec +++ b/xournalpp.spec @@ -118,9 +118,6 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/com.github.%{n - 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 From 53b02aa66e31da116c4684fae4170b606d682fa2 Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Sun, 28 Feb 2021 15:09:15 -0800 Subject: [PATCH 06/11] Enable math tex support Add fdupes for build requirement Simplify summary --- xournalpp.spec | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/xournalpp.spec b/xournalpp.spec index 334a57e..713818a 100644 --- a/xournalpp.spec +++ b/xournalpp.spec @@ -2,15 +2,15 @@ Name: xournalpp Version: 1.0.20 -Release: 1%{?dist} -Summary: Handwriting note-taking software with PDF annotation support - +Release: 3%{?dist} +Summary: Handwriting note-taking software License: GPLv2+ URL: https://github.com/%{name}/%{name} 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 @@ -25,6 +25,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} @@ -58,6 +59,7 @@ 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 @@ -77,9 +79,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 @@ -106,6 +109,11 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/com.github.%{n %{_datadir}/%{name}/ui %changelog +* Sun Feb 28 2021 Luya Tshimbalanga - 1.0.20-3 +- Enable math tex support +- Add fdupes for build requirement +- Simplify summary + * Fri Dec 18 2020 Fedora Release Monitoring - 1.0.20-1 - Update to 1.0.20 (#1908932) From e071cfeaff382f4a696f3cf82483adf745503077 Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Tue, 15 Mar 2022 20:01:46 -0700 Subject: [PATCH 07/11] 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 b346ff8..d96f823 100644 --- a/xournalpp.spec +++ b/xournalpp.spec @@ -1,13 +1,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 @@ -16,10 +16,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 } @@ -110,6 +106,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 cfef7adc84cdc8c3f69b3cc04ce609384abc49a8 Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Sun, 30 Oct 2022 13:43:07 -0700 Subject: [PATCH 08/11] Update to 1.1.2 (#2136012) --- .gitignore | 1 + sources | 2 +- xournalpp.spec | 119 ++++++++++--------------------------------------- 3 files changed, 26 insertions(+), 96 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 d96f823..29746a1 100644 --- a/xournalpp.spec +++ b/xournalpp.spec @@ -1,11 +1,12 @@ %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 @@ -14,21 +15,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} @@ -57,6 +66,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 @@ -77,7 +87,6 @@ desktop-file-install \ # REMOVE UNNECESSARY SCRIPTS find %{buildroot}%{_datadir}/%{name} -name update-icon-cache.sh -delete -print - %fdupes %{buildroot}%{_datadir} %check @@ -97,6 +106,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 @@ -106,85 +116,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 - -* 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) - -* 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 793f5988884f9ddaaf9b0d4beaf460c1f2aba4c6 Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Mon, 28 Nov 2022 09:10:05 -0800 Subject: [PATCH 09/11] 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 29746a1..d2ced9b 100644 --- a/xournalpp.spec +++ b/xournalpp.spec @@ -3,7 +3,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+ @@ -35,9 +35,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 d6ae5a0d5eaf2974079a0162588b35b5172d7ad9 Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Sun, 30 Jul 2023 11:45:15 -0700 Subject: [PATCH 10/11] Update to 1.2.0 --- xournalpp.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/xournalpp.spec b/xournalpp.spec index d2ced9b..ad388f6 100644 --- a/xournalpp.spec +++ b/xournalpp.spec @@ -3,7 +3,7 @@ #%%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+ @@ -100,7 +100,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 e09f23db11c5d6be6908e83714ad86a8adb763dc Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Sun, 30 Jul 2023 11:58:28 -0700 Subject: [PATCH 11/11] Upload source --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) 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