diff --git a/.gitignore b/.gitignore index 82bfe74..105050c 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,7 @@ /xournalpp-1.0.19.tar.gz /xournalpp-1.0.20.tar.gz /xournalpp-1.1.0.tar.gz +/xournalpp-1.1.1.tar.gz +/xournalpp-1.1.2.tar.gz +/xournalpp-1.1.3.tar.gz +/xournalpp-1.2.0.tar.gz diff --git a/sources b/sources index 99174b0..3c413f2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xournalpp-1.1.0.tar.gz) = 823d2561caa45bd7deb994bd71df0df35b6f279e04c4e8bb5d3f05f2fff2a68af8ea572f42095a9f28da5b2fdbe6b9b465aeca758d36ab29a24c62ea68c99c56 +SHA512 (xournalpp-1.2.0.tar.gz) = 9b8a1d0cb3502ea81008d00310731b10946608e5d73ddb4c785e30012389d788ccf1958e9e36875937b9c1475f562275a4e301fd641b3e9eb72c10466804d42b diff --git a/xournalpp.spec b/xournalpp.spec index bf6718d..ad388f6 100644 --- a/xournalpp.spec +++ b/xournalpp.spec @@ -1,39 +1,41 @@ -%global __cmake_in_source_build 0 %global _with_cppunit 1 +%global _gtest 1 +#%%global profiling 0 Name: xournalpp -Version: 1.1.0 +Version: 1.2.0 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/%{version}/%{name}-%{version}.tar.gz +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 -# 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 } -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-latex-bin Requires: hicolor-icon-theme Requires: %{name}-plugins = %{version}-%{release} Requires: %{name}-ui = %{version}-%{release} @@ -62,6 +64,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 @@ -82,7 +85,6 @@ desktop-file-install \ # REMOVE UNNECESSARY SCRIPTS find %{buildroot}%{_datadir}/%{name} -name update-icon-cache.sh -delete -print - %fdupes %{buildroot}%{_datadir} %check @@ -98,10 +100,10 @@ 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 +%{_mandir}/man1/%{name}*.gz %{_metainfodir}/com.github.%{name}.%{name}.appdata.xml %files plugins @@ -111,92 +113,4 @@ 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 -- 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