From 7d4c238a945b9a8ceb32c4a735fa847b3009c129 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Thu, 17 Feb 2022 15:34:21 +0200 Subject: [PATCH] Since Leap 15.4 we must switch to lrelease-pro. --- dist/rpm/valentina.spec | 40 +++++++++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/dist/rpm/valentina.spec b/dist/rpm/valentina.spec index 7b7ba38e1..07b21da60 100644 --- a/dist/rpm/valentina.spec +++ b/dist/rpm/valentina.spec @@ -60,7 +60,8 @@ BuildRequires: libqt5-qttools BuildRequires: libQt5Svg-devel BuildRequires: update-desktop-files -Requires: libqt5-qtimageformats +Requires: libqt5-qtimageformats +Requires: poppler-tools %if 0%{?suse_version} == 1310 BuildRequires: libQt5XmlPatterns-devel @@ -71,13 +72,15 @@ BuildRequires: libqt5-linguist-devel BuildRequires: libqt5-qtxmlpatterns-devel %endif +%if 0%{?suse_version} == 1500 + %if 0%{?sle_version} >= 150400 && 0%{?is_opensuse} BuildRequires: libqt5-linguist %endif -%if 0%{?suse_version} > 1500 +%elif 0%{?suse_version} > 1500 BuildRequires: libqt5-linguist -%endif +%endif # %if 0%{?suse_version} == 1500 %endif # %if 0%{?suse_version} > 0 @@ -95,10 +98,6 @@ BuildRequires: libqt5-linguist Requires: poppler %endif -%if 0%{?suse_version} > 0 -Requires: poppler-tools -%endif - %if 0%{?fedora_version} > 0 || 0%{?rhel_version} > 0 || 0%{?centos_version} > 0 Requires: poppler-utils %endif @@ -134,17 +133,28 @@ a unique pattern making tool. %setup -q -n %{name}-%{version} %build -%if 0%{?suse_version} >= 1315 && 0%{?suse_version} != 1550 -qmake-qt5 PREFIX=%{_prefix} PREFIX_LIB=%{_prefix}/%{_lib} LRELEASE=lrelease-qt5 Valentina.pro -r "CONFIG += noTests noRunPath no_ccache noDebugSymbols" +%if 0%{?suse_version} > 0 + %if 0%{?suse_version} > 1500 # Tumbleweed + qmake-qt5 PREFIX=%{_prefix} PREFIX_LIB=%{_prefix}/%{_lib} LRELEASE=lrelease-pro Valentina.pro -r "CONFIG += noTests noRunPath no_ccache noDebugSymbols" + %elif 0%{?suse_version} == 1500 # Leap + %if 0%{?sle_version} >= 150400 && 0%{?is_opensuse} # Leap 15.4 + qmake-qt5 PREFIX=%{_prefix} PREFIX_LIB=%{_prefix}/%{_lib} LRELEASE=lrelease-pro Valentina.pro -r "CONFIG += noTests noRunPath no_ccache noDebugSymbols" + %else + qmake-qt5 PREFIX=%{_prefix} PREFIX_LIB=%{_prefix}/%{_lib} LRELEASE=lrelease-qt5 Valentina.pro -r "CONFIG += noTests noRunPath no_ccache noDebugSymbols" + %endif + %elif 0%{?suse_version} < 1500 && 0%{?suse_version} >= 1315 + qmake-qt5 PREFIX=%{_prefix} PREFIX_LIB=%{_prefix}/%{_lib} LRELEASE=lrelease-qt5 Valentina.pro -r "CONFIG += noTests noRunPath no_ccache noDebugSymbols" + %else + qmake-qt5 PREFIX=%{_prefix} PREFIX_LIB=%{_prefix}/%{_lib} Valentina.pro -r "CONFIG += noTests noRunPath no_ccache noDebugSymbols" + %endif %else - -%if 0%{?mageia} >= 6 -qmake PREFIX=%{_prefix} PREFIX_LIB=%{_prefix}/%{_lib} Valentina.pro -r "CONFIG += noTests noRunPath no_ccache noDebugSymbols" -%else -qmake-qt5 PREFIX=%{_prefix} PREFIX_LIB=%{_prefix}/%{_lib} Valentina.pro -r "CONFIG += noTests noRunPath no_ccache noDebugSymbols" + %if 0%{?mageia} >= 6 + qmake PREFIX=%{_prefix} PREFIX_LIB=%{_prefix}/%{_lib} Valentina.pro -r "CONFIG += noTests noRunPath no_ccache noDebugSymbols" + %else + qmake-qt5 PREFIX=%{_prefix} PREFIX_LIB=%{_prefix}/%{_lib} Valentina.pro -r "CONFIG += noTests noRunPath no_ccache noDebugSymbols" %endif -%endif +%endif # 0%{?suse_version} > 0 %{__make} %{?jobs:-j %jobs}