Notification time stamped 2021-02-28 23:09:22 UTC
From b292f6887d28a59033b95a72e73159b83327d61c Mon Sep 17 00:00:00 2001
From: Luya Tshimbalanga <luya(a)fedoraproject.org>
Date: Feb 28 2021 23:08:22 +0000
Subject: Merge branch 'f34' into f33
---
diff --git a/xournalpp.spec b/xournalpp.spec
index bc9a911..5be61fb 100644
--- a/xournalpp.spec
+++ b/xournalpp.spec
@@ -3,8 +3,8 @@
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}
@@ -12,9 +12,15 @@ 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
+
+# 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
}
@@ -26,6 +32,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}
@@ -59,12 +66,10 @@ 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
-# Add translations parameter
-#
https://github.com/xournalpp/xournalpp/issues/1596
-# %%cmake3_build --target translations
%install
%cmake_install
@@ -78,9 +83,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
@@ -107,8 +113,17 @@ appstream-util validate-relax --nonet
%{buildroot}%{_metainfodir}/com.github.%{n
%{_datadir}/%{name}/ui
%changelog
+* Sun Feb 28 2021 Luya Tshimbalanga <luya(a)fedoraproject.org> - 1.0.20-3
+- Enable math tex support
+- Add fdupes for build requirement
+- Simplify summary
+
+* Thu Jan 28 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.0.20-2
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
* Fri Dec 18 2020 Fedora Release Monitoring <release-monitoring(a)fedoraproject.org>
- 1.0.20-1
- Update to 1.0.20 (#1908932)
+- Work around firefox carrying bogus Provides
* Fri Oct 23 2020 Luya Tshimbalanga <luya(a)fedoraproject.org> - 1.0.19-2
- Replace old xournal thumbnail with xournalpp version
https://src.fedoraproject.org/rpms/xournalpp/c/b292f6887d28a59033b95a72e7...