Attachment 2076902 Details for Bug 2344534 – The .spec file difference from Copr build 8631918 to 8664955

[patch] The .spec file difference from Copr build 8631918 to 8664955

spec-from-8631918-to-8664955.diff (text/plain), 2.39 KB, created by Fedora Review Service on 2025-02-17 19:52:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Fedora Review Service

Created: 2025-02-17 19:52:46 UTC

Size: 2.39 KB

patch

obsolete

>--- https://copr.fedorainfracloud.org/coprs/build/8631918
>+++ https://copr.fedorainfracloud.org/coprs/build/8664955
>@@ -2,8 +2,8 @@
> %bcond check 0
> %global watcher_name aw-awatcher
> 
>-%global commit a0cdef90cf86cd8d2cc89723f5751c1123ae7e2b
>-%global short_commit %(c=%{commit}; echo ${c:0:7})
>+%global aw_server_rust_commit a0cdef90cf86cd8d2cc89723f5751c1123ae7e2b
>+%global aw_server_rust_short_commit %(c=%{aw_server_rust_commit}; echo ${c:0:7})
> 
> Name:           awatcher
> Version:        0.3.1
>@@ -20,7 +20,6 @@
> # MIT OR Apache-2.0
> # (MIT OR Apache-2.0) AND Unicode-DFS-2016
> # MIT OR Apache-2.0 OR Zlib
>-# Mozilla Public License 2.0
> # MPL-2.0
> # Unlicense OR MIT
> # Zlib OR Apache-2.0 OR MIT
>@@ -29,14 +28,21 @@
> 
> URL:            https://github.com/2e3s/awatcher
> Source0:        %{url}/archive/refs/tags/v%{version}.tar.gz
>-Source1:        https://github.com/ActivityWatch/aw-server-rust/archive/%{commit}/aw-server-rust-%{short_commit}.tar.gz
>+Source1:        https://github.com/ActivityWatch/aw-server-rust/archive/%{aw_server_rust_commit}/aw-server-rust-%{aw_server_rust_short_commit}.tar.gz
> 
> Patch0:         0001-Fix-dependencies.patch
> Patch1:         0002-Remove-unneeded-dev-dependencies.patch
>+# Use SPDX short identifier
>+Patch2:         https://github.com/2e3s/awatcher/pull/45.patch
> 
> Requires:       aw-server-rust
> BuildRequires:  cargo-rpm-macros >= 24
>+BuildRequires:  systemd-rpm-macros
> BuildRequires:  help2man
>+
>+# Hopefuly one day it will be a part of aw-server-rust
>+# https://github.com/ActivityWatch/activitywatch/issues/92#issuecomment-1583938452
>+Provides:       bundled(aw-server-rust)
> 
> %description
> %{summary}.
>@@ -49,7 +55,7 @@
> 
> %prep
> %autosetup -n %{name}-%{version} -N
>-tar -xf %{SOURCE1} --strip-components 1 aw-server-rust-%{commit}/{aw-client-rust,aw-models}
>+tar -xf %{SOURCE1} --strip-components 1 aw-server-rust-%{aw_server_rust_commit}/{aw-client-rust,aw-models}
> %autopatch -p1
> %cargo_prep
> 
>@@ -62,9 +68,8 @@
> %{cargo_license} > LICENSE.dependencies
> 
> %install
>-%cargo_install
> # prefix with aw- in order to be detected as a watcher in aw-qt
>-mv %{buildroot}%{_bindir}/{%{name},%{watcher_name}}
>+install -Dm 0755 target/release/%{name} %{buildroot}%{_bindir}/%{watcher_name}
> mkdir -p %{buildroot}%{_mandir}/man1
> help2man %{buildroot}%{_bindir}/%{watcher_name} -o %{buildroot}%{_mandir}/man1/%{watcher_name}.1
> install -Dm 0644 config/%{watcher_name}.service -t %{buildroot}%{_userunitdir}

Actions: View | Diff

Attachments on bug 2344534: 2076902 | 2079902 | 2080390