From eb71e3fa82dd0dca6a7776c62d9b89359164fb87 Mon Sep 17 00:00:00 2001 From: Mark Washeim Date: Tue, 20 Jun 2023 14:09:16 +0200 Subject: [PATCH] [Release] roll back spec. --- rpm/harbour-fibonacci.spec | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/rpm/harbour-fibonacci.spec b/rpm/harbour-fibonacci.spec index aa0737e..474b1fa 100755 --- a/rpm/harbour-fibonacci.spec +++ b/rpm/harbour-fibonacci.spec @@ -6,22 +6,19 @@ Name: harbour-fibonacci # >> macros %define _binary_payload w2.xzdio -%define _with_harbour 0 %define __provides_exclude_from ^%{_datadir}/%{name}/lib/.*\\.so\\> %define __requires_exclude_from ^%{_datadir}/%{name}/lib/.*\\.so\\> %define __requires_exclude ^libc|libdl|libm|libpthread|libpython3.7m|libpython3.4m|python|env|libutil.*$ # << macros -%bcond_with harbour - %{!?qtc_qmake:%define qtc_qmake %qmake} %{!?qtc_qmake5:%define qtc_qmake5 %qmake5} %{!?qtc_make:%define qtc_make make} %{?qtc_builddir:%define _builddir %qtc_builddir} Summary: RPN Calculator with exprtk programmable interface for SailfishOS. -Version: 1.0.1 -Release: 2 +Version: 1.0.2 +Release: 1 Group: Qt/Qt License: GPL URL: https://github.com/poetaster/fibonacci @@ -34,9 +31,7 @@ Source0: %{name}-%{version}.tar.bz2 Requires: sailfishsilica-qt5 >= 0.10.9 Requires: pyotherside-qml-plugin-python3-qt5 >= 1.3.0 -%if ! %{with harbour} Requires: jolla-keyboard -%endif BuildRequires: pkgconfig(sailfishapp) >= 1.0.2 BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5Qml) @@ -122,7 +117,6 @@ rm -rf %{buildroot}/%{_datadir}/%{name}/bin cd %_builddir -%if ! %{with harbour} %post # >> post killall maliit-server @@ -131,7 +125,6 @@ killall maliit-server # >> postun killall maliit-server # << postun -%endif %files %defattr(-,root,root,-) @@ -139,9 +132,7 @@ killall maliit-server %{_datadir}/%{name} %{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor/*/apps/%{name}.png -%if ! %{with harbour} %{_datadir}/maliit/plugins/com/jolla/layouts/programmers.qml %{_datadir}/maliit/plugins/com/jolla/layouts/layouts_programmers.conf -%endif # >> files # << files