diff --git a/.abf.yml b/.abf.yml index 3576993..1798d74 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,2 +1,2 @@ sources: - qownnotes-24.12.5.tar.xz: 0193f7a75763452682c37c02ce5c87fd25cd06fe + qownnotes-24.12.6.tar.xz: fbe0da2f8053db5799e2d8162aad941f5ae5a299 diff --git a/qownnotes.spec b/qownnotes.spec index 8b6140f..bcc4801 100644 --- a/qownnotes.spec +++ b/qownnotes.spec @@ -1,9 +1,10 @@ %define oname QOwnNotes %define debug %nil %define debug_package %nil +%define with_qt515 1 Name: qownnotes -Version: 24.12.5 +Version: 24.12.6 Release: 1 Summary: A notepad and todo-list manager with markdown support and cloud integration URL: https://www.qownnotes.org @@ -11,6 +12,9 @@ Source0: https://github.com/pbek/QOwnNotes/releases/download/v%{version}/%{name} License: GPLv2 Group: Office BuildRequires: xz +%if %{with_qt515} +BuildRequires: qt515 +%else BuildRequires: qt5-linguist-tools BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5Gui) @@ -23,7 +27,7 @@ BuildRequires: pkgconfig(Qt5WebSockets) BuildRequires: pkgconfig(Qt5X11Extras) BuildRequires: pkgconfig(Qt5Qml) BuildRequires: pkgconfig(Qt5Network) -#BuildRequires: qt515 +%endif BuildRequires: pkgconfig(libdrm) @@ -36,12 +40,15 @@ that works together with Nextcloud Notes and ownCloud Notes. %setup -q %build +%if %{with_qt515} +#/opt/qt5/5.15/bin/lrelease QOwnNotes.pro +export LD_LIBRARY_PATH=/opt/qt5/5.15/lib:/opt/openssl3.3/lib64:${LD_LIBRARY_PATH} + +/opt/qt5/5.15/bin/qmake +%else lrelease-qt5 QOwnNotes.pro %qmake_qt5 -#/opt/qt5/5.15/bin/lrelease QOwnNotes.pro -#export LD_LIBRARY_PATH=/opt/qt5/5.15/lib:/opt/openssl3.3/lib64:${LD_LIBRARY_PATH} - -#/opt/qt5/5.15/bin/qmake +%endif %make