rpm/cosmic-session
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/X11:COSMIC:Factory/cosmic-session?expand=0&rev=6

Browse Source
This commit is contained in:
Richard Rahl
2024-08-08 02:46:31 +00:00
committed by Git OBS Bridge
parent 3c22aeca9e
commit 32b5d84114
6 changed files with 72 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
_service
View File

@@ -3,9 +3,11 @@
<service name="tar_scm" mode="manual">
<param name="url">https://github.com/pop-os/cosmic-session.git</param>
<param name="scm">git</param>
<param name="revision">@PARENT_TAG@</param>
<param name="revision">refs/tags/epoch-1.0.0-alpha.1</param>
<param name="versionrewrite-pattern">epoch-(.*)</param>
<param name="versionformat">1.0.0~alpha1</param>
<param name="package-meta">yes</param>
<param name="filename">cosmic-session</param>
</service>
<service name="recompress" mode="manual">
<param name="file">*.tar</param>

13
cosmic-session.changes
View File

@@ -1,9 +1,18 @@
-------------------------------------------------------------------
Thu Aug 8 01:00:28 UTC 2024 - Richard Rahl <rrahl0@opensuse.org>
- standardize packaging with also fixes for miscellaneous hardcoding
filenames, using @PARENT_TAG where applicable, and be more specific
with files in the %files section (so no non-wanted files are getting
added
-------------------------------------------------------------------
Wed Aug 7 01:50:31 UTC 2024 - Richard Rahl <rrahl0@opensuse.org>
- update to 1.0.0-alpha1:
- update to 1.0.0~alpha1:
* Depend on switcheroo-control
- enable leap (thanks to vyvir)
- enable leap with patch leap-fix-justfile.patch (thanks to vyvir)
- fix justfile with fix-justfile.patch
-------------------------------------------------------------------
Thu Mar 14 02:36:04 UTC 2024 - Richard Rahl <rrahl0@proton.me>

11
cosmic-session.spec
View File

@@ -24,7 +24,8 @@ License: GPL-3.0-only
URL: https://github.com/pop-os/cosmic-session
Source0: %{name}-%{version}.tar.zst
Source1: vendor.tar.zst
Patch0: leap-fix-libexec.patch
Patch0: fix-justfile.patch
Patch1: leap-fix-justfile.patch
BuildRequires: cargo-packaging
BuildRequires: just
Requires: switcheroo-control
@@ -35,14 +36,16 @@ Requires: switcheroo-control
%prep
%autosetup -N -a1
%if 0%{?suse_version} < 1600
%autopatch -p0
%patch -P1 -p1
%else
%patch -P0 -p1
%endif
%build
just build
just build-release
%install
just rootdir=%{buildroot} install
just rootdir=%{buildroot} prefix=%{_prefix} install
%check
%{cargo_test}

24
fix-justfile.patch Normal file
View File

@@ -0,0 +1,24 @@
diff -rub cosmic-session-1.0.0~alpha1/Justfile cosmic-session-1.0.0~alpha1-patched/Justfile
--- cosmic-session-1.0.0~alpha1/Justfile 2024-07-31 20:17:20.000000000 +0200
+++ cosmic-session-1.0.0~alpha1-patched/Justfile 2024-08-08 01:33:35.218115522 +0200
@@ -11,14 +11,14 @@
cargo_args := vendor_args + ' ' + debug_args
xdp_cosmic := '/usr/libexec/xdg-desktop-portal-cosmic'
-bindir := prefix + '/bin'
-systemddir := prefix + '/lib/systemd/user'
-sessiondir := prefix + '/share/wayland-sessions'
-applicationdir := prefix + '/share/applications'
+bindir := rootdir + prefix + '/bin'
+systemddir := rootdir + prefix + '/lib/systemd/user'
+sessiondir := rootdir + prefix + '/share/wayland-sessions'
+applicationdir := rootdir + prefix + '/share/applications'
-all: _extract_vendor build
+all: _extract_vendor build-release
-build:
+build-release:
XDP_COSMIC={{xdp_cosmic}} cargo build {{cargo_args}}
# Installs files into the system

27
leap-fix-justfile.patch Normal file
View File

@@ -0,0 +1,27 @@
diff -rub cosmic-session-1.0.0~alpha1/Justfile cosmic-session-1.0.0~alpha1-patched/Justfile
--- cosmic-session-1.0.0~alpha1/Justfile 2024-07-31 20:17:20.000000000 +0200
+++ cosmic-session-1.0.0~alpha1-patched/Justfile 2024-08-08 01:39:58.397316941 +0200
@@ -9,16 +9,16 @@
vendor_args := if vendor == '1' { '--frozen --offline' } else { '' }
debug_args := if debug == '1' { '' } else { '--release' }
cargo_args := vendor_args + ' ' + debug_args
-xdp_cosmic := '/usr/libexec/xdg-desktop-portal-cosmic'
+xdp_cosmic := '/usr/lib/xdg-desktop-portal-cosmic'
-bindir := prefix + '/bin'
-systemddir := prefix + '/lib/systemd/user'
-sessiondir := prefix + '/share/wayland-sessions'
-applicationdir := prefix + '/share/applications'
+bindir := rootdir + prefix + '/bin'
+systemddir := rootdir + prefix + '/lib/systemd/user'
+sessiondir := rootdir + prefix + '/share/wayland-sessions'
+applicationdir := rootdir + prefix + '/share/applications'
-all: _extract_vendor build
+all: _extract_vendor build-release
-build:
+build-release:
XDP_COSMIC={{xdp_cosmic}} cargo build {{cargo_args}}
# Installs files into the system

11
leap-fix-libexec.patch
View File

@@ -1,11 +0,0 @@
--- ./Justfile.orig 2024-07-29 21:04:43.186719834 +0300
+++ ./Justfile 2024-07-29 21:05:22.143729145 +0300
@@ -9,7 +9,7 @@ target := if debug == '1' { 'debug' } el
vendor_args := if vendor == '1' { '--frozen --offline' } else { '' }
debug_args := if debug == '1' { '' } else { '--release' }
cargo_args := vendor_args + ' ' + debug_args
-xdp_cosmic := '/usr/libexec/xdg-desktop-portal-cosmic'
+xdp_cosmic := '/usr/lib/xdg-desktop-portal-cosmic'
bindir := prefix + '/bin'
systemddir := prefix + '/lib/systemd/user'