From a1c8e527fef8cfa83c758b8b3cbdd9440ef60e2d Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Fri, 23 Oct 2020 00:09:28 -0700 Subject: [PATCH] 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