diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c0d0dd0..ea75b0c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -57,7 +57,7 @@ jobs: set -x assets=() for asset in RPMS/*.rpm; do - assets+=("-a" "$asset") + assets+=("$asset") done tag_name="${GITHUB_REF##*/}" gh release create "$tag_name" "${assets[@]}" @@ -70,7 +70,7 @@ jobs: set -x assets=() for asset in RPMS/*.rpm; do - assets+=("-a" "$asset") + assets+=("$asset") done tag_name="${GITHUB_REF##*/}" gh release create "$tag_name" -p -n "This is a pre-release for testing purposes only. It may or may not be unstable." "${assets[@]}" diff --git a/harbour-slumber.pro b/harbour-slumber.pro index 8cb51b1..90f14f9 100644 --- a/harbour-slumber.pro +++ b/harbour-slumber.pro @@ -10,7 +10,7 @@ app_src.depends = privileged-launcher DISTFILES += rpm/harbour-slumber.changes \ rpm/harbour-slumber.spec \ -rpm/harbour-slumber.yaml \ + SUBDIRS += \ app_src \ diff --git a/main/slumber.pro b/main/slumber.pro index 5833756..0f16b1e 100644 --- a/main/slumber.pro +++ b/main/slumber.pro @@ -1,4 +1,4 @@ -TEMPLATE = app +#TEMPLATE = app # The name of your application TARGET = harbour-slumber diff --git a/rpm/harbour-slumber.spec b/rpm/harbour-slumber.spec index 11f8776..c2060aa 100644 --- a/rpm/harbour-slumber.spec +++ b/rpm/harbour-slumber.spec @@ -14,12 +14,12 @@ Name: harbour-slumber %{?qtc_builddir:%define _builddir %qtc_builddir} Summary: Slumber Sleeptimer Version: 0.15 -Release: 2 +Release: 3 Group: Qt/Qt License: GPLv2 URL: https://github.com/jgibbon/slumber Source0: %{name}-%{version}.tar.bz2 -Source100: harbour-slumber.yaml +# Source100: harbour-slumber.yaml Requires: sailfishsilica-qt5 >= 0.10.9 Requires: qt5-qtdeclarative-import-sensors Requires: nemo-qml-plugin-dbus-qt5 @@ -66,9 +66,14 @@ Links: # >> build pre # << build pre -%qtc_qmake5 -%qtc_make %{?_smp_mflags} +%qmake5 + +%make_build + +#%qtc_qmake5 + +#%qtc_make %{?_smp_mflags} # >> build post # << build post