Fix build on OBS

ilpianista · Dec 30, 2022 · f488d82 · f488d82
1 parent 04b6214
commit f488d82
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 102 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Prepare
       run: mkdir RPMS
@@ -32,9 +32,6 @@ jobs:
             cp -r /workspace/* . ;
             cd rpm ;
             curl -O https://pkgs.tailscale.com/stable/tailscale_${TAILSCALE_VERSION}_arm.tgz ;
-            tar xfz tailscale_${TAILSCALE_VERSION}_arm.tgz ;
-            mv tailscale_${TAILSCALE_VERSION}_arm/tailscale . ;
-            mv tailscale_${TAILSCALE_VERSION}_arm/tailscaled . ;
             cd .. ;
             mb2 -t SailfishOS-$RELEASE-armv7hl build ;
             sudo mkdir -p /workspace/RPMS ;
@@ -48,9 +45,6 @@ jobs:
             cp -r /workspace/* . ;
             cd rpm ;
             curl -O https://pkgs.tailscale.com/stable/tailscale_${TAILSCALE_VERSION}_386.tgz ;
-            tar xfz tailscale_${TAILSCALE_VERSION}_386.tgz ;
-            mv tailscale_${TAILSCALE_VERSION}_386/tailscale . ;
-            mv tailscale_${TAILSCALE_VERSION}_386/tailscaled . ;
             cd .. ;
             mb2 -t SailfishOS-$RELEASE-i486 build ;
             sudo mkdir -p /workspace/RPMS ;
@@ -64,16 +58,13 @@ jobs:
             cp -r /workspace/* . ;
             cd rpm ;
             curl -O https://pkgs.tailscale.com/stable/tailscale_${TAILSCALE_VERSION}_arm64.tgz ;
-            tar xfz tailscale_${TAILSCALE_VERSION}_arm64.tgz ;
-            mv tailscale_${TAILSCALE_VERSION}_arm64/tailscale . ;
-            mv tailscale_${TAILSCALE_VERSION}_arm64/tailscaled . ;
             cd .. ;
             mb2 -t SailfishOS-$RELEASE-aarch64 build ;
             sudo mkdir -p /workspace/RPMS ;
             sudo cp -r RPMS/*.rpm /workspace/RPMS"
 
     - name: Upload build result
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: rpms
         path: RPMS

diff --git a/.gitignore b/.gitignore
@@ -4,5 +4,4 @@
 *.autosave
 RPMS
 
-rpm/tailscale
-rpm/tailscaled
+rpm/*.tgz
diff --git a/Tailscale.pro b/Tailscale.pro
@@ -14,7 +14,6 @@ OTHER_FILES += \
     harbour-tailscale.desktop \
     rpm/harbour-tailscale.changes \
     rpm/harbour-tailscale.spec \
-    rpm/harbour-tailscale.yaml \
     rpm/tailscale.service \
     translations/*.ts
 

diff --git a/rpm/harbour-tailscale.spec b/rpm/harbour-tailscale.spec
@@ -1,12 +1,8 @@
-# 
-# Do NOT Edit the Auto-generated Part!
-# Generated by: spectacle version 0.32
-# 
-
 Name:       harbour-tailscale
 
 # >> macros
 %global _missing_build_ids_terminate_build 0
+%define tailscale_version 1.34.1
 # << macros
 
 %{!?qtc_qmake:%define qtc_qmake %qmake}
@@ -20,18 +16,34 @@ Group:      Qt/Qt
 License:    GPLv3
 URL:        https://scarpino.dev
 Source0:    %{name}-%{version}.tar.bz2
-Source1:    tailscaled.service
-Source2:    tailscale
-Source3:    tailscaled
-Source4:    tailscaled.defaults
-Source100:  harbour-tailscale.yaml
+%ifarch %arm
+Source1: tailscale_%{tailscale_version}_arm.tgz
+%endif
+%ifarch aarch64
+Source1: tailscale_%{tailscale_version}_arm64.tgz
+%endif
+%ifarch %ix86
+Source1: tailscale_%{tailscale_version}_386.tgz
+%endif
+Source2:    tailscaled.service
+Source3:    tailscaled.defaults
 Requires:   sailfishsilica-qt5 >= 0.10.9
 BuildRequires:  pkgconfig(sailfishapp) >= 1.0.2
 BuildRequires:  pkgconfig(Qt5Core)
 BuildRequires:  pkgconfig(Qt5Qml)
 BuildRequires:  pkgconfig(Qt5Quick)
 BuildRequires:  desktop-file-utils
 
+%ifarch %arm
+%define tailscale_dir tailscale_%{tailscale_version}_arm
+%endif
+%ifarch aarch64
+%define tailscale_dir tailscale_%{tailscale_version}_arm64
+%endif
+%ifarch %ix86
+%define tailscale_dir tailscale_%{tailscale_version}_386
+%endif
+
 %description
 
 Tailscale makes networking easy
@@ -56,14 +68,19 @@ Url:
 %prep
 %setup -q -n %{name}-%{version}
 
+#%setup -a 1 doesn't work in mb2
+if [ ! -d %{tailscale_dir} ]; then
+  tar xf %{SOURCE1}
+fi
+
 # >> setup
 # << setup
 
 %build
 # >> build pre
 # << build pre
 
-%qtc_qmake5 
+%qtc_qmake5
 
 %qtc_make %{?_smp_mflags}
 
@@ -78,16 +95,16 @@ rm -rf %{buildroot}
 
 # >> install post
 install -d %{buildroot}%{_unitdir}
-install -m644 %{SOURCE1} %{buildroot}%{_unitdir}
+install -m644 %{SOURCE2} %{buildroot}%{_unitdir}
 
-install -m755 %{SOURCE2} %{buildroot}%{_bindir}
-install -m755 %{SOURCE3} %{buildroot}%{_bindir}
+install -m755 %{tailscale_dir}/tailscale %{buildroot}%{_bindir}
+install -m755 %{tailscale_dir}/tailscaled %{buildroot}%{_bindir}
 
 install -d %{buildroot}%{_sharedstatedir}/tailscale
 install -d %{buildroot}%{_localstatedir}/cache/tailscale
 
 install -d %{buildroot}%{_sysconfdir}/sysconfig
-install -Dm644 %{SOURCE4} %{buildroot}%{_sysconfdir}/sysconfig/tailscaled
+install -Dm644 %{SOURCE3} %{buildroot}%{_sysconfdir}/sysconfig/tailscaled
 # << install post
 
 desktop-file-install --delete-original       \

diff --git a/rpm/harbour-tailscale.yaml b/rpm/harbour-tailscale.yaml