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 9d4ada2..e9dd5a3 100644 --- a/xournalpp.spec +++ b/xournalpp.spec @@ -1,10 +1,10 @@ %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+ @@ -18,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 @@ -66,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