From 116513ec27ce6d6227703b4c99a15b695b9ca2ac Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 04 2024 06:16:10 +0000 Subject: [PATCH 1/220] Fix cosmic-launcher --- diff --git a/cosmic_apps.py b/cosmic_apps.py index ad1316c..c41a9e2 100644 --- a/cosmic_apps.py +++ b/cosmic_apps.py @@ -972,20 +972,7 @@ POP_LAUNCHER = { "requires": STANDARD_REQUIRES, "prep": STANDARD_PREP, "build": f"just build-vendored", -"install": f"""install -Dm0755 target/release/pop-launcher-bin %{{buildroot}}/%{{_bindir}}/pop-launcher -#!/usr/bin/env sh -set -ex -for plugin in $('calc desktop_entries files find pop_shell pulse recent scripts terminal web cosmic_toplevel'); do - dest=%{{buildroot}}/%{{_prefix}}/lib/pop-launcher/plugins/${{plugin}} - mkdir -p ${{dest}} - install -Dm0644 plugins/src/${{plugin}}/*.ron ${{dest}} - ln -sf %{{buildroot}}/%{{_bindir}}/pop-launcher %{{_prefix}}/lib/pop-launcher/plugins/${{plugin}}/$(echo ${{plugin}} | sed 's/_/-/') -done -mkdir -p %{{buildroot}}/%{{_prefix}}/lib/pop-launcher/scripts/ -for script in scripts/*; do - cp -r ${{script}} %{{buildroot}}/%{{_prefix}}/lib/pop-launcher/scripts/ -done -""", +"install": f"just rootdir=%{{buildroot}} prefix=%{{_prefix}} install", "files": f""" {contains_(f"%{{_bindir}}/pop-launcher")} {contains_(f"%{{_prefix}}/lib/pop-launcher/*")} diff --git a/pop-launcher/pop-launcher.spec b/pop-launcher/pop-launcher.spec index 6f20c04..441cc40 100644 --- a/pop-launcher/pop-launcher.spec +++ b/pop-launcher/pop-launcher.spec @@ -75,20 +75,7 @@ cp .vendor/config.toml .cargo/config.toml just build-vendored %install -install -Dm0755 target/release/pop-launcher-bin %{buildroot}/%{_bindir}/pop-launcher -#!/usr/bin/env sh -set -ex -for plugin in $('calc desktop_entries files find pop_shell pulse recent scripts terminal web cosmic_toplevel'); do - dest=%{buildroot}/%{_prefix}/lib/pop-launcher/plugins/${plugin} - mkdir -p ${dest} - install -Dm0644 plugins/src/${plugin}/*.ron ${dest} - ln -sf %{buildroot}/%{_bindir}/pop-launcher %{_prefix}/lib/pop-launcher/plugins/${plugin}/$(echo ${plugin} | sed 's/_/-/') -done -mkdir -p %{buildroot}/%{_prefix}/lib/pop-launcher/scripts/ -for script in scripts/*; do - cp -r ${script} %{buildroot}/%{_prefix}/lib/pop-launcher/scripts/ -done - +just rootdir=%{buildroot} prefix=%{_prefix} install %files From 32496d49c9d8cf395a5bfa41fcaaa9b286c0bfee Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 04 2024 06:16:10 +0000 Subject: [PATCH 2/220] Fix srpm build scripts not using proper directory. --- diff --git a/bootstrap.sh b/bootstrap.sh index 0c73c5b..ee96b71 100644 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -3,5 +3,5 @@ PACKAGE= git clone --recurse-submodules https://pagure.io/fedora-cosmic/cosmic-packaging.git -cd cosmic-rpms/$PACKAGE +cd cosmic-packaging/$PACKAGE . ./srpm.sh \ No newline at end of file diff --git a/cosmic-app-library/srpm.sh b/cosmic-app-library/srpm.sh index 637af3e..5c609a5 100644 --- a/cosmic-app-library/srpm.sh +++ b/cosmic-app-library/srpm.sh @@ -42,7 +42,7 @@ tar -pcf vendor.tar vendor && mv vendor.tar ../vendor.tar rm -rf vendor && cd .. -# Back into cosmic-rpms +# Back into cosmic-packaging ls @@ -56,9 +56,9 @@ tar -czf $name.tar.gz $name rm -rf $name -cp cosmic-rpms/$path_to_spec . +cp cosmic-packaging/$path_to_spec . -rm -rf cosmic-rpms +rm -rf cosmic-packaging current_date=$(date +'%Y%m%d.%H') diff --git a/cosmic-applet-app-list/srpm.sh b/cosmic-applet-app-list/srpm.sh index 6361edf..b5bb2eb 100644 --- a/cosmic-applet-app-list/srpm.sh +++ b/cosmic-applet-app-list/srpm.sh @@ -42,7 +42,7 @@ tar -pcf vendor.tar vendor && mv vendor.tar ../vendor.tar rm -rf vendor && cd .. -# Back into cosmic-rpms +# Back into cosmic-packaging ls @@ -56,9 +56,9 @@ tar -czf $name.tar.gz $name rm -rf $name -cp cosmic-rpms/$path_to_spec . +cp cosmic-packaging/$path_to_spec . -rm -rf cosmic-rpms +rm -rf cosmic-packaging current_date=$(date +'%Y%m%d.%H') diff --git a/cosmic-applet-audio/srpm.sh b/cosmic-applet-audio/srpm.sh index 90071c0..e329670 100644 --- a/cosmic-applet-audio/srpm.sh +++ b/cosmic-applet-audio/srpm.sh @@ -42,7 +42,7 @@ tar -pcf vendor.tar vendor && mv vendor.tar ../vendor.tar rm -rf vendor && cd .. -# Back into cosmic-rpms +# Back into cosmic-packaging ls @@ -56,9 +56,9 @@ tar -czf $name.tar.gz $name rm -rf $name -cp cosmic-rpms/$path_to_spec . +cp cosmic-packaging/$path_to_spec . -rm -rf cosmic-rpms +rm -rf cosmic-packaging current_date=$(date +'%Y%m%d.%H') diff --git a/cosmic-applet-battery/srpm.sh b/cosmic-applet-battery/srpm.sh index 2ff369e..eea8ea8 100644 --- a/cosmic-applet-battery/srpm.sh +++ b/cosmic-applet-battery/srpm.sh @@ -42,7 +42,7 @@ tar -pcf vendor.tar vendor && mv vendor.tar ../vendor.tar rm -rf vendor && cd .. -# Back into cosmic-rpms +# Back into cosmic-packaging ls @@ -56,9 +56,9 @@ tar -czf $name.tar.gz $name rm -rf $name -cp cosmic-rpms/$path_to_spec . +cp cosmic-packaging/$path_to_spec . -rm -rf cosmic-rpms +rm -rf cosmic-packaging current_date=$(date +'%Y%m%d.%H') diff --git a/cosmic-applet-bluetooth/srpm.sh b/cosmic-applet-bluetooth/srpm.sh index 83ce059..dedbed6 100644 --- a/cosmic-applet-bluetooth/srpm.sh +++ b/cosmic-applet-bluetooth/srpm.sh @@ -42,7 +42,7 @@ tar -pcf vendor.tar vendor && mv vendor.tar ../vendor.tar rm -rf vendor && cd .. -# Back into cosmic-rpms +# Back into cosmic-packaging ls @@ -56,9 +56,9 @@ tar -czf $name.tar.gz $name rm -rf $name -cp cosmic-rpms/$path_to_spec . +cp cosmic-packaging/$path_to_spec . -rm -rf cosmic-rpms +rm -rf cosmic-packaging current_date=$(date +'%Y%m%d.%H') diff --git a/cosmic-applet-network/srpm.sh b/cosmic-applet-network/srpm.sh index 9a7bfb3..47cce53 100644 --- a/cosmic-applet-network/srpm.sh +++ b/cosmic-applet-network/srpm.sh @@ -42,7 +42,7 @@ tar -pcf vendor.tar vendor && mv vendor.tar ../vendor.tar rm -rf vendor && cd .. -# Back into cosmic-rpms +# Back into cosmic-packaging ls @@ -56,9 +56,9 @@ tar -czf $name.tar.gz $name rm -rf $name -cp cosmic-rpms/$path_to_spec . +cp cosmic-packaging/$path_to_spec . -rm -rf cosmic-rpms +rm -rf cosmic-packaging current_date=$(date +'%Y%m%d.%H') diff --git a/cosmic-applet-notifications/srpm.sh b/cosmic-applet-notifications/srpm.sh index 06d523b..30a356e 100644 --- a/cosmic-applet-notifications/srpm.sh +++ b/cosmic-applet-notifications/srpm.sh @@ -42,7 +42,7 @@ tar -pcf vendor.tar vendor && mv vendor.tar ../vendor.tar rm -rf vendor && cd .. -# Back into cosmic-rpms +# Back into cosmic-packaging ls @@ -56,9 +56,9 @@ tar -czf $name.tar.gz $name rm -rf $name -cp cosmic-rpms/$path_to_spec . +cp cosmic-packaging/$path_to_spec . -rm -rf cosmic-rpms +rm -rf cosmic-packaging current_date=$(date +'%Y%m%d.%H') diff --git a/cosmic-applet-panel-button/srpm.sh b/cosmic-applet-panel-button/srpm.sh index ef62dbe..ee71ebb 100644 --- a/cosmic-applet-panel-button/srpm.sh +++ b/cosmic-applet-panel-button/srpm.sh @@ -42,7 +42,7 @@ tar -pcf vendor.tar vendor && mv vendor.tar ../vendor.tar rm -rf vendor && cd .. -# Back into cosmic-rpms +# Back into cosmic-packaging ls @@ -56,9 +56,9 @@ tar -czf $name.tar.gz $name rm -rf $name -cp cosmic-rpms/$path_to_spec . +cp cosmic-packaging/$path_to_spec . -rm -rf cosmic-rpms +rm -rf cosmic-packaging current_date=$(date +'%Y%m%d.%H') diff --git a/cosmic-applet-power/srpm.sh b/cosmic-applet-power/srpm.sh index 832926c..437d65d 100644 --- a/cosmic-applet-power/srpm.sh +++ b/cosmic-applet-power/srpm.sh @@ -42,7 +42,7 @@ tar -pcf vendor.tar vendor && mv vendor.tar ../vendor.tar rm -rf vendor && cd .. -# Back into cosmic-rpms +# Back into cosmic-packaging ls @@ -56,9 +56,9 @@ tar -czf $name.tar.gz $name rm -rf $name -cp cosmic-rpms/$path_to_spec . +cp cosmic-packaging/$path_to_spec . -rm -rf cosmic-rpms +rm -rf cosmic-packaging current_date=$(date +'%Y%m%d.%H') diff --git a/cosmic-applet-status-area/srpm.sh b/cosmic-applet-status-area/srpm.sh index ea12ec5..1961de1 100644 --- a/cosmic-applet-status-area/srpm.sh +++ b/cosmic-applet-status-area/srpm.sh @@ -42,7 +42,7 @@ tar -pcf vendor.tar vendor && mv vendor.tar ../vendor.tar rm -rf vendor && cd .. -# Back into cosmic-rpms +# Back into cosmic-packaging ls @@ -56,9 +56,9 @@ tar -czf $name.tar.gz $name rm -rf $name -cp cosmic-rpms/$path_to_spec . +cp cosmic-packaging/$path_to_spec . -rm -rf cosmic-rpms +rm -rf cosmic-packaging current_date=$(date +'%Y%m%d.%H') diff --git a/cosmic-applet-tiling/srpm.sh b/cosmic-applet-tiling/srpm.sh index 4833824..e0a4b29 100644 --- a/cosmic-applet-tiling/srpm.sh +++ b/cosmic-applet-tiling/srpm.sh @@ -42,7 +42,7 @@ tar -pcf vendor.tar vendor && mv vendor.tar ../vendor.tar rm -rf vendor && cd .. -# Back into cosmic-rpms +# Back into cosmic-packaging ls @@ -56,9 +56,9 @@ tar -czf $name.tar.gz $name rm -rf $name -cp cosmic-rpms/$path_to_spec . +cp cosmic-packaging/$path_to_spec . -rm -rf cosmic-rpms +rm -rf cosmic-packaging current_date=$(date +'%Y%m%d.%H') diff --git a/cosmic-applet-time/srpm.sh b/cosmic-applet-time/srpm.sh index d333c60..b59ecff 100644 --- a/cosmic-applet-time/srpm.sh +++ b/cosmic-applet-time/srpm.sh @@ -42,7 +42,7 @@ tar -pcf vendor.tar vendor && mv vendor.tar ../vendor.tar rm -rf vendor && cd .. -# Back into cosmic-rpms +# Back into cosmic-packaging ls @@ -56,9 +56,9 @@ tar -czf $name.tar.gz $name rm -rf $name -cp cosmic-rpms/$path_to_spec . +cp cosmic-packaging/$path_to_spec . -rm -rf cosmic-rpms +rm -rf cosmic-packaging current_date=$(date +'%Y%m%d.%H') diff --git a/cosmic-applet-workspaces/srpm.sh b/cosmic-applet-workspaces/srpm.sh index bf6f5d9..5f80700 100644 --- a/cosmic-applet-workspaces/srpm.sh +++ b/cosmic-applet-workspaces/srpm.sh @@ -42,7 +42,7 @@ tar -pcf vendor.tar vendor && mv vendor.tar ../vendor.tar rm -rf vendor && cd .. -# Back into cosmic-rpms +# Back into cosmic-packaging ls @@ -56,9 +56,9 @@ tar -czf $name.tar.gz $name rm -rf $name -cp cosmic-rpms/$path_to_spec . +cp cosmic-packaging/$path_to_spec . -rm -rf cosmic-rpms +rm -rf cosmic-packaging current_date=$(date +'%Y%m%d.%H') diff --git a/cosmic-bg/srpm.sh b/cosmic-bg/srpm.sh index b6ce8c7..a2436b2 100644 --- a/cosmic-bg/srpm.sh +++ b/cosmic-bg/srpm.sh @@ -42,7 +42,7 @@ tar -pcf vendor.tar vendor && mv vendor.tar ../vendor.tar rm -rf vendor && cd .. -# Back into cosmic-rpms +# Back into cosmic-packaging ls @@ -56,9 +56,9 @@ tar -czf $name.tar.gz $name rm -rf $name -cp cosmic-rpms/$path_to_spec . +cp cosmic-packaging/$path_to_spec . -rm -rf cosmic-rpms +rm -rf cosmic-packaging current_date=$(date +'%Y%m%d.%H') diff --git a/cosmic-comp/srpm.sh b/cosmic-comp/srpm.sh index e2bc158..a2cb721 100644 --- a/cosmic-comp/srpm.sh +++ b/cosmic-comp/srpm.sh @@ -42,7 +42,7 @@ tar -pcf vendor.tar vendor && mv vendor.tar ../vendor.tar rm -rf vendor && cd .. -# Back into cosmic-rpms +# Back into cosmic-packaging ls @@ -56,9 +56,9 @@ tar -czf $name.tar.gz $name rm -rf $name -cp cosmic-rpms/$path_to_spec . +cp cosmic-packaging/$path_to_spec . -rm -rf cosmic-rpms +rm -rf cosmic-packaging current_date=$(date +'%Y%m%d.%H') diff --git a/cosmic-edit/srpm.sh b/cosmic-edit/srpm.sh index 6664822..093a933 100644 --- a/cosmic-edit/srpm.sh +++ b/cosmic-edit/srpm.sh @@ -42,7 +42,7 @@ tar -pcf vendor.tar vendor && mv vendor.tar ../vendor.tar rm -rf vendor && cd .. -# Back into cosmic-rpms +# Back into cosmic-packaging ls @@ -56,9 +56,9 @@ tar -czf $name.tar.gz $name rm -rf $name -cp cosmic-rpms/$path_to_spec . +cp cosmic-packaging/$path_to_spec . -rm -rf cosmic-rpms +rm -rf cosmic-packaging current_date=$(date +'%Y%m%d.%H') diff --git a/cosmic-files/srpm.sh b/cosmic-files/srpm.sh index d2ebc67..20c9333 100644 --- a/cosmic-files/srpm.sh +++ b/cosmic-files/srpm.sh @@ -42,7 +42,7 @@ tar -pcf vendor.tar vendor && mv vendor.tar ../vendor.tar rm -rf vendor && cd .. -# Back into cosmic-rpms +# Back into cosmic-packaging ls @@ -56,9 +56,9 @@ tar -czf $name.tar.gz $name rm -rf $name -cp cosmic-rpms/$path_to_spec . +cp cosmic-packaging/$path_to_spec . -rm -rf cosmic-rpms +rm -rf cosmic-packaging current_date=$(date +'%Y%m%d.%H') diff --git a/cosmic-greeter/srpm.sh b/cosmic-greeter/srpm.sh index 3e8ea66..044f1de 100644 --- a/cosmic-greeter/srpm.sh +++ b/cosmic-greeter/srpm.sh @@ -42,7 +42,7 @@ tar -pcf vendor.tar vendor && mv vendor.tar ../vendor.tar rm -rf vendor && cd .. -# Back into cosmic-rpms +# Back into cosmic-packaging ls @@ -56,9 +56,9 @@ tar -czf $name.tar.gz $name rm -rf $name -cp cosmic-rpms/$path_to_spec . +cp cosmic-packaging/$path_to_spec . -rm -rf cosmic-rpms +rm -rf cosmic-packaging current_date=$(date +'%Y%m%d.%H') diff --git a/cosmic-launcher/srpm.sh b/cosmic-launcher/srpm.sh index 909fd36..5dda2a4 100644 --- a/cosmic-launcher/srpm.sh +++ b/cosmic-launcher/srpm.sh @@ -42,7 +42,7 @@ tar -pcf vendor.tar vendor && mv vendor.tar ../vendor.tar rm -rf vendor && cd .. -# Back into cosmic-rpms +# Back into cosmic-packaging ls @@ -56,9 +56,9 @@ tar -czf $name.tar.gz $name rm -rf $name -cp cosmic-rpms/$path_to_spec . +cp cosmic-packaging/$path_to_spec . -rm -rf cosmic-rpms +rm -rf cosmic-packaging current_date=$(date +'%Y%m%d.%H') diff --git a/cosmic-notifications/srpm.sh b/cosmic-notifications/srpm.sh index 79171e6..de6c84f 100644 --- a/cosmic-notifications/srpm.sh +++ b/cosmic-notifications/srpm.sh @@ -42,7 +42,7 @@ tar -pcf vendor.tar vendor && mv vendor.tar ../vendor.tar rm -rf vendor && cd .. -# Back into cosmic-rpms +# Back into cosmic-packaging ls @@ -56,9 +56,9 @@ tar -czf $name.tar.gz $name rm -rf $name -cp cosmic-rpms/$path_to_spec . +cp cosmic-packaging/$path_to_spec . -rm -rf cosmic-rpms +rm -rf cosmic-packaging current_date=$(date +'%Y%m%d.%H') diff --git a/cosmic-osd/srpm.sh b/cosmic-osd/srpm.sh index ef3a85d..0b459bc 100644 --- a/cosmic-osd/srpm.sh +++ b/cosmic-osd/srpm.sh @@ -42,7 +42,7 @@ tar -pcf vendor.tar vendor && mv vendor.tar ../vendor.tar rm -rf vendor && cd .. -# Back into cosmic-rpms +# Back into cosmic-packaging ls @@ -56,9 +56,9 @@ tar -czf $name.tar.gz $name rm -rf $name -cp cosmic-rpms/$path_to_spec . +cp cosmic-packaging/$path_to_spec . -rm -rf cosmic-rpms +rm -rf cosmic-packaging current_date=$(date +'%Y%m%d.%H') diff --git a/cosmic-panel/srpm.sh b/cosmic-panel/srpm.sh index 9e3a92c..70f8ba6 100644 --- a/cosmic-panel/srpm.sh +++ b/cosmic-panel/srpm.sh @@ -42,7 +42,7 @@ tar -pcf vendor.tar vendor && mv vendor.tar ../vendor.tar rm -rf vendor && cd .. -# Back into cosmic-rpms +# Back into cosmic-packaging ls @@ -56,9 +56,9 @@ tar -czf $name.tar.gz $name rm -rf $name -cp cosmic-rpms/$path_to_spec . +cp cosmic-packaging/$path_to_spec . -rm -rf cosmic-rpms +rm -rf cosmic-packaging current_date=$(date +'%Y%m%d.%H') diff --git a/cosmic-randr/srpm.sh b/cosmic-randr/srpm.sh index 2f07430..1204d2c 100644 --- a/cosmic-randr/srpm.sh +++ b/cosmic-randr/srpm.sh @@ -42,7 +42,7 @@ tar -pcf vendor.tar vendor && mv vendor.tar ../vendor.tar rm -rf vendor && cd .. -# Back into cosmic-rpms +# Back into cosmic-packaging ls @@ -56,9 +56,9 @@ tar -czf $name.tar.gz $name rm -rf $name -cp cosmic-rpms/$path_to_spec . +cp cosmic-packaging/$path_to_spec . -rm -rf cosmic-rpms +rm -rf cosmic-packaging current_date=$(date +'%Y%m%d.%H') diff --git a/cosmic-screenshot/srpm.sh b/cosmic-screenshot/srpm.sh index 3000935..7a9b922 100644 --- a/cosmic-screenshot/srpm.sh +++ b/cosmic-screenshot/srpm.sh @@ -42,7 +42,7 @@ tar -pcf vendor.tar vendor && mv vendor.tar ../vendor.tar rm -rf vendor && cd .. -# Back into cosmic-rpms +# Back into cosmic-packaging ls @@ -56,9 +56,9 @@ tar -czf $name.tar.gz $name rm -rf $name -cp cosmic-rpms/$path_to_spec . +cp cosmic-packaging/$path_to_spec . -rm -rf cosmic-rpms +rm -rf cosmic-packaging current_date=$(date +'%Y%m%d.%H') diff --git a/cosmic-session/srpm.sh b/cosmic-session/srpm.sh index a8c854d..f13ce53 100644 --- a/cosmic-session/srpm.sh +++ b/cosmic-session/srpm.sh @@ -42,7 +42,7 @@ tar -pcf vendor.tar vendor && mv vendor.tar ../vendor.tar rm -rf vendor && cd .. -# Back into cosmic-rpms +# Back into cosmic-packaging ls @@ -56,9 +56,9 @@ tar -czf $name.tar.gz $name rm -rf $name -cp cosmic-rpms/$path_to_spec . +cp cosmic-packaging/$path_to_spec . -rm -rf cosmic-rpms +rm -rf cosmic-packaging current_date=$(date +'%Y%m%d.%H') diff --git a/cosmic-settings-daemon/srpm.sh b/cosmic-settings-daemon/srpm.sh index cedec44..b90334c 100644 --- a/cosmic-settings-daemon/srpm.sh +++ b/cosmic-settings-daemon/srpm.sh @@ -42,7 +42,7 @@ tar -pcf vendor.tar vendor && mv vendor.tar ../vendor.tar rm -rf vendor && cd .. -# Back into cosmic-rpms +# Back into cosmic-packaging ls @@ -56,9 +56,9 @@ tar -czf $name.tar.gz $name rm -rf $name -cp cosmic-rpms/$path_to_spec . +cp cosmic-packaging/$path_to_spec . -rm -rf cosmic-rpms +rm -rf cosmic-packaging current_date=$(date +'%Y%m%d.%H') diff --git a/cosmic-settings/srpm.sh b/cosmic-settings/srpm.sh index 37d55d9..84c3721 100644 --- a/cosmic-settings/srpm.sh +++ b/cosmic-settings/srpm.sh @@ -42,7 +42,7 @@ tar -pcf vendor.tar vendor && mv vendor.tar ../vendor.tar rm -rf vendor && cd .. -# Back into cosmic-rpms +# Back into cosmic-packaging ls @@ -56,9 +56,9 @@ tar -czf $name.tar.gz $name rm -rf $name -cp cosmic-rpms/$path_to_spec . +cp cosmic-packaging/$path_to_spec . -rm -rf cosmic-rpms +rm -rf cosmic-packaging current_date=$(date +'%Y%m%d.%H') diff --git a/cosmic-store/srpm.sh b/cosmic-store/srpm.sh index 11dcb57..7150850 100644 --- a/cosmic-store/srpm.sh +++ b/cosmic-store/srpm.sh @@ -42,7 +42,7 @@ tar -pcf vendor.tar vendor && mv vendor.tar ../vendor.tar rm -rf vendor && cd .. -# Back into cosmic-rpms +# Back into cosmic-packaging ls @@ -56,9 +56,9 @@ tar -czf $name.tar.gz $name rm -rf $name -cp cosmic-rpms/$path_to_spec . +cp cosmic-packaging/$path_to_spec . -rm -rf cosmic-rpms +rm -rf cosmic-packaging current_date=$(date +'%Y%m%d.%H') diff --git a/cosmic-term/srpm.sh b/cosmic-term/srpm.sh index 00b541d..146c2c7 100644 --- a/cosmic-term/srpm.sh +++ b/cosmic-term/srpm.sh @@ -42,7 +42,7 @@ tar -pcf vendor.tar vendor && mv vendor.tar ../vendor.tar rm -rf vendor && cd .. -# Back into cosmic-rpms +# Back into cosmic-packaging ls @@ -56,9 +56,9 @@ tar -czf $name.tar.gz $name rm -rf $name -cp cosmic-rpms/$path_to_spec . +cp cosmic-packaging/$path_to_spec . -rm -rf cosmic-rpms +rm -rf cosmic-packaging current_date=$(date +'%Y%m%d.%H') diff --git a/cosmic-workspaces/srpm.sh b/cosmic-workspaces/srpm.sh index 9a93698..1b251da 100644 --- a/cosmic-workspaces/srpm.sh +++ b/cosmic-workspaces/srpm.sh @@ -42,7 +42,7 @@ tar -pcf vendor.tar vendor && mv vendor.tar ../vendor.tar rm -rf vendor && cd .. -# Back into cosmic-rpms +# Back into cosmic-packaging ls @@ -56,9 +56,9 @@ tar -czf $name.tar.gz $name rm -rf $name -cp cosmic-rpms/$path_to_spec . +cp cosmic-packaging/$path_to_spec . -rm -rf cosmic-rpms +rm -rf cosmic-packaging current_date=$(date +'%Y%m%d.%H') diff --git a/pop-launcher/srpm.sh b/pop-launcher/srpm.sh index 897b783..c0a9af2 100644 --- a/pop-launcher/srpm.sh +++ b/pop-launcher/srpm.sh @@ -42,7 +42,7 @@ tar -pcf vendor.tar vendor && mv vendor.tar ../vendor.tar rm -rf vendor && cd .. -# Back into cosmic-rpms +# Back into cosmic-packaging ls @@ -56,9 +56,9 @@ tar -czf $name.tar.gz $name rm -rf $name -cp cosmic-rpms/$path_to_spec . +cp cosmic-packaging/$path_to_spec . -rm -rf cosmic-rpms +rm -rf cosmic-packaging current_date=$(date +'%Y%m%d.%H') diff --git a/specgen.py b/specgen.py index da26c4a..26d7252 100644 --- a/specgen.py +++ b/specgen.py @@ -135,7 +135,7 @@ tar -pcf vendor.tar vendor && mv vendor.tar ../vendor.tar rm -rf vendor && cd .. -# Back into cosmic-rpms +# Back into cosmic-packaging ls @@ -149,9 +149,9 @@ tar -czf $name.tar.gz $name rm -rf $name -cp cosmic-rpms/$path_to_spec . +cp cosmic-packaging/$path_to_spec . -rm -rf cosmic-rpms +rm -rf cosmic-packaging current_date=$(date +'%Y%m%d.%H') diff --git a/xdg-desktop-portal-cosmic/srpm.sh b/xdg-desktop-portal-cosmic/srpm.sh index 8a73f41..ecf864f 100644 --- a/xdg-desktop-portal-cosmic/srpm.sh +++ b/xdg-desktop-portal-cosmic/srpm.sh @@ -42,7 +42,7 @@ tar -pcf vendor.tar vendor && mv vendor.tar ../vendor.tar rm -rf vendor && cd .. -# Back into cosmic-rpms +# Back into cosmic-packaging ls @@ -56,9 +56,9 @@ tar -czf $name.tar.gz $name rm -rf $name -cp cosmic-rpms/$path_to_spec . +cp cosmic-packaging/$path_to_spec . -rm -rf cosmic-rpms +rm -rf cosmic-packaging current_date=$(date +'%Y%m%d.%H') From 5073e05fafd445c764e3bd506f4446cd73ed9368 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 04 2024 07:15:23 +0000 Subject: [PATCH 3/220] wip fixing pop-launcher --- diff --git a/cosmic_apps.py b/cosmic_apps.py index c41a9e2..ef20d49 100644 --- a/cosmic_apps.py +++ b/cosmic_apps.py @@ -972,7 +972,7 @@ POP_LAUNCHER = { "requires": STANDARD_REQUIRES, "prep": STANDARD_PREP, "build": f"just build-vendored", -"install": f"just rootdir=%{{buildroot}} prefix=%{{_prefix}} install", +"install": f"just rootdir=%{{buildroot}} install", "files": f""" {contains_(f"%{{_bindir}}/pop-launcher")} {contains_(f"%{{_prefix}}/lib/pop-launcher/*")} diff --git a/pop-launcher/pop-launcher.spec b/pop-launcher/pop-launcher.spec index 441cc40..bcae4f3 100644 --- a/pop-launcher/pop-launcher.spec +++ b/pop-launcher/pop-launcher.spec @@ -75,7 +75,7 @@ cp .vendor/config.toml .cargo/config.toml just build-vendored %install -just rootdir=%{buildroot} prefix=%{_prefix} install +just rootdir=%{buildroot} install %files From 29e352a7d61fcf501a05f82a900c0e7ae7dac9b7 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 04 2024 07:52:33 +0000 Subject: [PATCH 4/220] New patch for pop launcher --- diff --git a/cosmic_apps.py b/cosmic_apps.py index ef20d49..ba68f3d 100644 --- a/cosmic_apps.py +++ b/cosmic_apps.py @@ -967,7 +967,7 @@ POP_LAUNCHER = { "commit": "latest", "summary": "Modular IPC-based desktop launcher service ", "license": GPL3, -"sources": STANDARD_SOURCES, +"sources": STANDARD_SOURCES + f"\nPatch1: install.patch", "buildrequires": STANDARD_BUILDREQUIRES, "requires": STANDARD_REQUIRES, "prep": STANDARD_PREP, diff --git a/pop-launcher/install.patch b/pop-launcher/install.patch new file mode 100644 index 0000000..61c7900 --- /dev/null +++ b/pop-launcher/install.patch @@ -0,0 +1,11 @@ +--- a/justfile 2024-03-04 01:43:55.410055690 -0600 ++++ b/justfile 2024-03-04 01:44:13.341056545 -0600 +@@ -67,7 +67,7 @@ + dest={{plugin-dir}}${plugin} + mkdir -p ${dest} + install -Dm0644 plugins/src/${plugin}/*.ron ${dest} +- ln -sf {{bin-path}} {{plugin-dir}}${plugin}/$(echo ${plugin} | sed 's/_/-/') ++ ln -srf {{bin-path}} {{plugin-dir}}${plugin}/$(echo ${plugin} | sed 's/_/-/') + done + + # Install pop-launcher scripts From 676ae72923d2e24fdc8fe2c8b69f31ac5a6024e9 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 04 2024 19:01:16 +0000 Subject: [PATCH 5/220] update patch for pop launcher --- diff --git a/pop-launcher/install.patch b/pop-launcher/install.patch index 61c7900..a32d5e5 100644 --- a/pop-launcher/install.patch +++ b/pop-launcher/install.patch @@ -1,5 +1,5 @@ ---- a/justfile 2024-03-04 01:43:55.410055690 -0600 -+++ b/justfile 2024-03-04 01:44:13.341056545 -0600 +--- ./justfile 2024-03-04 01:43:55.410055690 -0600 ++++ ./justfile.patched 2024-03-04 01:44:13.341056545 -0600 @@ -67,7 +67,7 @@ dest={{plugin-dir}}${plugin} mkdir -p ${dest} From bef0ca3ca738ba71bd51cb96d52ef722ef00f886 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 04 2024 19:02:22 +0000 Subject: [PATCH 6/220] add pop launcher patch --- diff --git a/pop-launcher/pop-launcher.spec b/pop-launcher/pop-launcher.spec index bcae4f3..0ddaa24 100644 --- a/pop-launcher/pop-launcher.spec +++ b/pop-launcher/pop-launcher.spec @@ -19,6 +19,7 @@ URL: https://github.com/pop-os/launcher Source: %{crate}.tar.gz Source: vendor.tar +Patch1: install.patch # For now, we require all deps for all of cosmic-epoch From 6ded3ffcaa1b0710321df4c31873534265855bfb Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 04 2024 21:41:13 +0000 Subject: [PATCH 7/220] update srpm scripts --- diff --git a/cosmic-app-library/srpm.sh b/cosmic-app-library/srpm.sh index 5c609a5..0946593 100644 --- a/cosmic-app-library/srpm.sh +++ b/cosmic-app-library/srpm.sh @@ -5,7 +5,6 @@ name='cosmic-app-library' version='0.1.0' -repo='https://pagure.io/fedora-cosmic/cosmic-packaging' path_to_spec='cosmic-app-library/*' pop_repo='cosmic-applibrary' diff --git a/cosmic-applet-app-list/srpm.sh b/cosmic-applet-app-list/srpm.sh index b5bb2eb..297a290 100644 --- a/cosmic-applet-app-list/srpm.sh +++ b/cosmic-applet-app-list/srpm.sh @@ -5,7 +5,6 @@ name='cosmic-applet-app-list' version='0.1.0' -repo='https://pagure.io/fedora-cosmic/cosmic-packaging' path_to_spec='cosmic-applet-app-list/*' pop_repo='cosmic-applets' diff --git a/cosmic-applet-audio/srpm.sh b/cosmic-applet-audio/srpm.sh index e329670..57f1942 100644 --- a/cosmic-applet-audio/srpm.sh +++ b/cosmic-applet-audio/srpm.sh @@ -5,7 +5,6 @@ name='cosmic-applet-audio' version='0.1.0' -repo='https://pagure.io/fedora-cosmic/cosmic-packaging' path_to_spec='cosmic-applet-audio/*' pop_repo='cosmic-applets' diff --git a/cosmic-applet-battery/srpm.sh b/cosmic-applet-battery/srpm.sh index eea8ea8..a6c0bcd 100644 --- a/cosmic-applet-battery/srpm.sh +++ b/cosmic-applet-battery/srpm.sh @@ -5,7 +5,6 @@ name='cosmic-applet-battery' version='0.1.0' -repo='https://pagure.io/fedora-cosmic/cosmic-packaging' path_to_spec='cosmic-applet-battery/*' pop_repo='cosmic-applets' diff --git a/cosmic-applet-bluetooth/srpm.sh b/cosmic-applet-bluetooth/srpm.sh index dedbed6..2c91c40 100644 --- a/cosmic-applet-bluetooth/srpm.sh +++ b/cosmic-applet-bluetooth/srpm.sh @@ -5,7 +5,6 @@ name='cosmic-applet-bluetooth' version='0.1.0' -repo='https://pagure.io/fedora-cosmic/cosmic-packaging' path_to_spec='cosmic-applet-bluetooth/*' pop_repo='cosmic-applets' diff --git a/cosmic-applet-network/srpm.sh b/cosmic-applet-network/srpm.sh index 47cce53..3f6b6f4 100644 --- a/cosmic-applet-network/srpm.sh +++ b/cosmic-applet-network/srpm.sh @@ -5,7 +5,6 @@ name='cosmic-applet-network' version='0.1.0' -repo='https://pagure.io/fedora-cosmic/cosmic-packaging' path_to_spec='cosmic-applet-network/*' pop_repo='cosmic-applets' diff --git a/cosmic-applet-notifications/srpm.sh b/cosmic-applet-notifications/srpm.sh index 30a356e..8d28580 100644 --- a/cosmic-applet-notifications/srpm.sh +++ b/cosmic-applet-notifications/srpm.sh @@ -5,7 +5,6 @@ name='cosmic-applet-notifications' version='0.1.0' -repo='https://pagure.io/fedora-cosmic/cosmic-packaging' path_to_spec='cosmic-applet-notifications/*' pop_repo='cosmic-applets' diff --git a/cosmic-applet-panel-button/srpm.sh b/cosmic-applet-panel-button/srpm.sh index ee71ebb..cc6206e 100644 --- a/cosmic-applet-panel-button/srpm.sh +++ b/cosmic-applet-panel-button/srpm.sh @@ -5,7 +5,6 @@ name='cosmic-applet-panel-button' version='0.1.0' -repo='https://pagure.io/fedora-cosmic/cosmic-packaging' path_to_spec='cosmic-applet-panel-button/*' pop_repo='cosmic-applets' diff --git a/cosmic-applet-power/srpm.sh b/cosmic-applet-power/srpm.sh index 437d65d..0917398 100644 --- a/cosmic-applet-power/srpm.sh +++ b/cosmic-applet-power/srpm.sh @@ -5,7 +5,6 @@ name='cosmic-applet-power' version='0.1.0' -repo='https://pagure.io/fedora-cosmic/cosmic-packaging' path_to_spec='cosmic-applet-power/*' pop_repo='cosmic-applets' diff --git a/cosmic-applet-status-area/srpm.sh b/cosmic-applet-status-area/srpm.sh index 1961de1..44fcb2d 100644 --- a/cosmic-applet-status-area/srpm.sh +++ b/cosmic-applet-status-area/srpm.sh @@ -5,7 +5,6 @@ name='cosmic-applet-status-area' version='0.1.0' -repo='https://pagure.io/fedora-cosmic/cosmic-packaging' path_to_spec='cosmic-applet-status-area/*' pop_repo='cosmic-applets' diff --git a/cosmic-applet-tiling/srpm.sh b/cosmic-applet-tiling/srpm.sh index e0a4b29..5e1ee3a 100644 --- a/cosmic-applet-tiling/srpm.sh +++ b/cosmic-applet-tiling/srpm.sh @@ -5,7 +5,6 @@ name='cosmic-applet-tiling' version='0.1.0' -repo='https://pagure.io/fedora-cosmic/cosmic-packaging' path_to_spec='cosmic-applet-tiling/*' pop_repo='cosmic-applets' diff --git a/cosmic-applet-time/srpm.sh b/cosmic-applet-time/srpm.sh index b59ecff..58f3c88 100644 --- a/cosmic-applet-time/srpm.sh +++ b/cosmic-applet-time/srpm.sh @@ -5,7 +5,6 @@ name='cosmic-applet-time' version='0.1.0' -repo='https://pagure.io/fedora-cosmic/cosmic-packaging' path_to_spec='cosmic-applet-time/*' pop_repo='cosmic-applets' diff --git a/cosmic-applet-workspaces/srpm.sh b/cosmic-applet-workspaces/srpm.sh index 5f80700..2ba898a 100644 --- a/cosmic-applet-workspaces/srpm.sh +++ b/cosmic-applet-workspaces/srpm.sh @@ -5,7 +5,6 @@ name='cosmic-applet-workspaces' version='0.1.0' -repo='https://pagure.io/fedora-cosmic/cosmic-packaging' path_to_spec='cosmic-applet-workspaces/*' pop_repo='cosmic-applets' diff --git a/cosmic-applets/srpm.sh b/cosmic-applets/srpm.sh index a1bfcd0..18db25d 100644 --- a/cosmic-applets/srpm.sh +++ b/cosmic-applets/srpm.sh @@ -11,9 +11,9 @@ path_to_spec='cosmic-applets/cosmic-applets.spec' cd ../.. # We should be in the base directory now -cp cosmic-rpms/$path_to_spec . +cp cosmic-packaging/$path_to_spec . -rm -rf cosmic-rpms +rm -rf cosmic-packaging current_date=$(date +'%Y%m%d.%H') diff --git a/cosmic-bg/srpm.sh b/cosmic-bg/srpm.sh index a2436b2..9be8314 100644 --- a/cosmic-bg/srpm.sh +++ b/cosmic-bg/srpm.sh @@ -5,7 +5,6 @@ name='cosmic-bg' version='0.1.0' -repo='https://pagure.io/fedora-cosmic/cosmic-packaging' path_to_spec='cosmic-bg/*' pop_repo='cosmic-bg' diff --git a/cosmic-comp/srpm.sh b/cosmic-comp/srpm.sh index a2cb721..2705f75 100644 --- a/cosmic-comp/srpm.sh +++ b/cosmic-comp/srpm.sh @@ -5,7 +5,6 @@ name='cosmic-comp' version='0.1.0' -repo='https://pagure.io/fedora-cosmic/cosmic-packaging' path_to_spec='cosmic-comp/*' pop_repo='cosmic-comp' diff --git a/cosmic-edit/srpm.sh b/cosmic-edit/srpm.sh index 093a933..5a2a836 100644 --- a/cosmic-edit/srpm.sh +++ b/cosmic-edit/srpm.sh @@ -5,7 +5,6 @@ name='cosmic-edit' version='0.1.0' -repo='https://pagure.io/fedora-cosmic/cosmic-packaging' path_to_spec='cosmic-edit/*' pop_repo='cosmic-edit' diff --git a/cosmic-epoch/srpm.sh b/cosmic-epoch/srpm.sh index ea83655..dfa2f5c 100644 --- a/cosmic-epoch/srpm.sh +++ b/cosmic-epoch/srpm.sh @@ -11,9 +11,9 @@ path_to_spec='cosmic-epoch/cosmic-epoch.spec' cd ../.. # We should be in the base directory now -cp cosmic-rpms/$path_to_spec . +cp cosmic-packaging/$path_to_spec . -rm -rf cosmic-rpms +rm -rf cosmic-packaging current_date=$(date +'%Y%m%d.%H') diff --git a/cosmic-files/srpm.sh b/cosmic-files/srpm.sh index 20c9333..f37446f 100644 --- a/cosmic-files/srpm.sh +++ b/cosmic-files/srpm.sh @@ -5,7 +5,6 @@ name='cosmic-files' version='0.1.0' -repo='https://pagure.io/fedora-cosmic/cosmic-packaging' path_to_spec='cosmic-files/*' pop_repo='cosmic-files' diff --git a/cosmic-greeter/srpm.sh b/cosmic-greeter/srpm.sh index 044f1de..39cb963 100644 --- a/cosmic-greeter/srpm.sh +++ b/cosmic-greeter/srpm.sh @@ -5,7 +5,6 @@ name='cosmic-greeter' version='0.1.0' -repo='https://pagure.io/fedora-cosmic/cosmic-packaging' path_to_spec='cosmic-greeter/*' pop_repo='cosmic-greeter' diff --git a/cosmic-icons/srpm.sh b/cosmic-icons/srpm.sh index 8ff5999..1ad87b5 100644 --- a/cosmic-icons/srpm.sh +++ b/cosmic-icons/srpm.sh @@ -36,7 +36,7 @@ git reset --hard $commit cd .. -# Back into cosmic-rpms +# Back into cosmic-packaging ls @@ -50,9 +50,9 @@ tar -czf $name.tar.gz $name rm -rf $name -cp cosmic-rpms/$path_to_spec . +cp cosmic-packaging/$path_to_spec . -rm -rf cosmic-rpms +rm -rf cosmic-packaging current_date=$(date +'%Y%m%d.%H') diff --git a/cosmic-launcher/srpm.sh b/cosmic-launcher/srpm.sh index 5dda2a4..d25228a 100644 --- a/cosmic-launcher/srpm.sh +++ b/cosmic-launcher/srpm.sh @@ -5,7 +5,6 @@ name='cosmic-launcher' version='0.1.0' -repo='https://pagure.io/fedora-cosmic/cosmic-packaging' path_to_spec='cosmic-launcher/*' pop_repo='cosmic-launcher' diff --git a/cosmic-notifications/srpm.sh b/cosmic-notifications/srpm.sh index de6c84f..80e9295 100644 --- a/cosmic-notifications/srpm.sh +++ b/cosmic-notifications/srpm.sh @@ -5,7 +5,6 @@ name='cosmic-notifications' version='0.1.0' -repo='https://pagure.io/fedora-cosmic/cosmic-packaging' path_to_spec='cosmic-notifications/*' pop_repo='cosmic-notifications' diff --git a/cosmic-osd/srpm.sh b/cosmic-osd/srpm.sh index 0b459bc..8fdfeed 100644 --- a/cosmic-osd/srpm.sh +++ b/cosmic-osd/srpm.sh @@ -5,7 +5,6 @@ name='cosmic-osd' version='0.1.0' -repo='https://pagure.io/fedora-cosmic/cosmic-packaging' path_to_spec='cosmic-osd/*' pop_repo='cosmic-osd' diff --git a/cosmic-panel/srpm.sh b/cosmic-panel/srpm.sh index 70f8ba6..e5a2759 100644 --- a/cosmic-panel/srpm.sh +++ b/cosmic-panel/srpm.sh @@ -5,7 +5,6 @@ name='cosmic-panel' version='0.1.0' -repo='https://pagure.io/fedora-cosmic/cosmic-packaging' path_to_spec='cosmic-panel/*' pop_repo='cosmic-panel' diff --git a/cosmic-randr/srpm.sh b/cosmic-randr/srpm.sh index 1204d2c..0d0dc13 100644 --- a/cosmic-randr/srpm.sh +++ b/cosmic-randr/srpm.sh @@ -5,7 +5,6 @@ name='cosmic-randr' version='0.1.0' -repo='https://pagure.io/fedora-cosmic/cosmic-packaging' path_to_spec='cosmic-randr/*' pop_repo='cosmic-randr' diff --git a/cosmic-screenshot/srpm.sh b/cosmic-screenshot/srpm.sh index 7a9b922..50565bd 100644 --- a/cosmic-screenshot/srpm.sh +++ b/cosmic-screenshot/srpm.sh @@ -5,7 +5,6 @@ name='cosmic-screenshot' version='0.1.0' -repo='https://pagure.io/fedora-cosmic/cosmic-packaging' path_to_spec='cosmic-screenshot/*' pop_repo='cosmic-screenshot' diff --git a/cosmic-session/srpm.sh b/cosmic-session/srpm.sh index f13ce53..a515bc5 100644 --- a/cosmic-session/srpm.sh +++ b/cosmic-session/srpm.sh @@ -5,7 +5,6 @@ name='cosmic-session' version='0.1.0' -repo='https://pagure.io/fedora-cosmic/cosmic-packaging' path_to_spec='cosmic-session/*' pop_repo='cosmic-session' diff --git a/cosmic-settings-daemon/srpm.sh b/cosmic-settings-daemon/srpm.sh index b90334c..acc1243 100644 --- a/cosmic-settings-daemon/srpm.sh +++ b/cosmic-settings-daemon/srpm.sh @@ -5,7 +5,6 @@ name='cosmic-settings-daemon' version='0.1.0' -repo='https://pagure.io/fedora-cosmic/cosmic-packaging' path_to_spec='cosmic-settings-daemon/*' pop_repo='cosmic-settings-daemon' diff --git a/cosmic-settings/srpm.sh b/cosmic-settings/srpm.sh index 84c3721..b21831a 100644 --- a/cosmic-settings/srpm.sh +++ b/cosmic-settings/srpm.sh @@ -5,7 +5,6 @@ name='cosmic-settings' version='0.1.0' -repo='https://pagure.io/fedora-cosmic/cosmic-packaging' path_to_spec='cosmic-settings/*' pop_repo='cosmic-settings' diff --git a/cosmic-store/srpm.sh b/cosmic-store/srpm.sh index 7150850..4c63d02 100644 --- a/cosmic-store/srpm.sh +++ b/cosmic-store/srpm.sh @@ -5,7 +5,6 @@ name='cosmic-store' version='0.1.0' -repo='https://pagure.io/fedora-cosmic/cosmic-packaging' path_to_spec='cosmic-store/*' pop_repo='cosmic-store' diff --git a/cosmic-term/srpm.sh b/cosmic-term/srpm.sh index 146c2c7..8531f9e 100644 --- a/cosmic-term/srpm.sh +++ b/cosmic-term/srpm.sh @@ -5,7 +5,6 @@ name='cosmic-term' version='0.1.0' -repo='https://pagure.io/fedora-cosmic/cosmic-packaging' path_to_spec='cosmic-term/*' pop_repo='cosmic-term' diff --git a/cosmic-workspaces/srpm.sh b/cosmic-workspaces/srpm.sh index 1b251da..947ee01 100644 --- a/cosmic-workspaces/srpm.sh +++ b/cosmic-workspaces/srpm.sh @@ -5,7 +5,6 @@ name='cosmic-workspaces' version='0.1.0' -repo='https://pagure.io/fedora-cosmic/cosmic-packaging' path_to_spec='cosmic-workspaces/*' pop_repo='cosmic-workspaces-epoch' diff --git a/pop-launcher/srpm.sh b/pop-launcher/srpm.sh index c0a9af2..206f092 100644 --- a/pop-launcher/srpm.sh +++ b/pop-launcher/srpm.sh @@ -5,7 +5,6 @@ name='pop-launcher' version='0.1.0' -repo='https://pagure.io/fedora-cosmic/cosmic-packaging' path_to_spec='pop-launcher/*' pop_repo='launcher' diff --git a/specgen.py b/specgen.py index 26d7252..1a1890b 100644 --- a/specgen.py +++ b/specgen.py @@ -98,7 +98,6 @@ def make_build_srpm_script(specinfo): name='{specinfo["name"]}' version='{specinfo["version"]}' -repo='https://pagure.io/fedora-cosmic/cosmic-packaging' path_to_spec='{specinfo["name"]}/*' pop_repo='{specinfo["reposhort"]}' diff --git a/xdg-desktop-portal-cosmic/srpm.sh b/xdg-desktop-portal-cosmic/srpm.sh index ecf864f..1c518e1 100644 --- a/xdg-desktop-portal-cosmic/srpm.sh +++ b/xdg-desktop-portal-cosmic/srpm.sh @@ -5,7 +5,6 @@ name='xdg-desktop-portal-cosmic' version='0.1.0' -repo='https://pagure.io/fedora-cosmic/cosmic-packaging' path_to_spec='xdg-desktop-portal-cosmic/*' pop_repo='xdg-desktop-portal-cosmic' From 5d7b3eb8b9eff4281a282944307237f46442ea60 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 04 2024 22:00:38 +0000 Subject: [PATCH 8/220] Add cosmic-applet-minimize --- diff --git a/cosmic-applet-minimize/cosmic-applet-minimize.spec b/cosmic-applet-minimize/cosmic-applet-minimize.spec new file mode 100644 index 0000000..525cfaf --- /dev/null +++ b/cosmic-applet-minimize/cosmic-applet-minimize.spec @@ -0,0 +1,93 @@ + +# Generated by rust2rpm 25 + +# prevent library files from being installed + +%global crate cosmic-applet-minimize +%global repo https://github.com/pop-os/cosmic-applets + +Name: cosmic-applet-minimize +Version: # TO BE REPLACED AUTOMATICALLY + +Release: %autorelease +Summary: WIP bluetooth applet for cosmic-panel + +License: GPL-3.0 + +URL: https://github.com/pop-os/cosmic-applets + +Source: %{crate}.tar.gz +Source: vendor.tar + + + +# For now, we require all deps for all of cosmic-epoch +BuildRequires: make +BuildRequires: which +BuildRequires: git-core +BuildRequires: just +BuildRequires: rustc +BuildRequires: lld +BuildRequires: cargo +BuildRequires: glib2-devel +BuildRequires: gtk3-devel +BuildRequires: dbus-devel +BuildRequires: wayland-devel +BuildRequires: clang-devel +BuildRequires: libxkbcommon-devel +BuildRequires: mesa-libgbm-devel +BuildRequires: rust-rav1e+nasm-rs-devel +BuildRequires: libappstream-glib +BuildRequires: pipewire-devel +BuildRequires: libglvnd-devel +BuildRequires: libseat-devel +BuildRequires: libinput-devel +BuildRequires: pam-devel +BuildRequires: flatpak-devel + + + +# For now, we require all deps for all of cosmic-epoch +Requires: libseat +Requires: pop-icon-theme +Requires: greetd +Requires: greetd-selinux +Requires: cage +Requires: mozilla-fira-mono-fonts +Requires: mozilla-fira-sans-fonts + + +%global _description %{expand: +%{summary}.} + +%description %{_description} + +%prep + +%autosetup -n %{crate} -p1 +mv %{_sourcedir}/vendor.tar vendor.tar +ls -a +mkdir -p .cargo +cp .vendor/config.toml .cargo/config.toml + + +%build + +just vendor=1 _extract_vendor +cargo build --frozen --offline --release --bin cosmic-applet-minimize + + +%install +just rootdir=%{buildroot} prefix=%{_prefix} _install_minimize + +%files + +%{_bindir}/cosmic-applet-bluetooth +%{_datadir}/applications/com.system76.CosmicAppletMinimize.desktop +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletMinimize.svg + + + +%changelog +%autochangelog + \ No newline at end of file diff --git a/cosmic-applet-minimize/srpm.sh b/cosmic-applet-minimize/srpm.sh new file mode 100644 index 0000000..0bdd2aa --- /dev/null +++ b/cosmic-applet-minimize/srpm.sh @@ -0,0 +1,64 @@ +#!/bin/bash -x + +# Variables. LOOK CLOSELY AND MAKE SURE THESE ARE CORRECT + +name='cosmic-applet-minimize' +version='0.1.0' + +path_to_spec='cosmic-applet-minimize/*' +pop_repo='cosmic-applets' + +# Commit to target. Use "latest" if you want master +commit="latest" + +# Don't edit anything past this line +# ===================================================== # + +LATEST="latest" + +cd ../.. +# We should be in the base directory now + +git clone --recurse-submodules https://github.com/pop-os/$pop_repo + +cd $pop_repo + +if [[ "$commit" == "$LATEST" ]] +then + commit=$(git rev-parse HEAD) +fi + +echo $commit +short_commit=${commit:0:6} + +git reset --hard $commit + +mkdir .vendor + +cargo vendor > .vendor/config.toml + +tar -pcf vendor.tar vendor && mv vendor.tar ../vendor.tar + +rm -rf vendor && cd .. + +# Back into cosmic-packaging + +ls + +if [ "$pop_repo" != "$name" ]; then + mv $pop_repo $name +else + echo "names are equal. continuing..." +fi + +tar -czf $name.tar.gz $name + +rm -rf $name + +cp cosmic-packaging/$path_to_spec . + +rm -rf cosmic-packaging + +current_date=$(date +'%Y%m%d.%H') + +sed -i "/^Version: / s/.*/Version: $version~$current_date.$short_commit/" $name.spec diff --git a/cosmic-applets/cosmic-applets.spec b/cosmic-applets/cosmic-applets.spec index 0545443..b3cda2b 100644 --- a/cosmic-applets/cosmic-applets.spec +++ b/cosmic-applets/cosmic-applets.spec @@ -13,6 +13,7 @@ Requires: cosmic-applet-app-list Requires: cosmic-applet-audio Requires: cosmic-applet-battery Requires: cosmic-applet-bluetooth +Requires: cosmic-applet-minimize Requires: cosmic-applet-network Requires: cosmic-applet-notifications Requires: cosmic-applet-panel-button diff --git a/cosmic_apps.py b/cosmic_apps.py index ba68f3d..f73f5a5 100644 --- a/cosmic_apps.py +++ b/cosmic_apps.py @@ -277,6 +277,29 @@ cargo build --frozen --offline --release --bin cosmic-applet-bluetooth """ } +COSMIC_APPLET_MINIMIZE = { +"globals": "", +"name": "cosmic-applet-minimize", +"version": "0.1.0", +"repo": "https://github.com/pop-os/cosmic-applets", +"reposhort": "cosmic-applets", +"commit": "latest", +"summary": "WIP bluetooth applet for cosmic-panel", +"license": GPL3, +"sources": STANDARD_SOURCES, +"buildrequires": STANDARD_BUILDREQUIRES, +"requires": STANDARD_REQUIRES, +"prep": STANDARD_PREP, +"build": f""" +just vendor=1 _extract_vendor +cargo build --frozen --offline --release --bin cosmic-applet-minimize +""", +"install": f"just rootdir=%{{buildroot}} prefix=%{{_prefix}} _install_minimize", +"files": f""" +{contains_app("cosmic-applet-bluetooth","com.system76.CosmicAppletMinimize",True, True, True, False, False, "cosmic-applet-minimize/")} +""" +} + COSMIC_APPLET_NETWORK = { "globals": "", "name": "cosmic-applet-network", diff --git a/specgen.py b/specgen.py index 1a1890b..7b42c36 100644 --- a/specgen.py +++ b/specgen.py @@ -11,6 +11,7 @@ BUILD_APPS = [ cosmic_apps.COSMIC_APPLET_AUDIO, cosmic_apps.COSMIC_APPLET_BATTERY, cosmic_apps.COSMIC_APPLET_BLUETOOTH, + cosmic_apps.COSMIC_APPLET_MINIMIZE, cosmic_apps.COSMIC_APPLET_NETWORK, cosmic_apps.COSMIC_APPLET_NOTIFICATIONS, cosmic_apps.COSMIC_APPLET_POWER, From f8e9428a298106acdeb3b9a8a3a33dc9078d9bd7 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 04 2024 22:24:51 +0000 Subject: [PATCH 9/220] fix for minimize applet --- diff --git a/cosmic-applet-minimize/cosmic-applet-minimize.spec b/cosmic-applet-minimize/cosmic-applet-minimize.spec index 525cfaf..df61998 100644 --- a/cosmic-applet-minimize/cosmic-applet-minimize.spec +++ b/cosmic-applet-minimize/cosmic-applet-minimize.spec @@ -10,7 +10,7 @@ Name: cosmic-applet-minimize Version: # TO BE REPLACED AUTOMATICALLY Release: %autorelease -Summary: WIP bluetooth applet for cosmic-panel +Summary: WIP minimize applet for cosmic-panel License: GPL-3.0 @@ -82,7 +82,7 @@ just rootdir=%{buildroot} prefix=%{_prefix} _install_minimize %files -%{_bindir}/cosmic-applet-bluetooth +%{_bindir}/cosmic-applet-minimize %{_datadir}/applications/com.system76.CosmicAppletMinimize.desktop %{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletMinimize.svg diff --git a/cosmic_apps.py b/cosmic_apps.py index f73f5a5..cc3088c 100644 --- a/cosmic_apps.py +++ b/cosmic_apps.py @@ -284,7 +284,7 @@ COSMIC_APPLET_MINIMIZE = { "repo": "https://github.com/pop-os/cosmic-applets", "reposhort": "cosmic-applets", "commit": "latest", -"summary": "WIP bluetooth applet for cosmic-panel", +"summary": "WIP minimize applet for cosmic-panel", "license": GPL3, "sources": STANDARD_SOURCES, "buildrequires": STANDARD_BUILDREQUIRES, @@ -296,7 +296,7 @@ cargo build --frozen --offline --release --bin cosmic-applet-minimize """, "install": f"just rootdir=%{{buildroot}} prefix=%{{_prefix}} _install_minimize", "files": f""" -{contains_app("cosmic-applet-bluetooth","com.system76.CosmicAppletMinimize",True, True, True, False, False, "cosmic-applet-minimize/")} +{contains_app("cosmic-applet-minimize","com.system76.CosmicAppletMinimize",True, True, True, False, False, "cosmic-applet-minimize/")} """ } From c23fd6913a16faef93f9d3e8ddea9c7c75b545ba Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 04 2024 22:59:39 +0000 Subject: [PATCH 10/220] Fix cosmic-session --- diff --git a/cosmic-session/cosmic-session.spec b/cosmic-session/cosmic-session.spec index 5e5bab9..eca1ca3 100644 --- a/cosmic-session/cosmic-session.spec +++ b/cosmic-session/cosmic-session.spec @@ -85,6 +85,7 @@ just rootdir=%{buildroot} install %{_bindir}/start-cosmic %{_userunitdir}/cosmic-session.target %{_datadir}/wayland-sessions/cosmic.desktop +%{_datadir}/applications/cosmic-mimeapps.list %changelog diff --git a/cosmic_apps.py b/cosmic_apps.py index cc3088c..fa9eadc 100644 --- a/cosmic_apps.py +++ b/cosmic_apps.py @@ -832,6 +832,7 @@ COSMIC_SESSION = { {contains_(f"%{{_bindir}}/start-cosmic")} {contains_(f"%{{_userunitdir}}/cosmic-session.target")} {contains_(f"%{{_datadir}}/wayland-sessions/cosmic.desktop")} +{contains_(f"%{{_datadir}}/applications/cosmic-mimeapps.list")} """, } From 5396f21077dc66d923020880fef734b4c6e24aff Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 05 2024 21:12:17 +0000 Subject: [PATCH 11/220] Add system76-power --- diff --git a/cosmic-epoch/cosmic-epoch.spec b/cosmic-epoch/cosmic-epoch.spec index a106641..d64cb3d 100644 --- a/cosmic-epoch/cosmic-epoch.spec +++ b/cosmic-epoch/cosmic-epoch.spec @@ -31,6 +31,7 @@ Requires: cosmic-store Requires: cosmic-term Requires: cosmic-workspaces Requires: xdg-desktop-portal-cosmic +Requires: system76-power %global _description %{expand: diff --git a/cosmic_apps.py b/cosmic_apps.py index fa9eadc..a97273b 100644 --- a/cosmic_apps.py +++ b/cosmic_apps.py @@ -1001,4 +1001,24 @@ POP_LAUNCHER = { {contains_(f"%{{_bindir}}/pop-launcher")} {contains_(f"%{{_prefix}}/lib/pop-launcher/*")} """, +} + +SYSTEM76_POWER = { +"globals": "", +"name": "system76-power", +"version": "1.1.25", +"repo": "https://github.com/pop-os/system76-power", +"reposhort": "system76-power", +"commit": "latest", +"summary": "System76 Power Management", +"license": GPL3, +"sources": STANDARD_SOURCES, +"buildrequires": STANDARD_BUILDREQUIRES, +"requires": STANDARD_REQUIRES, +"prep": STANDARD_PREP, +"build": f"""make all VENDOR=1""", +"install": f"""make install DESTDIR=%{{buildroot}} prefix=%{{_prefix}}""", +"files": f""" + +""" } \ No newline at end of file diff --git a/specgen.py b/specgen.py index 7b42c36..f89960e 100644 --- a/specgen.py +++ b/specgen.py @@ -38,7 +38,8 @@ BUILD_APPS = [ cosmic_apps.COSMIC_TERM, cosmic_apps.COSMIC_WORKSPACES, cosmic_apps.COSMIC_XDG_DESKTOP_PORTAL, - cosmic_apps.POP_LAUNCHER + cosmic_apps.POP_LAUNCHER, + cosmic_apps.SYSTEM76_POWER ] BUILD_ETC = [cosmic_apps.COSMIC_ICONS] diff --git a/system76-power/srpm.sh b/system76-power/srpm.sh new file mode 100644 index 0000000..948d660 --- /dev/null +++ b/system76-power/srpm.sh @@ -0,0 +1,64 @@ +#!/bin/bash -x + +# Variables. LOOK CLOSELY AND MAKE SURE THESE ARE CORRECT + +name='system76-power' +version='1.1.25' + +path_to_spec='system76-power/*' +pop_repo='system76-power' + +# Commit to target. Use "latest" if you want master +commit="latest" + +# Don't edit anything past this line +# ===================================================== # + +LATEST="latest" + +cd ../.. +# We should be in the base directory now + +git clone --recurse-submodules https://github.com/pop-os/$pop_repo + +cd $pop_repo + +if [[ "$commit" == "$LATEST" ]] +then + commit=$(git rev-parse HEAD) +fi + +echo $commit +short_commit=${commit:0:6} + +git reset --hard $commit + +mkdir .vendor + +cargo vendor > .vendor/config.toml + +tar -pcf vendor.tar vendor && mv vendor.tar ../vendor.tar + +rm -rf vendor && cd .. + +# Back into cosmic-packaging + +ls + +if [ "$pop_repo" != "$name" ]; then + mv $pop_repo $name +else + echo "names are equal. continuing..." +fi + +tar -czf $name.tar.gz $name + +rm -rf $name + +cp cosmic-packaging/$path_to_spec . + +rm -rf cosmic-packaging + +current_date=$(date +'%Y%m%d.%H') + +sed -i "/^Version: / s/.*/Version: $version~$current_date.$short_commit/" $name.spec diff --git a/system76-power/system76-power.spec b/system76-power/system76-power.spec new file mode 100644 index 0000000..3cc1ffa --- /dev/null +++ b/system76-power/system76-power.spec @@ -0,0 +1,87 @@ + +# Generated by rust2rpm 25 + +# prevent library files from being installed + +%global crate system76-power +%global repo https://github.com/pop-os/system76-power + +Name: system76-power +Version: # TO BE REPLACED AUTOMATICALLY + +Release: %autorelease +Summary: System76 Power Management + +License: GPL-3.0 + +URL: https://github.com/pop-os/system76-power + +Source: %{crate}.tar.gz +Source: vendor.tar + + + +# For now, we require all deps for all of cosmic-epoch +BuildRequires: make +BuildRequires: which +BuildRequires: git-core +BuildRequires: just +BuildRequires: rustc +BuildRequires: lld +BuildRequires: cargo +BuildRequires: glib2-devel +BuildRequires: gtk3-devel +BuildRequires: dbus-devel +BuildRequires: wayland-devel +BuildRequires: clang-devel +BuildRequires: libxkbcommon-devel +BuildRequires: mesa-libgbm-devel +BuildRequires: rust-rav1e+nasm-rs-devel +BuildRequires: libappstream-glib +BuildRequires: pipewire-devel +BuildRequires: libglvnd-devel +BuildRequires: libseat-devel +BuildRequires: libinput-devel +BuildRequires: pam-devel +BuildRequires: flatpak-devel + + + +# For now, we require all deps for all of cosmic-epoch +Requires: libseat +Requires: pop-icon-theme +Requires: greetd +Requires: greetd-selinux +Requires: cage +Requires: mozilla-fira-mono-fonts +Requires: mozilla-fira-sans-fonts + + +%global _description %{expand: +%{summary}.} + +%description %{_description} + +%prep + +%autosetup -n %{crate} -p1 +mv %{_sourcedir}/vendor.tar vendor.tar +ls -a +mkdir -p .cargo +cp .vendor/config.toml .cargo/config.toml + + +%build +make all VENDOR=1 + +%install +make install DESTDIR=%{buildroot} prefix=%{_prefix} + +%files + + + + +%changelog +%autochangelog + \ No newline at end of file From 7d0ca58f73809ff1d4f9c650a1a0d701ab9f9c74 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 05 2024 21:32:39 +0000 Subject: [PATCH 12/220] Update system76-power --- diff --git a/cosmic_apps.py b/cosmic_apps.py index a97273b..dd45adb 100644 --- a/cosmic_apps.py +++ b/cosmic_apps.py @@ -1015,8 +1015,8 @@ SYSTEM76_POWER = { "sources": STANDARD_SOURCES, "buildrequires": STANDARD_BUILDREQUIRES, "requires": STANDARD_REQUIRES, -"prep": STANDARD_PREP, -"build": f"""make all VENDOR=1""", +"prep": STANDARD_PREP + f"\ntar -pxf vendor.tar", +"build": f"""cargo build --release --offline --frozen""", "install": f"""make install DESTDIR=%{{buildroot}} prefix=%{{_prefix}}""", "files": f""" diff --git a/system76-power/system76-power.spec b/system76-power/system76-power.spec index 3cc1ffa..fe9694b 100644 --- a/system76-power/system76-power.spec +++ b/system76-power/system76-power.spec @@ -70,9 +70,10 @@ ls -a mkdir -p .cargo cp .vendor/config.toml .cargo/config.toml +tar -pxf vendor.tar %build -make all VENDOR=1 +cargo build --release --offline --frozen %install make install DESTDIR=%{buildroot} prefix=%{_prefix} From ed583d0672d00da2b7768da9cb898704ee3116b3 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 05 2024 21:49:06 +0000 Subject: [PATCH 13/220] Fix system76-power --- diff --git a/cosmic_apps.py b/cosmic_apps.py index dd45adb..cb40c49 100644 --- a/cosmic_apps.py +++ b/cosmic_apps.py @@ -1013,7 +1013,7 @@ SYSTEM76_POWER = { "summary": "System76 Power Management", "license": GPL3, "sources": STANDARD_SOURCES, -"buildrequires": STANDARD_BUILDREQUIRES, +"buildrequires": STANDARD_BUILDREQUIRES + "\nBuildRequires: rust-hidapi+linux-shared-libusb-devel", "requires": STANDARD_REQUIRES, "prep": STANDARD_PREP + f"\ntar -pxf vendor.tar", "build": f"""cargo build --release --offline --frozen""", diff --git a/system76-power/system76-power.spec b/system76-power/system76-power.spec index fe9694b..6a88626 100644 --- a/system76-power/system76-power.spec +++ b/system76-power/system76-power.spec @@ -45,6 +45,7 @@ BuildRequires: libinput-devel BuildRequires: pam-devel BuildRequires: flatpak-devel +BuildRequires: rust-hidapi+linux-shared-libusb-devel # For now, we require all deps for all of cosmic-epoch From 02c7bb1ef565a584296030b9f0c7047d0c2a39ec Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 05 2024 22:08:34 +0000 Subject: [PATCH 14/220] Fix system76-power.spec --- diff --git a/cosmic_apps.py b/cosmic_apps.py index cb40c49..ad7b2c6 100644 --- a/cosmic_apps.py +++ b/cosmic_apps.py @@ -1013,7 +1013,7 @@ SYSTEM76_POWER = { "summary": "System76 Power Management", "license": GPL3, "sources": STANDARD_SOURCES, -"buildrequires": STANDARD_BUILDREQUIRES + "\nBuildRequires: rust-hidapi+linux-shared-libusb-devel", +"buildrequires": STANDARD_BUILDREQUIRES + "\nBuildRequires: rust-hidapi+linux-shared-libusb-devel\nBuildRequires: libusb1-devel", "requires": STANDARD_REQUIRES, "prep": STANDARD_PREP + f"\ntar -pxf vendor.tar", "build": f"""cargo build --release --offline --frozen""", diff --git a/system76-power/system76-power.spec b/system76-power/system76-power.spec index 6a88626..7910baf 100644 --- a/system76-power/system76-power.spec +++ b/system76-power/system76-power.spec @@ -46,6 +46,7 @@ BuildRequires: pam-devel BuildRequires: flatpak-devel BuildRequires: rust-hidapi+linux-shared-libusb-devel +BuildRequires: libusb1-devel # For now, we require all deps for all of cosmic-epoch From 9740a175fd59374b0b8dca42b042b4251a350a18 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 05 2024 22:21:21 +0000 Subject: [PATCH 15/220] Final system76-power fix hopefully --- diff --git a/cosmic_apps.py b/cosmic_apps.py index ad7b2c6..543faea 100644 --- a/cosmic_apps.py +++ b/cosmic_apps.py @@ -1004,7 +1004,7 @@ POP_LAUNCHER = { } SYSTEM76_POWER = { -"globals": "", +"globals": f"%define debug_package %{{nil}}", "name": "system76-power", "version": "1.1.25", "repo": "https://github.com/pop-os/system76-power", @@ -1013,12 +1013,16 @@ SYSTEM76_POWER = { "summary": "System76 Power Management", "license": GPL3, "sources": STANDARD_SOURCES, -"buildrequires": STANDARD_BUILDREQUIRES + "\nBuildRequires: rust-hidapi+linux-shared-libusb-devel\nBuildRequires: libusb1-devel", +"buildrequires": STANDARD_BUILDREQUIRES + "\nBuildRequires: rust-hidapi+linux-shared-libusb-devel\nBuildRequires: libusb1-devel\nBuildRequires: systemd-rpm-macros", "requires": STANDARD_REQUIRES, "prep": STANDARD_PREP + f"\ntar -pxf vendor.tar", "build": f"""cargo build --release --offline --frozen""", "install": f"""make install DESTDIR=%{{buildroot}} prefix=%{{_prefix}}""", "files": f""" - +%{{_bindir}}/system76-power +%{{_unitdir}}/com.system76.PowerDaemon.service +%{{_datadir}}/dbus-1/interfaces/com.system76.PowerDaemon.xml +%{{_datadir}}/dbus-1/system.d/com.system76.PowerDaemon.conf +%{{_datadir}}/polkit-1/actions/com.system76.PowerDaemon.policy """ } \ No newline at end of file diff --git a/system76-power/system76-power.spec b/system76-power/system76-power.spec index 7910baf..dd21c4c 100644 --- a/system76-power/system76-power.spec +++ b/system76-power/system76-power.spec @@ -1,4 +1,4 @@ - +%define debug_package %{nil} # Generated by rust2rpm 25 # prevent library files from being installed @@ -47,6 +47,7 @@ BuildRequires: flatpak-devel BuildRequires: rust-hidapi+linux-shared-libusb-devel BuildRequires: libusb1-devel +BuildRequires: systemd-rpm-macros # For now, we require all deps for all of cosmic-epoch @@ -82,7 +83,11 @@ make install DESTDIR=%{buildroot} prefix=%{_prefix} %files - +%{_bindir}/system76-power +%{_unitdir}/com.system76.PowerDaemon.service +%{_datadir}/dbus-1/interfaces/com.system76.PowerDaemon.xml +%{_datadir}/dbus-1/system.d/com.system76.PowerDaemon.conf +%{_datadir}/polkit-1/actions/com.system76.PowerDaemon.policy %changelog From 33aaa2430b3190af2b2831a5bfb315bfe364ca85 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 10 2024 06:08:12 +0000 Subject: [PATCH 16/220] Update cosmic-applet-app-list --- diff --git a/cosmic-applet-app-list/cosmic-applet-app-list.spec b/cosmic-applet-app-list/cosmic-applet-app-list.spec index 2559d0d..a521d59 100644 --- a/cosmic-applet-app-list/cosmic-applet-app-list.spec +++ b/cosmic-applet-app-list/cosmic-applet-app-list.spec @@ -86,6 +86,8 @@ just rootdir=%{buildroot} prefix=%{_prefix} _install_app_list %{_datadir}/applications/com.system76.CosmicAppList.desktop %{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppList.svg +%{_datadir}/cosmic/com.system76.CosmicAppList/v1/favorites +%{_datadir}/cosmic/com.system76.CosmicAppList/v1/filter_top_levels %changelog diff --git a/cosmic_apps.py b/cosmic_apps.py index 543faea..3fcf978 100644 --- a/cosmic_apps.py +++ b/cosmic_apps.py @@ -163,6 +163,8 @@ cargo build --frozen --offline --release --bin cosmic-app-list "install": f"just rootdir=%{{buildroot}} prefix=%{{_prefix}} _install_app_list", "files": f""" {contains_app("cosmic-app-list","com.system76.CosmicAppList",True, True, True, False, False, "cosmic-app-list/")} +%{{_datadir}}/cosmic/com.system76.CosmicAppList/v1/favorites +%{{_datadir}}/cosmic/com.system76.CosmicAppList/v1/filter_top_levels """ } From b971465aabc6fc2ff14a8c9e3c4ac067b42efdcf Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 13 2024 20:59:01 +0000 Subject: [PATCH 17/220] Fix cosmic-edit --- diff --git a/cosmic-edit/cosmic-edit.spec b/cosmic-edit/cosmic-edit.spec index e4f99e0..5551c77 100644 --- a/cosmic-edit/cosmic-edit.spec +++ b/cosmic-edit/cosmic-edit.spec @@ -81,6 +81,7 @@ just rootdir=%{buildroot} prefix=%{_prefix} install %{_bindir}/cosmic-edit %{_datadir}/applications/com.system76.CosmicEdit.desktop +%{_metainfodir}/com.system76.CosmicEdit.metainfo.xml %{_datadir}/icons/hicolor/128x128/apps/com.system76.CosmicEdit.svg %{_datadir}/icons/hicolor/16x16/apps/com.system76.CosmicEdit.svg diff --git a/cosmic_apps.py b/cosmic_apps.py index 3fcf978..3557eb6 100644 --- a/cosmic_apps.py +++ b/cosmic_apps.py @@ -561,7 +561,7 @@ COSMIC_EDIT = { "build": f"just build-vendored", "install": f"just rootdir=%{{buildroot}} prefix=%{{_prefix}} install", "files": f""" -{contains_app("cosmic-edit","com.system76.CosmicEdit",True, True, False, False, False, "")} +{contains_app("cosmic-edit","com.system76.CosmicEdit",True, True, False, False, True, "")} %{{_datadir}}/icons/hicolor/128x128/apps/com.system76.CosmicEdit.svg %{{_datadir}}/icons/hicolor/16x16/apps/com.system76.CosmicEdit.svg %{{_datadir}}/icons/hicolor/24x24/apps/com.system76.CosmicEdit.svg From 9ee9f6bc29fe81f7d2846c66c73d059fffd25599 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 13 2024 21:04:12 +0000 Subject: [PATCH 18/220] Update cosmic-files and cosmic-term --- diff --git a/cosmic-files/cosmic-files.spec b/cosmic-files/cosmic-files.spec index b01f036..5963604 100644 --- a/cosmic-files/cosmic-files.spec +++ b/cosmic-files/cosmic-files.spec @@ -81,6 +81,7 @@ just rootdir=%{buildroot} prefix=%{_prefix} install %{_bindir}/cosmic-files %{_datadir}/applications/com.system76.CosmicFiles.desktop +%{_metainfodir}/com.system76.CosmicFiles.metainfo.xml %{_datadir}/icons/hicolor/128x128/apps/com.system76.CosmicFiles.svg %{_datadir}/icons/hicolor/16x16/apps/com.system76.CosmicFiles.svg diff --git a/cosmic-term/cosmic-term.spec b/cosmic-term/cosmic-term.spec index 2ec5532..79ff267 100644 --- a/cosmic-term/cosmic-term.spec +++ b/cosmic-term/cosmic-term.spec @@ -81,6 +81,7 @@ just rootdir=%{buildroot} prefix=%{_prefix} install %{_bindir}/cosmic-term %{_datadir}/applications/com.system76.CosmicTerm.desktop +%{_metainfodir}/com.system76.CosmicTerm.metainfo.xml %{_datadir}/icons/hicolor/128x128/apps/com.system76.CosmicTerm.svg %{_datadir}/icons/hicolor/16x16/apps/com.system76.CosmicTerm.svg diff --git a/cosmic_apps.py b/cosmic_apps.py index 3557eb6..36bdcea 100644 --- a/cosmic_apps.py +++ b/cosmic_apps.py @@ -588,7 +588,7 @@ COSMIC_FILES = { "build": f"just build-vendored", "install": f"just rootdir=%{{buildroot}} prefix=%{{_prefix}} install", "files": f""" -{contains_app("cosmic-files","com.system76.CosmicFiles",True, True, False, False, False, "")} +{contains_app("cosmic-files","com.system76.CosmicFiles",True, True, False, False, True, "")} %{{_datadir}}/icons/hicolor/128x128/apps/com.system76.CosmicFiles.svg %{{_datadir}}/icons/hicolor/16x16/apps/com.system76.CosmicFiles.svg %{{_datadir}}/icons/hicolor/24x24/apps/com.system76.CosmicFiles.svg @@ -927,7 +927,7 @@ COSMIC_TERM = { "build": f"just build-vendored", "install": f"just rootdir=%{{buildroot}} prefix=%{{_prefix}} install", "files": f""" -{contains_app("cosmic-term","com.system76.CosmicTerm",True, True, False, False, False, "")} +{contains_app("cosmic-term","com.system76.CosmicTerm",True, True, False, False, True, "")} %{{_datadir}}/icons/hicolor/128x128/apps/com.system76.CosmicTerm.svg %{{_datadir}}/icons/hicolor/16x16/apps/com.system76.CosmicTerm.svg %{{_datadir}}/icons/hicolor/24x24/apps/com.system76.CosmicTerm.svg From 92b34d41925d0e2ed41f5dff49a97dd462e2d2b9 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 15 2024 04:44:44 +0000 Subject: [PATCH 19/220] Cosmic applets --- diff --git a/cosmic-applet-app-list/cosmic-applet-app-list.spec b/cosmic-applet-app-list/cosmic-applet-app-list.spec deleted file mode 100644 index a521d59..0000000 --- a/cosmic-applet-app-list/cosmic-applet-app-list.spec +++ /dev/null @@ -1,95 +0,0 @@ - -# Generated by rust2rpm 25 - -# prevent library files from being installed - -%global crate cosmic-applet-app-list -%global repo https://github.com/pop-os/cosmic-applets - -Name: cosmic-applet-app-list -Version: # TO BE REPLACED AUTOMATICALLY - -Release: %autorelease -Summary: WIP app list applet for cosmic-panel - -License: GPL-3.0 - -URL: https://github.com/pop-os/cosmic-applets - -Source: %{crate}.tar.gz -Source: vendor.tar - - - -# For now, we require all deps for all of cosmic-epoch -BuildRequires: make -BuildRequires: which -BuildRequires: git-core -BuildRequires: just -BuildRequires: rustc -BuildRequires: lld -BuildRequires: cargo -BuildRequires: glib2-devel -BuildRequires: gtk3-devel -BuildRequires: dbus-devel -BuildRequires: wayland-devel -BuildRequires: clang-devel -BuildRequires: libxkbcommon-devel -BuildRequires: mesa-libgbm-devel -BuildRequires: rust-rav1e+nasm-rs-devel -BuildRequires: libappstream-glib -BuildRequires: pipewire-devel -BuildRequires: libglvnd-devel -BuildRequires: libseat-devel -BuildRequires: libinput-devel -BuildRequires: pam-devel -BuildRequires: flatpak-devel - - - -# For now, we require all deps for all of cosmic-epoch -Requires: libseat -Requires: pop-icon-theme -Requires: greetd -Requires: greetd-selinux -Requires: cage -Requires: mozilla-fira-mono-fonts -Requires: mozilla-fira-sans-fonts - - -%global _description %{expand: -%{summary}.} - -%description %{_description} - -%prep - -%autosetup -n %{crate} -p1 -mv %{_sourcedir}/vendor.tar vendor.tar -ls -a -mkdir -p .cargo -cp .vendor/config.toml .cargo/config.toml - - -%build - -just vendor=1 _extract_vendor -cargo build --frozen --offline --release --bin cosmic-app-list - - -%install -just rootdir=%{buildroot} prefix=%{_prefix} _install_app_list - -%files - -%{_bindir}/cosmic-app-list -%{_datadir}/applications/com.system76.CosmicAppList.desktop -%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppList.svg - -%{_datadir}/cosmic/com.system76.CosmicAppList/v1/favorites -%{_datadir}/cosmic/com.system76.CosmicAppList/v1/filter_top_levels - - -%changelog -%autochangelog - \ No newline at end of file diff --git a/cosmic-applet-app-list/srpm.sh b/cosmic-applet-app-list/srpm.sh deleted file mode 100644 index 297a290..0000000 --- a/cosmic-applet-app-list/srpm.sh +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/bash -x - -# Variables. LOOK CLOSELY AND MAKE SURE THESE ARE CORRECT - -name='cosmic-applet-app-list' -version='0.1.0' - -path_to_spec='cosmic-applet-app-list/*' -pop_repo='cosmic-applets' - -# Commit to target. Use "latest" if you want master -commit="latest" - -# Don't edit anything past this line -# ===================================================== # - -LATEST="latest" - -cd ../.. -# We should be in the base directory now - -git clone --recurse-submodules https://github.com/pop-os/$pop_repo - -cd $pop_repo - -if [[ "$commit" == "$LATEST" ]] -then - commit=$(git rev-parse HEAD) -fi - -echo $commit -short_commit=${commit:0:6} - -git reset --hard $commit - -mkdir .vendor - -cargo vendor > .vendor/config.toml - -tar -pcf vendor.tar vendor && mv vendor.tar ../vendor.tar - -rm -rf vendor && cd .. - -# Back into cosmic-packaging - -ls - -if [ "$pop_repo" != "$name" ]; then - mv $pop_repo $name -else - echo "names are equal. continuing..." -fi - -tar -czf $name.tar.gz $name - -rm -rf $name - -cp cosmic-packaging/$path_to_spec . - -rm -rf cosmic-packaging - -current_date=$(date +'%Y%m%d.%H') - -sed -i "/^Version: / s/.*/Version: $version~$current_date.$short_commit/" $name.spec diff --git a/cosmic-applet-audio/cosmic-applet-audio.spec b/cosmic-applet-audio/cosmic-applet-audio.spec deleted file mode 100644 index 12808e7..0000000 --- a/cosmic-applet-audio/cosmic-applet-audio.spec +++ /dev/null @@ -1,93 +0,0 @@ - -# Generated by rust2rpm 25 - -# prevent library files from being installed - -%global crate cosmic-applet-audio -%global repo https://github.com/pop-os/cosmic-applets - -Name: cosmic-applet-audio -Version: # TO BE REPLACED AUTOMATICALLY - -Release: %autorelease -Summary: WIP audio applet for cosmic-panel - -License: GPL-3.0 - -URL: https://github.com/pop-os/cosmic-applets - -Source: %{crate}.tar.gz -Source: vendor.tar - - - -# For now, we require all deps for all of cosmic-epoch -BuildRequires: make -BuildRequires: which -BuildRequires: git-core -BuildRequires: just -BuildRequires: rustc -BuildRequires: lld -BuildRequires: cargo -BuildRequires: glib2-devel -BuildRequires: gtk3-devel -BuildRequires: dbus-devel -BuildRequires: wayland-devel -BuildRequires: clang-devel -BuildRequires: libxkbcommon-devel -BuildRequires: mesa-libgbm-devel -BuildRequires: rust-rav1e+nasm-rs-devel -BuildRequires: libappstream-glib -BuildRequires: pipewire-devel -BuildRequires: libglvnd-devel -BuildRequires: libseat-devel -BuildRequires: libinput-devel -BuildRequires: pam-devel -BuildRequires: flatpak-devel - - - -# For now, we require all deps for all of cosmic-epoch -Requires: libseat -Requires: pop-icon-theme -Requires: greetd -Requires: greetd-selinux -Requires: cage -Requires: mozilla-fira-mono-fonts -Requires: mozilla-fira-sans-fonts - - -%global _description %{expand: -%{summary}.} - -%description %{_description} - -%prep - -%autosetup -n %{crate} -p1 -mv %{_sourcedir}/vendor.tar vendor.tar -ls -a -mkdir -p .cargo -cp .vendor/config.toml .cargo/config.toml - - -%build - -just vendor=1 _extract_vendor -cargo build --frozen --offline --release --bin cosmic-applet-audio - - -%install -just rootdir=%{buildroot} prefix=%{_prefix} _install_audio - -%files - -%{_bindir}/cosmic-applet-audio -%{_datadir}/applications/com.system76.CosmicAppletAudio.desktop -%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletAudio.svg - - - -%changelog -%autochangelog - \ No newline at end of file diff --git a/cosmic-applet-audio/srpm.sh b/cosmic-applet-audio/srpm.sh deleted file mode 100644 index 57f1942..0000000 --- a/cosmic-applet-audio/srpm.sh +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/bash -x - -# Variables. LOOK CLOSELY AND MAKE SURE THESE ARE CORRECT - -name='cosmic-applet-audio' -version='0.1.0' - -path_to_spec='cosmic-applet-audio/*' -pop_repo='cosmic-applets' - -# Commit to target. Use "latest" if you want master -commit="latest" - -# Don't edit anything past this line -# ===================================================== # - -LATEST="latest" - -cd ../.. -# We should be in the base directory now - -git clone --recurse-submodules https://github.com/pop-os/$pop_repo - -cd $pop_repo - -if [[ "$commit" == "$LATEST" ]] -then - commit=$(git rev-parse HEAD) -fi - -echo $commit -short_commit=${commit:0:6} - -git reset --hard $commit - -mkdir .vendor - -cargo vendor > .vendor/config.toml - -tar -pcf vendor.tar vendor && mv vendor.tar ../vendor.tar - -rm -rf vendor && cd .. - -# Back into cosmic-packaging - -ls - -if [ "$pop_repo" != "$name" ]; then - mv $pop_repo $name -else - echo "names are equal. continuing..." -fi - -tar -czf $name.tar.gz $name - -rm -rf $name - -cp cosmic-packaging/$path_to_spec . - -rm -rf cosmic-packaging - -current_date=$(date +'%Y%m%d.%H') - -sed -i "/^Version: / s/.*/Version: $version~$current_date.$short_commit/" $name.spec diff --git a/cosmic-applet-battery/cosmic-applet-battery.spec b/cosmic-applet-battery/cosmic-applet-battery.spec deleted file mode 100644 index 2005f37..0000000 --- a/cosmic-applet-battery/cosmic-applet-battery.spec +++ /dev/null @@ -1,133 +0,0 @@ - -# Generated by rust2rpm 25 - -# prevent library files from being installed - -%global crate cosmic-applet-battery -%global repo https://github.com/pop-os/cosmic-applets - -Name: cosmic-applet-battery -Version: # TO BE REPLACED AUTOMATICALLY - -Release: %autorelease -Summary: WIP battery applet for cosmic-panel - -License: GPL-3.0 - -URL: https://github.com/pop-os/cosmic-applets - -Source: %{crate}.tar.gz -Source: vendor.tar - - - -# For now, we require all deps for all of cosmic-epoch -BuildRequires: make -BuildRequires: which -BuildRequires: git-core -BuildRequires: just -BuildRequires: rustc -BuildRequires: lld -BuildRequires: cargo -BuildRequires: glib2-devel -BuildRequires: gtk3-devel -BuildRequires: dbus-devel -BuildRequires: wayland-devel -BuildRequires: clang-devel -BuildRequires: libxkbcommon-devel -BuildRequires: mesa-libgbm-devel -BuildRequires: rust-rav1e+nasm-rs-devel -BuildRequires: libappstream-glib -BuildRequires: pipewire-devel -BuildRequires: libglvnd-devel -BuildRequires: libseat-devel -BuildRequires: libinput-devel -BuildRequires: pam-devel -BuildRequires: flatpak-devel - - - -# For now, we require all deps for all of cosmic-epoch -Requires: libseat -Requires: pop-icon-theme -Requires: greetd -Requires: greetd-selinux -Requires: cage -Requires: mozilla-fira-mono-fonts -Requires: mozilla-fira-sans-fonts - - -%global _description %{expand: -%{summary}.} - -%description %{_description} - -%prep - -%autosetup -n %{crate} -p1 -mv %{_sourcedir}/vendor.tar vendor.tar -ls -a -mkdir -p .cargo -cp .vendor/config.toml .cargo/config.toml - - -%build - -just vendor=1 _extract_vendor -cargo build --frozen --offline --release --bin cosmic-applet-battery - - -%install -just rootdir=%{buildroot} prefix=%{_prefix} _install_battery - -%files - -%{_bindir}/cosmic-applet-battery -%{_datadir}/applications/com.system76.CosmicAppletBattery.desktop -%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletBattery.svg - -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-display-brightness-high-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-display-brightness-low-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-display-brightness-medium-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-display-brightness-off-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-0-charging-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-0-limited-charging-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-0-limited-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-0-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-10-charging-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-10-limited-charging-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-10-limited-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-10-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-100-charging-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-100-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-20-charging-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-20-limited-charging-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-20-limited-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-20-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-35-charging-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-35-limited-charging-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-35-limited-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-35-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-5-charging-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-5-limited-charging-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-5-limited-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-5-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-50-charging-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-50-limited-charging-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-50-limited-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-50-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-65-charging-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-65-limited-charging-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-65-limited-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-65-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-80-charging-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-80-limited-charging-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-80-limited-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-80-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-90-charging-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-90-symbolic.svg - - -%changelog -%autochangelog - \ No newline at end of file diff --git a/cosmic-applet-battery/srpm.sh b/cosmic-applet-battery/srpm.sh deleted file mode 100644 index a6c0bcd..0000000 --- a/cosmic-applet-battery/srpm.sh +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/bash -x - -# Variables. LOOK CLOSELY AND MAKE SURE THESE ARE CORRECT - -name='cosmic-applet-battery' -version='0.1.0' - -path_to_spec='cosmic-applet-battery/*' -pop_repo='cosmic-applets' - -# Commit to target. Use "latest" if you want master -commit="latest" - -# Don't edit anything past this line -# ===================================================== # - -LATEST="latest" - -cd ../.. -# We should be in the base directory now - -git clone --recurse-submodules https://github.com/pop-os/$pop_repo - -cd $pop_repo - -if [[ "$commit" == "$LATEST" ]] -then - commit=$(git rev-parse HEAD) -fi - -echo $commit -short_commit=${commit:0:6} - -git reset --hard $commit - -mkdir .vendor - -cargo vendor > .vendor/config.toml - -tar -pcf vendor.tar vendor && mv vendor.tar ../vendor.tar - -rm -rf vendor && cd .. - -# Back into cosmic-packaging - -ls - -if [ "$pop_repo" != "$name" ]; then - mv $pop_repo $name -else - echo "names are equal. continuing..." -fi - -tar -czf $name.tar.gz $name - -rm -rf $name - -cp cosmic-packaging/$path_to_spec . - -rm -rf cosmic-packaging - -current_date=$(date +'%Y%m%d.%H') - -sed -i "/^Version: / s/.*/Version: $version~$current_date.$short_commit/" $name.spec diff --git a/cosmic-applet-bluetooth/cosmic-applet-bluetooth.spec b/cosmic-applet-bluetooth/cosmic-applet-bluetooth.spec deleted file mode 100644 index add21a1..0000000 --- a/cosmic-applet-bluetooth/cosmic-applet-bluetooth.spec +++ /dev/null @@ -1,95 +0,0 @@ - -# Generated by rust2rpm 25 - -# prevent library files from being installed - -%global crate cosmic-applet-bluetooth -%global repo https://github.com/pop-os/cosmic-applets - -Name: cosmic-applet-bluetooth -Version: # TO BE REPLACED AUTOMATICALLY - -Release: %autorelease -Summary: WIP bluetooth applet for cosmic-panel - -License: GPL-3.0 - -URL: https://github.com/pop-os/cosmic-applets - -Source: %{crate}.tar.gz -Source: vendor.tar - - - -# For now, we require all deps for all of cosmic-epoch -BuildRequires: make -BuildRequires: which -BuildRequires: git-core -BuildRequires: just -BuildRequires: rustc -BuildRequires: lld -BuildRequires: cargo -BuildRequires: glib2-devel -BuildRequires: gtk3-devel -BuildRequires: dbus-devel -BuildRequires: wayland-devel -BuildRequires: clang-devel -BuildRequires: libxkbcommon-devel -BuildRequires: mesa-libgbm-devel -BuildRequires: rust-rav1e+nasm-rs-devel -BuildRequires: libappstream-glib -BuildRequires: pipewire-devel -BuildRequires: libglvnd-devel -BuildRequires: libseat-devel -BuildRequires: libinput-devel -BuildRequires: pam-devel -BuildRequires: flatpak-devel - - - -# For now, we require all deps for all of cosmic-epoch -Requires: libseat -Requires: pop-icon-theme -Requires: greetd -Requires: greetd-selinux -Requires: cage -Requires: mozilla-fira-mono-fonts -Requires: mozilla-fira-sans-fonts - - -%global _description %{expand: -%{summary}.} - -%description %{_description} - -%prep - -%autosetup -n %{crate} -p1 -mv %{_sourcedir}/vendor.tar vendor.tar -ls -a -mkdir -p .cargo -cp .vendor/config.toml .cargo/config.toml - - -%build - -just vendor=1 _extract_vendor -cargo build --frozen --offline --release --bin cosmic-applet-bluetooth - - -%install -just rootdir=%{buildroot} prefix=%{_prefix} _install_bluetooth - -%files - -%{_bindir}/cosmic-applet-bluetooth -%{_datadir}/applications/com.system76.CosmicAppletBluetooth.desktop -%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletBluetooth.svg - -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-bluetooth-active-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-bluetooth-disabled-symbolic.svg - - -%changelog -%autochangelog - \ No newline at end of file diff --git a/cosmic-applet-bluetooth/srpm.sh b/cosmic-applet-bluetooth/srpm.sh deleted file mode 100644 index 2c91c40..0000000 --- a/cosmic-applet-bluetooth/srpm.sh +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/bash -x - -# Variables. LOOK CLOSELY AND MAKE SURE THESE ARE CORRECT - -name='cosmic-applet-bluetooth' -version='0.1.0' - -path_to_spec='cosmic-applet-bluetooth/*' -pop_repo='cosmic-applets' - -# Commit to target. Use "latest" if you want master -commit="latest" - -# Don't edit anything past this line -# ===================================================== # - -LATEST="latest" - -cd ../.. -# We should be in the base directory now - -git clone --recurse-submodules https://github.com/pop-os/$pop_repo - -cd $pop_repo - -if [[ "$commit" == "$LATEST" ]] -then - commit=$(git rev-parse HEAD) -fi - -echo $commit -short_commit=${commit:0:6} - -git reset --hard $commit - -mkdir .vendor - -cargo vendor > .vendor/config.toml - -tar -pcf vendor.tar vendor && mv vendor.tar ../vendor.tar - -rm -rf vendor && cd .. - -# Back into cosmic-packaging - -ls - -if [ "$pop_repo" != "$name" ]; then - mv $pop_repo $name -else - echo "names are equal. continuing..." -fi - -tar -czf $name.tar.gz $name - -rm -rf $name - -cp cosmic-packaging/$path_to_spec . - -rm -rf cosmic-packaging - -current_date=$(date +'%Y%m%d.%H') - -sed -i "/^Version: / s/.*/Version: $version~$current_date.$short_commit/" $name.spec diff --git a/cosmic-applet-minimize/cosmic-applet-minimize.spec b/cosmic-applet-minimize/cosmic-applet-minimize.spec deleted file mode 100644 index df61998..0000000 --- a/cosmic-applet-minimize/cosmic-applet-minimize.spec +++ /dev/null @@ -1,93 +0,0 @@ - -# Generated by rust2rpm 25 - -# prevent library files from being installed - -%global crate cosmic-applet-minimize -%global repo https://github.com/pop-os/cosmic-applets - -Name: cosmic-applet-minimize -Version: # TO BE REPLACED AUTOMATICALLY - -Release: %autorelease -Summary: WIP minimize applet for cosmic-panel - -License: GPL-3.0 - -URL: https://github.com/pop-os/cosmic-applets - -Source: %{crate}.tar.gz -Source: vendor.tar - - - -# For now, we require all deps for all of cosmic-epoch -BuildRequires: make -BuildRequires: which -BuildRequires: git-core -BuildRequires: just -BuildRequires: rustc -BuildRequires: lld -BuildRequires: cargo -BuildRequires: glib2-devel -BuildRequires: gtk3-devel -BuildRequires: dbus-devel -BuildRequires: wayland-devel -BuildRequires: clang-devel -BuildRequires: libxkbcommon-devel -BuildRequires: mesa-libgbm-devel -BuildRequires: rust-rav1e+nasm-rs-devel -BuildRequires: libappstream-glib -BuildRequires: pipewire-devel -BuildRequires: libglvnd-devel -BuildRequires: libseat-devel -BuildRequires: libinput-devel -BuildRequires: pam-devel -BuildRequires: flatpak-devel - - - -# For now, we require all deps for all of cosmic-epoch -Requires: libseat -Requires: pop-icon-theme -Requires: greetd -Requires: greetd-selinux -Requires: cage -Requires: mozilla-fira-mono-fonts -Requires: mozilla-fira-sans-fonts - - -%global _description %{expand: -%{summary}.} - -%description %{_description} - -%prep - -%autosetup -n %{crate} -p1 -mv %{_sourcedir}/vendor.tar vendor.tar -ls -a -mkdir -p .cargo -cp .vendor/config.toml .cargo/config.toml - - -%build - -just vendor=1 _extract_vendor -cargo build --frozen --offline --release --bin cosmic-applet-minimize - - -%install -just rootdir=%{buildroot} prefix=%{_prefix} _install_minimize - -%files - -%{_bindir}/cosmic-applet-minimize -%{_datadir}/applications/com.system76.CosmicAppletMinimize.desktop -%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletMinimize.svg - - - -%changelog -%autochangelog - \ No newline at end of file diff --git a/cosmic-applet-minimize/srpm.sh b/cosmic-applet-minimize/srpm.sh deleted file mode 100644 index 0bdd2aa..0000000 --- a/cosmic-applet-minimize/srpm.sh +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/bash -x - -# Variables. LOOK CLOSELY AND MAKE SURE THESE ARE CORRECT - -name='cosmic-applet-minimize' -version='0.1.0' - -path_to_spec='cosmic-applet-minimize/*' -pop_repo='cosmic-applets' - -# Commit to target. Use "latest" if you want master -commit="latest" - -# Don't edit anything past this line -# ===================================================== # - -LATEST="latest" - -cd ../.. -# We should be in the base directory now - -git clone --recurse-submodules https://github.com/pop-os/$pop_repo - -cd $pop_repo - -if [[ "$commit" == "$LATEST" ]] -then - commit=$(git rev-parse HEAD) -fi - -echo $commit -short_commit=${commit:0:6} - -git reset --hard $commit - -mkdir .vendor - -cargo vendor > .vendor/config.toml - -tar -pcf vendor.tar vendor && mv vendor.tar ../vendor.tar - -rm -rf vendor && cd .. - -# Back into cosmic-packaging - -ls - -if [ "$pop_repo" != "$name" ]; then - mv $pop_repo $name -else - echo "names are equal. continuing..." -fi - -tar -czf $name.tar.gz $name - -rm -rf $name - -cp cosmic-packaging/$path_to_spec . - -rm -rf cosmic-packaging - -current_date=$(date +'%Y%m%d.%H') - -sed -i "/^Version: / s/.*/Version: $version~$current_date.$short_commit/" $name.spec diff --git a/cosmic-applet-network/cosmic-applet-network.spec b/cosmic-applet-network/cosmic-applet-network.spec deleted file mode 100644 index 66cb1c6..0000000 --- a/cosmic-applet-network/cosmic-applet-network.spec +++ /dev/null @@ -1,93 +0,0 @@ - -# Generated by rust2rpm 25 - -# prevent library files from being installed - -%global crate cosmic-applet-network -%global repo https://github.com/pop-os/cosmic-applets - -Name: cosmic-applet-network -Version: # TO BE REPLACED AUTOMATICALLY - -Release: %autorelease -Summary: WIP network applet for cosmic-panel - -License: GPL-3.0 - -URL: https://github.com/pop-os/cosmic-applets - -Source: %{crate}.tar.gz -Source: vendor.tar - - - -# For now, we require all deps for all of cosmic-epoch -BuildRequires: make -BuildRequires: which -BuildRequires: git-core -BuildRequires: just -BuildRequires: rustc -BuildRequires: lld -BuildRequires: cargo -BuildRequires: glib2-devel -BuildRequires: gtk3-devel -BuildRequires: dbus-devel -BuildRequires: wayland-devel -BuildRequires: clang-devel -BuildRequires: libxkbcommon-devel -BuildRequires: mesa-libgbm-devel -BuildRequires: rust-rav1e+nasm-rs-devel -BuildRequires: libappstream-glib -BuildRequires: pipewire-devel -BuildRequires: libglvnd-devel -BuildRequires: libseat-devel -BuildRequires: libinput-devel -BuildRequires: pam-devel -BuildRequires: flatpak-devel - - - -# For now, we require all deps for all of cosmic-epoch -Requires: libseat -Requires: pop-icon-theme -Requires: greetd -Requires: greetd-selinux -Requires: cage -Requires: mozilla-fira-mono-fonts -Requires: mozilla-fira-sans-fonts - - -%global _description %{expand: -%{summary}.} - -%description %{_description} - -%prep - -%autosetup -n %{crate} -p1 -mv %{_sourcedir}/vendor.tar vendor.tar -ls -a -mkdir -p .cargo -cp .vendor/config.toml .cargo/config.toml - - -%build - -just vendor=1 _extract_vendor -cargo build --frozen --offline --release --bin cosmic-applet-network - - -%install -just rootdir=%{buildroot} prefix=%{_prefix} _install_network - -%files - -%{_bindir}/cosmic-applet-network -%{_datadir}/applications/com.system76.CosmicAppletNetwork.desktop -%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletNetwork.svg - - - -%changelog -%autochangelog - \ No newline at end of file diff --git a/cosmic-applet-network/srpm.sh b/cosmic-applet-network/srpm.sh deleted file mode 100644 index 3f6b6f4..0000000 --- a/cosmic-applet-network/srpm.sh +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/bash -x - -# Variables. LOOK CLOSELY AND MAKE SURE THESE ARE CORRECT - -name='cosmic-applet-network' -version='0.1.0' - -path_to_spec='cosmic-applet-network/*' -pop_repo='cosmic-applets' - -# Commit to target. Use "latest" if you want master -commit="latest" - -# Don't edit anything past this line -# ===================================================== # - -LATEST="latest" - -cd ../.. -# We should be in the base directory now - -git clone --recurse-submodules https://github.com/pop-os/$pop_repo - -cd $pop_repo - -if [[ "$commit" == "$LATEST" ]] -then - commit=$(git rev-parse HEAD) -fi - -echo $commit -short_commit=${commit:0:6} - -git reset --hard $commit - -mkdir .vendor - -cargo vendor > .vendor/config.toml - -tar -pcf vendor.tar vendor && mv vendor.tar ../vendor.tar - -rm -rf vendor && cd .. - -# Back into cosmic-packaging - -ls - -if [ "$pop_repo" != "$name" ]; then - mv $pop_repo $name -else - echo "names are equal. continuing..." -fi - -tar -czf $name.tar.gz $name - -rm -rf $name - -cp cosmic-packaging/$path_to_spec . - -rm -rf cosmic-packaging - -current_date=$(date +'%Y%m%d.%H') - -sed -i "/^Version: / s/.*/Version: $version~$current_date.$short_commit/" $name.spec diff --git a/cosmic-applet-notifications/cosmic-applet-notifications.spec b/cosmic-applet-notifications/cosmic-applet-notifications.spec deleted file mode 100644 index 7013e83..0000000 --- a/cosmic-applet-notifications/cosmic-applet-notifications.spec +++ /dev/null @@ -1,96 +0,0 @@ - -# Generated by rust2rpm 25 - -# prevent library files from being installed - -%global crate cosmic-applet-notifications -%global repo https://github.com/pop-os/cosmic-applets - -Name: cosmic-applet-notifications -Version: # TO BE REPLACED AUTOMATICALLY - -Release: %autorelease -Summary: WIP notifications applet for cosmic-panel - -License: GPL-3.0 - -URL: https://github.com/pop-os/cosmic-applets - -Source: %{crate}.tar.gz -Source: vendor.tar - - - -# For now, we require all deps for all of cosmic-epoch -BuildRequires: make -BuildRequires: which -BuildRequires: git-core -BuildRequires: just -BuildRequires: rustc -BuildRequires: lld -BuildRequires: cargo -BuildRequires: glib2-devel -BuildRequires: gtk3-devel -BuildRequires: dbus-devel -BuildRequires: wayland-devel -BuildRequires: clang-devel -BuildRequires: libxkbcommon-devel -BuildRequires: mesa-libgbm-devel -BuildRequires: rust-rav1e+nasm-rs-devel -BuildRequires: libappstream-glib -BuildRequires: pipewire-devel -BuildRequires: libglvnd-devel -BuildRequires: libseat-devel -BuildRequires: libinput-devel -BuildRequires: pam-devel -BuildRequires: flatpak-devel - - - -# For now, we require all deps for all of cosmic-epoch -Requires: libseat -Requires: pop-icon-theme -Requires: greetd -Requires: greetd-selinux -Requires: cage -Requires: mozilla-fira-mono-fonts -Requires: mozilla-fira-sans-fonts - - -%global _description %{expand: -%{summary}.} - -%description %{_description} - -%prep - -%autosetup -n %{crate} -p1 -mv %{_sourcedir}/vendor.tar vendor.tar -ls -a -mkdir -p .cargo -cp .vendor/config.toml .cargo/config.toml - - -%build - -just vendor=1 _extract_vendor -cargo build --frozen --offline --release --bin cosmic-applet-notifications - - -%install -just rootdir=%{buildroot} prefix=%{_prefix} _install_notifications - -%files - -%{_bindir}/cosmic-applet-notifications -%{_datadir}/applications/com.system76.CosmicAppletNotifications.desktop -%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletNotifications.svg - -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-notification-disabled-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-notification-new-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-notification-symbolic.svg - - -%changelog -%autochangelog - \ No newline at end of file diff --git a/cosmic-applet-notifications/srpm.sh b/cosmic-applet-notifications/srpm.sh deleted file mode 100644 index 8d28580..0000000 --- a/cosmic-applet-notifications/srpm.sh +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/bash -x - -# Variables. LOOK CLOSELY AND MAKE SURE THESE ARE CORRECT - -name='cosmic-applet-notifications' -version='0.1.0' - -path_to_spec='cosmic-applet-notifications/*' -pop_repo='cosmic-applets' - -# Commit to target. Use "latest" if you want master -commit="latest" - -# Don't edit anything past this line -# ===================================================== # - -LATEST="latest" - -cd ../.. -# We should be in the base directory now - -git clone --recurse-submodules https://github.com/pop-os/$pop_repo - -cd $pop_repo - -if [[ "$commit" == "$LATEST" ]] -then - commit=$(git rev-parse HEAD) -fi - -echo $commit -short_commit=${commit:0:6} - -git reset --hard $commit - -mkdir .vendor - -cargo vendor > .vendor/config.toml - -tar -pcf vendor.tar vendor && mv vendor.tar ../vendor.tar - -rm -rf vendor && cd .. - -# Back into cosmic-packaging - -ls - -if [ "$pop_repo" != "$name" ]; then - mv $pop_repo $name -else - echo "names are equal. continuing..." -fi - -tar -czf $name.tar.gz $name - -rm -rf $name - -cp cosmic-packaging/$path_to_spec . - -rm -rf cosmic-packaging - -current_date=$(date +'%Y%m%d.%H') - -sed -i "/^Version: / s/.*/Version: $version~$current_date.$short_commit/" $name.spec diff --git a/cosmic-applet-panel-button/cosmic-applet-panel-button.spec b/cosmic-applet-panel-button/cosmic-applet-panel-button.spec deleted file mode 100644 index ae50fcc..0000000 --- a/cosmic-applet-panel-button/cosmic-applet-panel-button.spec +++ /dev/null @@ -1,98 +0,0 @@ -%define debug_package %{nil} -# Generated by rust2rpm 25 - -# prevent library files from being installed - -%global crate cosmic-applet-panel-button -%global repo https://github.com/pop-os/cosmic-applets - -Name: cosmic-applet-panel-button -Version: # TO BE REPLACED AUTOMATICALLY - -Release: %autorelease -Summary: WIP panel button applet for cosmic-panel - -License: GPL-3.0 - -URL: https://github.com/pop-os/cosmic-applets - -Source: %{crate}.tar.gz -Source: vendor.tar - - - -# For now, we require all deps for all of cosmic-epoch -BuildRequires: make -BuildRequires: which -BuildRequires: git-core -BuildRequires: just -BuildRequires: rustc -BuildRequires: lld -BuildRequires: cargo -BuildRequires: glib2-devel -BuildRequires: gtk3-devel -BuildRequires: dbus-devel -BuildRequires: wayland-devel -BuildRequires: clang-devel -BuildRequires: libxkbcommon-devel -BuildRequires: mesa-libgbm-devel -BuildRequires: rust-rav1e+nasm-rs-devel -BuildRequires: libappstream-glib -BuildRequires: pipewire-devel -BuildRequires: libglvnd-devel -BuildRequires: libseat-devel -BuildRequires: libinput-devel -BuildRequires: pam-devel -BuildRequires: flatpak-devel - - - -# For now, we require all deps for all of cosmic-epoch -Requires: libseat -Requires: pop-icon-theme -Requires: greetd -Requires: greetd-selinux -Requires: cage -Requires: mozilla-fira-mono-fonts -Requires: mozilla-fira-sans-fonts - - -%global _description %{expand: -%{summary}.} - -%description %{_description} - -%prep - -%autosetup -n %{crate} -p1 -mv %{_sourcedir}/vendor.tar vendor.tar -ls -a -mkdir -p .cargo -cp .vendor/config.toml .cargo/config.toml - - -%build - -just vendor=1 _extract_vendor -cargo build --frozen --offline --release --bin cosmic-panel-button - - -%install - -just rootdir=%{buildroot} prefix=%{_prefix} _install_panel_button -just rootdir=%{buildroot} prefix=%{_prefix} _install_app_button -just rootdir=%{buildroot} prefix=%{_prefix} _install_workspaces_button - - -%files - -%{_bindir}/cosmic-panel-button -%{_datadir}/applications/com.system76.CosmicPanelAppButton.desktop -%{_datadir}/applications/com.system76.CosmicPanelWorkspacesButton.desktop -%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicPanelAppButton.svg -%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicPanelWorkspacesButton.svg - - -%changelog -%autochangelog - \ No newline at end of file diff --git a/cosmic-applet-panel-button/srpm.sh b/cosmic-applet-panel-button/srpm.sh deleted file mode 100644 index cc6206e..0000000 --- a/cosmic-applet-panel-button/srpm.sh +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/bash -x - -# Variables. LOOK CLOSELY AND MAKE SURE THESE ARE CORRECT - -name='cosmic-applet-panel-button' -version='0.1.0' - -path_to_spec='cosmic-applet-panel-button/*' -pop_repo='cosmic-applets' - -# Commit to target. Use "latest" if you want master -commit="latest" - -# Don't edit anything past this line -# ===================================================== # - -LATEST="latest" - -cd ../.. -# We should be in the base directory now - -git clone --recurse-submodules https://github.com/pop-os/$pop_repo - -cd $pop_repo - -if [[ "$commit" == "$LATEST" ]] -then - commit=$(git rev-parse HEAD) -fi - -echo $commit -short_commit=${commit:0:6} - -git reset --hard $commit - -mkdir .vendor - -cargo vendor > .vendor/config.toml - -tar -pcf vendor.tar vendor && mv vendor.tar ../vendor.tar - -rm -rf vendor && cd .. - -# Back into cosmic-packaging - -ls - -if [ "$pop_repo" != "$name" ]; then - mv $pop_repo $name -else - echo "names are equal. continuing..." -fi - -tar -czf $name.tar.gz $name - -rm -rf $name - -cp cosmic-packaging/$path_to_spec . - -rm -rf cosmic-packaging - -current_date=$(date +'%Y%m%d.%H') - -sed -i "/^Version: / s/.*/Version: $version~$current_date.$short_commit/" $name.spec diff --git a/cosmic-applet-power/cosmic-applet-power.spec b/cosmic-applet-power/cosmic-applet-power.spec deleted file mode 100644 index 899897a..0000000 --- a/cosmic-applet-power/cosmic-applet-power.spec +++ /dev/null @@ -1,93 +0,0 @@ - -# Generated by rust2rpm 25 - -# prevent library files from being installed - -%global crate cosmic-applet-power -%global repo https://github.com/pop-os/cosmic-applets - -Name: cosmic-applet-power -Version: # TO BE REPLACED AUTOMATICALLY - -Release: %autorelease -Summary: WIP power applet for cosmic-panel - -License: GPL-3.0 - -URL: https://github.com/pop-os/cosmic-applets - -Source: %{crate}.tar.gz -Source: vendor.tar - - - -# For now, we require all deps for all of cosmic-epoch -BuildRequires: make -BuildRequires: which -BuildRequires: git-core -BuildRequires: just -BuildRequires: rustc -BuildRequires: lld -BuildRequires: cargo -BuildRequires: glib2-devel -BuildRequires: gtk3-devel -BuildRequires: dbus-devel -BuildRequires: wayland-devel -BuildRequires: clang-devel -BuildRequires: libxkbcommon-devel -BuildRequires: mesa-libgbm-devel -BuildRequires: rust-rav1e+nasm-rs-devel -BuildRequires: libappstream-glib -BuildRequires: pipewire-devel -BuildRequires: libglvnd-devel -BuildRequires: libseat-devel -BuildRequires: libinput-devel -BuildRequires: pam-devel -BuildRequires: flatpak-devel - - - -# For now, we require all deps for all of cosmic-epoch -Requires: libseat -Requires: pop-icon-theme -Requires: greetd -Requires: greetd-selinux -Requires: cage -Requires: mozilla-fira-mono-fonts -Requires: mozilla-fira-sans-fonts - - -%global _description %{expand: -%{summary}.} - -%description %{_description} - -%prep - -%autosetup -n %{crate} -p1 -mv %{_sourcedir}/vendor.tar vendor.tar -ls -a -mkdir -p .cargo -cp .vendor/config.toml .cargo/config.toml - - -%build - -just vendor=1 _extract_vendor -cargo build --frozen --offline --release --bin cosmic-applet-power - - -%install -just rootdir=%{buildroot} prefix=%{_prefix} _install_power - -%files - -%{_bindir}/cosmic-applet-power -%{_datadir}/applications/com.system76.CosmicAppletPower.desktop -%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletPower.svg - - - -%changelog -%autochangelog - \ No newline at end of file diff --git a/cosmic-applet-power/srpm.sh b/cosmic-applet-power/srpm.sh deleted file mode 100644 index 0917398..0000000 --- a/cosmic-applet-power/srpm.sh +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/bash -x - -# Variables. LOOK CLOSELY AND MAKE SURE THESE ARE CORRECT - -name='cosmic-applet-power' -version='0.1.0' - -path_to_spec='cosmic-applet-power/*' -pop_repo='cosmic-applets' - -# Commit to target. Use "latest" if you want master -commit="latest" - -# Don't edit anything past this line -# ===================================================== # - -LATEST="latest" - -cd ../.. -# We should be in the base directory now - -git clone --recurse-submodules https://github.com/pop-os/$pop_repo - -cd $pop_repo - -if [[ "$commit" == "$LATEST" ]] -then - commit=$(git rev-parse HEAD) -fi - -echo $commit -short_commit=${commit:0:6} - -git reset --hard $commit - -mkdir .vendor - -cargo vendor > .vendor/config.toml - -tar -pcf vendor.tar vendor && mv vendor.tar ../vendor.tar - -rm -rf vendor && cd .. - -# Back into cosmic-packaging - -ls - -if [ "$pop_repo" != "$name" ]; then - mv $pop_repo $name -else - echo "names are equal. continuing..." -fi - -tar -czf $name.tar.gz $name - -rm -rf $name - -cp cosmic-packaging/$path_to_spec . - -rm -rf cosmic-packaging - -current_date=$(date +'%Y%m%d.%H') - -sed -i "/^Version: / s/.*/Version: $version~$current_date.$short_commit/" $name.spec diff --git a/cosmic-applet-status-area/cosmic-applet-status-area.spec b/cosmic-applet-status-area/cosmic-applet-status-area.spec deleted file mode 100644 index 7789f7b..0000000 --- a/cosmic-applet-status-area/cosmic-applet-status-area.spec +++ /dev/null @@ -1,93 +0,0 @@ - -# Generated by rust2rpm 25 - -# prevent library files from being installed - -%global crate cosmic-applet-status-area -%global repo https://github.com/pop-os/cosmic-applets - -Name: cosmic-applet-status-area -Version: # TO BE REPLACED AUTOMATICALLY - -Release: %autorelease -Summary: WIP status area applet for cosmic-panel - -License: GPL-3.0 - -URL: https://github.com/pop-os/cosmic-applets - -Source: %{crate}.tar.gz -Source: vendor.tar - - - -# For now, we require all deps for all of cosmic-epoch -BuildRequires: make -BuildRequires: which -BuildRequires: git-core -BuildRequires: just -BuildRequires: rustc -BuildRequires: lld -BuildRequires: cargo -BuildRequires: glib2-devel -BuildRequires: gtk3-devel -BuildRequires: dbus-devel -BuildRequires: wayland-devel -BuildRequires: clang-devel -BuildRequires: libxkbcommon-devel -BuildRequires: mesa-libgbm-devel -BuildRequires: rust-rav1e+nasm-rs-devel -BuildRequires: libappstream-glib -BuildRequires: pipewire-devel -BuildRequires: libglvnd-devel -BuildRequires: libseat-devel -BuildRequires: libinput-devel -BuildRequires: pam-devel -BuildRequires: flatpak-devel - - - -# For now, we require all deps for all of cosmic-epoch -Requires: libseat -Requires: pop-icon-theme -Requires: greetd -Requires: greetd-selinux -Requires: cage -Requires: mozilla-fira-mono-fonts -Requires: mozilla-fira-sans-fonts - - -%global _description %{expand: -%{summary}.} - -%description %{_description} - -%prep - -%autosetup -n %{crate} -p1 -mv %{_sourcedir}/vendor.tar vendor.tar -ls -a -mkdir -p .cargo -cp .vendor/config.toml .cargo/config.toml - - -%build - -just vendor=1 _extract_vendor -cargo build --frozen --offline --release --bin cosmic-applet-status-area - - -%install -just rootdir=%{buildroot} prefix=%{_prefix} _install_status_area - -%files - -%{_bindir}/cosmic-applet-status-area -%{_datadir}/applications/com.system76.CosmicAppletStatusArea.desktop - -%{_datadir}/icons/hicolor/scalable/app/com.system76.CosmicAppletStatusArea.svg - - -%changelog -%autochangelog - \ No newline at end of file diff --git a/cosmic-applet-status-area/srpm.sh b/cosmic-applet-status-area/srpm.sh deleted file mode 100644 index 44fcb2d..0000000 --- a/cosmic-applet-status-area/srpm.sh +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/bash -x - -# Variables. LOOK CLOSELY AND MAKE SURE THESE ARE CORRECT - -name='cosmic-applet-status-area' -version='0.1.0' - -path_to_spec='cosmic-applet-status-area/*' -pop_repo='cosmic-applets' - -# Commit to target. Use "latest" if you want master -commit="latest" - -# Don't edit anything past this line -# ===================================================== # - -LATEST="latest" - -cd ../.. -# We should be in the base directory now - -git clone --recurse-submodules https://github.com/pop-os/$pop_repo - -cd $pop_repo - -if [[ "$commit" == "$LATEST" ]] -then - commit=$(git rev-parse HEAD) -fi - -echo $commit -short_commit=${commit:0:6} - -git reset --hard $commit - -mkdir .vendor - -cargo vendor > .vendor/config.toml - -tar -pcf vendor.tar vendor && mv vendor.tar ../vendor.tar - -rm -rf vendor && cd .. - -# Back into cosmic-packaging - -ls - -if [ "$pop_repo" != "$name" ]; then - mv $pop_repo $name -else - echo "names are equal. continuing..." -fi - -tar -czf $name.tar.gz $name - -rm -rf $name - -cp cosmic-packaging/$path_to_spec . - -rm -rf cosmic-packaging - -current_date=$(date +'%Y%m%d.%H') - -sed -i "/^Version: / s/.*/Version: $version~$current_date.$short_commit/" $name.spec diff --git a/cosmic-applet-tiling/cosmic-applet-tiling.spec b/cosmic-applet-tiling/cosmic-applet-tiling.spec deleted file mode 100644 index c44b341..0000000 --- a/cosmic-applet-tiling/cosmic-applet-tiling.spec +++ /dev/null @@ -1,94 +0,0 @@ - -# Generated by rust2rpm 25 - -# prevent library files from being installed - -%global crate cosmic-applet-tiling -%global repo https://github.com/pop-os/cosmic-applets - -Name: cosmic-applet-tiling -Version: # TO BE REPLACED AUTOMATICALLY - -Release: %autorelease -Summary: WIP tiling applet for cosmic-panel - -License: GPL-3.0 - -URL: https://github.com/pop-os/cosmic-applets - -Source: %{crate}.tar.gz -Source: vendor.tar - - - -# For now, we require all deps for all of cosmic-epoch -BuildRequires: make -BuildRequires: which -BuildRequires: git-core -BuildRequires: just -BuildRequires: rustc -BuildRequires: lld -BuildRequires: cargo -BuildRequires: glib2-devel -BuildRequires: gtk3-devel -BuildRequires: dbus-devel -BuildRequires: wayland-devel -BuildRequires: clang-devel -BuildRequires: libxkbcommon-devel -BuildRequires: mesa-libgbm-devel -BuildRequires: rust-rav1e+nasm-rs-devel -BuildRequires: libappstream-glib -BuildRequires: pipewire-devel -BuildRequires: libglvnd-devel -BuildRequires: libseat-devel -BuildRequires: libinput-devel -BuildRequires: pam-devel -BuildRequires: flatpak-devel - - - -# For now, we require all deps for all of cosmic-epoch -Requires: libseat -Requires: pop-icon-theme -Requires: greetd -Requires: greetd-selinux -Requires: cage -Requires: mozilla-fira-mono-fonts -Requires: mozilla-fira-sans-fonts - - -%global _description %{expand: -%{summary}.} - -%description %{_description} - -%prep - -%autosetup -n %{crate} -p1 -mv %{_sourcedir}/vendor.tar vendor.tar -ls -a -mkdir -p .cargo -cp .vendor/config.toml .cargo/config.toml - - -%build - -just vendor=1 _extract_vendor -cargo build --frozen --offline --release --bin cosmic-applet-tiling - - -%install -just rootdir=%{buildroot} prefix=%{_prefix} _install_tiling - -%files - -%{_bindir}/cosmic-applet-tiling -%{_datadir}/applications/com.system76.CosmicAppletTiling.desktop - -%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletTiling.Off.svg -%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletTiling.On.svg - - -%changelog -%autochangelog - \ No newline at end of file diff --git a/cosmic-applet-tiling/srpm.sh b/cosmic-applet-tiling/srpm.sh deleted file mode 100644 index 5e1ee3a..0000000 --- a/cosmic-applet-tiling/srpm.sh +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/bash -x - -# Variables. LOOK CLOSELY AND MAKE SURE THESE ARE CORRECT - -name='cosmic-applet-tiling' -version='0.1.0' - -path_to_spec='cosmic-applet-tiling/*' -pop_repo='cosmic-applets' - -# Commit to target. Use "latest" if you want master -commit="latest" - -# Don't edit anything past this line -# ===================================================== # - -LATEST="latest" - -cd ../.. -# We should be in the base directory now - -git clone --recurse-submodules https://github.com/pop-os/$pop_repo - -cd $pop_repo - -if [[ "$commit" == "$LATEST" ]] -then - commit=$(git rev-parse HEAD) -fi - -echo $commit -short_commit=${commit:0:6} - -git reset --hard $commit - -mkdir .vendor - -cargo vendor > .vendor/config.toml - -tar -pcf vendor.tar vendor && mv vendor.tar ../vendor.tar - -rm -rf vendor && cd .. - -# Back into cosmic-packaging - -ls - -if [ "$pop_repo" != "$name" ]; then - mv $pop_repo $name -else - echo "names are equal. continuing..." -fi - -tar -czf $name.tar.gz $name - -rm -rf $name - -cp cosmic-packaging/$path_to_spec . - -rm -rf cosmic-packaging - -current_date=$(date +'%Y%m%d.%H') - -sed -i "/^Version: / s/.*/Version: $version~$current_date.$short_commit/" $name.spec diff --git a/cosmic-applet-time/cosmic-applet-time.spec b/cosmic-applet-time/cosmic-applet-time.spec deleted file mode 100644 index bfae6a1..0000000 --- a/cosmic-applet-time/cosmic-applet-time.spec +++ /dev/null @@ -1,93 +0,0 @@ - -# Generated by rust2rpm 25 - -# prevent library files from being installed - -%global crate cosmic-applet-time -%global repo https://github.com/pop-os/cosmic-applets - -Name: cosmic-applet-time -Version: # TO BE REPLACED AUTOMATICALLY - -Release: %autorelease -Summary: WIP time applet for cosmic-panel - -License: GPL-3.0 - -URL: https://github.com/pop-os/cosmic-applets - -Source: %{crate}.tar.gz -Source: vendor.tar - - - -# For now, we require all deps for all of cosmic-epoch -BuildRequires: make -BuildRequires: which -BuildRequires: git-core -BuildRequires: just -BuildRequires: rustc -BuildRequires: lld -BuildRequires: cargo -BuildRequires: glib2-devel -BuildRequires: gtk3-devel -BuildRequires: dbus-devel -BuildRequires: wayland-devel -BuildRequires: clang-devel -BuildRequires: libxkbcommon-devel -BuildRequires: mesa-libgbm-devel -BuildRequires: rust-rav1e+nasm-rs-devel -BuildRequires: libappstream-glib -BuildRequires: pipewire-devel -BuildRequires: libglvnd-devel -BuildRequires: libseat-devel -BuildRequires: libinput-devel -BuildRequires: pam-devel -BuildRequires: flatpak-devel - - - -# For now, we require all deps for all of cosmic-epoch -Requires: libseat -Requires: pop-icon-theme -Requires: greetd -Requires: greetd-selinux -Requires: cage -Requires: mozilla-fira-mono-fonts -Requires: mozilla-fira-sans-fonts - - -%global _description %{expand: -%{summary}.} - -%description %{_description} - -%prep - -%autosetup -n %{crate} -p1 -mv %{_sourcedir}/vendor.tar vendor.tar -ls -a -mkdir -p .cargo -cp .vendor/config.toml .cargo/config.toml - - -%build - -just vendor=1 _extract_vendor -cargo build --frozen --offline --release --bin cosmic-applet-time - - -%install -just rootdir=%{buildroot} prefix=%{_prefix} _install_time - -%files - -%{_bindir}/cosmic-applet-time -%{_datadir}/applications/com.system76.CosmicAppletTime.desktop -%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletTime.svg - - - -%changelog -%autochangelog - \ No newline at end of file diff --git a/cosmic-applet-time/srpm.sh b/cosmic-applet-time/srpm.sh deleted file mode 100644 index 58f3c88..0000000 --- a/cosmic-applet-time/srpm.sh +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/bash -x - -# Variables. LOOK CLOSELY AND MAKE SURE THESE ARE CORRECT - -name='cosmic-applet-time' -version='0.1.0' - -path_to_spec='cosmic-applet-time/*' -pop_repo='cosmic-applets' - -# Commit to target. Use "latest" if you want master -commit="latest" - -# Don't edit anything past this line -# ===================================================== # - -LATEST="latest" - -cd ../.. -# We should be in the base directory now - -git clone --recurse-submodules https://github.com/pop-os/$pop_repo - -cd $pop_repo - -if [[ "$commit" == "$LATEST" ]] -then - commit=$(git rev-parse HEAD) -fi - -echo $commit -short_commit=${commit:0:6} - -git reset --hard $commit - -mkdir .vendor - -cargo vendor > .vendor/config.toml - -tar -pcf vendor.tar vendor && mv vendor.tar ../vendor.tar - -rm -rf vendor && cd .. - -# Back into cosmic-packaging - -ls - -if [ "$pop_repo" != "$name" ]; then - mv $pop_repo $name -else - echo "names are equal. continuing..." -fi - -tar -czf $name.tar.gz $name - -rm -rf $name - -cp cosmic-packaging/$path_to_spec . - -rm -rf cosmic-packaging - -current_date=$(date +'%Y%m%d.%H') - -sed -i "/^Version: / s/.*/Version: $version~$current_date.$short_commit/" $name.spec diff --git a/cosmic-applet-workspaces/cosmic-applet-workspaces.spec b/cosmic-applet-workspaces/cosmic-applet-workspaces.spec deleted file mode 100644 index e5ef6e7..0000000 --- a/cosmic-applet-workspaces/cosmic-applet-workspaces.spec +++ /dev/null @@ -1,93 +0,0 @@ - -# Generated by rust2rpm 25 - -# prevent library files from being installed - -%global crate cosmic-applet-workspaces -%global repo https://github.com/pop-os/cosmic-applets - -Name: cosmic-applet-workspaces -Version: # TO BE REPLACED AUTOMATICALLY - -Release: %autorelease -Summary: WIP workspaces applet for cosmic-panel - -License: GPL-3.0 - -URL: https://github.com/pop-os/cosmic-applets - -Source: %{crate}.tar.gz -Source: vendor.tar - - - -# For now, we require all deps for all of cosmic-epoch -BuildRequires: make -BuildRequires: which -BuildRequires: git-core -BuildRequires: just -BuildRequires: rustc -BuildRequires: lld -BuildRequires: cargo -BuildRequires: glib2-devel -BuildRequires: gtk3-devel -BuildRequires: dbus-devel -BuildRequires: wayland-devel -BuildRequires: clang-devel -BuildRequires: libxkbcommon-devel -BuildRequires: mesa-libgbm-devel -BuildRequires: rust-rav1e+nasm-rs-devel -BuildRequires: libappstream-glib -BuildRequires: pipewire-devel -BuildRequires: libglvnd-devel -BuildRequires: libseat-devel -BuildRequires: libinput-devel -BuildRequires: pam-devel -BuildRequires: flatpak-devel - - - -# For now, we require all deps for all of cosmic-epoch -Requires: libseat -Requires: pop-icon-theme -Requires: greetd -Requires: greetd-selinux -Requires: cage -Requires: mozilla-fira-mono-fonts -Requires: mozilla-fira-sans-fonts - - -%global _description %{expand: -%{summary}.} - -%description %{_description} - -%prep - -%autosetup -n %{crate} -p1 -mv %{_sourcedir}/vendor.tar vendor.tar -ls -a -mkdir -p .cargo -cp .vendor/config.toml .cargo/config.toml - - -%build - -just vendor=1 _extract_vendor -cargo build --frozen --offline --release --bin cosmic-applet-workspaces - - -%install -just rootdir=%{buildroot} prefix=%{_prefix} _install_workspace - -%files - -%{_bindir}/cosmic-applet-workspaces -%{_datadir}/applications/com.system76.CosmicAppletWorkspaces.desktop -%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletWorkspaces.svg - - - -%changelog -%autochangelog - \ No newline at end of file diff --git a/cosmic-applet-workspaces/srpm.sh b/cosmic-applet-workspaces/srpm.sh deleted file mode 100644 index 2ba898a..0000000 --- a/cosmic-applet-workspaces/srpm.sh +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/bash -x - -# Variables. LOOK CLOSELY AND MAKE SURE THESE ARE CORRECT - -name='cosmic-applet-workspaces' -version='0.1.0' - -path_to_spec='cosmic-applet-workspaces/*' -pop_repo='cosmic-applets' - -# Commit to target. Use "latest" if you want master -commit="latest" - -# Don't edit anything past this line -# ===================================================== # - -LATEST="latest" - -cd ../.. -# We should be in the base directory now - -git clone --recurse-submodules https://github.com/pop-os/$pop_repo - -cd $pop_repo - -if [[ "$commit" == "$LATEST" ]] -then - commit=$(git rev-parse HEAD) -fi - -echo $commit -short_commit=${commit:0:6} - -git reset --hard $commit - -mkdir .vendor - -cargo vendor > .vendor/config.toml - -tar -pcf vendor.tar vendor && mv vendor.tar ../vendor.tar - -rm -rf vendor && cd .. - -# Back into cosmic-packaging - -ls - -if [ "$pop_repo" != "$name" ]; then - mv $pop_repo $name -else - echo "names are equal. continuing..." -fi - -tar -czf $name.tar.gz $name - -rm -rf $name - -cp cosmic-packaging/$path_to_spec . - -rm -rf cosmic-packaging - -current_date=$(date +'%Y%m%d.%H') - -sed -i "/^Version: / s/.*/Version: $version~$current_date.$short_commit/" $name.spec diff --git a/cosmic-applets/cosmic-applets.spec b/cosmic-applets/cosmic-applets.spec index b3cda2b..81f9297 100644 --- a/cosmic-applets/cosmic-applets.spec +++ b/cosmic-applets/cosmic-applets.spec @@ -1,27 +1,60 @@ -# COSMIC Desktop meta package + +# Generated by rust2rpm 25 + +# prevent library files from being installed + +%global crate cosmic-applets +%global repo https://github.com/pop-os/cosmic-applets + Name: cosmic-applets -Version: 0.1.0~20240226 +Version: # TO BE REPLACED AUTOMATICALLY Release: %autorelease -Summary: WIP applets for the COSMIC Desktop Environment +Summary: WIP applets for cosmic-panel License: GPL-3.0 -URL: https://github.com/pop-os/cosmic-epoch +URL: https://github.com/pop-os/cosmic-applets + +Source: %{crate}.tar.gz +Source: vendor.tar + + + +# For now, we require all deps for all of cosmic-epoch +BuildRequires: make +BuildRequires: which +BuildRequires: git-core +BuildRequires: just +BuildRequires: rustc +BuildRequires: lld +BuildRequires: cargo +BuildRequires: glib2-devel +BuildRequires: gtk3-devel +BuildRequires: dbus-devel +BuildRequires: wayland-devel +BuildRequires: clang-devel +BuildRequires: libxkbcommon-devel +BuildRequires: mesa-libgbm-devel +BuildRequires: rust-rav1e+nasm-rs-devel +BuildRequires: libappstream-glib +BuildRequires: pipewire-devel +BuildRequires: libglvnd-devel +BuildRequires: libseat-devel +BuildRequires: libinput-devel +BuildRequires: pam-devel +BuildRequires: flatpak-devel + -Requires: cosmic-applet-app-list -Requires: cosmic-applet-audio -Requires: cosmic-applet-battery -Requires: cosmic-applet-bluetooth -Requires: cosmic-applet-minimize -Requires: cosmic-applet-network -Requires: cosmic-applet-notifications -Requires: cosmic-applet-panel-button -Requires: cosmic-applet-power -Requires: cosmic-applet-status-area -Requires: cosmic-applet-tiling -Requires: cosmic-applet-time -Requires: cosmic-applet-workspaces + +# For now, we require all deps for all of cosmic-epoch +Requires: libseat +Requires: pop-icon-theme +Requires: greetd +Requires: greetd-selinux +Requires: cage +Requires: mozilla-fira-mono-fonts +Requires: mozilla-fira-sans-fonts %global _description %{expand: @@ -31,12 +64,26 @@ Requires: cosmic-applet-workspaces %prep +%autosetup -n %{crate} -p1 +mv %{_sourcedir}/vendor.tar vendor.tar +ls -a +mkdir -p .cargo +cp .vendor/config.toml .cargo/config.toml + + %build +just build-vendored + + %install +just rootdir=%{buildroot} prefix=%{_prefix} install %files + + + %changelog %autochangelog \ No newline at end of file diff --git a/cosmic-applets/srpm.sh b/cosmic-applets/srpm.sh index 18db25d..9ccac3d 100644 --- a/cosmic-applets/srpm.sh +++ b/cosmic-applets/srpm.sh @@ -5,16 +5,60 @@ name='cosmic-applets' version='0.1.0' -repo='https://pagure.io/fedora-cosmic/cosmic-packaging' -path_to_spec='cosmic-applets/cosmic-applets.spec' +path_to_spec='cosmic-applets/*' +pop_repo='cosmic-applets' + +# Commit to target. Use "latest" if you want master +commit="latest" + +# Don't edit anything past this line +# ===================================================== # + +LATEST="latest" cd ../.. # We should be in the base directory now +git clone --recurse-submodules https://github.com/pop-os/$pop_repo + +cd $pop_repo + +if [[ "$commit" == "$LATEST" ]] +then + commit=$(git rev-parse HEAD) +fi + +echo $commit +short_commit=${commit:0:6} + +git reset --hard $commit + +mkdir .vendor + +cargo vendor > .vendor/config.toml + +tar -pcf vendor.tar vendor && mv vendor.tar ../vendor.tar + +rm -rf vendor && cd .. + +# Back into cosmic-packaging + +ls + +if [ "$pop_repo" != "$name" ]; then + mv $pop_repo $name +else + echo "names are equal. continuing..." +fi + +tar -czf $name.tar.gz $name + +rm -rf $name + cp cosmic-packaging/$path_to_spec . rm -rf cosmic-packaging current_date=$(date +'%Y%m%d.%H') -sed -i "/^Version: / s/.*/Version: $version~$current_date/" $name.spec +sed -i "/^Version: / s/.*/Version: $version~$current_date.$short_commit/" $name.spec diff --git a/cosmic_apps.py b/cosmic_apps.py index 36bdcea..2c9aabb 100644 --- a/cosmic_apps.py +++ b/cosmic_apps.py @@ -143,360 +143,25 @@ COSMIC_APP_LIBRARY = { """, } -COSMIC_APPLET_APP_LIST = { +COSMIC_APPLETS = { "globals": "", -"name": "cosmic-applet-app-list", +"name": "cosmic-applets", "version": "0.1.0", "repo": "https://github.com/pop-os/cosmic-applets", "reposhort": "cosmic-applets", "commit": "latest", -"summary": "WIP app list applet for cosmic-panel", +"summary": "WIP applets for cosmic-panel", "license": GPL3, "sources": STANDARD_SOURCES, "buildrequires": STANDARD_BUILDREQUIRES, "requires": STANDARD_REQUIRES, "prep": STANDARD_PREP, "build": f""" -just vendor=1 _extract_vendor -cargo build --frozen --offline --release --bin cosmic-app-list +just build-vendored """, -"install": f"just rootdir=%{{buildroot}} prefix=%{{_prefix}} _install_app_list", -"files": f""" -{contains_app("cosmic-app-list","com.system76.CosmicAppList",True, True, True, False, False, "cosmic-app-list/")} -%{{_datadir}}/cosmic/com.system76.CosmicAppList/v1/favorites -%{{_datadir}}/cosmic/com.system76.CosmicAppList/v1/filter_top_levels -""" -} - -COSMIC_APPLET_AUDIO = { -"globals": "", -"name": "cosmic-applet-audio", -"version": "0.1.0", -"repo": "https://github.com/pop-os/cosmic-applets", -"reposhort": "cosmic-applets", -"commit": "latest", -"summary": "WIP audio applet for cosmic-panel", -"license": GPL3, -"sources": STANDARD_SOURCES, -"buildrequires": STANDARD_BUILDREQUIRES, -"requires": STANDARD_REQUIRES, -"prep": STANDARD_PREP, -"build": f""" -just vendor=1 _extract_vendor -cargo build --frozen --offline --release --bin cosmic-applet-audio -""", -"install": f"just rootdir=%{{buildroot}} prefix=%{{_prefix}} _install_audio", -"files": f""" -{contains_app("cosmic-applet-audio","com.system76.CosmicAppletAudio",True, True, True, False, False, "cosmic-applet-audio/")} -""" -} - -COSMIC_APPLET_BATTERY = { -"globals": "", -"name": "cosmic-applet-battery", -"version": "0.1.0", -"repo": "https://github.com/pop-os/cosmic-applets", -"reposhort": "cosmic-applets", -"commit": "latest", -"summary": "WIP battery applet for cosmic-panel", -"license": GPL3, -"sources": STANDARD_SOURCES, -"buildrequires": STANDARD_BUILDREQUIRES, -"requires": STANDARD_REQUIRES, -"prep": STANDARD_PREP, -"build": f""" -just vendor=1 _extract_vendor -cargo build --frozen --offline --release --bin cosmic-applet-battery -""", -"install": f"just rootdir=%{{buildroot}} prefix=%{{_prefix}} _install_battery", -"files": f""" -{contains_app("cosmic-applet-battery","com.system76.CosmicAppletBattery",True, True, True, False, False, "cosmic-applet-battery/")} -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-display-brightness-high-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-display-brightness-low-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-display-brightness-medium-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-display-brightness-off-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-0-charging-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-0-limited-charging-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-0-limited-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-0-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-10-charging-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-10-limited-charging-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-10-limited-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-10-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-100-charging-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-100-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-20-charging-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-20-limited-charging-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-20-limited-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-20-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-35-charging-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-35-limited-charging-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-35-limited-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-35-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-5-charging-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-5-limited-charging-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-5-limited-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-5-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-50-charging-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-50-limited-charging-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-50-limited-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-50-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-65-charging-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-65-limited-charging-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-65-limited-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-65-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-80-charging-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-80-limited-charging-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-80-limited-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-80-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-90-charging-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-90-symbolic.svg -""" -} - -COSMIC_APPLET_BLUETOOTH = { -"globals": "", -"name": "cosmic-applet-bluetooth", -"version": "0.1.0", -"repo": "https://github.com/pop-os/cosmic-applets", -"reposhort": "cosmic-applets", -"commit": "latest", -"summary": "WIP bluetooth applet for cosmic-panel", -"license": GPL3, -"sources": STANDARD_SOURCES, -"buildrequires": STANDARD_BUILDREQUIRES, -"requires": STANDARD_REQUIRES, -"prep": STANDARD_PREP, -"build": f""" -just vendor=1 _extract_vendor -cargo build --frozen --offline --release --bin cosmic-applet-bluetooth -""", -"install": f"just rootdir=%{{buildroot}} prefix=%{{_prefix}} _install_bluetooth", -"files": f""" -{contains_app("cosmic-applet-bluetooth","com.system76.CosmicAppletBluetooth",True, True, True, False, False, "cosmic-applet-bluetooth/")} -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-bluetooth-active-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-bluetooth-disabled-symbolic.svg -""" -} - -COSMIC_APPLET_MINIMIZE = { -"globals": "", -"name": "cosmic-applet-minimize", -"version": "0.1.0", -"repo": "https://github.com/pop-os/cosmic-applets", -"reposhort": "cosmic-applets", -"commit": "latest", -"summary": "WIP minimize applet for cosmic-panel", -"license": GPL3, -"sources": STANDARD_SOURCES, -"buildrequires": STANDARD_BUILDREQUIRES, -"requires": STANDARD_REQUIRES, -"prep": STANDARD_PREP, -"build": f""" -just vendor=1 _extract_vendor -cargo build --frozen --offline --release --bin cosmic-applet-minimize -""", -"install": f"just rootdir=%{{buildroot}} prefix=%{{_prefix}} _install_minimize", -"files": f""" -{contains_app("cosmic-applet-minimize","com.system76.CosmicAppletMinimize",True, True, True, False, False, "cosmic-applet-minimize/")} -""" -} - -COSMIC_APPLET_NETWORK = { -"globals": "", -"name": "cosmic-applet-network", -"version": "0.1.0", -"repo": "https://github.com/pop-os/cosmic-applets", -"reposhort": "cosmic-applets", -"commit": "latest", -"summary": "WIP network applet for cosmic-panel", -"license": GPL3, -"sources": STANDARD_SOURCES, -"buildrequires": STANDARD_BUILDREQUIRES, -"requires": STANDARD_REQUIRES, -"prep": STANDARD_PREP, -"build": f""" -just vendor=1 _extract_vendor -cargo build --frozen --offline --release --bin cosmic-applet-network -""", -"install": f"just rootdir=%{{buildroot}} prefix=%{{_prefix}} _install_network", -"files": f""" -{contains_app("cosmic-applet-network","com.system76.CosmicAppletNetwork",True, True, True, False, False, "cosmic-applet-network/")} -""" -} - -COSMIC_APPLET_NOTIFICATIONS = { -"globals": "", -"name": "cosmic-applet-notifications", -"version": "0.1.0", -"repo": "https://github.com/pop-os/cosmic-applets", -"reposhort": "cosmic-applets", -"commit": "latest", -"summary": "WIP notifications applet for cosmic-panel", -"license": GPL3, -"sources": STANDARD_SOURCES, -"buildrequires": STANDARD_BUILDREQUIRES, -"requires": STANDARD_REQUIRES, -"prep": STANDARD_PREP, -"build": f""" -just vendor=1 _extract_vendor -cargo build --frozen --offline --release --bin cosmic-applet-notifications -""", -"install": f"just rootdir=%{{buildroot}} prefix=%{{_prefix}} _install_notifications", -"files": f""" -{contains_app("cosmic-applet-notifications","com.system76.CosmicAppletNotifications",True, True, True, False, False, "cosmic-applet-notifications/")} -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-notification-disabled-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-notification-new-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-notification-symbolic.svg -""" -} - -COSMIC_APPLET_POWER = { -"globals": "", -"name": "cosmic-applet-power", -"version": "0.1.0", -"repo": "https://github.com/pop-os/cosmic-applets", -"reposhort": "cosmic-applets", -"commit": "latest", -"summary": "WIP power applet for cosmic-panel", -"license": GPL3, -"sources": STANDARD_SOURCES, -"buildrequires": STANDARD_BUILDREQUIRES, -"requires": STANDARD_REQUIRES, -"prep": STANDARD_PREP, -"build": f""" -just vendor=1 _extract_vendor -cargo build --frozen --offline --release --bin cosmic-applet-power -""", -"install": f"just rootdir=%{{buildroot}} prefix=%{{_prefix}} _install_power", -"files": f""" -{contains_app("cosmic-applet-power","com.system76.CosmicAppletPower",True, True, True, False, False, "cosmic-applet-power/")} -""" -} - -COSMIC_APPLET_STATUS_AREA = { -"globals": "", -"name": "cosmic-applet-status-area", -"version": "0.1.0", -"repo": "https://github.com/pop-os/cosmic-applets", -"reposhort": "cosmic-applets", -"commit": "latest", -"summary": "WIP status area applet for cosmic-panel", -"license": GPL3, -"sources": STANDARD_SOURCES, -"buildrequires": STANDARD_BUILDREQUIRES, -"requires": STANDARD_REQUIRES, -"prep": STANDARD_PREP, -"build": f""" -just vendor=1 _extract_vendor -cargo build --frozen --offline --release --bin cosmic-applet-status-area -""", -"install": f"just rootdir=%{{buildroot}} prefix=%{{_prefix}} _install_status_area", -"files": f""" -{contains_app("cosmic-applet-status-area","com.system76.CosmicAppletStatusArea",True, True, False, False, False, "cosmic-applet-status-area/")} -%{{_datadir}}/icons/hicolor/scalable/app/com.system76.CosmicAppletStatusArea.svg -""" -} - -COSMIC_APPLET_TILING = { -"globals": "", -"name": "cosmic-applet-tiling", -"version": "0.1.0", -"repo": "https://github.com/pop-os/cosmic-applets", -"reposhort": "cosmic-applets", -"commit": "latest", -"summary": "WIP tiling applet for cosmic-panel", -"license": GPL3, -"sources": STANDARD_SOURCES, -"buildrequires": STANDARD_BUILDREQUIRES, -"requires": STANDARD_REQUIRES, -"prep": STANDARD_PREP, -"build": f""" -just vendor=1 _extract_vendor -cargo build --frozen --offline --release --bin cosmic-applet-tiling -""", -"install": f"just rootdir=%{{buildroot}} prefix=%{{_prefix}} _install_tiling", -"files": f""" -{contains_app("cosmic-applet-tiling","com.system76.CosmicAppletTiling",True, True, False, False, False, "cosmic-applet-tiling/")} -%{{_datadir}}/icons/hicolor/scalable/apps/com.system76.CosmicAppletTiling.Off.svg -%{{_datadir}}/icons/hicolor/scalable/apps/com.system76.CosmicAppletTiling.On.svg -""" -} - -COSMIC_APPLET_TIME = { -"globals": "", -"name": "cosmic-applet-time", -"version": "0.1.0", -"repo": "https://github.com/pop-os/cosmic-applets", -"reposhort": "cosmic-applets", -"commit": "latest", -"summary": "WIP time applet for cosmic-panel", -"license": GPL3, -"sources": STANDARD_SOURCES, -"buildrequires": STANDARD_BUILDREQUIRES, -"requires": STANDARD_REQUIRES, -"prep": STANDARD_PREP, -"build": f""" -just vendor=1 _extract_vendor -cargo build --frozen --offline --release --bin cosmic-applet-time -""", -"install": f"just rootdir=%{{buildroot}} prefix=%{{_prefix}} _install_time", -"files": f""" -{contains_app("cosmic-applet-time","com.system76.CosmicAppletTime",True, True, True, False, False, "cosmic-applet-time/")} -""" -} - -COSMIC_APPLET_WORKSPACES = { -"globals": "", -"name": "cosmic-applet-workspaces", -"version": "0.1.0", -"repo": "https://github.com/pop-os/cosmic-applets", -"reposhort": "cosmic-applets", -"commit": "latest", -"summary": "WIP workspaces applet for cosmic-panel", -"license": GPL3, -"sources": STANDARD_SOURCES, -"buildrequires": STANDARD_BUILDREQUIRES, -"requires": STANDARD_REQUIRES, -"prep": STANDARD_PREP, -"build": f""" -just vendor=1 _extract_vendor -cargo build --frozen --offline --release --bin cosmic-applet-workspaces -""", -"install": f"just rootdir=%{{buildroot}} prefix=%{{_prefix}} _install_workspace", +"install": f"just rootdir=%{{buildroot}} prefix=%{{_prefix}} install", "files": f""" -{contains_app("cosmic-applet-workspaces","com.system76.CosmicAppletWorkspaces",True, True, True, False, False, "cosmic-applet-workspaces/")} -""" -} -COSMIC_APPLET_PANEL_BUTTON = { -"globals": f"%define debug_package %{{nil}}", -"name": "cosmic-applet-panel-button", -"version": "0.1.0", -"repo": "https://github.com/pop-os/cosmic-applets", -"reposhort": "cosmic-applets", -"commit": "latest", -"summary": "WIP panel button applet for cosmic-panel", -"license": GPL3, -"sources": STANDARD_SOURCES, -"buildrequires": STANDARD_BUILDREQUIRES, -"requires": STANDARD_REQUIRES, -"prep": STANDARD_PREP, -"build": f""" -just vendor=1 _extract_vendor -cargo build --frozen --offline --release --bin cosmic-panel-button -""", -"install": f""" -just rootdir=%{{buildroot}} prefix=%{{_prefix}} _install_panel_button -just rootdir=%{{buildroot}} prefix=%{{_prefix}} _install_app_button -just rootdir=%{{buildroot}} prefix=%{{_prefix}} _install_workspaces_button -""", -"files": f""" -%{{_bindir}}/cosmic-panel-button -%{{_datadir}}/applications/com.system76.CosmicPanelAppButton.desktop -%{{_datadir}}/applications/com.system76.CosmicPanelWorkspacesButton.desktop -%{{_datadir}}/icons/hicolor/scalable/apps/com.system76.CosmicPanelAppButton.svg -%{{_datadir}}/icons/hicolor/scalable/apps/com.system76.CosmicPanelWorkspacesButton.svg """ } diff --git a/files_cosmic_apps.txt b/files_cosmic_apps.txt new file mode 100644 index 0000000..9f8fc19 --- /dev/null +++ b/files_cosmic_apps.txt @@ -0,0 +1,83 @@ +{contains_app("cosmic-app-list","com.system76.CosmicAppList",True, True, True, False, False, "cosmic-app-list/")} +%{{_datadir}}/cosmic/com.system76.CosmicAppList/v1/favorites +%{{_datadir}}/cosmic/com.system76.CosmicAppList/v1/filter_top_levels + +{contains_app("cosmic-app-list","com.system76.CosmicAppList",True, True, True, False, False, "cosmic-app-list/")} +%{{_datadir}}/cosmic/com.system76.CosmicAppList/v1/favorites +%{{_datadir}}/cosmic/com.system76.CosmicAppList/v1/filter_top_levels + +{contains_app("cosmic-applet-audio","com.system76.CosmicAppletAudio",True, True, True, False, False, "cosmic-applet-audio/")} + +{contains_app("cosmic-applet-battery","com.system76.CosmicAppletBattery",True, True, True, False, False, "cosmic-applet-battery/")} +%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-display-brightness-high-symbolic.svg +%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-display-brightness-low-symbolic.svg +%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-display-brightness-medium-symbolic.svg +%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-display-brightness-off-symbolic.svg +%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-0-charging-symbolic.svg +%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-0-limited-charging-symbolic.svg +%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-0-limited-symbolic.svg +%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-0-symbolic.svg +%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-10-charging-symbolic.svg +%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-10-limited-charging-symbolic.svg +%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-10-limited-symbolic.svg +%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-10-symbolic.svg +%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-100-charging-symbolic.svg +%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-100-symbolic.svg +%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-20-charging-symbolic.svg +%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-20-limited-charging-symbolic.svg +%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-20-limited-symbolic.svg +%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-20-symbolic.svg +%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-35-charging-symbolic.svg +%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-35-limited-charging-symbolic.svg +%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-35-limited-symbolic.svg +%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-35-symbolic.svg +%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-5-charging-symbolic.svg +%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-5-limited-charging-symbolic.svg +%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-5-limited-symbolic.svg +%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-5-symbolic.svg +%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-50-charging-symbolic.svg +%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-50-limited-charging-symbolic.svg +%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-50-limited-symbolic.svg +%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-50-symbolic.svg +%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-65-charging-symbolic.svg +%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-65-limited-charging-symbolic.svg +%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-65-limited-symbolic.svg +%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-65-symbolic.svg +%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-80-charging-symbolic.svg +%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-80-limited-charging-symbolic.svg +%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-80-limited-symbolic.svg +%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-80-symbolic.svg +%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-90-charging-symbolic.svg +%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-90-symbolic.svg + +{contains_app("cosmic-applet-bluetooth","com.system76.CosmicAppletBluetooth",True, True, True, False, False, "cosmic-applet-bluetooth/")} +%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-bluetooth-active-symbolic.svg +%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-bluetooth-disabled-symbolic.svg + +{contains_app("cosmic-applet-minimize","com.system76.CosmicAppletMinimize",True, True, True, False, False, "cosmic-applet-minimize/")} + +{contains_app("cosmic-applet-network","com.system76.CosmicAppletNetwork",True, True, True, False, False, "cosmic-applet-network/")} + +{contains_app("cosmic-applet-notifications","com.system76.CosmicAppletNotifications",True, True, True, False, False, "cosmic-applet-notifications/")} +%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-notification-disabled-symbolic.svg +%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-notification-new-symbolic.svg +%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-notification-symbolic.svg + +{contains_app("cosmic-applet-power","com.system76.CosmicAppletPower",True, True, True, False, False, "cosmic-applet-power/")} + +{contains_app("cosmic-applet-status-area","com.system76.CosmicAppletStatusArea",True, True, False, False, False, "cosmic-applet-status-area/")} +%{{_datadir}}/icons/hicolor/scalable/app/com.system76.CosmicAppletStatusArea.svg + +{contains_app("cosmic-applet-tiling","com.system76.CosmicAppletTiling",True, True, False, False, False, "cosmic-applet-tiling/")} +%{{_datadir}}/icons/hicolor/scalable/apps/com.system76.CosmicAppletTiling.Off.svg +%{{_datadir}}/icons/hicolor/scalable/apps/com.system76.CosmicAppletTiling.On.svg + +{contains_app("cosmic-applet-time","com.system76.CosmicAppletTime",True, True, True, False, False, "cosmic-applet-time/")} + +{contains_app("cosmic-applet-workspaces","com.system76.CosmicAppletWorkspaces",True, True, True, False, False, "cosmic-applet-workspaces/")} + +%{{_bindir}}/cosmic-panel-button +%{{_datadir}}/applications/com.system76.CosmicPanelAppButton.desktop +%{{_datadir}}/applications/com.system76.CosmicPanelWorkspacesButton.desktop +%{{_datadir}}/icons/hicolor/scalable/apps/com.system76.CosmicPanelAppButton.svg +%{{_datadir}}/icons/hicolor/scalable/apps/com.system76.CosmicPanelWorkspacesButton.svg \ No newline at end of file diff --git a/specgen.py b/specgen.py index f89960e..d0761e7 100644 --- a/specgen.py +++ b/specgen.py @@ -7,19 +7,7 @@ BUILD_SCRIPTS_FOLDER = "BUILD_SCRIPTS" BUILD_APPS = [ cosmic_apps.COSMIC_APP_LIBRARY, - cosmic_apps.COSMIC_APPLET_APP_LIST, - cosmic_apps.COSMIC_APPLET_AUDIO, - cosmic_apps.COSMIC_APPLET_BATTERY, - cosmic_apps.COSMIC_APPLET_BLUETOOTH, - cosmic_apps.COSMIC_APPLET_MINIMIZE, - cosmic_apps.COSMIC_APPLET_NETWORK, - cosmic_apps.COSMIC_APPLET_NOTIFICATIONS, - cosmic_apps.COSMIC_APPLET_POWER, - cosmic_apps.COSMIC_APPLET_STATUS_AREA, - cosmic_apps.COSMIC_APPLET_TILING, - cosmic_apps.COSMIC_APPLET_TIME, - cosmic_apps.COSMIC_APPLET_WORKSPACES, - cosmic_apps.COSMIC_APPLET_PANEL_BUTTON, + cosmic_apps.COSMIC_APPLETS, cosmic_apps.COSMIC_BG, cosmic_apps.COSMIC_COMP, cosmic_apps.COSMIC_EDIT, From fefdfe183d171504662d312ed49a064c3db88291 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 15 2024 16:13:15 +0000 Subject: [PATCH 20/220] Patch/fix cosmic-applets --- diff --git a/cosmic-applets/better_compile.patch b/cosmic-applets/better_compile.patch new file mode 100644 index 0000000..8f0e727 --- /dev/null +++ b/cosmic-applets/better_compile.patch @@ -0,0 +1,11 @@ +--- Cargo.toml.orig 2024-03-11 21:37:46.314317326 -0500 ++++ Cargo.toml 2024-03-15 11:06:42.557015619 -0500 +@@ -43,7 +43,7 @@ + tracing-log = "0.2.0" + + [profile.release] +-lto = "fat" ++lto = "thin" + + [patch."https://github.com/Smithay/client-toolkit"] + sctk = { git = "https://github.com/smithay/client-toolkit//", package = "smithay-client-toolkit", rev = "e63ab5f" } diff --git a/cosmic-applets/cosmic-applets.spec b/cosmic-applets/cosmic-applets.spec index 81f9297..e55bec0 100644 --- a/cosmic-applets/cosmic-applets.spec +++ b/cosmic-applets/cosmic-applets.spec @@ -1,4 +1,4 @@ - +%define debug_package %{nil} # Generated by rust2rpm 25 # prevent library files from being installed @@ -19,6 +19,7 @@ URL: https://github.com/pop-os/cosmic-applets Source: %{crate}.tar.gz Source: vendor.tar +Patch1: better_compile.patch # For now, we require all deps for all of cosmic-epoch @@ -81,7 +82,84 @@ just rootdir=%{buildroot} prefix=%{_prefix} install %files - +%{_bindir}/cosmic-applets +%{_bindir}/cosmic-panel-button +%{_datadir}/applications/com.system76.CosmicAppList.desktop +%{_datadir}/applications/com.system76.CosmicAppletAudio.desktop +%{_datadir}/applications/com.system76.CosmicAppletBattery.desktop +%{_datadir}/applications/com.system76.CosmicAppletBluetooth.desktop +%{_datadir}/applications/com.system76.CosmicAppletMinimize.desktop +%{_datadir}/applications/com.system76.CosmicAppletNetwork.desktop +%{_datadir}/applications/com.system76.CosmicAppletNotifications.desktop +%{_datadir}/applications/com.system76.CosmicAppletPower.desktop +%{_datadir}/applications/com.system76.CosmicAppletStatusArea.desktop +%{_datadir}/applications/com.system76.CosmicAppletTiling.desktop +%{_datadir}/applications/com.system76.CosmicAppletTime.desktop +%{_datadir}/applications/com.system76.CosmicAppletWorkspaces.desktop +%{_datadir}/applications/com.system76.CosmicPanelAppButton.desktop +%{_datadir}/applications/com.system76.CosmicPanelWorkspacesButton.desktop +%{_datadir}/cosmic/com.system76.CosmicAppList/v1/favorites +%{_datadir}/cosmic/com.system76.CosmicAppList/v1/filter_top_levels +%{_datadir}/icons/hicolor/scalable/app/com.system76.CosmicAppletStatusArea.svg +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppList.svg +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletAudio.svg +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletBattery.svg +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletBluetooth.svg +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletMinimize.svg +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletNetwork.svg +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletNotifications.svg +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletPower.svg +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletTiling.Off.svg +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletTiling.On.svg +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletTime.svg +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletWorkspaces.svg +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicPanelAppButton.svg +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicPanelWorkspacesButton.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-display-brightness-high-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-display-brightness-low-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-display-brightness-medium-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-display-brightness-off-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-0-charging-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-0-limited-charging-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-0-limited-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-0-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-10-charging-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-10-limited-charging-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-10-limited-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-10-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-100-charging-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-100-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-20-charging-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-20-limited-charging-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-20-limited-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-20-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-35-charging-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-35-limited-charging-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-35-limited-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-35-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-5-charging-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-5-limited-charging-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-5-limited-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-5-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-50-charging-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-50-limited-charging-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-50-limited-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-50-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-65-charging-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-65-limited-charging-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-65-limited-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-65-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-80-charging-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-80-limited-charging-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-80-limited-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-80-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-90-charging-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-90-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-bluetooth-active-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-bluetooth-disabled-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-notification-disabled-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-notification-new-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-notification-symbolic.svg %changelog diff --git a/cosmic_apps.py b/cosmic_apps.py index 2c9aabb..c9b4b0c 100644 --- a/cosmic_apps.py +++ b/cosmic_apps.py @@ -144,7 +144,7 @@ COSMIC_APP_LIBRARY = { } COSMIC_APPLETS = { -"globals": "", +"globals": f"%define debug_package %{{nil}}", "name": "cosmic-applets", "version": "0.1.0", "repo": "https://github.com/pop-os/cosmic-applets", @@ -152,7 +152,7 @@ COSMIC_APPLETS = { "commit": "latest", "summary": "WIP applets for cosmic-panel", "license": GPL3, -"sources": STANDARD_SOURCES, +"sources": STANDARD_SOURCES + "\nPatch1: better_compile.patch", "buildrequires": STANDARD_BUILDREQUIRES, "requires": STANDARD_REQUIRES, "prep": STANDARD_PREP, @@ -161,7 +161,84 @@ just build-vendored """, "install": f"just rootdir=%{{buildroot}} prefix=%{{_prefix}} install", "files": f""" - +%{{_bindir}}/cosmic-applets +%{{_bindir}}/cosmic-panel-button +%{{_datadir}}/applications/com.system76.CosmicAppList.desktop +%{{_datadir}}/applications/com.system76.CosmicAppletAudio.desktop +%{{_datadir}}/applications/com.system76.CosmicAppletBattery.desktop +%{{_datadir}}/applications/com.system76.CosmicAppletBluetooth.desktop +%{{_datadir}}/applications/com.system76.CosmicAppletMinimize.desktop +%{{_datadir}}/applications/com.system76.CosmicAppletNetwork.desktop +%{{_datadir}}/applications/com.system76.CosmicAppletNotifications.desktop +%{{_datadir}}/applications/com.system76.CosmicAppletPower.desktop +%{{_datadir}}/applications/com.system76.CosmicAppletStatusArea.desktop +%{{_datadir}}/applications/com.system76.CosmicAppletTiling.desktop +%{{_datadir}}/applications/com.system76.CosmicAppletTime.desktop +%{{_datadir}}/applications/com.system76.CosmicAppletWorkspaces.desktop +%{{_datadir}}/applications/com.system76.CosmicPanelAppButton.desktop +%{{_datadir}}/applications/com.system76.CosmicPanelWorkspacesButton.desktop +%{{_datadir}}/cosmic/com.system76.CosmicAppList/v1/favorites +%{{_datadir}}/cosmic/com.system76.CosmicAppList/v1/filter_top_levels +%{{_datadir}}/icons/hicolor/scalable/app/com.system76.CosmicAppletStatusArea.svg +%{{_datadir}}/icons/hicolor/scalable/apps/com.system76.CosmicAppList.svg +%{{_datadir}}/icons/hicolor/scalable/apps/com.system76.CosmicAppletAudio.svg +%{{_datadir}}/icons/hicolor/scalable/apps/com.system76.CosmicAppletBattery.svg +%{{_datadir}}/icons/hicolor/scalable/apps/com.system76.CosmicAppletBluetooth.svg +%{{_datadir}}/icons/hicolor/scalable/apps/com.system76.CosmicAppletMinimize.svg +%{{_datadir}}/icons/hicolor/scalable/apps/com.system76.CosmicAppletNetwork.svg +%{{_datadir}}/icons/hicolor/scalable/apps/com.system76.CosmicAppletNotifications.svg +%{{_datadir}}/icons/hicolor/scalable/apps/com.system76.CosmicAppletPower.svg +%{{_datadir}}/icons/hicolor/scalable/apps/com.system76.CosmicAppletTiling.Off.svg +%{{_datadir}}/icons/hicolor/scalable/apps/com.system76.CosmicAppletTiling.On.svg +%{{_datadir}}/icons/hicolor/scalable/apps/com.system76.CosmicAppletTime.svg +%{{_datadir}}/icons/hicolor/scalable/apps/com.system76.CosmicAppletWorkspaces.svg +%{{_datadir}}/icons/hicolor/scalable/apps/com.system76.CosmicPanelAppButton.svg +%{{_datadir}}/icons/hicolor/scalable/apps/com.system76.CosmicPanelWorkspacesButton.svg +%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-display-brightness-high-symbolic.svg +%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-display-brightness-low-symbolic.svg +%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-display-brightness-medium-symbolic.svg +%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-display-brightness-off-symbolic.svg +%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-0-charging-symbolic.svg +%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-0-limited-charging-symbolic.svg +%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-0-limited-symbolic.svg +%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-0-symbolic.svg +%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-10-charging-symbolic.svg +%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-10-limited-charging-symbolic.svg +%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-10-limited-symbolic.svg +%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-10-symbolic.svg +%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-100-charging-symbolic.svg +%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-100-symbolic.svg +%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-20-charging-symbolic.svg +%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-20-limited-charging-symbolic.svg +%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-20-limited-symbolic.svg +%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-20-symbolic.svg +%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-35-charging-symbolic.svg +%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-35-limited-charging-symbolic.svg +%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-35-limited-symbolic.svg +%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-35-symbolic.svg +%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-5-charging-symbolic.svg +%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-5-limited-charging-symbolic.svg +%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-5-limited-symbolic.svg +%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-5-symbolic.svg +%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-50-charging-symbolic.svg +%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-50-limited-charging-symbolic.svg +%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-50-limited-symbolic.svg +%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-50-symbolic.svg +%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-65-charging-symbolic.svg +%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-65-limited-charging-symbolic.svg +%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-65-limited-symbolic.svg +%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-65-symbolic.svg +%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-80-charging-symbolic.svg +%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-80-limited-charging-symbolic.svg +%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-80-limited-symbolic.svg +%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-80-symbolic.svg +%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-90-charging-symbolic.svg +%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-90-symbolic.svg +%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-bluetooth-active-symbolic.svg +%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-bluetooth-disabled-symbolic.svg +%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-notification-disabled-symbolic.svg +%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-notification-new-symbolic.svg +%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-notification-symbolic.svg """ } From b6e64bea92440715812884a3b836c28f463ccaa3 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 15 2024 16:31:38 +0000 Subject: [PATCH 21/220] s --- diff --git a/cosmic-applets/better_compile.patch b/cosmic-applets/better_compile.patch index 8f0e727..b5009ec 100644 --- a/cosmic-applets/better_compile.patch +++ b/cosmic-applets/better_compile.patch @@ -1,5 +1,5 @@ ---- Cargo.toml.orig 2024-03-11 21:37:46.314317326 -0500 -+++ Cargo.toml 2024-03-15 11:06:42.557015619 -0500 +--- ./Cargo.toml.orig 2024-03-11 21:37:46.314317326 -0500 ++++ ./Cargo.toml 2024-03-15 11:06:42.557015619 -0500 @@ -43,7 +43,7 @@ tracing-log = "0.2.0" From e4d59d0a498178777e4ba973017a5839f556357e Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 15 2024 16:40:45 +0000 Subject: [PATCH 22/220] fix stuff --- diff --git a/cosmic-applets/better_compile.patch b/cosmic-applets/better_compile.patch index b5009ec..5828782 100644 --- a/cosmic-applets/better_compile.patch +++ b/cosmic-applets/better_compile.patch @@ -1,5 +1,5 @@ ---- ./Cargo.toml.orig 2024-03-11 21:37:46.314317326 -0500 -+++ ./Cargo.toml 2024-03-15 11:06:42.557015619 -0500 +--- ./Cargo.toml 2024-03-11 21:37:46.314317326 -0500 ++++ ./Cargo.toml.patched 2024-03-15 11:06:42.557015619 -0500 @@ -43,7 +43,7 @@ tracing-log = "0.2.0" From 2afe4712fd9320cfd38809639396152124acfe3f Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 15 2024 17:16:04 +0000 Subject: [PATCH 23/220] s --- diff --git a/cosmic-applets/better_compile.patch b/cosmic-applets/better_compile.patch index 5828782..f1fcdf7 100644 --- a/cosmic-applets/better_compile.patch +++ b/cosmic-applets/better_compile.patch @@ -1,11 +1,11 @@ ---- ./Cargo.toml 2024-03-11 21:37:46.314317326 -0500 -+++ ./Cargo.toml.patched 2024-03-15 11:06:42.557015619 -0500 -@@ -43,7 +43,7 @@ +--- ./Cargo.toml 2024-03-15 12:13:48.916128075 -0500 ++++ ./Cargo.toml.new 2024-03-15 12:14:58.707131403 -0500 +@@ -50,7 +50,7 @@ tracing-log = "0.2.0" [profile.release] -lto = "fat" +lto = "thin" - [patch."https://github.com/Smithay/client-toolkit"] - sctk = { git = "https://github.com/smithay/client-toolkit//", package = "smithay-client-toolkit", rev = "e63ab5f" } + [workspace.metadata.cargo-machete] + ignored = ["libcosmic"] From ecf0bcc11bb2b4f69d905f5e342dd9f02c56ee12 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 15 2024 17:44:06 +0000 Subject: [PATCH 24/220] fix cosmic-applets --- diff --git a/cosmic-applets/cosmic-applets.spec b/cosmic-applets/cosmic-applets.spec index e55bec0..436410b 100644 --- a/cosmic-applets/cosmic-applets.spec +++ b/cosmic-applets/cosmic-applets.spec @@ -84,6 +84,18 @@ just rootdir=%{buildroot} prefix=%{_prefix} install %{_bindir}/cosmic-applets %{_bindir}/cosmic-panel-button +%{_bindir}/cosmic-app-list +%{_bindir}/cosmic-applet-audio +%{_bindir}/cosmic-applet-battery +%{_bindir}/cosmic-applet-bluetooth +%{_bindir}/cosmic-applet-minimize +%{_bindir}/cosmic-applet-network +%{_bindir}/cosmic-applet-notifications +%{_bindir}/cosmic-applet-power +%{_bindir}/cosmic-applet-status-area +%{_bindir}/cosmic-applet-tiling +%{_bindir}/cosmic-applet-time +%{_bindir}/cosmic-applet-workspaces %{_datadir}/applications/com.system76.CosmicAppList.desktop %{_datadir}/applications/com.system76.CosmicAppletAudio.desktop %{_datadir}/applications/com.system76.CosmicAppletBattery.desktop diff --git a/cosmic_apps.py b/cosmic_apps.py index c9b4b0c..0fcfe27 100644 --- a/cosmic_apps.py +++ b/cosmic_apps.py @@ -163,6 +163,18 @@ just build-vendored "files": f""" %{{_bindir}}/cosmic-applets %{{_bindir}}/cosmic-panel-button +%{{_bindir}}/cosmic-app-list +%{{_bindir}}/cosmic-applet-audio +%{{_bindir}}/cosmic-applet-battery +%{{_bindir}}/cosmic-applet-bluetooth +%{{_bindir}}/cosmic-applet-minimize +%{{_bindir}}/cosmic-applet-network +%{{_bindir}}/cosmic-applet-notifications +%{{_bindir}}/cosmic-applet-power +%{{_bindir}}/cosmic-applet-status-area +%{{_bindir}}/cosmic-applet-tiling +%{{_bindir}}/cosmic-applet-time +%{{_bindir}}/cosmic-applet-workspaces %{{_datadir}}/applications/com.system76.CosmicAppList.desktop %{{_datadir}}/applications/com.system76.CosmicAppletAudio.desktop %{{_datadir}}/applications/com.system76.CosmicAppletBattery.desktop From c7a33ed5e34bfab3cf90851da35d5da948406486 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 15 2024 19:11:08 +0000 Subject: [PATCH 25/220] Another applets patch --- diff --git a/cosmic-applets/cosmic-applets.spec b/cosmic-applets/cosmic-applets.spec index 436410b..ba6cb69 100644 --- a/cosmic-applets/cosmic-applets.spec +++ b/cosmic-applets/cosmic-applets.spec @@ -20,6 +20,7 @@ Source: %{crate}.tar.gz Source: vendor.tar Patch1: better_compile.patch +Patch2: symlink.patch # For now, we require all deps for all of cosmic-epoch diff --git a/cosmic-applets/symlink.patch b/cosmic-applets/symlink.patch new file mode 100644 index 0000000..331bc96 --- /dev/null +++ b/cosmic-applets/symlink.patch @@ -0,0 +1,19 @@ +--- ./justfile 2024-03-15 13:59:51.256329082 -0500 ++++ ./justfile.new 2024-03-15 14:08:39.724372221 -0500 +@@ -12,6 +12,7 @@ + sharedir := rootdir + prefix + '/share' + iconsdir := sharedir + '/icons/hicolor' + bindir := rootdir + prefix + '/bin' ++lndir := prefix + '/bin' + default-schema-target := sharedir / 'cosmic' + + cosmic-applets-bin := bindir / 'cosmic-applets' +@@ -29,7 +30,7 @@ + build-vendored *args: vendor-extract (build-release '--frozen --offline' args) + + _link_applet name: +- ln -sf {{cosmic-applets-bin}} {{bindir}}/{{name}} ++ ln -sf {{cosmic-applets-bin}} {{lndir}}/{{name}} + + _install_icons name: + find {{name}}/'data'/'icons' -type f -exec echo {} \; | rev | cut -d'/' -f-3 | rev | xargs -d '\n' -I {} install -Dm0644 {{name}}/'data'/'icons'/{} {{iconsdir}}/{} diff --git a/cosmic_apps.py b/cosmic_apps.py index 0fcfe27..01cb7ed 100644 --- a/cosmic_apps.py +++ b/cosmic_apps.py @@ -152,7 +152,7 @@ COSMIC_APPLETS = { "commit": "latest", "summary": "WIP applets for cosmic-panel", "license": GPL3, -"sources": STANDARD_SOURCES + "\nPatch1: better_compile.patch", +"sources": STANDARD_SOURCES + "\nPatch1: better_compile.patch\nPatch2: symlink.patch", "buildrequires": STANDARD_BUILDREQUIRES, "requires": STANDARD_REQUIRES, "prep": STANDARD_PREP, From a2bd5c8586e85ffd0864b8d4ea0761f2963f25df Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 15 2024 20:00:19 +0000 Subject: [PATCH 26/220] update symlink patch --- diff --git a/cosmic-applets/symlink.patch b/cosmic-applets/symlink.patch index 331bc96..dd556e3 100644 --- a/cosmic-applets/symlink.patch +++ b/cosmic-applets/symlink.patch @@ -1,19 +1,11 @@ --- ./justfile 2024-03-15 13:59:51.256329082 -0500 -+++ ./justfile.new 2024-03-15 14:08:39.724372221 -0500 -@@ -12,6 +12,7 @@ - sharedir := rootdir + prefix + '/share' - iconsdir := sharedir + '/icons/hicolor' - bindir := rootdir + prefix + '/bin' -+lndir := prefix + '/bin' - default-schema-target := sharedir / 'cosmic' - - cosmic-applets-bin := bindir / 'cosmic-applets' -@@ -29,7 +30,7 @@ ++++ ./justfile.new 2024-03-15 14:59:32.284621404 -0500 +@@ -29,7 +29,7 @@ build-vendored *args: vendor-extract (build-release '--frozen --offline' args) _link_applet name: - ln -sf {{cosmic-applets-bin}} {{bindir}}/{{name}} -+ ln -sf {{cosmic-applets-bin}} {{lndir}}/{{name}} ++ ln -srf {{cosmic-applets-bin}} {{rootdir}}/{{bindir}}/{{name}} _install_icons name: find {{name}}/'data'/'icons' -type f -exec echo {} \; | rev | cut -d'/' -f-3 | rev | xargs -d '\n' -I {} install -Dm0644 {{name}}/'data'/'icons'/{} {{iconsdir}}/{} From 791f3e049820e5c77dd10cab9d57e24691a34ba3 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 15 2024 20:02:58 +0000 Subject: [PATCH 27/220] Fix pop launcher --- diff --git a/cosmic_apps.py b/cosmic_apps.py index 01cb7ed..a122546 100644 --- a/cosmic_apps.py +++ b/cosmic_apps.py @@ -747,7 +747,7 @@ POP_LAUNCHER = { "commit": "latest", "summary": "Modular IPC-based desktop launcher service ", "license": GPL3, -"sources": STANDARD_SOURCES + f"\nPatch1: install.patch", +"sources": STANDARD_SOURCES + f"\nPatch1: symlink.patch", "buildrequires": STANDARD_BUILDREQUIRES, "requires": STANDARD_REQUIRES, "prep": STANDARD_PREP, diff --git a/pop-launcher/install.patch b/pop-launcher/install.patch deleted file mode 100644 index a32d5e5..0000000 --- a/pop-launcher/install.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./justfile 2024-03-04 01:43:55.410055690 -0600 -+++ ./justfile.patched 2024-03-04 01:44:13.341056545 -0600 -@@ -67,7 +67,7 @@ - dest={{plugin-dir}}${plugin} - mkdir -p ${dest} - install -Dm0644 plugins/src/${plugin}/*.ron ${dest} -- ln -sf {{bin-path}} {{plugin-dir}}${plugin}/$(echo ${plugin} | sed 's/_/-/') -+ ln -srf {{bin-path}} {{plugin-dir}}${plugin}/$(echo ${plugin} | sed 's/_/-/') - done - - # Install pop-launcher scripts diff --git a/pop-launcher/pop-launcher.spec b/pop-launcher/pop-launcher.spec index 0ddaa24..bc42d6b 100644 --- a/pop-launcher/pop-launcher.spec +++ b/pop-launcher/pop-launcher.spec @@ -19,7 +19,7 @@ URL: https://github.com/pop-os/launcher Source: %{crate}.tar.gz Source: vendor.tar -Patch1: install.patch +Patch1: symlink.patch # For now, we require all deps for all of cosmic-epoch diff --git a/pop-launcher/symlink.patch b/pop-launcher/symlink.patch new file mode 100644 index 0000000..15f67b9 --- /dev/null +++ b/pop-launcher/symlink.patch @@ -0,0 +1,11 @@ +--- ./justfile 2024-03-15 15:00:57.529628363 -0500 ++++ ./justfile.new 2024-03-15 15:01:40.282631853 -0500 +@@ -67,7 +67,7 @@ + dest={{plugin-dir}}${plugin} + mkdir -p ${dest} + install -Dm0644 plugins/src/${plugin}/*.ron ${dest} +- ln -sf {{bin-path}} {{plugin-dir}}${plugin}/$(echo ${plugin} | sed 's/_/-/') ++ ln -srf {{bin-path}} {{rootdir}}/{{plugin-dir}}${plugin}/$(echo ${plugin} | sed 's/_/-/') + done + + # Install pop-launcher scripts From 797dd65d7b17e66c9d8e97cdea444a0ddbfd4c6b Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 15 2024 20:18:56 +0000 Subject: [PATCH 28/220] update patch --- diff --git a/pop-launcher/symlink.patch b/pop-launcher/symlink.patch index 15f67b9..fe52f83 100644 --- a/pop-launcher/symlink.patch +++ b/pop-launcher/symlink.patch @@ -1,11 +1,11 @@ --- ./justfile 2024-03-15 15:00:57.529628363 -0500 -+++ ./justfile.new 2024-03-15 15:01:40.282631853 -0500 ++++ ./justfile.new 2024-03-15 15:18:09.912712637 -0500 @@ -67,7 +67,7 @@ dest={{plugin-dir}}${plugin} mkdir -p ${dest} install -Dm0644 plugins/src/${plugin}/*.ron ${dest} - ln -sf {{bin-path}} {{plugin-dir}}${plugin}/$(echo ${plugin} | sed 's/_/-/') -+ ln -srf {{bin-path}} {{rootdir}}/{{plugin-dir}}${plugin}/$(echo ${plugin} | sed 's/_/-/') ++ ln -srf {{bin-path}} {{plugin-dir}}${plugin}/$(echo ${plugin} | sed 's/_/-/') done # Install pop-launcher scripts From b4ef219c45e4cbbcac8bb2633324c4ac80e68931 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 15 2024 20:38:57 +0000 Subject: [PATCH 29/220] Update symlink patch --- diff --git a/cosmic-applets/symlink.patch b/cosmic-applets/symlink.patch index dd556e3..5b04aa9 100644 --- a/cosmic-applets/symlink.patch +++ b/cosmic-applets/symlink.patch @@ -1,11 +1,11 @@ --- ./justfile 2024-03-15 13:59:51.256329082 -0500 -+++ ./justfile.new 2024-03-15 14:59:32.284621404 -0500 ++++ ./justfile.new 2024-03-15 15:37:57.363809570 -0500 @@ -29,7 +29,7 @@ build-vendored *args: vendor-extract (build-release '--frozen --offline' args) _link_applet name: - ln -sf {{cosmic-applets-bin}} {{bindir}}/{{name}} -+ ln -srf {{cosmic-applets-bin}} {{rootdir}}/{{bindir}}/{{name}} ++ ln -srf {{cosmic-applets-bin}} {{bindir}}/{{name}} _install_icons name: find {{name}}/'data'/'icons' -type f -exec echo {} \; | rev | cut -d'/' -f-3 | rev | xargs -d '\n' -I {} install -Dm0644 {{name}}/'data'/'icons'/{} {{iconsdir}}/{} From 4dbd062f3ff49baa41f6585479c0b052a441b7e8 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 19 2024 01:20:30 +0000 Subject: [PATCH 30/220] Fix cosmic-settings --- diff --git a/cosmic-settings/cosmic-settings.spec b/cosmic-settings/cosmic-settings.spec index e25dae5..a34b08f 100644 --- a/cosmic-settings/cosmic-settings.spec +++ b/cosmic-settings/cosmic-settings.spec @@ -81,6 +81,7 @@ just rootdir=%{buildroot} install %{_bindir}/cosmic-settings %{_datadir}/applications/com.system76.CosmicSettings.desktop +%{_metainfodir}/com.system76.CosmicSettings.metainfo.xml %{_datadir}/cosmic/com.system76.CosmicTheme.Dark.Builder/v1/* %{_datadir}/cosmic/com.system76.CosmicTheme.Dark/v1/* @@ -95,6 +96,13 @@ just rootdir=%{buildroot} install %{_datadir}/icons/hicolor/scalable/status/illustration-appearance-light-style-square.svg %{_datadir}/icons/hicolor/scalable/status/illustration-appearance-mode-dark.svg %{_datadir}/icons/hicolor/scalable/status/illustration-appearance-mode-light.svg +%{_datadir}/icons/hicolor/128x128/apps/com.system76.CosmicSettings.svg +%{_datadir}/icons/hicolor/16x16/apps/com.system76.CosmicSettings.svg +%{_datadir}/icons/hicolor/24x24/apps/com.system76.CosmicSettings.svg +%{_datadir}/icons/hicolor/256x256/apps/com.system76.CosmicSettings.svg +%{_datadir}/icons/hicolor/32x32/apps/com.system76.CosmicSettings.svg +%{_datadir}/icons/hicolor/48x48/apps/com.system76.CosmicSettings.svg +%{_datadir}/icons/hicolor/64x64/apps/com.system76.CosmicSettings.svg %changelog diff --git a/cosmic_apps.py b/cosmic_apps.py index a122546..b892a16 100644 --- a/cosmic_apps.py +++ b/cosmic_apps.py @@ -628,7 +628,7 @@ COSMIC_SETTINGS = { "build": f"just build-vendored", "install": f"just rootdir=%{{buildroot}} install", "files": f""" -{contains_app("cosmic-settings","com.system76.CosmicSettings",True, True, False, False, False, "")} +{contains_app("cosmic-settings","com.system76.CosmicSettings",True, True, False, False, True, "")} {contains_(f"%{{_datadir}}/cosmic/com.system76.CosmicTheme.Dark.Builder/v1/*")} {contains_(f"%{{_datadir}}/cosmic/com.system76.CosmicTheme.Dark/v1/*")} {contains_(f"%{{_datadir}}/cosmic/com.system76.CosmicTheme.Light.Builder/v1/*")} @@ -642,6 +642,13 @@ COSMIC_SETTINGS = { {contains_(f"%{{_datadir}}/icons/hicolor/scalable/status/illustration-appearance-light-style-square.svg")} {contains_(f"%{{_datadir}}/icons/hicolor/scalable/status/illustration-appearance-mode-dark.svg")} {contains_(f"%{{_datadir}}/icons/hicolor/scalable/status/illustration-appearance-mode-light.svg")} +%{{_datadir}}/icons/hicolor/128x128/apps/com.system76.CosmicSettings.svg +%{{_datadir}}/icons/hicolor/16x16/apps/com.system76.CosmicSettings.svg +%{{_datadir}}/icons/hicolor/24x24/apps/com.system76.CosmicSettings.svg +%{{_datadir}}/icons/hicolor/256x256/apps/com.system76.CosmicSettings.svg +%{{_datadir}}/icons/hicolor/32x32/apps/com.system76.CosmicSettings.svg +%{{_datadir}}/icons/hicolor/48x48/apps/com.system76.CosmicSettings.svg +%{{_datadir}}/icons/hicolor/64x64/apps/com.system76.CosmicSettings.svg """, } From 3506652e56299dab2e11cf9325edf18655fa5977 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 19 2024 01:30:41 +0000 Subject: [PATCH 31/220] fix cosmic-store --- diff --git a/cosmic-store/cosmic-store.spec b/cosmic-store/cosmic-store.spec index 7a4542f..ecd6793 100644 --- a/cosmic-store/cosmic-store.spec +++ b/cosmic-store/cosmic-store.spec @@ -81,7 +81,15 @@ just rootdir=%{buildroot} prefix=%{_prefix} install %{_bindir}/cosmic-store %{_datadir}/applications/com.system76.CosmicStore.desktop - +%{_metainfodir}/com.system76.CosmicStore.metainfo.xml + +%{_datadir}/icons/hicolor/128x128/apps/com.system76.CosmicStore.svg +%{_datadir}/icons/hicolor/16x16/apps/com.system76.CosmicStore.svg +%{_datadir}/icons/hicolor/24x24/apps/com.system76.CosmicStore.svg +%{_datadir}/icons/hicolor/256x256/apps/com.system76.CosmicStore.svg +%{_datadir}/icons/hicolor/32x32/apps/com.system76.CosmicStore.svg +%{_datadir}/icons/hicolor/48x48/apps/com.system76.CosmicStore.svg +%{_datadir}/icons/hicolor/64x64/apps/com.system76.CosmicStore.svg %changelog diff --git a/cosmic_apps.py b/cosmic_apps.py index b892a16..dd7713b 100644 --- a/cosmic_apps.py +++ b/cosmic_apps.py @@ -668,7 +668,14 @@ COSMIC_STORE = { "build": f"just build-vendored", "install": f"just rootdir=%{{buildroot}} prefix=%{{_prefix}} install", "files": f""" -{contains_app("cosmic-store","com.system76.CosmicStore",True, True, False, False, False, "")} +{contains_app("cosmic-store","com.system76.CosmicStore",True, True, False, False, True, "")} +%{{_datadir}}/icons/hicolor/128x128/apps/com.system76.CosmicStore.svg +%{{_datadir}}/icons/hicolor/16x16/apps/com.system76.CosmicStore.svg +%{{_datadir}}/icons/hicolor/24x24/apps/com.system76.CosmicStore.svg +%{{_datadir}}/icons/hicolor/256x256/apps/com.system76.CosmicStore.svg +%{{_datadir}}/icons/hicolor/32x32/apps/com.system76.CosmicStore.svg +%{{_datadir}}/icons/hicolor/48x48/apps/com.system76.CosmicStore.svg +%{{_datadir}}/icons/hicolor/64x64/apps/com.system76.CosmicStore.svg """, } From 33294d4651d74dfa817640b902bd3b8868230d3f Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 22 2024 18:05:59 +0000 Subject: [PATCH 32/220] fix cosmic-settings --- diff --git a/cosmic-settings/cosmic-settings.spec b/cosmic-settings/cosmic-settings.spec index a34b08f..2b288a2 100644 --- a/cosmic-settings/cosmic-settings.spec +++ b/cosmic-settings/cosmic-settings.spec @@ -103,6 +103,21 @@ just rootdir=%{buildroot} install %{_datadir}/icons/hicolor/32x32/apps/com.system76.CosmicSettings.svg %{_datadir}/icons/hicolor/48x48/apps/com.system76.CosmicSettings.svg %{_datadir}/icons/hicolor/64x64/apps/com.system76.CosmicSettings.svg +%{_datadir}/applications/com.system76.CosmicSettings.About.desktop +%{_datadir}/applications/com.system76.CosmicSettings.Appearance.desktop +%{_datadir}/applications/com.system76.CosmicSettings.DateTime.desktop +%{_datadir}/applications/com.system76.CosmicSettings.Desktop.desktop +%{_datadir}/applications/com.system76.CosmicSettings.Displays.desktop +%{_datadir}/applications/com.system76.CosmicSettings.Firmware.desktop +%{_datadir}/applications/com.system76.CosmicSettings.Keyboard.desktop +%{_datadir}/applications/com.system76.CosmicSettings.Mouse.desktop +%{_datadir}/applications/com.system76.CosmicSettings.Notifications.desktop +%{_datadir}/applications/com.system76.CosmicSettings.RegionLanguage.desktop +%{_datadir}/applications/com.system76.CosmicSettings.Sound.desktop +%{_datadir}/applications/com.system76.CosmicSettings.Touchpad.desktop +%{_datadir}/applications/com.system76.CosmicSettings.Users.desktop +%{_datadir}/applications/com.system76.CosmicSettings.Wallpaper.desktop +%{_datadir}/applications/com.system76.CosmicSettings.Workspaces.desktop %changelog diff --git a/cosmic_apps.py b/cosmic_apps.py index dd7713b..dfac784 100644 --- a/cosmic_apps.py +++ b/cosmic_apps.py @@ -649,6 +649,21 @@ COSMIC_SETTINGS = { %{{_datadir}}/icons/hicolor/32x32/apps/com.system76.CosmicSettings.svg %{{_datadir}}/icons/hicolor/48x48/apps/com.system76.CosmicSettings.svg %{{_datadir}}/icons/hicolor/64x64/apps/com.system76.CosmicSettings.svg +%{{_datadir}}/applications/com.system76.CosmicSettings.About.desktop +%{{_datadir}}/applications/com.system76.CosmicSettings.Appearance.desktop +%{{_datadir}}/applications/com.system76.CosmicSettings.DateTime.desktop +%{{_datadir}}/applications/com.system76.CosmicSettings.Desktop.desktop +%{{_datadir}}/applications/com.system76.CosmicSettings.Displays.desktop +%{{_datadir}}/applications/com.system76.CosmicSettings.Firmware.desktop +%{{_datadir}}/applications/com.system76.CosmicSettings.Keyboard.desktop +%{{_datadir}}/applications/com.system76.CosmicSettings.Mouse.desktop +%{{_datadir}}/applications/com.system76.CosmicSettings.Notifications.desktop +%{{_datadir}}/applications/com.system76.CosmicSettings.RegionLanguage.desktop +%{{_datadir}}/applications/com.system76.CosmicSettings.Sound.desktop +%{{_datadir}}/applications/com.system76.CosmicSettings.Touchpad.desktop +%{{_datadir}}/applications/com.system76.CosmicSettings.Users.desktop +%{{_datadir}}/applications/com.system76.CosmicSettings.Wallpaper.desktop +%{{_datadir}}/applications/com.system76.CosmicSettings.Workspaces.desktop """, } From 855aa4c50c089c92ee539c42531ea8be8615321f Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 27 2024 00:19:58 +0000 Subject: [PATCH 33/220] Add files_list --- diff --git a/cosmic-applets.spec b/cosmic-applets.spec new file mode 100644 index 0000000..2e71cba --- /dev/null +++ b/cosmic-applets.spec @@ -0,0 +1,63 @@ +# Generated by rust2rpm 26 +%bcond_without check + +Name: cosmic-applets +Version: 0.1.0 +Release: %autorelease +Summary: # FIXME + +SourceLicense: GPL-3.0-or-later +# FIXME: paste output of %%cargo_license_summary here +License: # FIXME +# LICENSE.dependencies contains a full license breakdown + +URL: # FIXME +Source: # FIXME +Source: cosmic-applets-0.1.0-vendor.tar.xz + +BuildRequires: cargo-rpm-macros >= 25 + +%global _description %{expand: +%{summary}.} + +%description %{_description} + +%prep +%autosetup -n cosmic-applets-%{version} -p1 -a1 +%cargo_prep -v vendor + +%build +%cargo_build +%{cargo_license_summary} +%{cargo_license} > LICENSE.dependencies +%{cargo_vendor_manifest} + +%install +%cargo_install + +%if %{with check} +%check +%cargo_test +%endif + +%files +%license LICENSE +%license LICENSE.dependencies +%license cargo-vendor.txt +%{_bindir}/cosmic-app-list +%{_bindir}/cosmic-applet-audio +%{_bindir}/cosmic-applet-battery +%{_bindir}/cosmic-applet-bluetooth +%{_bindir}/cosmic-applet-minimize +%{_bindir}/cosmic-applet-network +%{_bindir}/cosmic-applet-notifications +%{_bindir}/cosmic-applet-power +%{_bindir}/cosmic-applet-status-area +%{_bindir}/cosmic-applet-tiling +%{_bindir}/cosmic-applet-time +%{_bindir}/cosmic-applet-workspaces +%{_bindir}/cosmic-applets +%{_bindir}/cosmic-panel-button + +%changelog +%autochangelog diff --git a/files_list.txt b/files_list.txt new file mode 100644 index 0000000..8d4f426 --- /dev/null +++ b/files_list.txt @@ -0,0 +1,303 @@ +This file lists all the files produced by each package. Please update this whenever adding files to a spec. + +cosmic-app-library + +%{_bindir}/cosmic-app-library +%{_datadir}/applications/com.system76.CosmicAppLibrary.desktop +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppLibrary.svg +%{_metainfodir}/com.system76.CosmicAppLibrary.metainfo.xml + +cosmic-applets + +%{_bindir}/cosmic-applets +%{_bindir}/cosmic-panel-button +%{_bindir}/cosmic-app-list +%{_bindir}/cosmic-applet-audio +%{_bindir}/cosmic-applet-battery +%{_bindir}/cosmic-applet-bluetooth +%{_bindir}/cosmic-applet-minimize +%{_bindir}/cosmic-applet-network +%{_bindir}/cosmic-applet-notifications +%{_bindir}/cosmic-applet-power +%{_bindir}/cosmic-applet-status-area +%{_bindir}/cosmic-applet-tiling +%{_bindir}/cosmic-applet-time +%{_bindir}/cosmic-applet-workspaces +%{_datadir}/applications/com.system76.CosmicAppList.desktop +%{_datadir}/applications/com.system76.CosmicAppletAudio.desktop +%{_datadir}/applications/com.system76.CosmicAppletBattery.desktop +%{_datadir}/applications/com.system76.CosmicAppletBluetooth.desktop +%{_datadir}/applications/com.system76.CosmicAppletMinimize.desktop +%{_datadir}/applications/com.system76.CosmicAppletNetwork.desktop +%{_datadir}/applications/com.system76.CosmicAppletNotifications.desktop +%{_datadir}/applications/com.system76.CosmicAppletPower.desktop +%{_datadir}/applications/com.system76.CosmicAppletStatusArea.desktop +%{_datadir}/applications/com.system76.CosmicAppletTiling.desktop +%{_datadir}/applications/com.system76.CosmicAppletTime.desktop +%{_datadir}/applications/com.system76.CosmicAppletWorkspaces.desktop +%{_datadir}/applications/com.system76.CosmicPanelAppButton.desktop +%{_datadir}/applications/com.system76.CosmicPanelWorkspacesButton.desktop +%{_datadir}/cosmic/com.system76.CosmicAppList/v1/favorites +%{_datadir}/cosmic/com.system76.CosmicAppList/v1/filter_top_levels +%{_datadir}/icons/hicolor/scalable/app/com.system76.CosmicAppletStatusArea.svg +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppList.svg +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletAudio.svg +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletBattery.svg +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletBluetooth.svg +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletMinimize.svg +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletNetwork.svg +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletNotifications.svg +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletPower.svg +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletTiling.Off.svg +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletTiling.On.svg +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletTime.svg +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletWorkspaces.svg +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicPanelAppButton.svg +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicPanelWorkspacesButton.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-display-brightness-high-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-display-brightness-low-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-display-brightness-medium-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-display-brightness-off-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-0-charging-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-0-limited-charging-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-0-limited-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-0-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-10-charging-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-10-limited-charging-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-10-limited-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-10-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-100-charging-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-100-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-20-charging-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-20-limited-charging-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-20-limited-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-20-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-35-charging-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-35-limited-charging-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-35-limited-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-35-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-5-charging-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-5-limited-charging-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-5-limited-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-5-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-50-charging-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-50-limited-charging-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-50-limited-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-50-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-65-charging-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-65-limited-charging-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-65-limited-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-65-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-80-charging-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-80-limited-charging-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-80-limited-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-80-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-90-charging-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-90-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-bluetooth-active-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-bluetooth-disabled-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-notification-disabled-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-notification-new-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-notification-symbolic.svg + +cosmic-bg + +%{_bindir}/cosmic-bg +%{_datadir}/applications/com.system76.CosmicBackground.desktop +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicBackground.svg +%{_datadir}/icons/hicolor/symbolic/apps/com.system76.CosmicBackground-symbolic.svg +%{_metainfodir}/com.system76.CosmicBackground.metainfo.xml +%{_datadir}/cosmic/com.system76.CosmicBackground/* + +cosmic-comp + +%{_bindir}/cosmic-comp +%{_sysconfdir}/cosmic-comp/config.ron + +cosmic-edit + +%{_bindir}/cosmic-edit +%{_datadir}/applications/com.system76.CosmicEdit.desktop +%{_metainfodir}/com.system76.CosmicEdit.metainfo.xml +%{_datadir}/icons/hicolor/128x128/apps/com.system76.CosmicEdit.svg +%{_datadir}/icons/hicolor/16x16/apps/com.system76.CosmicEdit.svg +%{_datadir}/icons/hicolor/24x24/apps/com.system76.CosmicEdit.svg +%{_datadir}/icons/hicolor/256x256/apps/com.system76.CosmicEdit.svg +%{_datadir}/icons/hicolor/32x32/apps/com.system76.CosmicEdit.svg +%{_datadir}/icons/hicolor/48x48/apps/com.system76.CosmicEdit.svg +%{_datadir}/icons/hicolor/64x64/apps/com.system76.CosmicEdit.svg + +cosmic-epoch + +(NONE) + +cosmic-files + +%{_bindir}/cosmic-files +%{_datadir}/applications/com.system76.CosmicFiles.desktop +%{_metainfodir}/com.system76.CosmicFiles.metainfo.xml +%{_datadir}/icons/hicolor/128x128/apps/com.system76.CosmicFiles.svg +%{_datadir}/icons/hicolor/16x16/apps/com.system76.CosmicFiles.svg +%{_datadir}/icons/hicolor/24x24/apps/com.system76.CosmicFiles.svg +%{_datadir}/icons/hicolor/256x256/apps/com.system76.CosmicFiles.svg +%{_datadir}/icons/hicolor/32x32/apps/com.system76.CosmicFiles.svg +%{_datadir}/icons/hicolor/48x48/apps/com.system76.CosmicFiles.svg +%{_datadir}/icons/hicolor/64x64/apps/com.system76.CosmicFiles.svg + +cosmic-greeter + +%{_bindir}/cosmic-greeter +%{_bindir}/cosmic-greeter-daemon +%{_datadir}/dbus-1/system.d/com.system76.CosmicGreeter.conf +%{_sysusersdir}/cosmic-greeter.conf +%{_tmpfilesdir}/cosmic-greeter.conf +%{_prefix}/etc/greetd/cosmic-greeter.toml +%{_unitdir}/cosmic-greeter.service +%{_unitdir}/cosmic-greeter-daemon.service + +cosmic-icons + +%{_datadir}/icons/Cosmic/scalable/* +%{_datadir}/icons/Cosmic/index.theme + +cosmic-launcher + +%{_bindir}/cosmic-launcher +%{_datadir}/applications/com.system76.CosmicLauncher.desktop +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicLauncher.svg +%{_metainfodir}/com.system76.CosmicLauncher.metainfo.xml + +cosmic-notifications + +%{_bindir}/cosmic-notifications +%{_datadir}/applications/com.system76.CosmicNotifications.desktop +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicNotifications.svg +%{_metainfodir}/com.system76.CosmicNotifications.metainfo.xml + +cosmic-osd + +%{_bindir}/cosmic-osd + +cosmic-panel + +%{_bindir}/cosmic-panel +%{_datadir}/cosmic/com.system76.CosmicPanel.Dock/* +%{_datadir}/cosmic/com.system76.CosmicPanel.Panel/* +%{_datadir}/cosmic/com.system76.CosmicPanel/* + +cosmic-randr + +%{_bindir}/cosmic-randr + +cosmic-screenshot + +%{_bindir}/cosmic-screenshot +%{_datadir}/applications/com.system76.CosmicScreenshot.desktop + +cosmic-session + +%{_bindir}/cosmic-session +%{_bindir}/start-cosmic +%{_userunitdir}/cosmic-session.target +%{_datadir}/wayland-sessions/cosmic.desktop +%{_datadir}/applications/cosmic-mimeapps.list + +cosmic-settings + +%{_bindir}/cosmic-settings +%{_datadir}/applications/com.system76.CosmicSettings.desktop +%{_metainfodir}/com.system76.CosmicSettings.metainfo.xml +%{_datadir}/cosmic/com.system76.CosmicTheme.Dark.Builder/v1/* +%{_datadir}/cosmic/com.system76.CosmicTheme.Dark/v1/* +%{_datadir}/cosmic/com.system76.CosmicTheme.Light.Builder/v1/* +%{_datadir}/cosmic/com.system76.CosmicTheme.Light/v1/* +%{_datadir}/cosmic/com.system76.CosmicTheme.Mode/v1/* +%{_datadir}/icons/hicolor/scalable/status/illustration-appearance-dark-style-round.svg +%{_datadir}/icons/hicolor/scalable/status/illustration-appearance-dark-style-slightly-round.svg +%{_datadir}/icons/hicolor/scalable/status/illustration-appearance-dark-style-square.svg +%{_datadir}/icons/hicolor/scalable/status/illustration-appearance-light-style-round.svg +%{_datadir}/icons/hicolor/scalable/status/illustration-appearance-light-style-slightly-round.svg +%{_datadir}/icons/hicolor/scalable/status/illustration-appearance-light-style-square.svg +%{_datadir}/icons/hicolor/scalable/status/illustration-appearance-mode-dark.svg +%{_datadir}/icons/hicolor/scalable/status/illustration-appearance-mode-light.svg +%{_datadir}/icons/hicolor/128x128/apps/com.system76.CosmicSettings.svg +%{_datadir}/icons/hicolor/16x16/apps/com.system76.CosmicSettings.svg +%{_datadir}/icons/hicolor/24x24/apps/com.system76.CosmicSettings.svg +%{_datadir}/icons/hicolor/256x256/apps/com.system76.CosmicSettings.svg +%{_datadir}/icons/hicolor/32x32/apps/com.system76.CosmicSettings.svg +%{_datadir}/icons/hicolor/48x48/apps/com.system76.CosmicSettings.svg +%{_datadir}/icons/hicolor/64x64/apps/com.system76.CosmicSettings.svg +%{_datadir}/applications/com.system76.CosmicSettings.About.desktop +%{_datadir}/applications/com.system76.CosmicSettings.Appearance.desktop +%{_datadir}/applications/com.system76.CosmicSettings.DateTime.desktop +%{_datadir}/applications/com.system76.CosmicSettings.Desktop.desktop +%{_datadir}/applications/com.system76.CosmicSettings.Displays.desktop +%{_datadir}/applications/com.system76.CosmicSettings.Firmware.desktop +%{_datadir}/applications/com.system76.CosmicSettings.Keyboard.desktop +%{_datadir}/applications/com.system76.CosmicSettings.Mouse.desktop +%{_datadir}/applications/com.system76.CosmicSettings.Notifications.desktop +%{_datadir}/applications/com.system76.CosmicSettings.RegionLanguage.desktop +%{_datadir}/applications/com.system76.CosmicSettings.Sound.desktop +%{_datadir}/applications/com.system76.CosmicSettings.Touchpad.desktop +%{_datadir}/applications/com.system76.CosmicSettings.Users.desktop +%{_datadir}/applications/com.system76.CosmicSettings.Wallpaper.desktop +%{_datadir}/applications/com.system76.CosmicSettings.Workspaces.desktop + +cosmic-settings-daemon + +%{_bindir}/cosmic-settings-daemon + +cosmic-store + +%{_bindir}/cosmic-store +%{_datadir}/applications/com.system76.CosmicStore.desktop +%{_metainfodir}/com.system76.CosmicStore.metainfo.xml +%{_datadir}/icons/hicolor/128x128/apps/com.system76.CosmicStore.svg +%{_datadir}/icons/hicolor/16x16/apps/com.system76.CosmicStore.svg +%{_datadir}/icons/hicolor/24x24/apps/com.system76.CosmicStore.svg +%{_datadir}/icons/hicolor/256x256/apps/com.system76.CosmicStore.svg +%{_datadir}/icons/hicolor/32x32/apps/com.system76.CosmicStore.svg +%{_datadir}/icons/hicolor/48x48/apps/com.system76.CosmicStore.svg +%{_datadir}/icons/hicolor/64x64/apps/com.system76.CosmicStore.svg + +cosmic-term + +%{_bindir}/cosmic-term +%{_datadir}/applications/com.system76.CosmicTerm.desktop +%{_metainfodir}/com.system76.CosmicTerm.metainfo.xml +%{_datadir}/icons/hicolor/128x128/apps/com.system76.CosmicTerm.svg +%{_datadir}/icons/hicolor/16x16/apps/com.system76.CosmicTerm.svg +%{_datadir}/icons/hicolor/24x24/apps/com.system76.CosmicTerm.svg +%{_datadir}/icons/hicolor/256x256/apps/com.system76.CosmicTerm.svg +%{_datadir}/icons/hicolor/32x32/apps/com.system76.CosmicTerm.svg +%{_datadir}/icons/hicolor/48x48/apps/com.system76.CosmicTerm.svg +%{_datadir}/icons/hicolor/64x64/apps/com.system76.CosmicTerm.svg + +cosmic-workspaces + +%{_bindir}/cosmic-workspaces +%{_datadir}/applications/com.system76.CosmicWorkspaces.desktop +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicWorkspaces.svg + +pop-launcher + +%{_bindir}/pop-launcher +%{_prefix}/lib/pop-launcher/* + +system76-power + +%{_bindir}/system76-power +%{_unitdir}/com.system76.PowerDaemon.service +%{_datadir}/dbus-1/interfaces/com.system76.PowerDaemon.xml +%{_datadir}/dbus-1/system.d/com.system76.PowerDaemon.conf +%{_datadir}/polkit-1/actions/com.system76.PowerDaemon.policy + +xdg-desktop-portal-cosmic + +%{_libexecdir}/xdg-desktop-portal-cosmic +%{_datadir}/dbus-1/services/org.freedesktop.impl.portal.desktop.cosmic.service +%{_datadir}/xdg-desktop-portal/portals/cosmic.portal +%{_datadir}/xdg-desktop-portal/cosmic-portals.conf +%{_datadir}/icons/hicolor/scalable/actions/screenshot-screen-symbolic.svg +%{_datadir}/icons/hicolor/scalable/actions/screenshot-selection-symbolic.svg +%{_datadir}/icons/hicolor/scalable/actions/screenshot-window-symbolic.svg From 0a5d9b9173703adf88e335d8eb1d9bca22e376c1 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 27 2024 00:40:00 +0000 Subject: [PATCH 34/220] Add summaries and files_list in metadata --- diff --git a/cosmic-applets.spec b/cosmic-applets.spec index 2e71cba..33f92bb 100644 --- a/cosmic-applets.spec +++ b/cosmic-applets.spec @@ -8,7 +8,7 @@ Summary: # FIXME SourceLicense: GPL-3.0-or-later # FIXME: paste output of %%cargo_license_summary here -License: # FIXME +License: GPL-3.0 # LICENSE.dependencies contains a full license breakdown URL: # FIXME diff --git a/cosmic-bg.spec b/cosmic-bg.spec new file mode 100644 index 0000000..8acfe80 --- /dev/null +++ b/cosmic-bg.spec @@ -0,0 +1,51 @@ +# Generated by rust2rpm 26 +%bcond_without check + +Name: cosmic-bg +Version: 0.1.0 +Release: %autorelease +Summary: # FIXME + +SourceLicense: +# FIXME: paste output of %%cargo_license_summary here +License: GPL-3.0 +# LICENSE.dependencies contains a full license breakdown + +URL: # FIXME +Source: # FIXME +Source: cosmic-bg-0.1.0-vendor.tar.xz + +BuildRequires: cargo-rpm-macros >= 25 + +%global _description %{expand: +%{summary}.} + +%description %{_description} + +%prep +%autosetup -n cosmic-bg-%{version} -p1 -a1 +%cargo_prep -v vendor + +%build +%cargo_build +%{cargo_license_summary} +%{cargo_license} > LICENSE.dependencies +%{cargo_vendor_manifest} + +%install +%cargo_install + +%if %{with check} +%check +%cargo_test +%endif + +%files +%license LICENSE.md +%license LICENSE.dependencies +%license cargo-vendor.txt +%doc README.md +%{_bindir}/cosmic-bg + +%changelog +%autochangelog diff --git a/files_cosmic_apps.txt b/files_cosmic_apps.txt deleted file mode 100644 index 9f8fc19..0000000 --- a/files_cosmic_apps.txt +++ /dev/null @@ -1,83 +0,0 @@ -{contains_app("cosmic-app-list","com.system76.CosmicAppList",True, True, True, False, False, "cosmic-app-list/")} -%{{_datadir}}/cosmic/com.system76.CosmicAppList/v1/favorites -%{{_datadir}}/cosmic/com.system76.CosmicAppList/v1/filter_top_levels - -{contains_app("cosmic-app-list","com.system76.CosmicAppList",True, True, True, False, False, "cosmic-app-list/")} -%{{_datadir}}/cosmic/com.system76.CosmicAppList/v1/favorites -%{{_datadir}}/cosmic/com.system76.CosmicAppList/v1/filter_top_levels - -{contains_app("cosmic-applet-audio","com.system76.CosmicAppletAudio",True, True, True, False, False, "cosmic-applet-audio/")} - -{contains_app("cosmic-applet-battery","com.system76.CosmicAppletBattery",True, True, True, False, False, "cosmic-applet-battery/")} -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-display-brightness-high-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-display-brightness-low-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-display-brightness-medium-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-display-brightness-off-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-0-charging-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-0-limited-charging-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-0-limited-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-0-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-10-charging-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-10-limited-charging-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-10-limited-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-10-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-100-charging-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-100-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-20-charging-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-20-limited-charging-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-20-limited-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-20-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-35-charging-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-35-limited-charging-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-35-limited-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-35-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-5-charging-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-5-limited-charging-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-5-limited-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-5-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-50-charging-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-50-limited-charging-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-50-limited-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-50-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-65-charging-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-65-limited-charging-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-65-limited-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-65-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-80-charging-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-80-limited-charging-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-80-limited-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-80-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-90-charging-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-90-symbolic.svg - -{contains_app("cosmic-applet-bluetooth","com.system76.CosmicAppletBluetooth",True, True, True, False, False, "cosmic-applet-bluetooth/")} -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-bluetooth-active-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-bluetooth-disabled-symbolic.svg - -{contains_app("cosmic-applet-minimize","com.system76.CosmicAppletMinimize",True, True, True, False, False, "cosmic-applet-minimize/")} - -{contains_app("cosmic-applet-network","com.system76.CosmicAppletNetwork",True, True, True, False, False, "cosmic-applet-network/")} - -{contains_app("cosmic-applet-notifications","com.system76.CosmicAppletNotifications",True, True, True, False, False, "cosmic-applet-notifications/")} -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-notification-disabled-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-notification-new-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-notification-symbolic.svg - -{contains_app("cosmic-applet-power","com.system76.CosmicAppletPower",True, True, True, False, False, "cosmic-applet-power/")} - -{contains_app("cosmic-applet-status-area","com.system76.CosmicAppletStatusArea",True, True, False, False, False, "cosmic-applet-status-area/")} -%{{_datadir}}/icons/hicolor/scalable/app/com.system76.CosmicAppletStatusArea.svg - -{contains_app("cosmic-applet-tiling","com.system76.CosmicAppletTiling",True, True, False, False, False, "cosmic-applet-tiling/")} -%{{_datadir}}/icons/hicolor/scalable/apps/com.system76.CosmicAppletTiling.Off.svg -%{{_datadir}}/icons/hicolor/scalable/apps/com.system76.CosmicAppletTiling.On.svg - -{contains_app("cosmic-applet-time","com.system76.CosmicAppletTime",True, True, True, False, False, "cosmic-applet-time/")} - -{contains_app("cosmic-applet-workspaces","com.system76.CosmicAppletWorkspaces",True, True, True, False, False, "cosmic-applet-workspaces/")} - -%{{_bindir}}/cosmic-panel-button -%{{_datadir}}/applications/com.system76.CosmicPanelAppButton.desktop -%{{_datadir}}/applications/com.system76.CosmicPanelWorkspacesButton.desktop -%{{_datadir}}/icons/hicolor/scalable/apps/com.system76.CosmicPanelAppButton.svg -%{{_datadir}}/icons/hicolor/scalable/apps/com.system76.CosmicPanelWorkspacesButton.svg \ No newline at end of file diff --git a/files_list.txt b/files_list.txt deleted file mode 100644 index 8d4f426..0000000 --- a/files_list.txt +++ /dev/null @@ -1,303 +0,0 @@ -This file lists all the files produced by each package. Please update this whenever adding files to a spec. - -cosmic-app-library - -%{_bindir}/cosmic-app-library -%{_datadir}/applications/com.system76.CosmicAppLibrary.desktop -%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppLibrary.svg -%{_metainfodir}/com.system76.CosmicAppLibrary.metainfo.xml - -cosmic-applets - -%{_bindir}/cosmic-applets -%{_bindir}/cosmic-panel-button -%{_bindir}/cosmic-app-list -%{_bindir}/cosmic-applet-audio -%{_bindir}/cosmic-applet-battery -%{_bindir}/cosmic-applet-bluetooth -%{_bindir}/cosmic-applet-minimize -%{_bindir}/cosmic-applet-network -%{_bindir}/cosmic-applet-notifications -%{_bindir}/cosmic-applet-power -%{_bindir}/cosmic-applet-status-area -%{_bindir}/cosmic-applet-tiling -%{_bindir}/cosmic-applet-time -%{_bindir}/cosmic-applet-workspaces -%{_datadir}/applications/com.system76.CosmicAppList.desktop -%{_datadir}/applications/com.system76.CosmicAppletAudio.desktop -%{_datadir}/applications/com.system76.CosmicAppletBattery.desktop -%{_datadir}/applications/com.system76.CosmicAppletBluetooth.desktop -%{_datadir}/applications/com.system76.CosmicAppletMinimize.desktop -%{_datadir}/applications/com.system76.CosmicAppletNetwork.desktop -%{_datadir}/applications/com.system76.CosmicAppletNotifications.desktop -%{_datadir}/applications/com.system76.CosmicAppletPower.desktop -%{_datadir}/applications/com.system76.CosmicAppletStatusArea.desktop -%{_datadir}/applications/com.system76.CosmicAppletTiling.desktop -%{_datadir}/applications/com.system76.CosmicAppletTime.desktop -%{_datadir}/applications/com.system76.CosmicAppletWorkspaces.desktop -%{_datadir}/applications/com.system76.CosmicPanelAppButton.desktop -%{_datadir}/applications/com.system76.CosmicPanelWorkspacesButton.desktop -%{_datadir}/cosmic/com.system76.CosmicAppList/v1/favorites -%{_datadir}/cosmic/com.system76.CosmicAppList/v1/filter_top_levels -%{_datadir}/icons/hicolor/scalable/app/com.system76.CosmicAppletStatusArea.svg -%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppList.svg -%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletAudio.svg -%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletBattery.svg -%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletBluetooth.svg -%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletMinimize.svg -%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletNetwork.svg -%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletNotifications.svg -%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletPower.svg -%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletTiling.Off.svg -%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletTiling.On.svg -%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletTime.svg -%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletWorkspaces.svg -%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicPanelAppButton.svg -%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicPanelWorkspacesButton.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-display-brightness-high-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-display-brightness-low-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-display-brightness-medium-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-display-brightness-off-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-0-charging-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-0-limited-charging-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-0-limited-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-0-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-10-charging-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-10-limited-charging-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-10-limited-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-10-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-100-charging-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-100-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-20-charging-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-20-limited-charging-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-20-limited-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-20-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-35-charging-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-35-limited-charging-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-35-limited-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-35-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-5-charging-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-5-limited-charging-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-5-limited-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-5-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-50-charging-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-50-limited-charging-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-50-limited-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-50-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-65-charging-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-65-limited-charging-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-65-limited-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-65-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-80-charging-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-80-limited-charging-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-80-limited-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-80-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-90-charging-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-90-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-bluetooth-active-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-bluetooth-disabled-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-notification-disabled-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-notification-new-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-notification-symbolic.svg - -cosmic-bg - -%{_bindir}/cosmic-bg -%{_datadir}/applications/com.system76.CosmicBackground.desktop -%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicBackground.svg -%{_datadir}/icons/hicolor/symbolic/apps/com.system76.CosmicBackground-symbolic.svg -%{_metainfodir}/com.system76.CosmicBackground.metainfo.xml -%{_datadir}/cosmic/com.system76.CosmicBackground/* - -cosmic-comp - -%{_bindir}/cosmic-comp -%{_sysconfdir}/cosmic-comp/config.ron - -cosmic-edit - -%{_bindir}/cosmic-edit -%{_datadir}/applications/com.system76.CosmicEdit.desktop -%{_metainfodir}/com.system76.CosmicEdit.metainfo.xml -%{_datadir}/icons/hicolor/128x128/apps/com.system76.CosmicEdit.svg -%{_datadir}/icons/hicolor/16x16/apps/com.system76.CosmicEdit.svg -%{_datadir}/icons/hicolor/24x24/apps/com.system76.CosmicEdit.svg -%{_datadir}/icons/hicolor/256x256/apps/com.system76.CosmicEdit.svg -%{_datadir}/icons/hicolor/32x32/apps/com.system76.CosmicEdit.svg -%{_datadir}/icons/hicolor/48x48/apps/com.system76.CosmicEdit.svg -%{_datadir}/icons/hicolor/64x64/apps/com.system76.CosmicEdit.svg - -cosmic-epoch - -(NONE) - -cosmic-files - -%{_bindir}/cosmic-files -%{_datadir}/applications/com.system76.CosmicFiles.desktop -%{_metainfodir}/com.system76.CosmicFiles.metainfo.xml -%{_datadir}/icons/hicolor/128x128/apps/com.system76.CosmicFiles.svg -%{_datadir}/icons/hicolor/16x16/apps/com.system76.CosmicFiles.svg -%{_datadir}/icons/hicolor/24x24/apps/com.system76.CosmicFiles.svg -%{_datadir}/icons/hicolor/256x256/apps/com.system76.CosmicFiles.svg -%{_datadir}/icons/hicolor/32x32/apps/com.system76.CosmicFiles.svg -%{_datadir}/icons/hicolor/48x48/apps/com.system76.CosmicFiles.svg -%{_datadir}/icons/hicolor/64x64/apps/com.system76.CosmicFiles.svg - -cosmic-greeter - -%{_bindir}/cosmic-greeter -%{_bindir}/cosmic-greeter-daemon -%{_datadir}/dbus-1/system.d/com.system76.CosmicGreeter.conf -%{_sysusersdir}/cosmic-greeter.conf -%{_tmpfilesdir}/cosmic-greeter.conf -%{_prefix}/etc/greetd/cosmic-greeter.toml -%{_unitdir}/cosmic-greeter.service -%{_unitdir}/cosmic-greeter-daemon.service - -cosmic-icons - -%{_datadir}/icons/Cosmic/scalable/* -%{_datadir}/icons/Cosmic/index.theme - -cosmic-launcher - -%{_bindir}/cosmic-launcher -%{_datadir}/applications/com.system76.CosmicLauncher.desktop -%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicLauncher.svg -%{_metainfodir}/com.system76.CosmicLauncher.metainfo.xml - -cosmic-notifications - -%{_bindir}/cosmic-notifications -%{_datadir}/applications/com.system76.CosmicNotifications.desktop -%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicNotifications.svg -%{_metainfodir}/com.system76.CosmicNotifications.metainfo.xml - -cosmic-osd - -%{_bindir}/cosmic-osd - -cosmic-panel - -%{_bindir}/cosmic-panel -%{_datadir}/cosmic/com.system76.CosmicPanel.Dock/* -%{_datadir}/cosmic/com.system76.CosmicPanel.Panel/* -%{_datadir}/cosmic/com.system76.CosmicPanel/* - -cosmic-randr - -%{_bindir}/cosmic-randr - -cosmic-screenshot - -%{_bindir}/cosmic-screenshot -%{_datadir}/applications/com.system76.CosmicScreenshot.desktop - -cosmic-session - -%{_bindir}/cosmic-session -%{_bindir}/start-cosmic -%{_userunitdir}/cosmic-session.target -%{_datadir}/wayland-sessions/cosmic.desktop -%{_datadir}/applications/cosmic-mimeapps.list - -cosmic-settings - -%{_bindir}/cosmic-settings -%{_datadir}/applications/com.system76.CosmicSettings.desktop -%{_metainfodir}/com.system76.CosmicSettings.metainfo.xml -%{_datadir}/cosmic/com.system76.CosmicTheme.Dark.Builder/v1/* -%{_datadir}/cosmic/com.system76.CosmicTheme.Dark/v1/* -%{_datadir}/cosmic/com.system76.CosmicTheme.Light.Builder/v1/* -%{_datadir}/cosmic/com.system76.CosmicTheme.Light/v1/* -%{_datadir}/cosmic/com.system76.CosmicTheme.Mode/v1/* -%{_datadir}/icons/hicolor/scalable/status/illustration-appearance-dark-style-round.svg -%{_datadir}/icons/hicolor/scalable/status/illustration-appearance-dark-style-slightly-round.svg -%{_datadir}/icons/hicolor/scalable/status/illustration-appearance-dark-style-square.svg -%{_datadir}/icons/hicolor/scalable/status/illustration-appearance-light-style-round.svg -%{_datadir}/icons/hicolor/scalable/status/illustration-appearance-light-style-slightly-round.svg -%{_datadir}/icons/hicolor/scalable/status/illustration-appearance-light-style-square.svg -%{_datadir}/icons/hicolor/scalable/status/illustration-appearance-mode-dark.svg -%{_datadir}/icons/hicolor/scalable/status/illustration-appearance-mode-light.svg -%{_datadir}/icons/hicolor/128x128/apps/com.system76.CosmicSettings.svg -%{_datadir}/icons/hicolor/16x16/apps/com.system76.CosmicSettings.svg -%{_datadir}/icons/hicolor/24x24/apps/com.system76.CosmicSettings.svg -%{_datadir}/icons/hicolor/256x256/apps/com.system76.CosmicSettings.svg -%{_datadir}/icons/hicolor/32x32/apps/com.system76.CosmicSettings.svg -%{_datadir}/icons/hicolor/48x48/apps/com.system76.CosmicSettings.svg -%{_datadir}/icons/hicolor/64x64/apps/com.system76.CosmicSettings.svg -%{_datadir}/applications/com.system76.CosmicSettings.About.desktop -%{_datadir}/applications/com.system76.CosmicSettings.Appearance.desktop -%{_datadir}/applications/com.system76.CosmicSettings.DateTime.desktop -%{_datadir}/applications/com.system76.CosmicSettings.Desktop.desktop -%{_datadir}/applications/com.system76.CosmicSettings.Displays.desktop -%{_datadir}/applications/com.system76.CosmicSettings.Firmware.desktop -%{_datadir}/applications/com.system76.CosmicSettings.Keyboard.desktop -%{_datadir}/applications/com.system76.CosmicSettings.Mouse.desktop -%{_datadir}/applications/com.system76.CosmicSettings.Notifications.desktop -%{_datadir}/applications/com.system76.CosmicSettings.RegionLanguage.desktop -%{_datadir}/applications/com.system76.CosmicSettings.Sound.desktop -%{_datadir}/applications/com.system76.CosmicSettings.Touchpad.desktop -%{_datadir}/applications/com.system76.CosmicSettings.Users.desktop -%{_datadir}/applications/com.system76.CosmicSettings.Wallpaper.desktop -%{_datadir}/applications/com.system76.CosmicSettings.Workspaces.desktop - -cosmic-settings-daemon - -%{_bindir}/cosmic-settings-daemon - -cosmic-store - -%{_bindir}/cosmic-store -%{_datadir}/applications/com.system76.CosmicStore.desktop -%{_metainfodir}/com.system76.CosmicStore.metainfo.xml -%{_datadir}/icons/hicolor/128x128/apps/com.system76.CosmicStore.svg -%{_datadir}/icons/hicolor/16x16/apps/com.system76.CosmicStore.svg -%{_datadir}/icons/hicolor/24x24/apps/com.system76.CosmicStore.svg -%{_datadir}/icons/hicolor/256x256/apps/com.system76.CosmicStore.svg -%{_datadir}/icons/hicolor/32x32/apps/com.system76.CosmicStore.svg -%{_datadir}/icons/hicolor/48x48/apps/com.system76.CosmicStore.svg -%{_datadir}/icons/hicolor/64x64/apps/com.system76.CosmicStore.svg - -cosmic-term - -%{_bindir}/cosmic-term -%{_datadir}/applications/com.system76.CosmicTerm.desktop -%{_metainfodir}/com.system76.CosmicTerm.metainfo.xml -%{_datadir}/icons/hicolor/128x128/apps/com.system76.CosmicTerm.svg -%{_datadir}/icons/hicolor/16x16/apps/com.system76.CosmicTerm.svg -%{_datadir}/icons/hicolor/24x24/apps/com.system76.CosmicTerm.svg -%{_datadir}/icons/hicolor/256x256/apps/com.system76.CosmicTerm.svg -%{_datadir}/icons/hicolor/32x32/apps/com.system76.CosmicTerm.svg -%{_datadir}/icons/hicolor/48x48/apps/com.system76.CosmicTerm.svg -%{_datadir}/icons/hicolor/64x64/apps/com.system76.CosmicTerm.svg - -cosmic-workspaces - -%{_bindir}/cosmic-workspaces -%{_datadir}/applications/com.system76.CosmicWorkspaces.desktop -%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicWorkspaces.svg - -pop-launcher - -%{_bindir}/pop-launcher -%{_prefix}/lib/pop-launcher/* - -system76-power - -%{_bindir}/system76-power -%{_unitdir}/com.system76.PowerDaemon.service -%{_datadir}/dbus-1/interfaces/com.system76.PowerDaemon.xml -%{_datadir}/dbus-1/system.d/com.system76.PowerDaemon.conf -%{_datadir}/polkit-1/actions/com.system76.PowerDaemon.policy - -xdg-desktop-portal-cosmic - -%{_libexecdir}/xdg-desktop-portal-cosmic -%{_datadir}/dbus-1/services/org.freedesktop.impl.portal.desktop.cosmic.service -%{_datadir}/xdg-desktop-portal/portals/cosmic.portal -%{_datadir}/xdg-desktop-portal/cosmic-portals.conf -%{_datadir}/icons/hicolor/scalable/actions/screenshot-screen-symbolic.svg -%{_datadir}/icons/hicolor/scalable/actions/screenshot-selection-symbolic.svg -%{_datadir}/icons/hicolor/scalable/actions/screenshot-window-symbolic.svg diff --git a/metadata/files_list.txt b/metadata/files_list.txt new file mode 100644 index 0000000..8d4f426 --- /dev/null +++ b/metadata/files_list.txt @@ -0,0 +1,303 @@ +This file lists all the files produced by each package. Please update this whenever adding files to a spec. + +cosmic-app-library + +%{_bindir}/cosmic-app-library +%{_datadir}/applications/com.system76.CosmicAppLibrary.desktop +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppLibrary.svg +%{_metainfodir}/com.system76.CosmicAppLibrary.metainfo.xml + +cosmic-applets + +%{_bindir}/cosmic-applets +%{_bindir}/cosmic-panel-button +%{_bindir}/cosmic-app-list +%{_bindir}/cosmic-applet-audio +%{_bindir}/cosmic-applet-battery +%{_bindir}/cosmic-applet-bluetooth +%{_bindir}/cosmic-applet-minimize +%{_bindir}/cosmic-applet-network +%{_bindir}/cosmic-applet-notifications +%{_bindir}/cosmic-applet-power +%{_bindir}/cosmic-applet-status-area +%{_bindir}/cosmic-applet-tiling +%{_bindir}/cosmic-applet-time +%{_bindir}/cosmic-applet-workspaces +%{_datadir}/applications/com.system76.CosmicAppList.desktop +%{_datadir}/applications/com.system76.CosmicAppletAudio.desktop +%{_datadir}/applications/com.system76.CosmicAppletBattery.desktop +%{_datadir}/applications/com.system76.CosmicAppletBluetooth.desktop +%{_datadir}/applications/com.system76.CosmicAppletMinimize.desktop +%{_datadir}/applications/com.system76.CosmicAppletNetwork.desktop +%{_datadir}/applications/com.system76.CosmicAppletNotifications.desktop +%{_datadir}/applications/com.system76.CosmicAppletPower.desktop +%{_datadir}/applications/com.system76.CosmicAppletStatusArea.desktop +%{_datadir}/applications/com.system76.CosmicAppletTiling.desktop +%{_datadir}/applications/com.system76.CosmicAppletTime.desktop +%{_datadir}/applications/com.system76.CosmicAppletWorkspaces.desktop +%{_datadir}/applications/com.system76.CosmicPanelAppButton.desktop +%{_datadir}/applications/com.system76.CosmicPanelWorkspacesButton.desktop +%{_datadir}/cosmic/com.system76.CosmicAppList/v1/favorites +%{_datadir}/cosmic/com.system76.CosmicAppList/v1/filter_top_levels +%{_datadir}/icons/hicolor/scalable/app/com.system76.CosmicAppletStatusArea.svg +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppList.svg +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletAudio.svg +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletBattery.svg +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletBluetooth.svg +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletMinimize.svg +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletNetwork.svg +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletNotifications.svg +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletPower.svg +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletTiling.Off.svg +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletTiling.On.svg +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletTime.svg +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletWorkspaces.svg +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicPanelAppButton.svg +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicPanelWorkspacesButton.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-display-brightness-high-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-display-brightness-low-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-display-brightness-medium-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-display-brightness-off-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-0-charging-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-0-limited-charging-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-0-limited-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-0-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-10-charging-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-10-limited-charging-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-10-limited-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-10-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-100-charging-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-100-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-20-charging-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-20-limited-charging-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-20-limited-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-20-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-35-charging-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-35-limited-charging-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-35-limited-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-35-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-5-charging-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-5-limited-charging-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-5-limited-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-5-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-50-charging-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-50-limited-charging-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-50-limited-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-50-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-65-charging-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-65-limited-charging-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-65-limited-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-65-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-80-charging-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-80-limited-charging-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-80-limited-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-80-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-90-charging-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-90-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-bluetooth-active-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-bluetooth-disabled-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-notification-disabled-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-notification-new-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-notification-symbolic.svg + +cosmic-bg + +%{_bindir}/cosmic-bg +%{_datadir}/applications/com.system76.CosmicBackground.desktop +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicBackground.svg +%{_datadir}/icons/hicolor/symbolic/apps/com.system76.CosmicBackground-symbolic.svg +%{_metainfodir}/com.system76.CosmicBackground.metainfo.xml +%{_datadir}/cosmic/com.system76.CosmicBackground/* + +cosmic-comp + +%{_bindir}/cosmic-comp +%{_sysconfdir}/cosmic-comp/config.ron + +cosmic-edit + +%{_bindir}/cosmic-edit +%{_datadir}/applications/com.system76.CosmicEdit.desktop +%{_metainfodir}/com.system76.CosmicEdit.metainfo.xml +%{_datadir}/icons/hicolor/128x128/apps/com.system76.CosmicEdit.svg +%{_datadir}/icons/hicolor/16x16/apps/com.system76.CosmicEdit.svg +%{_datadir}/icons/hicolor/24x24/apps/com.system76.CosmicEdit.svg +%{_datadir}/icons/hicolor/256x256/apps/com.system76.CosmicEdit.svg +%{_datadir}/icons/hicolor/32x32/apps/com.system76.CosmicEdit.svg +%{_datadir}/icons/hicolor/48x48/apps/com.system76.CosmicEdit.svg +%{_datadir}/icons/hicolor/64x64/apps/com.system76.CosmicEdit.svg + +cosmic-epoch + +(NONE) + +cosmic-files + +%{_bindir}/cosmic-files +%{_datadir}/applications/com.system76.CosmicFiles.desktop +%{_metainfodir}/com.system76.CosmicFiles.metainfo.xml +%{_datadir}/icons/hicolor/128x128/apps/com.system76.CosmicFiles.svg +%{_datadir}/icons/hicolor/16x16/apps/com.system76.CosmicFiles.svg +%{_datadir}/icons/hicolor/24x24/apps/com.system76.CosmicFiles.svg +%{_datadir}/icons/hicolor/256x256/apps/com.system76.CosmicFiles.svg +%{_datadir}/icons/hicolor/32x32/apps/com.system76.CosmicFiles.svg +%{_datadir}/icons/hicolor/48x48/apps/com.system76.CosmicFiles.svg +%{_datadir}/icons/hicolor/64x64/apps/com.system76.CosmicFiles.svg + +cosmic-greeter + +%{_bindir}/cosmic-greeter +%{_bindir}/cosmic-greeter-daemon +%{_datadir}/dbus-1/system.d/com.system76.CosmicGreeter.conf +%{_sysusersdir}/cosmic-greeter.conf +%{_tmpfilesdir}/cosmic-greeter.conf +%{_prefix}/etc/greetd/cosmic-greeter.toml +%{_unitdir}/cosmic-greeter.service +%{_unitdir}/cosmic-greeter-daemon.service + +cosmic-icons + +%{_datadir}/icons/Cosmic/scalable/* +%{_datadir}/icons/Cosmic/index.theme + +cosmic-launcher + +%{_bindir}/cosmic-launcher +%{_datadir}/applications/com.system76.CosmicLauncher.desktop +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicLauncher.svg +%{_metainfodir}/com.system76.CosmicLauncher.metainfo.xml + +cosmic-notifications + +%{_bindir}/cosmic-notifications +%{_datadir}/applications/com.system76.CosmicNotifications.desktop +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicNotifications.svg +%{_metainfodir}/com.system76.CosmicNotifications.metainfo.xml + +cosmic-osd + +%{_bindir}/cosmic-osd + +cosmic-panel + +%{_bindir}/cosmic-panel +%{_datadir}/cosmic/com.system76.CosmicPanel.Dock/* +%{_datadir}/cosmic/com.system76.CosmicPanel.Panel/* +%{_datadir}/cosmic/com.system76.CosmicPanel/* + +cosmic-randr + +%{_bindir}/cosmic-randr + +cosmic-screenshot + +%{_bindir}/cosmic-screenshot +%{_datadir}/applications/com.system76.CosmicScreenshot.desktop + +cosmic-session + +%{_bindir}/cosmic-session +%{_bindir}/start-cosmic +%{_userunitdir}/cosmic-session.target +%{_datadir}/wayland-sessions/cosmic.desktop +%{_datadir}/applications/cosmic-mimeapps.list + +cosmic-settings + +%{_bindir}/cosmic-settings +%{_datadir}/applications/com.system76.CosmicSettings.desktop +%{_metainfodir}/com.system76.CosmicSettings.metainfo.xml +%{_datadir}/cosmic/com.system76.CosmicTheme.Dark.Builder/v1/* +%{_datadir}/cosmic/com.system76.CosmicTheme.Dark/v1/* +%{_datadir}/cosmic/com.system76.CosmicTheme.Light.Builder/v1/* +%{_datadir}/cosmic/com.system76.CosmicTheme.Light/v1/* +%{_datadir}/cosmic/com.system76.CosmicTheme.Mode/v1/* +%{_datadir}/icons/hicolor/scalable/status/illustration-appearance-dark-style-round.svg +%{_datadir}/icons/hicolor/scalable/status/illustration-appearance-dark-style-slightly-round.svg +%{_datadir}/icons/hicolor/scalable/status/illustration-appearance-dark-style-square.svg +%{_datadir}/icons/hicolor/scalable/status/illustration-appearance-light-style-round.svg +%{_datadir}/icons/hicolor/scalable/status/illustration-appearance-light-style-slightly-round.svg +%{_datadir}/icons/hicolor/scalable/status/illustration-appearance-light-style-square.svg +%{_datadir}/icons/hicolor/scalable/status/illustration-appearance-mode-dark.svg +%{_datadir}/icons/hicolor/scalable/status/illustration-appearance-mode-light.svg +%{_datadir}/icons/hicolor/128x128/apps/com.system76.CosmicSettings.svg +%{_datadir}/icons/hicolor/16x16/apps/com.system76.CosmicSettings.svg +%{_datadir}/icons/hicolor/24x24/apps/com.system76.CosmicSettings.svg +%{_datadir}/icons/hicolor/256x256/apps/com.system76.CosmicSettings.svg +%{_datadir}/icons/hicolor/32x32/apps/com.system76.CosmicSettings.svg +%{_datadir}/icons/hicolor/48x48/apps/com.system76.CosmicSettings.svg +%{_datadir}/icons/hicolor/64x64/apps/com.system76.CosmicSettings.svg +%{_datadir}/applications/com.system76.CosmicSettings.About.desktop +%{_datadir}/applications/com.system76.CosmicSettings.Appearance.desktop +%{_datadir}/applications/com.system76.CosmicSettings.DateTime.desktop +%{_datadir}/applications/com.system76.CosmicSettings.Desktop.desktop +%{_datadir}/applications/com.system76.CosmicSettings.Displays.desktop +%{_datadir}/applications/com.system76.CosmicSettings.Firmware.desktop +%{_datadir}/applications/com.system76.CosmicSettings.Keyboard.desktop +%{_datadir}/applications/com.system76.CosmicSettings.Mouse.desktop +%{_datadir}/applications/com.system76.CosmicSettings.Notifications.desktop +%{_datadir}/applications/com.system76.CosmicSettings.RegionLanguage.desktop +%{_datadir}/applications/com.system76.CosmicSettings.Sound.desktop +%{_datadir}/applications/com.system76.CosmicSettings.Touchpad.desktop +%{_datadir}/applications/com.system76.CosmicSettings.Users.desktop +%{_datadir}/applications/com.system76.CosmicSettings.Wallpaper.desktop +%{_datadir}/applications/com.system76.CosmicSettings.Workspaces.desktop + +cosmic-settings-daemon + +%{_bindir}/cosmic-settings-daemon + +cosmic-store + +%{_bindir}/cosmic-store +%{_datadir}/applications/com.system76.CosmicStore.desktop +%{_metainfodir}/com.system76.CosmicStore.metainfo.xml +%{_datadir}/icons/hicolor/128x128/apps/com.system76.CosmicStore.svg +%{_datadir}/icons/hicolor/16x16/apps/com.system76.CosmicStore.svg +%{_datadir}/icons/hicolor/24x24/apps/com.system76.CosmicStore.svg +%{_datadir}/icons/hicolor/256x256/apps/com.system76.CosmicStore.svg +%{_datadir}/icons/hicolor/32x32/apps/com.system76.CosmicStore.svg +%{_datadir}/icons/hicolor/48x48/apps/com.system76.CosmicStore.svg +%{_datadir}/icons/hicolor/64x64/apps/com.system76.CosmicStore.svg + +cosmic-term + +%{_bindir}/cosmic-term +%{_datadir}/applications/com.system76.CosmicTerm.desktop +%{_metainfodir}/com.system76.CosmicTerm.metainfo.xml +%{_datadir}/icons/hicolor/128x128/apps/com.system76.CosmicTerm.svg +%{_datadir}/icons/hicolor/16x16/apps/com.system76.CosmicTerm.svg +%{_datadir}/icons/hicolor/24x24/apps/com.system76.CosmicTerm.svg +%{_datadir}/icons/hicolor/256x256/apps/com.system76.CosmicTerm.svg +%{_datadir}/icons/hicolor/32x32/apps/com.system76.CosmicTerm.svg +%{_datadir}/icons/hicolor/48x48/apps/com.system76.CosmicTerm.svg +%{_datadir}/icons/hicolor/64x64/apps/com.system76.CosmicTerm.svg + +cosmic-workspaces + +%{_bindir}/cosmic-workspaces +%{_datadir}/applications/com.system76.CosmicWorkspaces.desktop +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicWorkspaces.svg + +pop-launcher + +%{_bindir}/pop-launcher +%{_prefix}/lib/pop-launcher/* + +system76-power + +%{_bindir}/system76-power +%{_unitdir}/com.system76.PowerDaemon.service +%{_datadir}/dbus-1/interfaces/com.system76.PowerDaemon.xml +%{_datadir}/dbus-1/system.d/com.system76.PowerDaemon.conf +%{_datadir}/polkit-1/actions/com.system76.PowerDaemon.policy + +xdg-desktop-portal-cosmic + +%{_libexecdir}/xdg-desktop-portal-cosmic +%{_datadir}/dbus-1/services/org.freedesktop.impl.portal.desktop.cosmic.service +%{_datadir}/xdg-desktop-portal/portals/cosmic.portal +%{_datadir}/xdg-desktop-portal/cosmic-portals.conf +%{_datadir}/icons/hicolor/scalable/actions/screenshot-screen-symbolic.svg +%{_datadir}/icons/hicolor/scalable/actions/screenshot-selection-symbolic.svg +%{_datadir}/icons/hicolor/scalable/actions/screenshot-window-symbolic.svg diff --git a/metadata/summaries.txt b/metadata/summaries.txt new file mode 100644 index 0000000..41f7d93 --- /dev/null +++ b/metadata/summaries.txt @@ -0,0 +1,95 @@ +cosmic-app-library + +App Library program for the COSMIC Desktop Environment. + +cosmic-applets + +Applets for the COSMIC Desktop Environment. + +cosmic-bg + +Program that manages the background in the COSMIC Desktop Environment + +cosmic-comp + +Compositor for the COSMIC Desktop Environment. Can also be used as a standalone compositor. + +cosmic-desktop + +COSMIC Desktop Environment Meta Package + +cosmic-edit + +Libcosmic text editor. + +cosmic-files + +Libcosmic file manager. + +cosmic-greeter + +Login and display manager built using GreetD for the COSMIC Desktop Environment. + +cosmic-icons + +Icon theme for the COSMIC Desktop Environment. + +cosmic-launcher + +Pop launcher frontend for the COSMIC Desktop Environment. + +cosmic-notifications + +Notifications daemon for the COSMIC Desktop Environment. + +cosmic-osd + +OSDs for the COSMIC Desktop Environment. + +cosmic-panel + +Panel for the COSMIC Desktop Environment. + +cosmic-randr + +Library and utility for displaying and configuring Wayland outputs. + +cosmic-screenshot + +Screenshot utility for the COSMIC Desktop Environment. + +cosmic-session + +Session management for the COSMIC Desktop Environment. + +cosmic-settings + +Settings app for the COSMIC Desktop Environment. + +cosmic-settings-daemon + +Settings daemon for the COSMIC Desktop Environment. + +cosmic-store + +App store for the COSMIC Desktop Environment. + +cosmic-term + +Terminal emulator built with Libcosmic. + +cosmic-workspaces + +Workspaces overview for the COSMIC Desktop Environment. + +pop-launcher + +Modular IPC-based desktop launcher service. + +system76-power + +System76 power management daemon + +xdg-desktop-portal-cosmic + +XDG Desktop Portals implementation for the COSMIC Desktop Environment. \ No newline at end of file From 10c70dd0a1d7e598283d111ded7ed4f4de1a65b3 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 27 2024 01:39:48 +0000 Subject: [PATCH 35/220] stuff --- diff --git a/cosmic-bg.spec b/cosmic-bg.spec deleted file mode 100644 index 8acfe80..0000000 --- a/cosmic-bg.spec +++ /dev/null @@ -1,51 +0,0 @@ -# Generated by rust2rpm 26 -%bcond_without check - -Name: cosmic-bg -Version: 0.1.0 -Release: %autorelease -Summary: # FIXME - -SourceLicense: -# FIXME: paste output of %%cargo_license_summary here -License: GPL-3.0 -# LICENSE.dependencies contains a full license breakdown - -URL: # FIXME -Source: # FIXME -Source: cosmic-bg-0.1.0-vendor.tar.xz - -BuildRequires: cargo-rpm-macros >= 25 - -%global _description %{expand: -%{summary}.} - -%description %{_description} - -%prep -%autosetup -n cosmic-bg-%{version} -p1 -a1 -%cargo_prep -v vendor - -%build -%cargo_build -%{cargo_license_summary} -%{cargo_license} > LICENSE.dependencies -%{cargo_vendor_manifest} - -%install -%cargo_install - -%if %{with check} -%check -%cargo_test -%endif - -%files -%license LICENSE.md -%license LICENSE.dependencies -%license cargo-vendor.txt -%doc README.md -%{_bindir}/cosmic-bg - -%changelog -%autochangelog diff --git a/rpms/cosmic-bg/changelog b/rpms/cosmic-bg/changelog new file mode 100644 index 0000000..c897992 --- /dev/null +++ b/rpms/cosmic-bg/changelog @@ -0,0 +1,3 @@ +* Tue Mar 26 2024 Ryan Brue - 0.1.0 + +- Created \ No newline at end of file diff --git a/rpms/cosmic-bg/cosmic-bg.spec b/rpms/cosmic-bg/cosmic-bg.spec new file mode 100644 index 0000000..c723a4d --- /dev/null +++ b/rpms/cosmic-bg/cosmic-bg.spec @@ -0,0 +1,61 @@ +# Generated by rust2rpm 26 +%bcond_without check + +%global ver ### +%global commit ### +%global date ### + +Name: cosmic-bg +Version: %{ver}~%{date} +Release: %autorelease +Summary: # FIXME + +SourceLicense: +# FIXME: paste output of %%cargo_license_summary here +License: GPL-3.0 +# LICENSE.dependencies contains a full license breakdown + +URL: https://github.com/pop-os/cosmic-bg +Source: cosmic-bg-%{ver}.tar.xz +Source: cosmic-bg-%{ver}-vendor.tar.xz + +BuildRequires: cargo-rpm-macros >= 25 + +%global _description %{expand: +%{summary}.} + +%description %{_description} + +%prep +%autosetup -n cosmic-bg-%{ver} -p1 -a1 +%cargo_prep -v vendor + +%build +%cargo_build +%{cargo_license_summary} +%{cargo_license} > LICENSE.dependencies +%{cargo_vendor_manifest} + +%install +# %%cargo_install +just rootdir=%{buildroot} prefix=%{_prefix} install + +%if %{with check} +%check +%cargo_test +%endif + +%files +%license LICENSE.md +%license LICENSE.dependencies +%license cargo-vendor.txt +%doc README.md +%{_bindir}/cosmic-bg +%{_datadir}/applications/com.system76.CosmicBackground.desktop +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicBackground.svg +%{_datadir}/icons/hicolor/symbolic/apps/com.system76.CosmicBackground-symbolic.svg +%{_datadir}/cosmic/com.system76.CosmicBackground/* +%{_metainfodir}/com.system76.CosmicBackground.metainfo.xml + +%changelog +%autochangelog diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh new file mode 100644 index 0000000..4f4a8a7 --- /dev/null +++ b/scripts/bootstrap.sh @@ -0,0 +1,10 @@ +#!/bin/bash -x + +PACKAGE= + +REPO=https://github.com/pop-os/$PACKAGE + +git clone --recurse-submodules https://pagure.io/forks/ryanabx/fedora-cosmic/cosmic-packaging.git +cp cosmic-packaging/rpms/$PACKAGE/* . +cp cosmic-packaging/scripts/vendor-srpm.sh . +. vendor-srpm.sh $PACKAGE 0.1.0 latest $PACKAGE.spec \ No newline at end of file diff --git a/scripts/vendor-srpm.sh b/scripts/vendor-srpm.sh new file mode 100644 index 0000000..8f17987 --- /dev/null +++ b/scripts/vendor-srpm.sh @@ -0,0 +1,49 @@ +#!/bin/bash -x + +# name of the crate/package +name=$1 +# version of the crate/package +version=$2 +# commit to target (latest == master) +commit=$3 +# path to the spec file on the pc +path_to_spec=$4 +# repo link +repo=$5 + +LATEST="latest" + +# Clone repo and cd into it +mkdir $name && cd $name && git clone --recurse-submodules $repo . + +# Get latest commit hash if commit is set to latest +if [[ "$commit" == "$LATEST" ]] +then + commit=$(git rev-parse HEAD) +fi + +# Short commit, used for versioning +short_commit=${commit:0:6} + +# Reset to specified commit +git reset --hard $commit + +# Vendor dependencies and zip vendor +mkdir .vendor +cargo vendor > .vendor/config.toml +tar -pcJf $name-vendor-$version.tar.xz vendor && mv $name-vendor-$version.tar.xz ../$name-vendor-$version.tar.xz +# Back into parent directory +rm -rf vendor && cd .. + +# Zip source +tar -czJf $name.tar.xz $name +rm -rf $name + +# Get specfile +cp $path_to_spec $name.spec 2>/dev/null || : + +# Make replacements to specfile +sed -i "/^%global ver / s/.*/%global ver $version/" $name.spec +sed -i "/^%global commit / s/.*/%global commit $commit/" $name.spec +current_date=$(date +'%Y%m%d.%H') +sed -i "/^%global date / s/.*/%global commit $current_date/" $name.spec \ No newline at end of file From 402fb77b2cd9ecc4507afd382d009677331a1613 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 27 2024 01:45:00 +0000 Subject: [PATCH 36/220] mayhaps? --- diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 4f4a8a7..697b0d0 100644 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -1,7 +1,6 @@ #!/bin/bash -x PACKAGE= - REPO=https://github.com/pop-os/$PACKAGE git clone --recurse-submodules https://pagure.io/forks/ryanabx/fedora-cosmic/cosmic-packaging.git diff --git a/scripts/vendor-srpm.sh b/scripts/vendor-srpm.sh index 8f17987..b52efcf 100644 --- a/scripts/vendor-srpm.sh +++ b/scripts/vendor-srpm.sh @@ -43,7 +43,7 @@ rm -rf $name cp $path_to_spec $name.spec 2>/dev/null || : # Make replacements to specfile -sed -i "/^%global ver / s/.*/%global ver $version/" $name.spec -sed -i "/^%global commit / s/.*/%global commit $commit/" $name.spec +sed -i "/^%%global ver / s/.*/%%global ver $version/" $name.spec +sed -i "/^%%global commit / s/.*/%%global commit $commit/" $name.spec current_date=$(date +'%Y%m%d.%H') -sed -i "/^%global date / s/.*/%global commit $current_date/" $name.spec \ No newline at end of file +sed -i "/^%%global date / s/.*/%%global commit $current_date/" $name.spec \ No newline at end of file From 919d5591114c3670eefdd0f195fac1daec4d28b2 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 27 2024 01:46:03 +0000 Subject: [PATCH 37/220] s --- diff --git a/scripts/vendor-srpm.sh b/scripts/vendor-srpm.sh index b52efcf..65c702b 100644 --- a/scripts/vendor-srpm.sh +++ b/scripts/vendor-srpm.sh @@ -46,4 +46,6 @@ cp $path_to_spec $name.spec 2>/dev/null || : sed -i "/^%%global ver / s/.*/%%global ver $version/" $name.spec sed -i "/^%%global commit / s/.*/%%global commit $commit/" $name.spec current_date=$(date +'%Y%m%d.%H') -sed -i "/^%%global date / s/.*/%%global commit $current_date/" $name.spec \ No newline at end of file +sed -i "/^%%global date / s/.*/%%global commit $current_date/" $name.spec + +echo Done! $1 $2 $3 $4 $5 \ No newline at end of file From c2ba7d326ebec8881dd60534c3c20c106faf6fd6 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 27 2024 01:59:03 +0000 Subject: [PATCH 38/220] s --- diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 697b0d0..1b49498 100644 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -6,4 +6,4 @@ REPO=https://github.com/pop-os/$PACKAGE git clone --recurse-submodules https://pagure.io/forks/ryanabx/fedora-cosmic/cosmic-packaging.git cp cosmic-packaging/rpms/$PACKAGE/* . cp cosmic-packaging/scripts/vendor-srpm.sh . -. vendor-srpm.sh $PACKAGE 0.1.0 latest $PACKAGE.spec \ No newline at end of file +. vendor-srpm.sh $PACKAGE 0.1.0 latest $PACKAGE.spec $REPO \ No newline at end of file diff --git a/scripts/vendor-srpm.sh b/scripts/vendor-srpm.sh index 65c702b..07f201c 100644 --- a/scripts/vendor-srpm.sh +++ b/scripts/vendor-srpm.sh @@ -43,9 +43,9 @@ rm -rf $name cp $path_to_spec $name.spec 2>/dev/null || : # Make replacements to specfile -sed -i "/^%%global ver / s/.*/%%global ver $version/" $name.spec -sed -i "/^%%global commit / s/.*/%%global commit $commit/" $name.spec +sed -i "/^%global ver / s/.*/%global ver $version/" $name.spec +sed -i "/^%global commit / s/.*/%global commit $commit/" $name.spec current_date=$(date +'%Y%m%d.%H') -sed -i "/^%%global date / s/.*/%%global commit $current_date/" $name.spec +sed -i "/^%global date / s/.*/%global commit $current_date/" $name.spec echo Done! $1 $2 $3 $4 $5 \ No newline at end of file From a124969531b6b2f7b7d61f04a28640a34679abcb Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 27 2024 02:23:05 +0000 Subject: [PATCH 39/220] cosmic-bg? --- diff --git a/metadata/all_deps.txt b/metadata/all_deps.txt new file mode 100644 index 0000000..1216ae6 --- /dev/null +++ b/metadata/all_deps.txt @@ -0,0 +1,50 @@ +Build Requirements + +make +which +git-core +just +rustc +lld +cargo +glib2-devel +gtk3-devel +dbus-devel +wayland-devel +clang-devel +libxkbcommon-devel +mesa-libgbm-devel +rust-rav1e+nasm-rs-devel +libappstream-glib +pipewire-devel +libglvnd-devel +libseat-devel +libinput-devel +pam-devel +flatpak-devel + +Requirements + +Requires: libseat +Requires: pop-icon-theme +Requires: greetd +Requires: greetd-selinux +Requires: cage +Requires: mozilla-fira-mono-fonts +Requires: mozilla-fira-sans-fonts + + +cosmic-bg + +Build Requirements: + +rustc +lld +cargo +wayland-devel +libxkbcommon-devel +just + +Requirements: + +cosmic-session \ No newline at end of file diff --git a/metadata/summaries.txt b/metadata/summaries.txt index 41f7d93..e283c41 100644 --- a/metadata/summaries.txt +++ b/metadata/summaries.txt @@ -8,7 +8,7 @@ Applets for the COSMIC Desktop Environment. cosmic-bg -Program that manages the background in the COSMIC Desktop Environment +Background manager for the COSMIC Desktop Environment. cosmic-comp diff --git a/rpms/cosmic-bg/cosmic-bg.spec b/rpms/cosmic-bg/cosmic-bg.spec index c723a4d..2af8b72 100644 --- a/rpms/cosmic-bg/cosmic-bg.spec +++ b/rpms/cosmic-bg/cosmic-bg.spec @@ -8,10 +8,9 @@ Name: cosmic-bg Version: %{ver}~%{date} Release: %autorelease -Summary: # FIXME +Summary: Background manager for the COSMIC Desktop Environment. -SourceLicense: -# FIXME: paste output of %%cargo_license_summary here +SourceLicense: MPL-2.0 License: GPL-3.0 # LICENSE.dependencies contains a full license breakdown @@ -20,6 +19,14 @@ Source: cosmic-bg-%{ver}.tar.xz Source: cosmic-bg-%{ver}-vendor.tar.xz BuildRequires: cargo-rpm-macros >= 25 +BuildRequires: rustc +BuildRequires: lld +BuildRequires: cargo +BuildRequires: wayland-devel +BuildRequires: libxkbcommon-devel +BuildRequires: just + +Requires: cosmic-session %global _description %{expand: %{summary}.} diff --git a/scripts/vendor-srpm.sh b/scripts/vendor-srpm.sh index 07f201c..97d1de8 100644 --- a/scripts/vendor-srpm.sh +++ b/scripts/vendor-srpm.sh @@ -46,6 +46,6 @@ cp $path_to_spec $name.spec 2>/dev/null || : sed -i "/^%global ver / s/.*/%global ver $version/" $name.spec sed -i "/^%global commit / s/.*/%global commit $commit/" $name.spec current_date=$(date +'%Y%m%d.%H') -sed -i "/^%global date / s/.*/%global commit $current_date/" $name.spec +sed -i "/^%global date / s/.*/%global date $current_date/" $name.spec echo Done! $1 $2 $3 $4 $5 \ No newline at end of file From b774044a51a66f93eab7553df77e9edcd370a2b9 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 27 2024 02:28:10 +0000 Subject: [PATCH 40/220] s --- diff --git a/scripts/vendor-srpm.sh b/scripts/vendor-srpm.sh index 97d1de8..25e944c 100644 --- a/scripts/vendor-srpm.sh +++ b/scripts/vendor-srpm.sh @@ -31,7 +31,7 @@ git reset --hard $commit # Vendor dependencies and zip vendor mkdir .vendor cargo vendor > .vendor/config.toml -tar -pcJf $name-vendor-$version.tar.xz vendor && mv $name-vendor-$version.tar.xz ../$name-vendor-$version.tar.xz +tar -pcJf $name-$version-vendor.tar.xz vendor && mv $name-$version-vendor.tar.xz ../$name-$version-vendor.tar.xz # Back into parent directory rm -rf vendor && cd .. From 3866306e25afb9343e6f785341e5f53b9e36dcb2 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 27 2024 02:40:47 +0000 Subject: [PATCH 41/220] s --- diff --git a/scripts/vendor-srpm.sh b/scripts/vendor-srpm.sh index 25e944c..d01472a 100644 --- a/scripts/vendor-srpm.sh +++ b/scripts/vendor-srpm.sh @@ -48,4 +48,8 @@ sed -i "/^%global commit / s/.*/%global commit $commit/" $name.spec current_date=$(date +'%Y%m%d.%H') sed -i "/^%global date / s/.*/%global date $current_date/" $name.spec + +ls -a +pwd + echo Done! $1 $2 $3 $4 $5 \ No newline at end of file From 25ebb3630a168e3110870342c515f8f7f26219bd Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 27 2024 02:47:48 +0000 Subject: [PATCH 42/220] s --- diff --git a/scripts/vendor-srpm.sh b/scripts/vendor-srpm.sh index d01472a..4fb6580 100644 --- a/scripts/vendor-srpm.sh +++ b/scripts/vendor-srpm.sh @@ -36,7 +36,7 @@ tar -pcJf $name-$version-vendor.tar.xz vendor && mv $name-$version-vendor.tar.xz rm -rf vendor && cd .. # Zip source -tar -czJf $name.tar.xz $name +tar -pcJf $name.tar.xz $name rm -rf $name # Get specfile From 1bbfecc5cb2a814ca1bd69982acc93be287fb31a Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 27 2024 02:53:14 +0000 Subject: [PATCH 43/220] s --- diff --git a/scripts/vendor-srpm.sh b/scripts/vendor-srpm.sh index 4fb6580..4cae3bb 100644 --- a/scripts/vendor-srpm.sh +++ b/scripts/vendor-srpm.sh @@ -14,7 +14,7 @@ repo=$5 LATEST="latest" # Clone repo and cd into it -mkdir $name && cd $name && git clone --recurse-submodules $repo . +mkdir $name-$version && cd $name-$version && git clone --recurse-submodules $repo . # Get latest commit hash if commit is set to latest if [[ "$commit" == "$LATEST" ]] @@ -36,8 +36,8 @@ tar -pcJf $name-$version-vendor.tar.xz vendor && mv $name-$version-vendor.tar.xz rm -rf vendor && cd .. # Zip source -tar -pcJf $name.tar.xz $name -rm -rf $name +tar -pcJf $name-$version.tar.xz $name-$version +rm -rf $name-$version # Get specfile cp $path_to_spec $name.spec 2>/dev/null || : From e9610ff9339b23da40fc5a59e9b350e31d5003ae Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 27 2024 03:16:36 +0000 Subject: [PATCH 44/220] s --- diff --git a/rpms/cosmic-bg/cosmic-bg.spec b/rpms/cosmic-bg/cosmic-bg.spec index 2af8b72..3502ddc 100644 --- a/rpms/cosmic-bg/cosmic-bg.spec +++ b/rpms/cosmic-bg/cosmic-bg.spec @@ -38,13 +38,16 @@ Requires: cosmic-session %cargo_prep -v vendor %build +cat .cargo/config +cat .vendor/config.toml + +cat .vendor/config.toml >> .cargo/config %cargo_build %{cargo_license_summary} %{cargo_license} > LICENSE.dependencies %{cargo_vendor_manifest} %install -# %%cargo_install just rootdir=%{buildroot} prefix=%{_prefix} install %if %{with check} From c97a7ff0283d392aa02ef2c5471676faf0537cfb Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 27 2024 03:23:30 +0000 Subject: [PATCH 45/220] s --- diff --git a/rpms/cosmic-bg/cosmic-bg.spec b/rpms/cosmic-bg/cosmic-bg.spec index 3502ddc..233ebc0 100644 --- a/rpms/cosmic-bg/cosmic-bg.spec +++ b/rpms/cosmic-bg/cosmic-bg.spec @@ -35,7 +35,7 @@ Requires: cosmic-session %prep %autosetup -n cosmic-bg-%{ver} -p1 -a1 -%cargo_prep -v vendor +%cargo_prep -N %build cat .cargo/config From 491231d597c93b1e4e4338dcb58a61c521d78b0f Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 27 2024 03:40:03 +0000 Subject: [PATCH 46/220] s --- diff --git a/rpms/cosmic-bg/cosmic-bg.spec b/rpms/cosmic-bg/cosmic-bg.spec index 233ebc0..6656864 100644 --- a/rpms/cosmic-bg/cosmic-bg.spec +++ b/rpms/cosmic-bg/cosmic-bg.spec @@ -38,13 +38,13 @@ Requires: cosmic-session %cargo_prep -N %build -cat .cargo/config -cat .vendor/config.toml - cat .vendor/config.toml >> .cargo/config %cargo_build +echo "Cargo license summary" %{cargo_license_summary} +echo "Cargo license" %{cargo_license} > LICENSE.dependencies +echo "Cargo vendor manifest" %{cargo_vendor_manifest} %install From bb03305f5b167227f1dddc56da5275ef152814cc Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 27 2024 03:50:39 +0000 Subject: [PATCH 47/220] s --- diff --git a/rpms/cosmic-bg/cosmic-bg.spec b/rpms/cosmic-bg/cosmic-bg.spec index 6656864..98489d8 100644 --- a/rpms/cosmic-bg/cosmic-bg.spec +++ b/rpms/cosmic-bg/cosmic-bg.spec @@ -38,7 +38,10 @@ Requires: cosmic-session %cargo_prep -N %build +cat .cargo/config +echo "\n" cat .vendor/config.toml >> .cargo/config +cat .cargo/config %cargo_build echo "Cargo license summary" %{cargo_license_summary} From 418028a6c9552e9ad20bfe951bfcc64623c61b62 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 27 2024 04:07:57 +0000 Subject: [PATCH 48/220] s --- diff --git a/rpms/cosmic-bg/cosmic-bg.spec b/rpms/cosmic-bg/cosmic-bg.spec index 98489d8..b1b493e 100644 --- a/rpms/cosmic-bg/cosmic-bg.spec +++ b/rpms/cosmic-bg/cosmic-bg.spec @@ -1,5 +1,6 @@ # Generated by rust2rpm 26 -%bcond_without check +# %%bcond_without check +%bcond_with check %global ver ### %global commit ### @@ -43,11 +44,8 @@ echo "\n" cat .vendor/config.toml >> .cargo/config cat .cargo/config %cargo_build -echo "Cargo license summary" %{cargo_license_summary} -echo "Cargo license" %{cargo_license} > LICENSE.dependencies -echo "Cargo vendor manifest" %{cargo_vendor_manifest} %install From 1c6b2044ff4bececfab08f2d6c2d3f8515cf519c Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 27 2024 04:21:16 +0000 Subject: [PATCH 49/220] s --- diff --git a/rpms/cosmic-bg/cosmic-bg.spec b/rpms/cosmic-bg/cosmic-bg.spec index b1b493e..18ba1e0 100644 --- a/rpms/cosmic-bg/cosmic-bg.spec +++ b/rpms/cosmic-bg/cosmic-bg.spec @@ -1,6 +1,5 @@ # Generated by rust2rpm 26 -# %%bcond_without check -%bcond_with check +%bcond_without check %global ver ### %global commit ### @@ -51,11 +50,6 @@ cat .cargo/config %install just rootdir=%{buildroot} prefix=%{_prefix} install -%if %{with check} -%check -%cargo_test -%endif - %files %license LICENSE.md %license LICENSE.dependencies From 25c226f52b7d9c77ac54216d39ddbac1e452193a Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 27 2024 04:40:28 +0000 Subject: [PATCH 50/220] s --- diff --git a/rpms/cosmic-bg/cosmic-bg.spec b/rpms/cosmic-bg/cosmic-bg.spec index 18ba1e0..425450b 100644 --- a/rpms/cosmic-bg/cosmic-bg.spec +++ b/rpms/cosmic-bg/cosmic-bg.spec @@ -50,11 +50,13 @@ cat .cargo/config %install just rootdir=%{buildroot} prefix=%{_prefix} install +%if %{with check} +%check +%cargo_test +%endif + %files -%license LICENSE.md -%license LICENSE.dependencies -%license cargo-vendor.txt -%doc README.md + %{_bindir}/cosmic-bg %{_datadir}/applications/com.system76.CosmicBackground.desktop %{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicBackground.svg From 96cd70eba9e37f2ec00fe9b39b0f01c83201c54b Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 27 2024 04:56:34 +0000 Subject: [PATCH 51/220] s --- diff --git a/rpms/cosmic-bg/cosmic-bg.spec b/rpms/cosmic-bg/cosmic-bg.spec index 425450b..42767ef 100644 --- a/rpms/cosmic-bg/cosmic-bg.spec +++ b/rpms/cosmic-bg/cosmic-bg.spec @@ -56,7 +56,10 @@ just rootdir=%{buildroot} prefix=%{_prefix} install %endif %files - +%license LICENSE.md +%license LICENSE.dependencies +# %%license cargo-vendor.txt +%doc README.md %{_bindir}/cosmic-bg %{_datadir}/applications/com.system76.CosmicBackground.desktop %{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicBackground.svg From 819aac7650db19db6db66e186a055a3eb7155265 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 27 2024 05:43:51 +0000 Subject: [PATCH 52/220] cosmic-applets --- diff --git a/cosmic-applets.spec b/cosmic-applets.spec deleted file mode 100644 index 33f92bb..0000000 --- a/cosmic-applets.spec +++ /dev/null @@ -1,63 +0,0 @@ -# Generated by rust2rpm 26 -%bcond_without check - -Name: cosmic-applets -Version: 0.1.0 -Release: %autorelease -Summary: # FIXME - -SourceLicense: GPL-3.0-or-later -# FIXME: paste output of %%cargo_license_summary here -License: GPL-3.0 -# LICENSE.dependencies contains a full license breakdown - -URL: # FIXME -Source: # FIXME -Source: cosmic-applets-0.1.0-vendor.tar.xz - -BuildRequires: cargo-rpm-macros >= 25 - -%global _description %{expand: -%{summary}.} - -%description %{_description} - -%prep -%autosetup -n cosmic-applets-%{version} -p1 -a1 -%cargo_prep -v vendor - -%build -%cargo_build -%{cargo_license_summary} -%{cargo_license} > LICENSE.dependencies -%{cargo_vendor_manifest} - -%install -%cargo_install - -%if %{with check} -%check -%cargo_test -%endif - -%files -%license LICENSE -%license LICENSE.dependencies -%license cargo-vendor.txt -%{_bindir}/cosmic-app-list -%{_bindir}/cosmic-applet-audio -%{_bindir}/cosmic-applet-battery -%{_bindir}/cosmic-applet-bluetooth -%{_bindir}/cosmic-applet-minimize -%{_bindir}/cosmic-applet-network -%{_bindir}/cosmic-applet-notifications -%{_bindir}/cosmic-applet-power -%{_bindir}/cosmic-applet-status-area -%{_bindir}/cosmic-applet-tiling -%{_bindir}/cosmic-applet-time -%{_bindir}/cosmic-applet-workspaces -%{_bindir}/cosmic-applets -%{_bindir}/cosmic-panel-button - -%changelog -%autochangelog diff --git a/metadata/all_deps.txt b/metadata/all_deps.txt index 1216ae6..b682241 100644 --- a/metadata/all_deps.txt +++ b/metadata/all_deps.txt @@ -33,11 +33,28 @@ Requires: cage Requires: mozilla-fira-mono-fonts Requires: mozilla-fira-sans-fonts +cosmic-applets + +Build Requirements: +rustc +lld +cargo +dbus-devel +wayland-devel +libinput-devel +libpulse-devel +libudev-devel +mesa-libEGL-devel +libxkbcommon-devel +just + +Requirements: +cosmic-icons +cosmic-panel cosmic-bg Build Requirements: - rustc lld cargo @@ -46,5 +63,4 @@ libxkbcommon-devel just Requirements: - cosmic-session \ No newline at end of file diff --git a/rpms/cosmic-app-library/cosmic-app-library.spec b/rpms/cosmic-app-library/cosmic-app-library.spec new file mode 100644 index 0000000..d2210ad --- /dev/null +++ b/rpms/cosmic-app-library/cosmic-app-library.spec @@ -0,0 +1,57 @@ +# Generated by rust2rpm 26 +%bcond_without check + +# prevent library files from being installed +%global cargo_install_lib 0 + +%global crate cosmic-app-library + +Name: cosmic-app-library +Version: 0.1.0 +Release: %autorelease +Summary: # FIXME + +SourceLicense: None +# FIXME: paste output of %%cargo_license_summary here +License: # FIXME +# LICENSE.dependencies contains a full license breakdown +# FIXME: No license information in crate metadata. + +URL: # FIXME +Source: # FIXME +Source: cosmic-app-library-0.1.0-vendor.tar.xz + +BuildRequires: cargo-rpm-macros >= 26 + +%global _description %{expand: +%{summary}.} + +%description %{_description} + +%prep +%autosetup -n %{crate}-%{version} -p1 -a1 +%cargo_prep -v vendor + +%build +%cargo_build +%{cargo_license_summary} +%{cargo_license} > LICENSE.dependencies +%{cargo_vendor_manifest} + +%install +%cargo_install + +%if %{with check} +%check +%cargo_test +%endif + +%files +%license LICENSE.md +%license LICENSE.dependencies +%license cargo-vendor.txt +%doc README.md +%{_bindir}/cosmic-app-library + +%changelog +%autochangelog diff --git a/rpms/cosmic-applets/better_compile.patch b/rpms/cosmic-applets/better_compile.patch new file mode 100644 index 0000000..f1fcdf7 --- /dev/null +++ b/rpms/cosmic-applets/better_compile.patch @@ -0,0 +1,11 @@ +--- ./Cargo.toml 2024-03-15 12:13:48.916128075 -0500 ++++ ./Cargo.toml.new 2024-03-15 12:14:58.707131403 -0500 +@@ -50,7 +50,7 @@ + tracing-log = "0.2.0" + + [profile.release] +-lto = "fat" ++lto = "thin" + + [workspace.metadata.cargo-machete] + ignored = ["libcosmic"] diff --git a/rpms/cosmic-applets/cosmic-applets.spec b/rpms/cosmic-applets/cosmic-applets.spec new file mode 100644 index 0000000..0d03754 --- /dev/null +++ b/rpms/cosmic-applets/cosmic-applets.spec @@ -0,0 +1,159 @@ +# Generated by rust2rpm 26 +%bcond_without check + +%global ver ### +%global commit ### +%global date ### + +Name: cosmic-applets +Version: %{ver}~%{date} +Release: %autorelease +Summary: Applets for the COSMIC Desktop Environment. + +SourceLicense: GPL-3.0-or-later +License: GPL-3.0 +# LICENSE.dependencies contains a full license breakdown + +URL: https://github.com/pop-os/cosmic-applets +Source: cosmic-applets-%{ver}.tar.xz +Source: cosmic-applets-%{ver}-vendor.tar.xz + +Patch: better_compile.patch +Patch: symlink.patch + +BuildRequires: cargo-rpm-macros >= 25 +BuildRequires: rustc +BuildRequires: lld +BuildRequires: cargo +BuildRequires: dbus-devel +BuildRequires: wayland-devel +BuildRequires: libinput-devel +BuildRequires: libpulse-devel +BuildRequires: libudev-devel +BuildRequires: mesa-libEGL-devel +BuildRequires: libxkbcommon-devel +BuildRequires: just + +Requires: cosmic-icons +Requires: cosmic-panel + +%global _description %{expand: +%{summary}.} + +%description %{_description} + +%prep +%autosetup -n cosmic-applets-%{ver} -p1 -a1 +%cargo_prep -N + +%build +%cargo_build +%{cargo_license_summary} +%{cargo_license} > LICENSE.dependencies +%{cargo_vendor_manifest} + +%install +just rootdir=%{buildroot} prefix=%{_prefix} install + +%if %{with check} +%check +%cargo_test +%endif + +%files +%license LICENSE +%license LICENSE.dependencies +# %%license cargo-vendor.txt +%{_bindir}/cosmic-applets +%{_bindir}/cosmic-panel-button +%{_bindir}/cosmic-app-list +%{_bindir}/cosmic-applet-audio +%{_bindir}/cosmic-applet-battery +%{_bindir}/cosmic-applet-bluetooth +%{_bindir}/cosmic-applet-minimize +%{_bindir}/cosmic-applet-network +%{_bindir}/cosmic-applet-notifications +%{_bindir}/cosmic-applet-power +%{_bindir}/cosmic-applet-status-area +%{_bindir}/cosmic-applet-tiling +%{_bindir}/cosmic-applet-time +%{_bindir}/cosmic-applet-workspaces +%{_datadir}/applications/com.system76.CosmicAppList.desktop +%{_datadir}/applications/com.system76.CosmicAppletAudio.desktop +%{_datadir}/applications/com.system76.CosmicAppletBattery.desktop +%{_datadir}/applications/com.system76.CosmicAppletBluetooth.desktop +%{_datadir}/applications/com.system76.CosmicAppletMinimize.desktop +%{_datadir}/applications/com.system76.CosmicAppletNetwork.desktop +%{_datadir}/applications/com.system76.CosmicAppletNotifications.desktop +%{_datadir}/applications/com.system76.CosmicAppletPower.desktop +%{_datadir}/applications/com.system76.CosmicAppletStatusArea.desktop +%{_datadir}/applications/com.system76.CosmicAppletTiling.desktop +%{_datadir}/applications/com.system76.CosmicAppletTime.desktop +%{_datadir}/applications/com.system76.CosmicAppletWorkspaces.desktop +%{_datadir}/applications/com.system76.CosmicPanelAppButton.desktop +%{_datadir}/applications/com.system76.CosmicPanelWorkspacesButton.desktop +%{_datadir}/cosmic/com.system76.CosmicAppList/v1/favorites +%{_datadir}/cosmic/com.system76.CosmicAppList/v1/filter_top_levels +%{_datadir}/icons/hicolor/scalable/app/com.system76.CosmicAppletStatusArea.svg +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppList.svg +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletAudio.svg +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletBattery.svg +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletBluetooth.svg +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletMinimize.svg +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletNetwork.svg +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletNotifications.svg +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletPower.svg +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletTiling.Off.svg +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletTiling.On.svg +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletTime.svg +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletWorkspaces.svg +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicPanelAppButton.svg +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicPanelWorkspacesButton.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-display-brightness-high-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-display-brightness-low-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-display-brightness-medium-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-display-brightness-off-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-0-charging-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-0-limited-charging-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-0-limited-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-0-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-10-charging-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-10-limited-charging-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-10-limited-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-10-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-100-charging-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-100-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-20-charging-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-20-limited-charging-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-20-limited-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-20-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-35-charging-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-35-limited-charging-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-35-limited-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-35-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-5-charging-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-5-limited-charging-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-5-limited-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-5-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-50-charging-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-50-limited-charging-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-50-limited-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-50-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-65-charging-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-65-limited-charging-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-65-limited-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-65-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-80-charging-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-80-limited-charging-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-80-limited-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-80-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-90-charging-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-90-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-bluetooth-active-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-bluetooth-disabled-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-notification-disabled-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-notification-new-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-notification-symbolic.svg + +%changelog +%autochangelog diff --git a/rpms/cosmic-applets/symlink.patch b/rpms/cosmic-applets/symlink.patch new file mode 100644 index 0000000..5b04aa9 --- /dev/null +++ b/rpms/cosmic-applets/symlink.patch @@ -0,0 +1,11 @@ +--- ./justfile 2024-03-15 13:59:51.256329082 -0500 ++++ ./justfile.new 2024-03-15 15:37:57.363809570 -0500 +@@ -29,7 +29,7 @@ + build-vendored *args: vendor-extract (build-release '--frozen --offline' args) + + _link_applet name: +- ln -sf {{cosmic-applets-bin}} {{bindir}}/{{name}} ++ ln -srf {{cosmic-applets-bin}} {{bindir}}/{{name}} + + _install_icons name: + find {{name}}/'data'/'icons' -type f -exec echo {} \; | rev | cut -d'/' -f-3 | rev | xargs -d '\n' -I {} install -Dm0644 {{name}}/'data'/'icons'/{} {{iconsdir}}/{} diff --git a/rpms/cosmic-bg/changelog b/rpms/cosmic-bg/changelog deleted file mode 100644 index c897992..0000000 --- a/rpms/cosmic-bg/changelog +++ /dev/null @@ -1,3 +0,0 @@ -* Tue Mar 26 2024 Ryan Brue - 0.1.0 - -- Created \ No newline at end of file From 9b8a3501b5fcb850ef0fd510be08bfb6e3593e14 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 27 2024 06:05:04 +0000 Subject: [PATCH 53/220] s --- diff --git a/rpms/cosmic-app-library/cosmic-app-library.spec b/rpms/cosmic-app-library/cosmic-app-library.spec index d2210ad..d73ffcd 100644 --- a/rpms/cosmic-app-library/cosmic-app-library.spec +++ b/rpms/cosmic-app-library/cosmic-app-library.spec @@ -4,22 +4,24 @@ # prevent library files from being installed %global cargo_install_lib 0 +%global ver ### +%global commit ### +%global date ### + %global crate cosmic-app-library Name: cosmic-app-library -Version: 0.1.0 +Version: %{ver}~%{date} Release: %autorelease -Summary: # FIXME +Summary: App Library program for the COSMIC Desktop Environment. -SourceLicense: None -# FIXME: paste output of %%cargo_license_summary here -License: # FIXME +SourceLicense: GPL-3.0 +License: GPL-3.0 # LICENSE.dependencies contains a full license breakdown -# FIXME: No license information in crate metadata. -URL: # FIXME -Source: # FIXME -Source: cosmic-app-library-0.1.0-vendor.tar.xz +URL: https://github.com/pop-os/cosmic-applibrary +Source: cosmic-app-library-%{ver}.tar.xz +Source: cosmic-app-library-%{ver}-vendor.tar.xz BuildRequires: cargo-rpm-macros >= 26 @@ -30,7 +32,8 @@ BuildRequires: cargo-rpm-macros >= 26 %prep %autosetup -n %{crate}-%{version} -p1 -a1 -%cargo_prep -v vendor +%cargo_prep -N +cat .vendor/config.toml >> .cargo/config %build %cargo_build @@ -49,9 +52,12 @@ BuildRequires: cargo-rpm-macros >= 26 %files %license LICENSE.md %license LICENSE.dependencies -%license cargo-vendor.txt +# %%license cargo-vendor.txt %doc README.md %{_bindir}/cosmic-app-library +%{_datadir}/applications/com.system76.CosmicAppLibrary.desktop +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppLibrary.svg +%{_metainfodir}/com.system76.CosmicAppLibrary.metainfo.xml %changelog %autochangelog diff --git a/rpms/cosmic-applets/cosmic-applets.spec b/rpms/cosmic-applets/cosmic-applets.spec index 0d03754..2208a33 100644 --- a/rpms/cosmic-applets/cosmic-applets.spec +++ b/rpms/cosmic-applets/cosmic-applets.spec @@ -28,7 +28,6 @@ BuildRequires: cargo BuildRequires: dbus-devel BuildRequires: wayland-devel BuildRequires: libinput-devel -BuildRequires: libpulse-devel BuildRequires: libudev-devel BuildRequires: mesa-libEGL-devel BuildRequires: libxkbcommon-devel @@ -45,6 +44,7 @@ Requires: cosmic-panel %prep %autosetup -n cosmic-applets-%{ver} -p1 -a1 %cargo_prep -N +cat .vendor/config.toml >> .cargo/config %build %cargo_build diff --git a/rpms/cosmic-bg/cosmic-bg.spec b/rpms/cosmic-bg/cosmic-bg.spec index 42767ef..ac4cbb8 100644 --- a/rpms/cosmic-bg/cosmic-bg.spec +++ b/rpms/cosmic-bg/cosmic-bg.spec @@ -36,12 +36,9 @@ Requires: cosmic-session %prep %autosetup -n cosmic-bg-%{ver} -p1 -a1 %cargo_prep -N +cat .vendor/config.toml >> .cargo/config %build -cat .cargo/config -echo "\n" -cat .vendor/config.toml >> .cargo/config -cat .cargo/config %cargo_build %{cargo_license_summary} %{cargo_license} > LICENSE.dependencies From ac5399c6c548b1f6b33410476854d9db1f2094cf Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 27 2024 06:44:01 +0000 Subject: [PATCH 54/220] fix --- diff --git a/rpms/cosmic-applets/cosmic-applets.spec b/rpms/cosmic-applets/cosmic-applets.spec index 2208a33..964e69f 100644 --- a/rpms/cosmic-applets/cosmic-applets.spec +++ b/rpms/cosmic-applets/cosmic-applets.spec @@ -29,6 +29,7 @@ BuildRequires: dbus-devel BuildRequires: wayland-devel BuildRequires: libinput-devel BuildRequires: libudev-devel +BuildRequires: pulseaudio-libs-devel BuildRequires: mesa-libEGL-devel BuildRequires: libxkbcommon-devel BuildRequires: just From a07a750a582f2ea22e0a25c1dc154d25016028ba Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 27 2024 15:50:16 +0000 Subject: [PATCH 55/220] s --- diff --git a/cosmic-applets/better_compile.patch b/cosmic-applets/better_compile.patch deleted file mode 100644 index f1fcdf7..0000000 --- a/cosmic-applets/better_compile.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./Cargo.toml 2024-03-15 12:13:48.916128075 -0500 -+++ ./Cargo.toml.new 2024-03-15 12:14:58.707131403 -0500 -@@ -50,7 +50,7 @@ - tracing-log = "0.2.0" - - [profile.release] --lto = "fat" -+lto = "thin" - - [workspace.metadata.cargo-machete] - ignored = ["libcosmic"] diff --git a/cosmic-applets/cosmic-applets.spec b/cosmic-applets/cosmic-applets.spec deleted file mode 100644 index ba6cb69..0000000 --- a/cosmic-applets/cosmic-applets.spec +++ /dev/null @@ -1,180 +0,0 @@ -%define debug_package %{nil} -# Generated by rust2rpm 25 - -# prevent library files from being installed - -%global crate cosmic-applets -%global repo https://github.com/pop-os/cosmic-applets - -Name: cosmic-applets -Version: # TO BE REPLACED AUTOMATICALLY - -Release: %autorelease -Summary: WIP applets for cosmic-panel - -License: GPL-3.0 - -URL: https://github.com/pop-os/cosmic-applets - -Source: %{crate}.tar.gz -Source: vendor.tar - -Patch1: better_compile.patch -Patch2: symlink.patch - - -# For now, we require all deps for all of cosmic-epoch -BuildRequires: make -BuildRequires: which -BuildRequires: git-core -BuildRequires: just -BuildRequires: rustc -BuildRequires: lld -BuildRequires: cargo -BuildRequires: glib2-devel -BuildRequires: gtk3-devel -BuildRequires: dbus-devel -BuildRequires: wayland-devel -BuildRequires: clang-devel -BuildRequires: libxkbcommon-devel -BuildRequires: mesa-libgbm-devel -BuildRequires: rust-rav1e+nasm-rs-devel -BuildRequires: libappstream-glib -BuildRequires: pipewire-devel -BuildRequires: libglvnd-devel -BuildRequires: libseat-devel -BuildRequires: libinput-devel -BuildRequires: pam-devel -BuildRequires: flatpak-devel - - - -# For now, we require all deps for all of cosmic-epoch -Requires: libseat -Requires: pop-icon-theme -Requires: greetd -Requires: greetd-selinux -Requires: cage -Requires: mozilla-fira-mono-fonts -Requires: mozilla-fira-sans-fonts - - -%global _description %{expand: -%{summary}.} - -%description %{_description} - -%prep - -%autosetup -n %{crate} -p1 -mv %{_sourcedir}/vendor.tar vendor.tar -ls -a -mkdir -p .cargo -cp .vendor/config.toml .cargo/config.toml - - -%build - -just build-vendored - - -%install -just rootdir=%{buildroot} prefix=%{_prefix} install - -%files - -%{_bindir}/cosmic-applets -%{_bindir}/cosmic-panel-button -%{_bindir}/cosmic-app-list -%{_bindir}/cosmic-applet-audio -%{_bindir}/cosmic-applet-battery -%{_bindir}/cosmic-applet-bluetooth -%{_bindir}/cosmic-applet-minimize -%{_bindir}/cosmic-applet-network -%{_bindir}/cosmic-applet-notifications -%{_bindir}/cosmic-applet-power -%{_bindir}/cosmic-applet-status-area -%{_bindir}/cosmic-applet-tiling -%{_bindir}/cosmic-applet-time -%{_bindir}/cosmic-applet-workspaces -%{_datadir}/applications/com.system76.CosmicAppList.desktop -%{_datadir}/applications/com.system76.CosmicAppletAudio.desktop -%{_datadir}/applications/com.system76.CosmicAppletBattery.desktop -%{_datadir}/applications/com.system76.CosmicAppletBluetooth.desktop -%{_datadir}/applications/com.system76.CosmicAppletMinimize.desktop -%{_datadir}/applications/com.system76.CosmicAppletNetwork.desktop -%{_datadir}/applications/com.system76.CosmicAppletNotifications.desktop -%{_datadir}/applications/com.system76.CosmicAppletPower.desktop -%{_datadir}/applications/com.system76.CosmicAppletStatusArea.desktop -%{_datadir}/applications/com.system76.CosmicAppletTiling.desktop -%{_datadir}/applications/com.system76.CosmicAppletTime.desktop -%{_datadir}/applications/com.system76.CosmicAppletWorkspaces.desktop -%{_datadir}/applications/com.system76.CosmicPanelAppButton.desktop -%{_datadir}/applications/com.system76.CosmicPanelWorkspacesButton.desktop -%{_datadir}/cosmic/com.system76.CosmicAppList/v1/favorites -%{_datadir}/cosmic/com.system76.CosmicAppList/v1/filter_top_levels -%{_datadir}/icons/hicolor/scalable/app/com.system76.CosmicAppletStatusArea.svg -%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppList.svg -%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletAudio.svg -%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletBattery.svg -%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletBluetooth.svg -%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletMinimize.svg -%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletNetwork.svg -%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletNotifications.svg -%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletPower.svg -%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletTiling.Off.svg -%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletTiling.On.svg -%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletTime.svg -%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletWorkspaces.svg -%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicPanelAppButton.svg -%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicPanelWorkspacesButton.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-display-brightness-high-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-display-brightness-low-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-display-brightness-medium-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-display-brightness-off-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-0-charging-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-0-limited-charging-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-0-limited-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-0-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-10-charging-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-10-limited-charging-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-10-limited-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-10-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-100-charging-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-100-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-20-charging-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-20-limited-charging-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-20-limited-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-20-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-35-charging-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-35-limited-charging-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-35-limited-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-35-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-5-charging-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-5-limited-charging-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-5-limited-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-5-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-50-charging-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-50-limited-charging-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-50-limited-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-50-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-65-charging-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-65-limited-charging-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-65-limited-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-65-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-80-charging-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-80-limited-charging-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-80-limited-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-80-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-90-charging-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-90-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-bluetooth-active-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-bluetooth-disabled-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-notification-disabled-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-notification-new-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-notification-symbolic.svg - - -%changelog -%autochangelog - \ No newline at end of file diff --git a/cosmic-applets/srpm.sh b/cosmic-applets/srpm.sh deleted file mode 100644 index 9ccac3d..0000000 --- a/cosmic-applets/srpm.sh +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/bash -x - -# Variables. LOOK CLOSELY AND MAKE SURE THESE ARE CORRECT - -name='cosmic-applets' -version='0.1.0' - -path_to_spec='cosmic-applets/*' -pop_repo='cosmic-applets' - -# Commit to target. Use "latest" if you want master -commit="latest" - -# Don't edit anything past this line -# ===================================================== # - -LATEST="latest" - -cd ../.. -# We should be in the base directory now - -git clone --recurse-submodules https://github.com/pop-os/$pop_repo - -cd $pop_repo - -if [[ "$commit" == "$LATEST" ]] -then - commit=$(git rev-parse HEAD) -fi - -echo $commit -short_commit=${commit:0:6} - -git reset --hard $commit - -mkdir .vendor - -cargo vendor > .vendor/config.toml - -tar -pcf vendor.tar vendor && mv vendor.tar ../vendor.tar - -rm -rf vendor && cd .. - -# Back into cosmic-packaging - -ls - -if [ "$pop_repo" != "$name" ]; then - mv $pop_repo $name -else - echo "names are equal. continuing..." -fi - -tar -czf $name.tar.gz $name - -rm -rf $name - -cp cosmic-packaging/$path_to_spec . - -rm -rf cosmic-packaging - -current_date=$(date +'%Y%m%d.%H') - -sed -i "/^Version: / s/.*/Version: $version~$current_date.$short_commit/" $name.spec diff --git a/cosmic-applets/symlink.patch b/cosmic-applets/symlink.patch deleted file mode 100644 index 5b04aa9..0000000 --- a/cosmic-applets/symlink.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./justfile 2024-03-15 13:59:51.256329082 -0500 -+++ ./justfile.new 2024-03-15 15:37:57.363809570 -0500 -@@ -29,7 +29,7 @@ - build-vendored *args: vendor-extract (build-release '--frozen --offline' args) - - _link_applet name: -- ln -sf {{cosmic-applets-bin}} {{bindir}}/{{name}} -+ ln -srf {{cosmic-applets-bin}} {{bindir}}/{{name}} - - _install_icons name: - find {{name}}/'data'/'icons' -type f -exec echo {} \; | rev | cut -d'/' -f-3 | rev | xargs -d '\n' -I {} install -Dm0644 {{name}}/'data'/'icons'/{} {{iconsdir}}/{} diff --git a/cosmic-bg/cosmic-bg.spec b/cosmic-bg/cosmic-bg.spec deleted file mode 100644 index 4978bc9..0000000 --- a/cosmic-bg/cosmic-bg.spec +++ /dev/null @@ -1,93 +0,0 @@ - -# Generated by rust2rpm 25 - -# prevent library files from being installed - -%global crate cosmic-bg -%global repo https://github.com/pop-os/cosmic-bg - -Name: cosmic-bg -Version: # TO BE REPLACED AUTOMATICALLY - -Release: %autorelease -Summary: COSMIC session service which applies backgrounds to displays - -License: MPL-2.0 - -URL: https://github.com/pop-os/cosmic-bg - -Source: %{crate}.tar.gz -Source: vendor.tar - - - -# For now, we require all deps for all of cosmic-epoch -BuildRequires: make -BuildRequires: which -BuildRequires: git-core -BuildRequires: just -BuildRequires: rustc -BuildRequires: lld -BuildRequires: cargo -BuildRequires: glib2-devel -BuildRequires: gtk3-devel -BuildRequires: dbus-devel -BuildRequires: wayland-devel -BuildRequires: clang-devel -BuildRequires: libxkbcommon-devel -BuildRequires: mesa-libgbm-devel -BuildRequires: rust-rav1e+nasm-rs-devel -BuildRequires: libappstream-glib -BuildRequires: pipewire-devel -BuildRequires: libglvnd-devel -BuildRequires: libseat-devel -BuildRequires: libinput-devel -BuildRequires: pam-devel -BuildRequires: flatpak-devel - - - -# For now, we require all deps for all of cosmic-epoch -Requires: libseat -Requires: pop-icon-theme -Requires: greetd -Requires: greetd-selinux -Requires: cage -Requires: mozilla-fira-mono-fonts -Requires: mozilla-fira-sans-fonts - - -%global _description %{expand: -%{summary}.} - -%description %{_description} - -%prep - -%autosetup -n %{crate} -p1 -mv %{_sourcedir}/vendor.tar vendor.tar -ls -a -mkdir -p .cargo -cp .vendor/config.toml .cargo/config.toml - - -%build -just build-vendored - -%install -just rootdir=%{buildroot} prefix=%{_prefix} install - -%files - -%{_bindir}/cosmic-bg -%{_datadir}/applications/com.system76.CosmicBackground.desktop -%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicBackground.svg -%{_datadir}/icons/hicolor/symbolic/apps/com.system76.CosmicBackground-symbolic.svg -%{_metainfodir}/com.system76.CosmicBackground.metainfo.xml - -%{_datadir}/cosmic/com.system76.CosmicBackground/* - - -%changelog -%autochangelog - \ No newline at end of file diff --git a/cosmic-bg/srpm.sh b/cosmic-bg/srpm.sh deleted file mode 100644 index 9be8314..0000000 --- a/cosmic-bg/srpm.sh +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/bash -x - -# Variables. LOOK CLOSELY AND MAKE SURE THESE ARE CORRECT - -name='cosmic-bg' -version='0.1.0' - -path_to_spec='cosmic-bg/*' -pop_repo='cosmic-bg' - -# Commit to target. Use "latest" if you want master -commit="latest" - -# Don't edit anything past this line -# ===================================================== # - -LATEST="latest" - -cd ../.. -# We should be in the base directory now - -git clone --recurse-submodules https://github.com/pop-os/$pop_repo - -cd $pop_repo - -if [[ "$commit" == "$LATEST" ]] -then - commit=$(git rev-parse HEAD) -fi - -echo $commit -short_commit=${commit:0:6} - -git reset --hard $commit - -mkdir .vendor - -cargo vendor > .vendor/config.toml - -tar -pcf vendor.tar vendor && mv vendor.tar ../vendor.tar - -rm -rf vendor && cd .. - -# Back into cosmic-packaging - -ls - -if [ "$pop_repo" != "$name" ]; then - mv $pop_repo $name -else - echo "names are equal. continuing..." -fi - -tar -czf $name.tar.gz $name - -rm -rf $name - -cp cosmic-packaging/$path_to_spec . - -rm -rf cosmic-packaging - -current_date=$(date +'%Y%m%d.%H') - -sed -i "/^Version: / s/.*/Version: $version~$current_date.$short_commit/" $name.spec From 5a6c367dd113fd6cd4db80d855ea75dfd4886865 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 27 2024 16:06:43 +0000 Subject: [PATCH 56/220] cosmic-comp and cosmic-app-library --- diff --git a/metadata/all_deps.txt b/metadata/all_deps.txt index b682241..c49accb 100644 --- a/metadata/all_deps.txt +++ b/metadata/all_deps.txt @@ -33,6 +33,19 @@ Requires: cage Requires: mozilla-fira-mono-fonts Requires: mozilla-fira-sans-fonts +cosmic-app-library +BR: +rustc +lld +cargo +wayland-devel +libxkbcommon-devel +just + +R: + + + cosmic-applets Build Requirements: diff --git a/rpms/cosmic-app-library/cosmic-app-library.spec b/rpms/cosmic-app-library/cosmic-app-library.spec index d73ffcd..14fbe7d 100644 --- a/rpms/cosmic-app-library/cosmic-app-library.spec +++ b/rpms/cosmic-app-library/cosmic-app-library.spec @@ -24,6 +24,12 @@ Source: cosmic-app-library-%{ver}.tar.xz Source: cosmic-app-library-%{ver}-vendor.tar.xz BuildRequires: cargo-rpm-macros >= 26 +BuildRequires: rustc +BuildRequires: lld +BuildRequires: cargo +BuildRequires: wayland-devel +BuildRequires: libxkbcommon-devel +BuildRequires: just %global _description %{expand: %{summary}.} @@ -42,7 +48,7 @@ cat .vendor/config.toml >> .cargo/config %{cargo_vendor_manifest} %install -%cargo_install +just rootdir=%{buildroot} prefix=%{_prefix} install %if %{with check} %check diff --git a/rpms/cosmic-comp/cosmic-comp.spec b/rpms/cosmic-comp/cosmic-comp.spec new file mode 100644 index 0000000..0b254e4 --- /dev/null +++ b/rpms/cosmic-comp/cosmic-comp.spec @@ -0,0 +1,56 @@ +# Generated by rust2rpm 26 +%bcond_without check + +%global ver ### +%global commit ### +%global date ### + +Name: cosmic-comp +Version: %{ver}~%{date} +Release: %autorelease +Summary: Compositor for the COSMIC Desktop Environment. Can also be used as a standalone compositor. + +SourceLicense: GPL-3.0-only +License: GPL-3.0 +# LICENSE.dependencies contains a full license breakdown + +URL: https://github.com/pop-os/cosmic-comp +Source: cosmic-comp-%{ver}.tar.xz +Source: cosmic-comp-%{ver}-vendor.tar.xz + +BuildRequires: cargo-rpm-macros >= 25 + +%global _description %{expand: +%{summary}.} + +%description %{_description} + +%prep +%autosetup -n cosmic-comp-%{ver} -p1 -a1 +%cargo_prep -N +cat .vendor/config.toml >> .cargo/config + +%build +%cargo_build +%{cargo_license_summary} +%{cargo_license} > LICENSE.dependencies +%{cargo_vendor_manifest} + +%install +make install DESTDIR=%{buildroot} prefix=%{_prefix} +install -Dm0644 config.ron %{buildroot}/%{_sysconfdir}/cosmic-comp/config.ron + +%if %{with check} +%check +%cargo_test +%endif + +%files +%license LICENSE +%license LICENSE.dependencies +%license cargo-vendor.txt +%{_bindir}/cosmic-comp +%{_sysconfdir}/cosmic-comp/config.ron + +%changelog +%autochangelog From cba638e0ebba19ad8f6e33b412f192b7cd833436 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 27 2024 16:13:01 +0000 Subject: [PATCH 57/220] maybe --- diff --git a/metadata/all_deps.txt b/metadata/all_deps.txt index c49accb..538ad5e 100644 --- a/metadata/all_deps.txt +++ b/metadata/all_deps.txt @@ -44,7 +44,7 @@ just R: - +?? cosmic-applets @@ -76,4 +76,18 @@ libxkbcommon-devel just Requirements: -cosmic-session \ No newline at end of file +cosmic-session + +cosmic-comp + +Build Requirements: +rustc +lld +cargo +wayland-devel +libxkbcommon-devel +libglvnd-devel +libseat-devel +libinput-devel +mesa-libgbm-devel +make \ No newline at end of file diff --git a/rpms/cosmic-comp/cosmic-comp.spec b/rpms/cosmic-comp/cosmic-comp.spec index 0b254e4..eb19cfa 100644 --- a/rpms/cosmic-comp/cosmic-comp.spec +++ b/rpms/cosmic-comp/cosmic-comp.spec @@ -19,6 +19,20 @@ Source: cosmic-comp-%{ver}.tar.xz Source: cosmic-comp-%{ver}-vendor.tar.xz BuildRequires: cargo-rpm-macros >= 25 +BuildRequires: rustc +BuildRequires: lld +BuildRequires: cargo +BuildRequires: wayland-devel +BuildRequires: libxkbcommon-devel +BuildRequires: libglvnd-devel +BuildRequires: libseat-devel +BuildRequires: libinput-devel +BuildRequires: mesa-libgbm-devel +BuildRequires: make + +Requires: libseat + +Recommends: cosmic-session %global _description %{expand: %{summary}.} From 05464aa0a795fac98b827c2d56e45e6f39c189f9 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 27 2024 16:19:55 +0000 Subject: [PATCH 58/220] cosmic-desktop --- diff --git a/cosmic-epoch/cosmic-epoch.spec b/cosmic-epoch/cosmic-epoch.spec index d64cb3d..25fcb4a 100644 --- a/cosmic-epoch/cosmic-epoch.spec +++ b/cosmic-epoch/cosmic-epoch.spec @@ -1,4 +1,7 @@ -# COSMIC Desktop meta package +%global ver ### +%global commit ### +%global date ### + Name: cosmic-epoch Version: 0.1.0~20240226 diff --git a/rpms/cosmic-desktop/cosmic-desktop.spec b/rpms/cosmic-desktop/cosmic-desktop.spec new file mode 100644 index 0000000..761dd5d --- /dev/null +++ b/rpms/cosmic-desktop/cosmic-desktop.spec @@ -0,0 +1,53 @@ +%global ver ### +%global commit ### +%global date ### + +Name: cosmic-desktop +Version: %{ver}~%{date} +Release: %autorelease +Summary: The next generation COSMIC Desktop Environment + +License: GPL-3.0 + +URL: https://github.com/pop-os/cosmic-epoch + +Requires: cosmic-app-library +Requires: cosmic-applets +Requires: cosmic-bg +Requires: cosmic-comp +Requires: cosmic-icons +Requires: cosmic-launcher +Requires: cosmic-notifications +Requires: cosmic-osd +Requires: cosmic-panel +Requires: cosmic-randr +Requires: cosmic-screenshot +Requires: cosmic-session +Requires: cosmic-settings +Requires: cosmic-settings-daemon +Requires: cosmic-workspaces +Requires: pop-launcher +Requires: xdg-desktop-portal-cosmic + +Recommends: cosmic-edit +Recommends: cosmic-files +Recommends: cosmic-greeter +Recommends: cosmic-store +Recommends: cosmic-term +Recommends: system76-power + +%global _description %{expand: +%{summary}.} + +%description %{_description} + +%prep + +%build + +%install + +%files + +%changelog +%autochangelog From e5f6d3a747450d79d5a7e009b4f51e2395c40e34 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 27 2024 17:22:42 +0000 Subject: [PATCH 59/220] fix cosmic-comp --- diff --git a/rpms/cosmic-comp/cosmic-comp.spec b/rpms/cosmic-comp/cosmic-comp.spec index eb19cfa..952444d 100644 --- a/rpms/cosmic-comp/cosmic-comp.spec +++ b/rpms/cosmic-comp/cosmic-comp.spec @@ -62,7 +62,7 @@ install -Dm0644 config.ron %{buildroot}/%{_sysconfdir}/cosmic-comp/config.ron %files %license LICENSE %license LICENSE.dependencies -%license cargo-vendor.txt +# %%license cargo-vendor.txt %{_bindir}/cosmic-comp %{_sysconfdir}/cosmic-comp/config.ron From 43876437050bf4f8815bf5ee86957a97e3118655 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 27 2024 17:39:28 +0000 Subject: [PATCH 60/220] cosmic-edit and cosmic-files --- diff --git a/cosmic-comp/cosmic-comp.spec b/cosmic-comp/cosmic-comp.spec deleted file mode 100644 index 17f0435..0000000 --- a/cosmic-comp/cosmic-comp.spec +++ /dev/null @@ -1,92 +0,0 @@ - -# Generated by rust2rpm 25 - -# prevent library files from being installed - -%global crate cosmic-comp -%global repo https://github.com/pop-os/cosmic-comp - -Name: cosmic-comp -Version: # TO BE REPLACED AUTOMATICALLY - -Release: %autorelease -Summary: Compositor for the COSMIC Desktop Environment - -License: GPL-3.0 - -URL: https://github.com/pop-os/cosmic-comp - -Source: %{crate}.tar.gz -Source: vendor.tar - - - -# For now, we require all deps for all of cosmic-epoch -BuildRequires: make -BuildRequires: which -BuildRequires: git-core -BuildRequires: just -BuildRequires: rustc -BuildRequires: lld -BuildRequires: cargo -BuildRequires: glib2-devel -BuildRequires: gtk3-devel -BuildRequires: dbus-devel -BuildRequires: wayland-devel -BuildRequires: clang-devel -BuildRequires: libxkbcommon-devel -BuildRequires: mesa-libgbm-devel -BuildRequires: rust-rav1e+nasm-rs-devel -BuildRequires: libappstream-glib -BuildRequires: pipewire-devel -BuildRequires: libglvnd-devel -BuildRequires: libseat-devel -BuildRequires: libinput-devel -BuildRequires: pam-devel -BuildRequires: flatpak-devel - - - -# For now, we require all deps for all of cosmic-epoch -Requires: libseat -Requires: pop-icon-theme -Requires: greetd -Requires: greetd-selinux -Requires: cage -Requires: mozilla-fira-mono-fonts -Requires: mozilla-fira-sans-fonts - - -%global _description %{expand: -%{summary}.} - -%description %{_description} - -%prep - -%autosetup -n %{crate} -p1 -mv %{_sourcedir}/vendor.tar vendor.tar -ls -a -mkdir -p .cargo -cp .vendor/config.toml .cargo/config.toml - - -%build -make all VENDOR=1 - -%install - -make install DESTDIR=%{buildroot} prefix=%{_prefix} -install -Dm0644 config.ron %{buildroot}/%{_sysconfdir}/cosmic-comp/config.ron - - -%files - -%{_bindir}/cosmic-comp - -%{_sysconfdir}/cosmic-comp/config.ron - - -%changelog -%autochangelog - \ No newline at end of file diff --git a/cosmic-comp/srpm.sh b/cosmic-comp/srpm.sh deleted file mode 100644 index 2705f75..0000000 --- a/cosmic-comp/srpm.sh +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/bash -x - -# Variables. LOOK CLOSELY AND MAKE SURE THESE ARE CORRECT - -name='cosmic-comp' -version='0.1.0' - -path_to_spec='cosmic-comp/*' -pop_repo='cosmic-comp' - -# Commit to target. Use "latest" if you want master -commit="latest" - -# Don't edit anything past this line -# ===================================================== # - -LATEST="latest" - -cd ../.. -# We should be in the base directory now - -git clone --recurse-submodules https://github.com/pop-os/$pop_repo - -cd $pop_repo - -if [[ "$commit" == "$LATEST" ]] -then - commit=$(git rev-parse HEAD) -fi - -echo $commit -short_commit=${commit:0:6} - -git reset --hard $commit - -mkdir .vendor - -cargo vendor > .vendor/config.toml - -tar -pcf vendor.tar vendor && mv vendor.tar ../vendor.tar - -rm -rf vendor && cd .. - -# Back into cosmic-packaging - -ls - -if [ "$pop_repo" != "$name" ]; then - mv $pop_repo $name -else - echo "names are equal. continuing..." -fi - -tar -czf $name.tar.gz $name - -rm -rf $name - -cp cosmic-packaging/$path_to_spec . - -rm -rf cosmic-packaging - -current_date=$(date +'%Y%m%d.%H') - -sed -i "/^Version: / s/.*/Version: $version~$current_date.$short_commit/" $name.spec diff --git a/metadata/all_deps.txt b/metadata/all_deps.txt index 538ad5e..21f0c71 100644 --- a/metadata/all_deps.txt +++ b/metadata/all_deps.txt @@ -90,4 +90,11 @@ libglvnd-devel libseat-devel libinput-devel mesa-libgbm-devel -make \ No newline at end of file +make + +cosmic-edit + +rustc +lld +cargo +just \ No newline at end of file diff --git a/rpms/cosmic-edit/cosmic-edit.spec b/rpms/cosmic-edit/cosmic-edit.spec new file mode 100644 index 0000000..2243988 --- /dev/null +++ b/rpms/cosmic-edit/cosmic-edit.spec @@ -0,0 +1,73 @@ +# Generated by rust2rpm 26 +%bcond_without check + +# prevent library files from being installed +%global cargo_install_lib 0 + +%global crate cosmic-edit + +%global ver ### +%global commit ### +%global date ### + +Name: cosmic-edit +Version: %{ver}~%{date} +Release: %autorelease +Summary: Libcosmic text editor. + +SourceLicense: GPL-3.0-only +License: GPL-3.0 +# LICENSE.dependencies contains a full license breakdown + +URL: https://github.com/pop-os/cosmic-edit +Source: cosmic-edit-%{ver}.tar.xz +Source: cosmic-edit-%{ver}-vendor.tar.xz + +BuildRequires: cargo-rpm-macros >= 26 +BuildRequires: rustc +BuildRequires: lld +BuildRequires: cargo +BuildRequires: just + +%global _description %{expand: +%{summary}.} + +%description %{_description} + +%prep +%autosetup -n %{crate}-%{version} -p1 -a1 +%cargo_prep -N +cat .vendor/config.toml >> .cargo/config + +%build +%cargo_build +%{cargo_license_summary} +%{cargo_license} > LICENSE.dependencies +%{cargo_vendor_manifest} + +%install +just rootdir=%{buildroot} prefix=%{_prefix} install + +%if %{with check} +%check +%cargo_test +%endif + +%files +%license LICENSE +%license LICENSE.dependencies +# %%license cargo-vendor.txt +%doc README.md +%{_bindir}/cosmic-edit +%{_datadir}/applications/com.system76.CosmicEdit.desktop +%{_metainfodir}/com.system76.CosmicEdit.metainfo.xml +%{_datadir}/icons/hicolor/128x128/apps/com.system76.CosmicEdit.svg +%{_datadir}/icons/hicolor/16x16/apps/com.system76.CosmicEdit.svg +%{_datadir}/icons/hicolor/24x24/apps/com.system76.CosmicEdit.svg +%{_datadir}/icons/hicolor/256x256/apps/com.system76.CosmicEdit.svg +%{_datadir}/icons/hicolor/32x32/apps/com.system76.CosmicEdit.svg +%{_datadir}/icons/hicolor/48x48/apps/com.system76.CosmicEdit.svg +%{_datadir}/icons/hicolor/64x64/apps/com.system76.CosmicEdit.svg + +%changelog +%autochangelog diff --git a/rpms/cosmic-files/cosmic-files.spec b/rpms/cosmic-files/cosmic-files.spec new file mode 100644 index 0000000..e7214fb --- /dev/null +++ b/rpms/cosmic-files/cosmic-files.spec @@ -0,0 +1,69 @@ +# Generated by rust2rpm 26 +%bcond_without check + +# prevent library files from being installed +%global cargo_install_lib 0 + +%global crate cosmic-files + +%global ver ### +%global commit ### +%global date ### + +Name: cosmic-files +Version: %{ver}~%{date} +Release: %autorelease +Summary: Libcosmic file manager. + +SourceLicense: GPL-3.0-only +License: GPL-3.0 +# LICENSE.dependencies contains a full license breakdown + +URL: https://github.com/pop-os/cosmic-files +Source: cosmic-files-%{ver}.tar.xx +Source: cosmic-files-%{ver}-vendor.tar.xz + +BuildRequires: cargo-rpm-macros >= 26 + +%global _description %{expand: +%{summary}.} + +%description %{_description} + +%prep +%autosetup -n %{crate}-%{version} -p1 -a1 +%cargo_prep -N +cat .vendor/config.toml >> .cargo/config + +%build +%cargo_build +%{cargo_license_summary} +%{cargo_license} > LICENSE.dependencies +%{cargo_vendor_manifest} + +%install +just rootdir=%{buildroot} prefix=%{_prefix} install + +%if %{with check} +%check +%cargo_test +%endif + +%files +%license LICENSE +%license LICENSE.dependencies +# %%license cargo-vendor.txt +%doc README.md +%{_bindir}/cosmic-files +%{_datadir}/applications/com.system76.CosmicFiles.desktop +%{_metainfodir}/com.system76.CosmicFiles.metainfo.xml +%{_datadir}/icons/hicolor/128x128/apps/com.system76.CosmicFiles.svg +%{_datadir}/icons/hicolor/16x16/apps/com.system76.CosmicFiles.svg +%{_datadir}/icons/hicolor/24x24/apps/com.system76.CosmicFiles.svg +%{_datadir}/icons/hicolor/256x256/apps/com.system76.CosmicFiles.svg +%{_datadir}/icons/hicolor/32x32/apps/com.system76.CosmicFiles.svg +%{_datadir}/icons/hicolor/48x48/apps/com.system76.CosmicFiles.svg +%{_datadir}/icons/hicolor/64x64/apps/com.system76.CosmicFiles.svg + +%changelog +%autochangelog From 618f848bb0c3f48c3a09ff2a5b3c8894c3c39377 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 27 2024 17:52:56 +0000 Subject: [PATCH 61/220] fixes, and cosmic-greeter --- diff --git a/metadata/all_deps.txt b/metadata/all_deps.txt index 21f0c71..c0f8ad3 100644 --- a/metadata/all_deps.txt +++ b/metadata/all_deps.txt @@ -97,4 +97,29 @@ cosmic-edit rustc lld cargo -just \ No newline at end of file +just + +cosmic-files + +rustc +lld +cargo +just + +cosmic-greeter + +rustc +lld +cargo +wayland-devel +clang-devel +libxkbcommon-devel +pam-devel +just + +Requires: + +dbus +greetd +greetd-selinux +cosmic-comp \ No newline at end of file diff --git a/rpms/cosmic-edit/cosmic-edit.spec b/rpms/cosmic-edit/cosmic-edit.spec index 2243988..4b0bd7d 100644 --- a/rpms/cosmic-edit/cosmic-edit.spec +++ b/rpms/cosmic-edit/cosmic-edit.spec @@ -35,7 +35,7 @@ BuildRequires: just %description %{_description} %prep -%autosetup -n %{crate}-%{version} -p1 -a1 +%autosetup -n %{crate}-%{ver} -p1 -a1 %cargo_prep -N cat .vendor/config.toml >> .cargo/config diff --git a/rpms/cosmic-files/cosmic-files.spec b/rpms/cosmic-files/cosmic-files.spec index e7214fb..c2680f0 100644 --- a/rpms/cosmic-files/cosmic-files.spec +++ b/rpms/cosmic-files/cosmic-files.spec @@ -31,7 +31,7 @@ BuildRequires: cargo-rpm-macros >= 26 %description %{_description} %prep -%autosetup -n %{crate}-%{version} -p1 -a1 +%autosetup -n %{crate}-%{ver} -p1 -a1 %cargo_prep -N cat .vendor/config.toml >> .cargo/config diff --git a/rpms/cosmic-greeter/cosmic-greeter.spec b/rpms/cosmic-greeter/cosmic-greeter.spec new file mode 100644 index 0000000..f427373 --- /dev/null +++ b/rpms/cosmic-greeter/cosmic-greeter.spec @@ -0,0 +1,84 @@ +# Generated by rust2rpm 26 +%bcond_without check + +%global ver ### +%global commit ### +%global date ### + +Name: cosmic-greeter +Version: %{ver}~%{date} +Release: %autorelease +Summary: Login and display manager built using GreetD for the COSMIC Desktop Environment. + +SourceLicense: GPL-3.0 +License: GPL-3.0 +# LICENSE.dependencies contains a full license breakdown + +URL: https://github.com/pop-os/cosmic-greeter +Source: cosmic-greeter-%{ver}.tar.xz +Source: cosmic-greeter-%{ver}-vendor.tar.xz + +Patch: service.patch + +BuildRequires: cargo-rpm-macros >= 25 +BuildRequires: rustc +BuildRequires: lld +BuildRequires: cargo +BuildRequires: wayland-devel +BuildRequires: clang-devel +BuildRequires: libxkbcommon-devel +BuildRequires: pam-devel +BuildRequires: just + +Requires: dbus +Requires: greetd +Requires: greetd-selinux +Requires: cosmic-comp + +%global _description %{expand: +%{summary}.} + +%description %{_description} + +%prep +%autosetup -n cosmic-greeter-%{ver} -p1 -a1 +%cargo_prep -N +cat .vendor/config.toml >> .cargo/config + +%build +%cargo_build +%{cargo_license_summary} +%{cargo_license} > LICENSE.dependencies +%{cargo_vendor_manifest} + +%install +install -Dm0755 target/release/cosmic-greeter %{buildroot}/%{_bindir}/cosmic-greeter +install -Dm0755 target/release/cosmic-greeter-daemon %{buildroot}/%{_bindir}/cosmic-greeter-daemon +install -Dm0644 dbus/com.system76.CosmicGreeter.conf %{buildroot}/%{_datadir}/dbus-1/system.d/com.system76.CosmicGreeter.conf +install -Dm0644 debian/cosmic-greeter.sysusers %{buildroot}/%{_sysusersdir}/cosmic-greeter.conf +install -Dm0644 debian/cosmic-greeter.tmpfiles %{buildroot}/%{_tmpfilesdir}/cosmic-greeter.conf +install -Dm0644 cosmic-greeter.toml %{buildroot}/%{_prefix}/etc/greetd/cosmic-greeter.toml +install -Dm0644 debian/cosmic-greeter.service %{buildroot}/%{_unitdir}/cosmic-greeter.service +install -Dm0644 debian/cosmic-greeter-daemon.service %{buildroot}/%{_unitdir}/cosmic-greeter-daemon.service + +%if %{with check} +%check +%cargo_test +%endif + +%files +%license LICENSE +%license LICENSE.dependencies +%license cargo-vendor.txt +%doc README.md +%{_bindir}/cosmic-greeter +%{_bindir}/cosmic-greeter-daemon +%{_datadir}/dbus-1/system.d/com.system76.CosmicGreeter.conf +%{_sysusersdir}/cosmic-greeter.conf +%{_tmpfilesdir}/cosmic-greeter.conf +%{_prefix}/etc/greetd/cosmic-greeter.toml +%{_unitdir}/cosmic-greeter.service +%{_unitdir}/cosmic-greeter-daemon.service + +%changelog +%autochangelog diff --git a/rpms/cosmic-greeter/service.patch b/rpms/cosmic-greeter/service.patch new file mode 100644 index 0000000..3602bbd --- /dev/null +++ b/rpms/cosmic-greeter/service.patch @@ -0,0 +1,12 @@ +--- ./debian/cosmic-greeter.service 2024-02-27 11:31:17.946973142 -0600 ++++ ./debian/cosmic-greeter.patched.service 2024-02-27 11:32:11.538968615 -0600 +@@ -16,6 +16,5 @@ RestartSec=1 + StartLimitBurst=5 + StartLimitInterval=30 + +-# Managed by debconf +-#[Install] +-#Alias=display-manager.service ++[Install] ++Alias=display-manager.service +\ No newline at end of file From 18848d6038b164a240df2aa8630108f0ec0fa1a5 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 27 2024 17:53:43 +0000 Subject: [PATCH 62/220] fix cosmic-files --- diff --git a/rpms/cosmic-files/cosmic-files.spec b/rpms/cosmic-files/cosmic-files.spec index c2680f0..52af261 100644 --- a/rpms/cosmic-files/cosmic-files.spec +++ b/rpms/cosmic-files/cosmic-files.spec @@ -20,7 +20,7 @@ License: GPL-3.0 # LICENSE.dependencies contains a full license breakdown URL: https://github.com/pop-os/cosmic-files -Source: cosmic-files-%{ver}.tar.xx +Source: cosmic-files-%{ver}.tar.xz Source: cosmic-files-%{ver}-vendor.tar.xz BuildRequires: cargo-rpm-macros >= 26 From 2c65a70c448a450ab1eacdd8e13f6b4917da2a5b Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 27 2024 18:11:06 +0000 Subject: [PATCH 63/220] cosmic-icons --- diff --git a/rpms/cosmic-icons/cosmic-icons.spec b/rpms/cosmic-icons/cosmic-icons.spec new file mode 100644 index 0000000..4fd504b --- /dev/null +++ b/rpms/cosmic-icons/cosmic-icons.spec @@ -0,0 +1,40 @@ +%define debug_package %{nil} + +%global ver ### +%global commit ### +%global date ### + +Name: cosmic-icons +Version: %{ver}~%{date} +Release: %autorelease +Summary: Icon theme for the COSMIC Desktop Environment. + +SourceLicense: CC-BY-SA-4.0 +License: GPL-3.0 + +URL: https://github.com/pop-os/cosmic-icons +Source: cosmic-icons-%{ver}.tar.xz + +BuildRequires: just + +%global _description %{expand: +%{summary}.} + +%description %{_description} + +%prep +%autosetup -n cosmic-icons + +%build + +%install +just rootdir=%{buildroot} install + +%files +%{_datadir}/icons/Cosmic/scalable/* +%{_datadir}/icons/Cosmic/index.theme + + +%changelog +%autochangelog + \ No newline at end of file diff --git a/scripts/srpm.sh b/scripts/srpm.sh new file mode 100644 index 0000000..153fa71 --- /dev/null +++ b/scripts/srpm.sh @@ -0,0 +1,51 @@ +#!/bin/bash -x + +# name of the crate/package +name=$1 +# version of the crate/package +version=$2 +# commit to target (latest == master) +commit=$3 +# path to the spec file on the pc +path_to_spec=$4 +# repo link +repo=$5 + +LATEST="latest" + +# Clone repo and cd into it +mkdir $name-$version && cd $name-$version && git clone --recurse-submodules $repo . + +# Get latest commit hash if commit is set to latest +if [[ "$commit" == "$LATEST" ]] +then + commit=$(git rev-parse HEAD) +fi + +# Short commit, used for versioning +short_commit=${commit:0:6} + +# Reset to specified commit +git reset --hard $commit + +# Go back to parent directory +cd .. + +# Zip source +tar -pcJf $name-$version.tar.xz $name-$version +rm -rf $name-$version + +# Get specfile +cp $path_to_spec $name.spec 2>/dev/null || : + +# Make replacements to specfile +sed -i "/^%global ver / s/.*/%global ver $version/" $name.spec +sed -i "/^%global commit / s/.*/%global commit $commit/" $name.spec +current_date=$(date +'%Y%m%d.%H') +sed -i "/^%global date / s/.*/%global date $current_date/" $name.spec + + +ls -a +pwd + +echo Done! $1 $2 $3 $4 $5 \ No newline at end of file From 7c5bcdeab8d22a92a41b840966674f2732cc7953 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 27 2024 18:13:44 +0000 Subject: [PATCH 64/220] remove some old specs --- diff --git a/cosmic-app-library/cosmic-app-library.spec b/cosmic-app-library/cosmic-app-library.spec deleted file mode 100644 index 331ab49..0000000 --- a/cosmic-app-library/cosmic-app-library.spec +++ /dev/null @@ -1,91 +0,0 @@ - -# Generated by rust2rpm 25 - -# prevent library files from being installed - -%global crate cosmic-app-library -%global repo https://github.com/pop-os/cosmic-applibrary - -Name: cosmic-app-library -Version: # TO BE REPLACED AUTOMATICALLY - -Release: %autorelease -Summary: A boilerplate template to get started with GTK, Rust, Meson, Flatpak, Debian made for Cosmic. - -License: GPL-3.0 - -URL: https://github.com/pop-os/cosmic-applibrary - -Source: %{crate}.tar.gz -Source: vendor.tar - - - -# For now, we require all deps for all of cosmic-epoch -BuildRequires: make -BuildRequires: which -BuildRequires: git-core -BuildRequires: just -BuildRequires: rustc -BuildRequires: lld -BuildRequires: cargo -BuildRequires: glib2-devel -BuildRequires: gtk3-devel -BuildRequires: dbus-devel -BuildRequires: wayland-devel -BuildRequires: clang-devel -BuildRequires: libxkbcommon-devel -BuildRequires: mesa-libgbm-devel -BuildRequires: rust-rav1e+nasm-rs-devel -BuildRequires: libappstream-glib -BuildRequires: pipewire-devel -BuildRequires: libglvnd-devel -BuildRequires: libseat-devel -BuildRequires: libinput-devel -BuildRequires: pam-devel -BuildRequires: flatpak-devel - - - -# For now, we require all deps for all of cosmic-epoch -Requires: libseat -Requires: pop-icon-theme -Requires: greetd -Requires: greetd-selinux -Requires: cage -Requires: mozilla-fira-mono-fonts -Requires: mozilla-fira-sans-fonts - - -%global _description %{expand: -%{summary}.} - -%description %{_description} - -%prep - -%autosetup -n %{crate} -p1 -mv %{_sourcedir}/vendor.tar vendor.tar -ls -a -mkdir -p .cargo -cp .vendor/config.toml .cargo/config.toml - - -%build -just build-vendored - -%install -just rootdir=%{buildroot} prefix=%{_prefix} install - -%files - -%{_bindir}/cosmic-app-library -%{_datadir}/applications/com.system76.CosmicAppLibrary.desktop -%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppLibrary.svg -%{_metainfodir}/com.system76.CosmicAppLibrary.metainfo.xml - - - -%changelog -%autochangelog - \ No newline at end of file diff --git a/cosmic-app-library/srpm.sh b/cosmic-app-library/srpm.sh deleted file mode 100644 index 0946593..0000000 --- a/cosmic-app-library/srpm.sh +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/bash -x - -# Variables. LOOK CLOSELY AND MAKE SURE THESE ARE CORRECT - -name='cosmic-app-library' -version='0.1.0' - -path_to_spec='cosmic-app-library/*' -pop_repo='cosmic-applibrary' - -# Commit to target. Use "latest" if you want master -commit="latest" - -# Don't edit anything past this line -# ===================================================== # - -LATEST="latest" - -cd ../.. -# We should be in the base directory now - -git clone --recurse-submodules https://github.com/pop-os/$pop_repo - -cd $pop_repo - -if [[ "$commit" == "$LATEST" ]] -then - commit=$(git rev-parse HEAD) -fi - -echo $commit -short_commit=${commit:0:6} - -git reset --hard $commit - -mkdir .vendor - -cargo vendor > .vendor/config.toml - -tar -pcf vendor.tar vendor && mv vendor.tar ../vendor.tar - -rm -rf vendor && cd .. - -# Back into cosmic-packaging - -ls - -if [ "$pop_repo" != "$name" ]; then - mv $pop_repo $name -else - echo "names are equal. continuing..." -fi - -tar -czf $name.tar.gz $name - -rm -rf $name - -cp cosmic-packaging/$path_to_spec . - -rm -rf cosmic-packaging - -current_date=$(date +'%Y%m%d.%H') - -sed -i "/^Version: / s/.*/Version: $version~$current_date.$short_commit/" $name.spec diff --git a/cosmic-edit/cosmic-edit.spec b/cosmic-edit/cosmic-edit.spec deleted file mode 100644 index 5551c77..0000000 --- a/cosmic-edit/cosmic-edit.spec +++ /dev/null @@ -1,97 +0,0 @@ - -# Generated by rust2rpm 25 - -# prevent library files from being installed - -%global crate cosmic-edit -%global repo https://github.com/pop-os/cosmic-edit - -Name: cosmic-edit -Version: # TO BE REPLACED AUTOMATICALLY - -Release: %autorelease -Summary: Text editor built using libcosmic for the COSMIC Desktop Environment - -License: GPL-3.0 - -URL: https://github.com/pop-os/cosmic-edit - -Source: %{crate}.tar.gz -Source: vendor.tar - - - -# For now, we require all deps for all of cosmic-epoch -BuildRequires: make -BuildRequires: which -BuildRequires: git-core -BuildRequires: just -BuildRequires: rustc -BuildRequires: lld -BuildRequires: cargo -BuildRequires: glib2-devel -BuildRequires: gtk3-devel -BuildRequires: dbus-devel -BuildRequires: wayland-devel -BuildRequires: clang-devel -BuildRequires: libxkbcommon-devel -BuildRequires: mesa-libgbm-devel -BuildRequires: rust-rav1e+nasm-rs-devel -BuildRequires: libappstream-glib -BuildRequires: pipewire-devel -BuildRequires: libglvnd-devel -BuildRequires: libseat-devel -BuildRequires: libinput-devel -BuildRequires: pam-devel -BuildRequires: flatpak-devel - - - -# For now, we require all deps for all of cosmic-epoch -Requires: libseat -Requires: pop-icon-theme -Requires: greetd -Requires: greetd-selinux -Requires: cage -Requires: mozilla-fira-mono-fonts -Requires: mozilla-fira-sans-fonts - - -%global _description %{expand: -%{summary}.} - -%description %{_description} - -%prep - -%autosetup -n %{crate} -p1 -mv %{_sourcedir}/vendor.tar vendor.tar -ls -a -mkdir -p .cargo -cp .vendor/config.toml .cargo/config.toml - - -%build -just build-vendored - -%install -just rootdir=%{buildroot} prefix=%{_prefix} install - -%files - -%{_bindir}/cosmic-edit -%{_datadir}/applications/com.system76.CosmicEdit.desktop -%{_metainfodir}/com.system76.CosmicEdit.metainfo.xml - -%{_datadir}/icons/hicolor/128x128/apps/com.system76.CosmicEdit.svg -%{_datadir}/icons/hicolor/16x16/apps/com.system76.CosmicEdit.svg -%{_datadir}/icons/hicolor/24x24/apps/com.system76.CosmicEdit.svg -%{_datadir}/icons/hicolor/256x256/apps/com.system76.CosmicEdit.svg -%{_datadir}/icons/hicolor/32x32/apps/com.system76.CosmicEdit.svg -%{_datadir}/icons/hicolor/48x48/apps/com.system76.CosmicEdit.svg -%{_datadir}/icons/hicolor/64x64/apps/com.system76.CosmicEdit.svg - - -%changelog -%autochangelog - \ No newline at end of file diff --git a/cosmic-edit/srpm.sh b/cosmic-edit/srpm.sh deleted file mode 100644 index 5a2a836..0000000 --- a/cosmic-edit/srpm.sh +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/bash -x - -# Variables. LOOK CLOSELY AND MAKE SURE THESE ARE CORRECT - -name='cosmic-edit' -version='0.1.0' - -path_to_spec='cosmic-edit/*' -pop_repo='cosmic-edit' - -# Commit to target. Use "latest" if you want master -commit="latest" - -# Don't edit anything past this line -# ===================================================== # - -LATEST="latest" - -cd ../.. -# We should be in the base directory now - -git clone --recurse-submodules https://github.com/pop-os/$pop_repo - -cd $pop_repo - -if [[ "$commit" == "$LATEST" ]] -then - commit=$(git rev-parse HEAD) -fi - -echo $commit -short_commit=${commit:0:6} - -git reset --hard $commit - -mkdir .vendor - -cargo vendor > .vendor/config.toml - -tar -pcf vendor.tar vendor && mv vendor.tar ../vendor.tar - -rm -rf vendor && cd .. - -# Back into cosmic-packaging - -ls - -if [ "$pop_repo" != "$name" ]; then - mv $pop_repo $name -else - echo "names are equal. continuing..." -fi - -tar -czf $name.tar.gz $name - -rm -rf $name - -cp cosmic-packaging/$path_to_spec . - -rm -rf cosmic-packaging - -current_date=$(date +'%Y%m%d.%H') - -sed -i "/^Version: / s/.*/Version: $version~$current_date.$short_commit/" $name.spec diff --git a/cosmic-files/cosmic-files.spec b/cosmic-files/cosmic-files.spec deleted file mode 100644 index 5963604..0000000 --- a/cosmic-files/cosmic-files.spec +++ /dev/null @@ -1,97 +0,0 @@ - -# Generated by rust2rpm 25 - -# prevent library files from being installed - -%global crate cosmic-files -%global repo https://github.com/pop-os/cosmic-files - -Name: cosmic-files -Version: # TO BE REPLACED AUTOMATICALLY - -Release: %autorelease -Summary: File browser built using libcosmic for the COSMIC Desktop Environment - -License: GPL-3.0 - -URL: https://github.com/pop-os/cosmic-files - -Source: %{crate}.tar.gz -Source: vendor.tar - - - -# For now, we require all deps for all of cosmic-epoch -BuildRequires: make -BuildRequires: which -BuildRequires: git-core -BuildRequires: just -BuildRequires: rustc -BuildRequires: lld -BuildRequires: cargo -BuildRequires: glib2-devel -BuildRequires: gtk3-devel -BuildRequires: dbus-devel -BuildRequires: wayland-devel -BuildRequires: clang-devel -BuildRequires: libxkbcommon-devel -BuildRequires: mesa-libgbm-devel -BuildRequires: rust-rav1e+nasm-rs-devel -BuildRequires: libappstream-glib -BuildRequires: pipewire-devel -BuildRequires: libglvnd-devel -BuildRequires: libseat-devel -BuildRequires: libinput-devel -BuildRequires: pam-devel -BuildRequires: flatpak-devel - - - -# For now, we require all deps for all of cosmic-epoch -Requires: libseat -Requires: pop-icon-theme -Requires: greetd -Requires: greetd-selinux -Requires: cage -Requires: mozilla-fira-mono-fonts -Requires: mozilla-fira-sans-fonts - - -%global _description %{expand: -%{summary}.} - -%description %{_description} - -%prep - -%autosetup -n %{crate} -p1 -mv %{_sourcedir}/vendor.tar vendor.tar -ls -a -mkdir -p .cargo -cp .vendor/config.toml .cargo/config.toml - - -%build -just build-vendored - -%install -just rootdir=%{buildroot} prefix=%{_prefix} install - -%files - -%{_bindir}/cosmic-files -%{_datadir}/applications/com.system76.CosmicFiles.desktop -%{_metainfodir}/com.system76.CosmicFiles.metainfo.xml - -%{_datadir}/icons/hicolor/128x128/apps/com.system76.CosmicFiles.svg -%{_datadir}/icons/hicolor/16x16/apps/com.system76.CosmicFiles.svg -%{_datadir}/icons/hicolor/24x24/apps/com.system76.CosmicFiles.svg -%{_datadir}/icons/hicolor/256x256/apps/com.system76.CosmicFiles.svg -%{_datadir}/icons/hicolor/32x32/apps/com.system76.CosmicFiles.svg -%{_datadir}/icons/hicolor/48x48/apps/com.system76.CosmicFiles.svg -%{_datadir}/icons/hicolor/64x64/apps/com.system76.CosmicFiles.svg - - -%changelog -%autochangelog - \ No newline at end of file diff --git a/cosmic-files/srpm.sh b/cosmic-files/srpm.sh deleted file mode 100644 index f37446f..0000000 --- a/cosmic-files/srpm.sh +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/bash -x - -# Variables. LOOK CLOSELY AND MAKE SURE THESE ARE CORRECT - -name='cosmic-files' -version='0.1.0' - -path_to_spec='cosmic-files/*' -pop_repo='cosmic-files' - -# Commit to target. Use "latest" if you want master -commit="latest" - -# Don't edit anything past this line -# ===================================================== # - -LATEST="latest" - -cd ../.. -# We should be in the base directory now - -git clone --recurse-submodules https://github.com/pop-os/$pop_repo - -cd $pop_repo - -if [[ "$commit" == "$LATEST" ]] -then - commit=$(git rev-parse HEAD) -fi - -echo $commit -short_commit=${commit:0:6} - -git reset --hard $commit - -mkdir .vendor - -cargo vendor > .vendor/config.toml - -tar -pcf vendor.tar vendor && mv vendor.tar ../vendor.tar - -rm -rf vendor && cd .. - -# Back into cosmic-packaging - -ls - -if [ "$pop_repo" != "$name" ]; then - mv $pop_repo $name -else - echo "names are equal. continuing..." -fi - -tar -czf $name.tar.gz $name - -rm -rf $name - -cp cosmic-packaging/$path_to_spec . - -rm -rf cosmic-packaging - -current_date=$(date +'%Y%m%d.%H') - -sed -i "/^Version: / s/.*/Version: $version~$current_date.$short_commit/" $name.spec diff --git a/cosmic-icons/cosmic-icons.spec b/cosmic-icons/cosmic-icons.spec deleted file mode 100644 index 19f7a83..0000000 --- a/cosmic-icons/cosmic-icons.spec +++ /dev/null @@ -1,79 +0,0 @@ -%define debug_package %{nil} -# Generated by rust2rpm 25 - -# prevent library files from being installed - -%global crate cosmic-icons -%global repo https://github.com/pop-os/cosmic-icons - -Name: cosmic-icons -Version: # TO BE REPLACED AUTOMATICALLY - -Release: %autorelease -Summary: System76 Cosmic icon theme for Linux - -License: CC-BY-SA-4.0 - -URL: https://github.com/pop-os/cosmic-icons -Source: %{crate}.tar.gz - - -# For now, we require all deps for all of cosmic-epoch -BuildRequires: make -BuildRequires: which -BuildRequires: git-core -BuildRequires: just -BuildRequires: rustc -BuildRequires: lld -BuildRequires: cargo -BuildRequires: glib2-devel -BuildRequires: gtk3-devel -BuildRequires: dbus-devel -BuildRequires: wayland-devel -BuildRequires: clang-devel -BuildRequires: libxkbcommon-devel -BuildRequires: mesa-libgbm-devel -BuildRequires: rust-rav1e+nasm-rs-devel -BuildRequires: libappstream-glib -BuildRequires: pipewire-devel -BuildRequires: libglvnd-devel -BuildRequires: libseat-devel -BuildRequires: libinput-devel -BuildRequires: pam-devel -BuildRequires: flatpak-devel - - - -# For now, we require all deps for all of cosmic-epoch -Requires: libseat -Requires: pop-icon-theme -Requires: greetd -Requires: greetd-selinux -Requires: cage -Requires: mozilla-fira-mono-fonts -Requires: mozilla-fira-sans-fonts - - -%global _description %{expand: -%{summary}.} - -%description %{_description} - -%prep -%autosetup -n cosmic-icons - -%build -echo done - -%install -just rootdir=%{buildroot} install - -%files - -%{_datadir}/icons/Cosmic/scalable/* -%{_datadir}/icons/Cosmic/index.theme - - -%changelog -%autochangelog - \ No newline at end of file diff --git a/cosmic-icons/srpm.sh b/cosmic-icons/srpm.sh deleted file mode 100644 index 1ad87b5..0000000 --- a/cosmic-icons/srpm.sh +++ /dev/null @@ -1,59 +0,0 @@ -#!/bin/bash -x - -# Variables. LOOK CLOSELY AND MAKE SURE THESE ARE CORRECT - -name='cosmic-icons' -version='0.1.0' - -repo='https://pagure.io/fedora-cosmic/cosmic-packaging' -path_to_spec='cosmic-icons/cosmic-icons.spec' -pop_repo='cosmic-icons' - -# Commit to target. Use "latest" if you want master -commit="latest" - -# Don't edit anything past this line -# ===================================================== # - -LATEST="latest" - -cd ../.. -# We should be in the base directory now - -git clone --recurse-submodules https://github.com/pop-os/$pop_repo - -cd $pop_repo - -if [[ "$commit" == "$LATEST" ]] -then - commit=$(git rev-parse HEAD) -fi - -echo $commit -short_commit=${commit:0:6} - -git reset --hard $commit - -cd .. - -# Back into cosmic-packaging - -ls - -if [ "$pop_repo" != "$name" ]; then - mv $pop_repo $name -else - echo "names are equal. continuing..." -fi - -tar -czf $name.tar.gz $name - -rm -rf $name - -cp cosmic-packaging/$path_to_spec . - -rm -rf cosmic-packaging - -current_date=$(date +'%Y%m%d.%H') - -sed -i "/^Version: / s/.*/Version: $version~$current_date.$short_commit/" $name.spec From 4e1cfaf4196016cae8fe441efc5d224c5d1668aa Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 27 2024 18:59:07 +0000 Subject: [PATCH 65/220] lots of new stuff --- diff --git a/metadata/all_deps.txt b/metadata/all_deps.txt index c0f8ad3..d85cdd2 100644 --- a/metadata/all_deps.txt +++ b/metadata/all_deps.txt @@ -122,4 +122,57 @@ Requires: dbus greetd greetd-selinux -cosmic-comp \ No newline at end of file +cosmic-comp + +cosmic-launcher + +rustc +lld +cargo +wayland-devel +libxkbcommon-devel +just + +Requires: +pop-launcher + +cosmic-notifications + +rustc +lld +cargo +wayland-devel +libxkbcommon-devel +just + +cosmic-osd + +rustc +lld +cargo +wayland-devel +libxkbcommon-devel +systemd-devel +just + +cosmic-panel + +rustc +lld +cargo +wayland-devel +libxkbcommon-devel +just + +cosmic-randr +rustc +lld +cargo +wayland-devel +just + +cosmic-screenshot +rustc +lld +cargo +just \ No newline at end of file diff --git a/rpms/cosmic-greeter/cosmic-greeter.spec b/rpms/cosmic-greeter/cosmic-greeter.spec index f427373..765ffc8 100644 --- a/rpms/cosmic-greeter/cosmic-greeter.spec +++ b/rpms/cosmic-greeter/cosmic-greeter.spec @@ -69,7 +69,7 @@ install -Dm0644 debian/cosmic-greeter-daemon.service %{buildroot}/%{_unitdir}/co %files %license LICENSE %license LICENSE.dependencies -%license cargo-vendor.txt +# %%license cargo-vendor.txt %doc README.md %{_bindir}/cosmic-greeter %{_bindir}/cosmic-greeter-daemon diff --git a/rpms/cosmic-launcher/cosmic-launcher.spec b/rpms/cosmic-launcher/cosmic-launcher.spec new file mode 100644 index 0000000..2a815cd --- /dev/null +++ b/rpms/cosmic-launcher/cosmic-launcher.spec @@ -0,0 +1,71 @@ +# Generated by rust2rpm 26 +%bcond_without check + +# prevent library files from being installed +%global cargo_install_lib 0 + +%global crate cosmic-launcher + +%global ver ### +%global commit ### +%global date ### + +Name: cosmic-launcher +Version: %{ver}~%{date} +Release: %autorelease +Summary: Pop launcher frontend for the COSMIC Desktop Environment. + +SourceLicense: GPL-3.0 +License: GPL-3.0 +# LICENSE.dependencies contains a full license breakdown + +URL: https://github.com/pop-os/cosmic-launcher +Source: cosmic-launcher-%{ver}.tar.xz +Source: cosmic-launcher-%{ver}-vendor.tar.xz + +BuildRequires: cargo-rpm-macros >= 26 +BuildRequires: rustc +BuildRequires: lld +BuildRequires: cargo +BuildRequires: wayland-devel +BuildRequires: libxkbcommon-devel +BuildRequires: just + +Requires: pop-launcher + +%global _description %{expand: +%{summary}.} + +%description %{_description} + +%prep +%autosetup -n %{crate}-%{ver} -p1 -a1 +%cargo_prep -N +cat .vendor/config.toml >> .cargo/config + +%build +%cargo_build +%{cargo_license_summary} +%{cargo_license} > LICENSE.dependencies +%{cargo_vendor_manifest} + +%install +just rootdir=%{buildroot} prefix=%{_prefix} install + +%if %{with check} +%check +%cargo_test +%endif + +%files +%license LICENSE.md +%license LICENSE.dependencies +# %%license cargo-vendor.txt +%doc README.md +%{_bindir}/cosmic-launcher +%{_datadir}/applications/com.system76.CosmicLauncher.desktop +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicLauncher.svg +%{_metainfodir}/com.system76.CosmicLauncher.metainfo.xml + +%changelog +%autochangelog diff --git a/rpms/cosmic-notifications/cosmic-notifications.spec b/rpms/cosmic-notifications/cosmic-notifications.spec new file mode 100644 index 0000000..66b79d0 --- /dev/null +++ b/rpms/cosmic-notifications/cosmic-notifications.spec @@ -0,0 +1,64 @@ +# Generated by rust2rpm 26 +%bcond_without check + +%global ver ### +%global commit ### +%global date ### + +Name: cosmic-notifications +Version: %{ver}~%{date} +Release: %autorelease +Summary: Notifications daemon for the COSMIC Desktop Environment. + +SourceLicense: GPL-3.0 +License: GPL-3.0 +# LICENSE.dependencies contains a full license breakdown + +URL: https://github.com/pop-os/cosmic-notifications +Source: cosmic-notifications-%{ver}.tar.xz +Source: cosmic-notifications-%{ver}-vendor.tar.xz + +BuildRequires: cargo-rpm-macros >= 25 +BuildRequires: rustc +BuildRequires: lld +BuildRequires: cargo +BuildRequires: wayland-devel +BuildRequires: libxkbcommon-devel +BuildRequires: just + +%global _description %{expand: +%{summary}.} + +%description %{_description} + +%prep +%autosetup -n cosmic-notifications-%{ver} -p1 -a1 +%cargo_prep -N +cat .vendor/config.toml >> .cargo/config + +%build +%cargo_build +%{cargo_license_summary} +%{cargo_license} > LICENSE.dependencies +%{cargo_vendor_manifest} + +%install +just rootdir=%{buildroot} prefix=%{_prefix} install + +%if %{with check} +%check +%cargo_test +%endif + +%files +%license LICENSE.md +%license LICENSE.dependencies +# %%license cargo-vendor.txt +%doc README.md +%{_bindir}/cosmic-notifications +%{_datadir}/applications/com.system76.CosmicNotifications.desktop +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicNotifications.svg +%{_metainfodir}/com.system76.CosmicNotifications.metainfo.xml + +%changelog +%autochangelog diff --git a/rpms/cosmic-osd/cosmic-osd.spec b/rpms/cosmic-osd/cosmic-osd.spec new file mode 100644 index 0000000..49ac070 --- /dev/null +++ b/rpms/cosmic-osd/cosmic-osd.spec @@ -0,0 +1,66 @@ +# Generated by rust2rpm 26 +%bcond_without check + +# prevent library files from being installed +%global cargo_install_lib 0 + +%global crate cosmic-osd + +%global ver ### +%global commit ### +%global date ### + +Name: cosmic-osd +Version: %{ver}~%{date} +Release: %autorelease +Summary: OSDs for the COSMIC Desktop Environment. + +SourceLicense: GPL-3.0-or-later +License: GPL-3.0 +# LICENSE.dependencies contains a full license breakdown + +URL: https://github.com/pop-os/cosmic-osd +Source: cosmic-osd-%{ver}.tar.xz +Source: cosmic-osd-%{ver}-vendor.tar.xz + +BuildRequires: cargo-rpm-macros >= 26 +BuildRequires: rustc +BuildRequires: lld +BuildRequires: cargo +BuildRequires: wayland-devel +BuildRequires: libxkbcommon-devel +BuildRequires: systemd-devel +BuildRequires: just + +%global _description %{expand: +%{summary}.} + +%description %{_description} + +%prep +%autosetup -n %{crate}-%{ver} -p1 -a1 +%cargo_prep -N +cat .vendor/config.toml >> .cargo/config + +%build +%cargo_build +%{cargo_license_summary} +%{cargo_license} > LICENSE.dependencies +%{cargo_vendor_manifest} + +%install +make install DESTDIR=%{buildroot} prefix=%{_prefix} + +%if %{with check} +%check +%cargo_test +%endif + +%files +%license LICENSE +%license LICENSE.dependencies +# %%license cargo-vendor.txt +%{_bindir}/cosmic-osd + +%changelog +%autochangelog diff --git a/rpms/cosmic-panel/cosmic-panel.spec b/rpms/cosmic-panel/cosmic-panel.spec new file mode 100644 index 0000000..dc0ff4f --- /dev/null +++ b/rpms/cosmic-panel/cosmic-panel.spec @@ -0,0 +1,64 @@ +# Generated by rust2rpm 26 +%bcond_without check + +%global ver ### +%global commit ### +%global date ### + +Name: cosmic-panel +Version: %{ver}~%{date} +Release: %autorelease +Summary: Panel for the COSMIC Desktop Environment. + +SourceLicense: GPL-3.0 +License: GPL-3.0 +# LICENSE.dependencies contains a full license breakdown + +URL: https://github.com/pop-os/cosmic-panel +Source: cosmic-panel-%{ver}.tar.xz +Source: cosmic-panel-%{ver}-vendor.tar.xz + +BuildRequires: cargo-rpm-macros >= 25 +BuildRequires: rustc +BuildRequires: lld +BuildRequires: cargo +BuildRequires: wayland-devel +BuildRequires: libxkbcommon-devel +BuildRequires: just + +%global _description %{expand: +%{summary}.} + +%description %{_description} + +%prep +%autosetup -n cosmic-panel-%{ver} -p1 -a1 +%cargo_prep -N +cat .vendor/config.toml >> .cargo/config + +%build +%cargo_build +%{cargo_license_summary} +%{cargo_license} > LICENSE.dependencies +%{cargo_vendor_manifest} + +%install +just rootdir=%{buildroot} prefix=%{_prefix} install + +%if %{with check} +%check +%cargo_test +%endif + +%files +%license LICENSE.md +%license LICENSE.dependencies +# %%license cargo-vendor.txt +%doc README.md +%{_bindir}/cosmic-panel +%{_datadir}/cosmic/com.system76.CosmicPanel.Dock/* +%{_datadir}/cosmic/com.system76.CosmicPanel.Panel/* +%{_datadir}/cosmic/com.system76.CosmicPanel/* + +%changelog +%autochangelog diff --git a/rpms/cosmic-player/cosmic-player.spec b/rpms/cosmic-player/cosmic-player.spec new file mode 100644 index 0000000..8d17bd9 --- /dev/null +++ b/rpms/cosmic-player/cosmic-player.spec @@ -0,0 +1,57 @@ +# Generated by rust2rpm 26 +%bcond_without check + +# prevent library files from being installed +%global cargo_install_lib 0 + +%global crate cosmic-player + +Name: cosmic-player +Version: 0.1.0 +Release: %autorelease +Summary: # FIXME + +SourceLicense: None +# FIXME: paste output of %%cargo_license_summary here +License: # FIXME +# LICENSE.dependencies contains a full license breakdown +# FIXME: No license information in crate metadata. + +URL: # FIXME +Source: # FIXME +Source: cosmic-player-0.1.0-vendor.tar.xz + +BuildRequires: cargo-rpm-macros >= 26 + +%global _description %{expand: +%{summary}.} + +%description %{_description} + +%prep +%autosetup -n %{crate}-%{version} -p1 -a1 +%cargo_prep -v vendor + +%build +%cargo_build +%{cargo_license_summary} +%{cargo_license} > LICENSE.dependencies +%{cargo_vendor_manifest} + +%install +%cargo_install + +%if %{with check} +%check +%cargo_test +%endif + +%files +%license LICENSE +%license LICENSE.dependencies +%license cargo-vendor.txt +%doc README.md +%{_bindir}/cosmic-player + +%changelog +%autochangelog diff --git a/rpms/cosmic-randr/cosmic-randr.spec b/rpms/cosmic-randr/cosmic-randr.spec new file mode 100644 index 0000000..f3f3cfc --- /dev/null +++ b/rpms/cosmic-randr/cosmic-randr.spec @@ -0,0 +1,60 @@ +# Generated by rust2rpm 26 +%bcond_without check + +%global ver ### +%global commit ### +%global date ### + +Name: cosmic-randr +Version: %{ver}~%{date} +Release: %autorelease +Summary: Cosmic-randr command line interface + +SourceLicense: MPL-2.0 +License: GPL-3.0 +# LICENSE.dependencies contains a full license breakdown + +URL: https://github.com/pop-os/cosmic-randr +Source: cosmic-randr-%{ver}.tar.xz +Source: cosmic-randr-%{ver}-vendor.tar.xz + +BuildRequires: cargo-rpm-macros >= 25 +BuildRequires: rustc +BuildRequires: lld +BuildRequires: cargo +BuildRequires: wayland-devel +BuildRequires: just + +%global _description %{expand: +Cosmic-randr command line interface.} + +%description %{_description} + +%prep +%autosetup -n cosmic-randr-%{ver} -p1 -a1 +%cargo_prep -N +cat .vendor/config.toml >> .cargo/config + +%build +%cargo_build +%{cargo_license_summary} +%{cargo_license} > LICENSE.dependencies +%{cargo_vendor_manifest} + +%install +just rootdir=%{buildroot} prefix=%{_prefix} install + +%if %{with check} +%check +%cargo_test +%endif + +%files +%license LICENSE +%license LICENSE.dependencies +# %%license cargo-vendor.txt +%doc README.md +%{_bindir}/cosmic-randr + +%changelog +%autochangelog diff --git a/rpms/cosmic-screenshot/cosmic-screenshot.spec b/rpms/cosmic-screenshot/cosmic-screenshot.spec new file mode 100644 index 0000000..fa9a15b --- /dev/null +++ b/rpms/cosmic-screenshot/cosmic-screenshot.spec @@ -0,0 +1,65 @@ +# Generated by rust2rpm 26 +%bcond_without check + +# prevent library files from being installed +%global cargo_install_lib 0 + +%global crate cosmic-screenshot + +%global ver ### +%global commit ### +%global date ### + +Name: cosmic-screenshot +Version: %{ver}~%{date} +Release: %autorelease +Summary: Screenshot utility for the COSMIC Desktop Environment. + +SourceLicense: GPL-3.0 +License: GPL-3.0 +# LICENSE.dependencies contains a full license breakdown + +URL: https://github.com/pop-os/cosmic-screenshot +Source: cosmic-screenshot-%{ver}.tar.xz +Source: cosmic-screenshot-%{ver}-vendor.tar.xz + +BuildRequires: cargo-rpm-macros >= 26 +BuildRequires: rustc +BuildRequires: lld +BuildRequires: cargo +BuildRequires: just + +%global _description %{expand: +%{summary}.} + +%description %{_description} + +%prep +%autosetup -n %{crate}-%{ver} -p1 -a1 +%cargo_prep -N +cat .vendor/config.toml >> .cargo/config + +%build +%cargo_build +%{cargo_license_summary} +%{cargo_license} > LICENSE.dependencies +%{cargo_vendor_manifest} + +%install +just rootdir=%{buildroot} prefix=%{_prefix} install + +%if %{with check} +%check +%cargo_test +%endif + +%files +%license LICENSE +%license LICENSE.dependencies +# %%license cargo-vendor.txt +%doc README.md +%{_bindir}/cosmic-screenshot +%{_datadir}/applications/com.system76.CosmicScreenshot.desktop + +%changelog +%autochangelog From 517c893eea5fe4b590f87d83a0cfcd33231df746 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 27 2024 19:04:45 +0000 Subject: [PATCH 66/220] Fix cosmic-edit, cosmic-files, cosmic-icons, cosmic-app-library --- diff --git a/rpms/cosmic-app-library/cosmic-app-library.spec b/rpms/cosmic-app-library/cosmic-app-library.spec index 14fbe7d..d8bdc3f 100644 --- a/rpms/cosmic-app-library/cosmic-app-library.spec +++ b/rpms/cosmic-app-library/cosmic-app-library.spec @@ -37,7 +37,7 @@ BuildRequires: just %description %{_description} %prep -%autosetup -n %{crate}-%{version} -p1 -a1 +%autosetup -n %{crate}-%{ver} -p1 -a1 %cargo_prep -N cat .vendor/config.toml >> .cargo/config diff --git a/rpms/cosmic-edit/cosmic-edit.spec b/rpms/cosmic-edit/cosmic-edit.spec index 4b0bd7d..6df5ef3 100644 --- a/rpms/cosmic-edit/cosmic-edit.spec +++ b/rpms/cosmic-edit/cosmic-edit.spec @@ -29,6 +29,8 @@ BuildRequires: lld BuildRequires: cargo BuildRequires: just +BuildRequires: git-core + %global _description %{expand: %{summary}.} diff --git a/rpms/cosmic-files/cosmic-files.spec b/rpms/cosmic-files/cosmic-files.spec index 52af261..18ab745 100644 --- a/rpms/cosmic-files/cosmic-files.spec +++ b/rpms/cosmic-files/cosmic-files.spec @@ -24,6 +24,12 @@ Source: cosmic-files-%{ver}.tar.xz Source: cosmic-files-%{ver}-vendor.tar.xz BuildRequires: cargo-rpm-macros >= 26 +BuildRequires: rustc +BuildRequires: lld +BuildRequires: cargo +BuildRequires: just + +BuildRequires: git-core %global _description %{expand: %{summary}.} diff --git a/rpms/cosmic-icons/cosmic-icons.spec b/rpms/cosmic-icons/cosmic-icons.spec index 4fd504b..a4d671e 100644 --- a/rpms/cosmic-icons/cosmic-icons.spec +++ b/rpms/cosmic-icons/cosmic-icons.spec @@ -23,7 +23,7 @@ BuildRequires: just %description %{_description} %prep -%autosetup -n cosmic-icons +%autosetup -n cosmic-icons-%{ver} %build From 0769f1527a5c25ba3dc0d9e341acbd56173e1582 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 27 2024 19:15:19 +0000 Subject: [PATCH 67/220] remove outdated specs --- diff --git a/cosmic-epoch/cosmic-epoch.spec b/cosmic-epoch/cosmic-epoch.spec deleted file mode 100644 index 25fcb4a..0000000 --- a/cosmic-epoch/cosmic-epoch.spec +++ /dev/null @@ -1,55 +0,0 @@ -%global ver ### -%global commit ### -%global date ### - -Name: cosmic-epoch -Version: 0.1.0~20240226 - -Release: %autorelease -Summary: The next generation COSMIC Desktop Environment - -License: GPL-3.0 - -URL: https://github.com/pop-os/cosmic-epoch - -Requires: cosmic-app-library -Requires: cosmic-applets -Requires: cosmic-bg -Requires: cosmic-comp -Requires: cosmic-edit -Requires: cosmic-files -Requires: cosmic-greeter -Requires: cosmic-icons -Requires: cosmic-launcher -Requires: pop-launcher -Requires: cosmic-notifications -Requires: cosmic-osd -Requires: cosmic-panel -Requires: cosmic-randr -Requires: cosmic-screenshot -Requires: cosmic-session -Requires: cosmic-settings -Requires: cosmic-settings-daemon -Requires: cosmic-store -Requires: cosmic-term -Requires: cosmic-workspaces -Requires: xdg-desktop-portal-cosmic -Requires: system76-power - - -%global _description %{expand: -%{summary}.} - -%description %{_description} - -%prep - -%build - -%install - -%files - -%changelog -%autochangelog - \ No newline at end of file diff --git a/cosmic-epoch/srpm.sh b/cosmic-epoch/srpm.sh deleted file mode 100644 index dfa2f5c..0000000 --- a/cosmic-epoch/srpm.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash -x - -# Variables. LOOK CLOSELY AND MAKE SURE THESE ARE CORRECT - -name='cosmic-epoch' -version='0.1.0' - -repo='https://pagure.io/fedora-cosmic/cosmic-packaging' -path_to_spec='cosmic-epoch/cosmic-epoch.spec' - -cd ../.. -# We should be in the base directory now - -cp cosmic-packaging/$path_to_spec . - -rm -rf cosmic-packaging - -current_date=$(date +'%Y%m%d.%H') - -sed -i "/^Version: / s/.*/Version: $version~$current_date/" $name.spec diff --git a/cosmic-launcher/cosmic-launcher.spec b/cosmic-launcher/cosmic-launcher.spec deleted file mode 100644 index 422bce0..0000000 --- a/cosmic-launcher/cosmic-launcher.spec +++ /dev/null @@ -1,91 +0,0 @@ - -# Generated by rust2rpm 25 - -# prevent library files from being installed - -%global crate cosmic-launcher -%global repo https://github.com/pop-os/cosmic-launcher - -Name: cosmic-launcher -Version: # TO BE REPLACED AUTOMATICALLY - -Release: %autorelease -Summary: Layer shell frontend for Pop Launcher - -License: GPL-3.0 - -URL: https://github.com/pop-os/cosmic-launcher - -Source: %{crate}.tar.gz -Source: vendor.tar - - - -# For now, we require all deps for all of cosmic-epoch -BuildRequires: make -BuildRequires: which -BuildRequires: git-core -BuildRequires: just -BuildRequires: rustc -BuildRequires: lld -BuildRequires: cargo -BuildRequires: glib2-devel -BuildRequires: gtk3-devel -BuildRequires: dbus-devel -BuildRequires: wayland-devel -BuildRequires: clang-devel -BuildRequires: libxkbcommon-devel -BuildRequires: mesa-libgbm-devel -BuildRequires: rust-rav1e+nasm-rs-devel -BuildRequires: libappstream-glib -BuildRequires: pipewire-devel -BuildRequires: libglvnd-devel -BuildRequires: libseat-devel -BuildRequires: libinput-devel -BuildRequires: pam-devel -BuildRequires: flatpak-devel - - - -# For now, we require all deps for all of cosmic-epoch -Requires: libseat -Requires: pop-icon-theme -Requires: greetd -Requires: greetd-selinux -Requires: cage -Requires: mozilla-fira-mono-fonts -Requires: mozilla-fira-sans-fonts - - -%global _description %{expand: -%{summary}.} - -%description %{_description} - -%prep - -%autosetup -n %{crate} -p1 -mv %{_sourcedir}/vendor.tar vendor.tar -ls -a -mkdir -p .cargo -cp .vendor/config.toml .cargo/config.toml - - -%build -just build-vendored - -%install -just rootdir=%{buildroot} prefix=%{_prefix} install - -%files - -%{_bindir}/cosmic-launcher -%{_datadir}/applications/com.system76.CosmicLauncher.desktop -%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicLauncher.svg -%{_metainfodir}/com.system76.CosmicLauncher.metainfo.xml - - - -%changelog -%autochangelog - \ No newline at end of file diff --git a/cosmic-launcher/srpm.sh b/cosmic-launcher/srpm.sh deleted file mode 100644 index d25228a..0000000 --- a/cosmic-launcher/srpm.sh +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/bash -x - -# Variables. LOOK CLOSELY AND MAKE SURE THESE ARE CORRECT - -name='cosmic-launcher' -version='0.1.0' - -path_to_spec='cosmic-launcher/*' -pop_repo='cosmic-launcher' - -# Commit to target. Use "latest" if you want master -commit="latest" - -# Don't edit anything past this line -# ===================================================== # - -LATEST="latest" - -cd ../.. -# We should be in the base directory now - -git clone --recurse-submodules https://github.com/pop-os/$pop_repo - -cd $pop_repo - -if [[ "$commit" == "$LATEST" ]] -then - commit=$(git rev-parse HEAD) -fi - -echo $commit -short_commit=${commit:0:6} - -git reset --hard $commit - -mkdir .vendor - -cargo vendor > .vendor/config.toml - -tar -pcf vendor.tar vendor && mv vendor.tar ../vendor.tar - -rm -rf vendor && cd .. - -# Back into cosmic-packaging - -ls - -if [ "$pop_repo" != "$name" ]; then - mv $pop_repo $name -else - echo "names are equal. continuing..." -fi - -tar -czf $name.tar.gz $name - -rm -rf $name - -cp cosmic-packaging/$path_to_spec . - -rm -rf cosmic-packaging - -current_date=$(date +'%Y%m%d.%H') - -sed -i "/^Version: / s/.*/Version: $version~$current_date.$short_commit/" $name.spec diff --git a/cosmic-notifications/cosmic-notifications.spec b/cosmic-notifications/cosmic-notifications.spec deleted file mode 100644 index b309dbf..0000000 --- a/cosmic-notifications/cosmic-notifications.spec +++ /dev/null @@ -1,91 +0,0 @@ - -# Generated by rust2rpm 25 - -# prevent library files from being installed - -%global crate cosmic-notifications -%global repo https://github.com/pop-os/cosmic-notifications - -Name: cosmic-notifications -Version: # TO BE REPLACED AUTOMATICALLY - -Release: %autorelease -Summary: Layer Shell notifications daemon which integrates with COSMIC - -License: GPL-3.0 - -URL: https://github.com/pop-os/cosmic-notifications - -Source: %{crate}.tar.gz -Source: vendor.tar - - - -# For now, we require all deps for all of cosmic-epoch -BuildRequires: make -BuildRequires: which -BuildRequires: git-core -BuildRequires: just -BuildRequires: rustc -BuildRequires: lld -BuildRequires: cargo -BuildRequires: glib2-devel -BuildRequires: gtk3-devel -BuildRequires: dbus-devel -BuildRequires: wayland-devel -BuildRequires: clang-devel -BuildRequires: libxkbcommon-devel -BuildRequires: mesa-libgbm-devel -BuildRequires: rust-rav1e+nasm-rs-devel -BuildRequires: libappstream-glib -BuildRequires: pipewire-devel -BuildRequires: libglvnd-devel -BuildRequires: libseat-devel -BuildRequires: libinput-devel -BuildRequires: pam-devel -BuildRequires: flatpak-devel - - - -# For now, we require all deps for all of cosmic-epoch -Requires: libseat -Requires: pop-icon-theme -Requires: greetd -Requires: greetd-selinux -Requires: cage -Requires: mozilla-fira-mono-fonts -Requires: mozilla-fira-sans-fonts - - -%global _description %{expand: -%{summary}.} - -%description %{_description} - -%prep - -%autosetup -n %{crate} -p1 -mv %{_sourcedir}/vendor.tar vendor.tar -ls -a -mkdir -p .cargo -cp .vendor/config.toml .cargo/config.toml - - -%build -just build-vendored - -%install -just rootdir=%{buildroot} prefix=%{_prefix} install - -%files - -%{_bindir}/cosmic-notifications -%{_datadir}/applications/com.system76.CosmicNotifications.desktop -%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicNotifications.svg -%{_metainfodir}/com.system76.CosmicNotifications.metainfo.xml - - - -%changelog -%autochangelog - \ No newline at end of file diff --git a/cosmic-notifications/srpm.sh b/cosmic-notifications/srpm.sh deleted file mode 100644 index 80e9295..0000000 --- a/cosmic-notifications/srpm.sh +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/bash -x - -# Variables. LOOK CLOSELY AND MAKE SURE THESE ARE CORRECT - -name='cosmic-notifications' -version='0.1.0' - -path_to_spec='cosmic-notifications/*' -pop_repo='cosmic-notifications' - -# Commit to target. Use "latest" if you want master -commit="latest" - -# Don't edit anything past this line -# ===================================================== # - -LATEST="latest" - -cd ../.. -# We should be in the base directory now - -git clone --recurse-submodules https://github.com/pop-os/$pop_repo - -cd $pop_repo - -if [[ "$commit" == "$LATEST" ]] -then - commit=$(git rev-parse HEAD) -fi - -echo $commit -short_commit=${commit:0:6} - -git reset --hard $commit - -mkdir .vendor - -cargo vendor > .vendor/config.toml - -tar -pcf vendor.tar vendor && mv vendor.tar ../vendor.tar - -rm -rf vendor && cd .. - -# Back into cosmic-packaging - -ls - -if [ "$pop_repo" != "$name" ]; then - mv $pop_repo $name -else - echo "names are equal. continuing..." -fi - -tar -czf $name.tar.gz $name - -rm -rf $name - -cp cosmic-packaging/$path_to_spec . - -rm -rf cosmic-packaging - -current_date=$(date +'%Y%m%d.%H') - -sed -i "/^Version: / s/.*/Version: $version~$current_date.$short_commit/" $name.spec diff --git a/cosmic-osd/cosmic-osd.spec b/cosmic-osd/cosmic-osd.spec deleted file mode 100644 index 30cef90..0000000 --- a/cosmic-osd/cosmic-osd.spec +++ /dev/null @@ -1,88 +0,0 @@ - -# Generated by rust2rpm 25 - -# prevent library files from being installed - -%global crate cosmic-osd -%global repo https://github.com/pop-os/cosmic-osd - -Name: cosmic-osd -Version: # TO BE REPLACED AUTOMATICALLY - -Release: %autorelease -Summary: OSDs for the COSMIC desktop environment - -License: GPL-3.0 - -URL: https://github.com/pop-os/cosmic-osd - -Source: %{crate}.tar.gz -Source: vendor.tar - - - -# For now, we require all deps for all of cosmic-epoch -BuildRequires: make -BuildRequires: which -BuildRequires: git-core -BuildRequires: just -BuildRequires: rustc -BuildRequires: lld -BuildRequires: cargo -BuildRequires: glib2-devel -BuildRequires: gtk3-devel -BuildRequires: dbus-devel -BuildRequires: wayland-devel -BuildRequires: clang-devel -BuildRequires: libxkbcommon-devel -BuildRequires: mesa-libgbm-devel -BuildRequires: rust-rav1e+nasm-rs-devel -BuildRequires: libappstream-glib -BuildRequires: pipewire-devel -BuildRequires: libglvnd-devel -BuildRequires: libseat-devel -BuildRequires: libinput-devel -BuildRequires: pam-devel -BuildRequires: flatpak-devel - - - -# For now, we require all deps for all of cosmic-epoch -Requires: libseat -Requires: pop-icon-theme -Requires: greetd -Requires: greetd-selinux -Requires: cage -Requires: mozilla-fira-mono-fonts -Requires: mozilla-fira-sans-fonts - - -%global _description %{expand: -%{summary}.} - -%description %{_description} - -%prep - -%autosetup -n %{crate} -p1 -mv %{_sourcedir}/vendor.tar vendor.tar -ls -a -mkdir -p .cargo -cp .vendor/config.toml .cargo/config.toml - - -%build -make all VENDOR=1 - -%install -make install DESTDIR=%{buildroot} prefix=%{_prefix} - -%files - -%{_bindir}/cosmic-osd - - - -%changelog -%autochangelog - \ No newline at end of file diff --git a/cosmic-osd/srpm.sh b/cosmic-osd/srpm.sh deleted file mode 100644 index 8fdfeed..0000000 --- a/cosmic-osd/srpm.sh +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/bash -x - -# Variables. LOOK CLOSELY AND MAKE SURE THESE ARE CORRECT - -name='cosmic-osd' -version='0.1.0' - -path_to_spec='cosmic-osd/*' -pop_repo='cosmic-osd' - -# Commit to target. Use "latest" if you want master -commit="latest" - -# Don't edit anything past this line -# ===================================================== # - -LATEST="latest" - -cd ../.. -# We should be in the base directory now - -git clone --recurse-submodules https://github.com/pop-os/$pop_repo - -cd $pop_repo - -if [[ "$commit" == "$LATEST" ]] -then - commit=$(git rev-parse HEAD) -fi - -echo $commit -short_commit=${commit:0:6} - -git reset --hard $commit - -mkdir .vendor - -cargo vendor > .vendor/config.toml - -tar -pcf vendor.tar vendor && mv vendor.tar ../vendor.tar - -rm -rf vendor && cd .. - -# Back into cosmic-packaging - -ls - -if [ "$pop_repo" != "$name" ]; then - mv $pop_repo $name -else - echo "names are equal. continuing..." -fi - -tar -czf $name.tar.gz $name - -rm -rf $name - -cp cosmic-packaging/$path_to_spec . - -rm -rf cosmic-packaging - -current_date=$(date +'%Y%m%d.%H') - -sed -i "/^Version: / s/.*/Version: $version~$current_date.$short_commit/" $name.spec diff --git a/cosmic-panel/cosmic-panel.spec b/cosmic-panel/cosmic-panel.spec deleted file mode 100644 index 31cf3ee..0000000 --- a/cosmic-panel/cosmic-panel.spec +++ /dev/null @@ -1,91 +0,0 @@ - -# Generated by rust2rpm 25 - -# prevent library files from being installed - -%global crate cosmic-panel -%global repo https://github.com/pop-os/cosmic-panel - -Name: cosmic-panel -Version: # TO BE REPLACED AUTOMATICALLY - -Release: %autorelease -Summary: Panel for COSMIC Desktop Environment - -License: GPL-3.0 - -URL: https://github.com/pop-os/cosmic-panel - -Source: %{crate}.tar.gz -Source: vendor.tar - - - -# For now, we require all deps for all of cosmic-epoch -BuildRequires: make -BuildRequires: which -BuildRequires: git-core -BuildRequires: just -BuildRequires: rustc -BuildRequires: lld -BuildRequires: cargo -BuildRequires: glib2-devel -BuildRequires: gtk3-devel -BuildRequires: dbus-devel -BuildRequires: wayland-devel -BuildRequires: clang-devel -BuildRequires: libxkbcommon-devel -BuildRequires: mesa-libgbm-devel -BuildRequires: rust-rav1e+nasm-rs-devel -BuildRequires: libappstream-glib -BuildRequires: pipewire-devel -BuildRequires: libglvnd-devel -BuildRequires: libseat-devel -BuildRequires: libinput-devel -BuildRequires: pam-devel -BuildRequires: flatpak-devel - - - -# For now, we require all deps for all of cosmic-epoch -Requires: libseat -Requires: pop-icon-theme -Requires: greetd -Requires: greetd-selinux -Requires: cage -Requires: mozilla-fira-mono-fonts -Requires: mozilla-fira-sans-fonts - - -%global _description %{expand: -%{summary}.} - -%description %{_description} - -%prep - -%autosetup -n %{crate} -p1 -mv %{_sourcedir}/vendor.tar vendor.tar -ls -a -mkdir -p .cargo -cp .vendor/config.toml .cargo/config.toml - - -%build -just build-vendored - -%install -just rootdir=%{buildroot} prefix=%{_prefix} install - -%files - -%{_bindir}/cosmic-panel - -%{_datadir}/cosmic/com.system76.CosmicPanel.Dock/* -%{_datadir}/cosmic/com.system76.CosmicPanel.Panel/* -%{_datadir}/cosmic/com.system76.CosmicPanel/* - - -%changelog -%autochangelog - \ No newline at end of file diff --git a/cosmic-panel/srpm.sh b/cosmic-panel/srpm.sh deleted file mode 100644 index e5a2759..0000000 --- a/cosmic-panel/srpm.sh +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/bash -x - -# Variables. LOOK CLOSELY AND MAKE SURE THESE ARE CORRECT - -name='cosmic-panel' -version='0.1.0' - -path_to_spec='cosmic-panel/*' -pop_repo='cosmic-panel' - -# Commit to target. Use "latest" if you want master -commit="latest" - -# Don't edit anything past this line -# ===================================================== # - -LATEST="latest" - -cd ../.. -# We should be in the base directory now - -git clone --recurse-submodules https://github.com/pop-os/$pop_repo - -cd $pop_repo - -if [[ "$commit" == "$LATEST" ]] -then - commit=$(git rev-parse HEAD) -fi - -echo $commit -short_commit=${commit:0:6} - -git reset --hard $commit - -mkdir .vendor - -cargo vendor > .vendor/config.toml - -tar -pcf vendor.tar vendor && mv vendor.tar ../vendor.tar - -rm -rf vendor && cd .. - -# Back into cosmic-packaging - -ls - -if [ "$pop_repo" != "$name" ]; then - mv $pop_repo $name -else - echo "names are equal. continuing..." -fi - -tar -czf $name.tar.gz $name - -rm -rf $name - -cp cosmic-packaging/$path_to_spec . - -rm -rf cosmic-packaging - -current_date=$(date +'%Y%m%d.%H') - -sed -i "/^Version: / s/.*/Version: $version~$current_date.$short_commit/" $name.spec diff --git a/cosmic-randr/cosmic-randr.spec b/cosmic-randr/cosmic-randr.spec deleted file mode 100644 index 6e201cb..0000000 --- a/cosmic-randr/cosmic-randr.spec +++ /dev/null @@ -1,88 +0,0 @@ - -# Generated by rust2rpm 25 - -# prevent library files from being installed - -%global crate cosmic-randr -%global repo https://github.com/pop-os/cosmic-randr - -Name: cosmic-randr -Version: # TO BE REPLACED AUTOMATICALLY - -Release: %autorelease -Summary: Library and utility for displaying and configuring Wayland outputs - -License: MPL-2.0 - -URL: https://github.com/pop-os/cosmic-randr - -Source: %{crate}.tar.gz -Source: vendor.tar - - - -# For now, we require all deps for all of cosmic-epoch -BuildRequires: make -BuildRequires: which -BuildRequires: git-core -BuildRequires: just -BuildRequires: rustc -BuildRequires: lld -BuildRequires: cargo -BuildRequires: glib2-devel -BuildRequires: gtk3-devel -BuildRequires: dbus-devel -BuildRequires: wayland-devel -BuildRequires: clang-devel -BuildRequires: libxkbcommon-devel -BuildRequires: mesa-libgbm-devel -BuildRequires: rust-rav1e+nasm-rs-devel -BuildRequires: libappstream-glib -BuildRequires: pipewire-devel -BuildRequires: libglvnd-devel -BuildRequires: libseat-devel -BuildRequires: libinput-devel -BuildRequires: pam-devel -BuildRequires: flatpak-devel - - - -# For now, we require all deps for all of cosmic-epoch -Requires: libseat -Requires: pop-icon-theme -Requires: greetd -Requires: greetd-selinux -Requires: cage -Requires: mozilla-fira-mono-fonts -Requires: mozilla-fira-sans-fonts - - -%global _description %{expand: -%{summary}.} - -%description %{_description} - -%prep - -%autosetup -n %{crate} -p1 -mv %{_sourcedir}/vendor.tar vendor.tar -ls -a -mkdir -p .cargo -cp .vendor/config.toml .cargo/config.toml - - -%build -just build-vendored - -%install -just rootdir=%{buildroot} prefix=%{_prefix} install - -%files - -%{_bindir}/cosmic-randr - - - -%changelog -%autochangelog - \ No newline at end of file diff --git a/cosmic-randr/srpm.sh b/cosmic-randr/srpm.sh deleted file mode 100644 index 0d0dc13..0000000 --- a/cosmic-randr/srpm.sh +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/bash -x - -# Variables. LOOK CLOSELY AND MAKE SURE THESE ARE CORRECT - -name='cosmic-randr' -version='0.1.0' - -path_to_spec='cosmic-randr/*' -pop_repo='cosmic-randr' - -# Commit to target. Use "latest" if you want master -commit="latest" - -# Don't edit anything past this line -# ===================================================== # - -LATEST="latest" - -cd ../.. -# We should be in the base directory now - -git clone --recurse-submodules https://github.com/pop-os/$pop_repo - -cd $pop_repo - -if [[ "$commit" == "$LATEST" ]] -then - commit=$(git rev-parse HEAD) -fi - -echo $commit -short_commit=${commit:0:6} - -git reset --hard $commit - -mkdir .vendor - -cargo vendor > .vendor/config.toml - -tar -pcf vendor.tar vendor && mv vendor.tar ../vendor.tar - -rm -rf vendor && cd .. - -# Back into cosmic-packaging - -ls - -if [ "$pop_repo" != "$name" ]; then - mv $pop_repo $name -else - echo "names are equal. continuing..." -fi - -tar -czf $name.tar.gz $name - -rm -rf $name - -cp cosmic-packaging/$path_to_spec . - -rm -rf cosmic-packaging - -current_date=$(date +'%Y%m%d.%H') - -sed -i "/^Version: / s/.*/Version: $version~$current_date.$short_commit/" $name.spec diff --git a/cosmic-screenshot/cosmic-screenshot.spec b/cosmic-screenshot/cosmic-screenshot.spec deleted file mode 100644 index c1ad941..0000000 --- a/cosmic-screenshot/cosmic-screenshot.spec +++ /dev/null @@ -1,89 +0,0 @@ - -# Generated by rust2rpm 25 - -# prevent library files from being installed - -%global crate cosmic-screenshot -%global repo https://github.com/pop-os/cosmic-screenshot - -Name: cosmic-screenshot -Version: # TO BE REPLACED AUTOMATICALLY - -Release: %autorelease -Summary: Utility for capturing screenshots via XDG Desktop Portal - -License: GPL-3.0 - -URL: https://github.com/pop-os/cosmic-screenshot - -Source: %{crate}.tar.gz -Source: vendor.tar - - - -# For now, we require all deps for all of cosmic-epoch -BuildRequires: make -BuildRequires: which -BuildRequires: git-core -BuildRequires: just -BuildRequires: rustc -BuildRequires: lld -BuildRequires: cargo -BuildRequires: glib2-devel -BuildRequires: gtk3-devel -BuildRequires: dbus-devel -BuildRequires: wayland-devel -BuildRequires: clang-devel -BuildRequires: libxkbcommon-devel -BuildRequires: mesa-libgbm-devel -BuildRequires: rust-rav1e+nasm-rs-devel -BuildRequires: libappstream-glib -BuildRequires: pipewire-devel -BuildRequires: libglvnd-devel -BuildRequires: libseat-devel -BuildRequires: libinput-devel -BuildRequires: pam-devel -BuildRequires: flatpak-devel - - - -# For now, we require all deps for all of cosmic-epoch -Requires: libseat -Requires: pop-icon-theme -Requires: greetd -Requires: greetd-selinux -Requires: cage -Requires: mozilla-fira-mono-fonts -Requires: mozilla-fira-sans-fonts - - -%global _description %{expand: -%{summary}.} - -%description %{_description} - -%prep - -%autosetup -n %{crate} -p1 -mv %{_sourcedir}/vendor.tar vendor.tar -ls -a -mkdir -p .cargo -cp .vendor/config.toml .cargo/config.toml - - -%build -just build-vendored - -%install -just rootdir=%{buildroot} prefix=%{_prefix} install - -%files - -%{_bindir}/cosmic-screenshot -%{_datadir}/applications/com.system76.CosmicScreenshot.desktop - - - -%changelog -%autochangelog - \ No newline at end of file diff --git a/cosmic-screenshot/srpm.sh b/cosmic-screenshot/srpm.sh deleted file mode 100644 index 50565bd..0000000 --- a/cosmic-screenshot/srpm.sh +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/bash -x - -# Variables. LOOK CLOSELY AND MAKE SURE THESE ARE CORRECT - -name='cosmic-screenshot' -version='0.1.0' - -path_to_spec='cosmic-screenshot/*' -pop_repo='cosmic-screenshot' - -# Commit to target. Use "latest" if you want master -commit="latest" - -# Don't edit anything past this line -# ===================================================== # - -LATEST="latest" - -cd ../.. -# We should be in the base directory now - -git clone --recurse-submodules https://github.com/pop-os/$pop_repo - -cd $pop_repo - -if [[ "$commit" == "$LATEST" ]] -then - commit=$(git rev-parse HEAD) -fi - -echo $commit -short_commit=${commit:0:6} - -git reset --hard $commit - -mkdir .vendor - -cargo vendor > .vendor/config.toml - -tar -pcf vendor.tar vendor && mv vendor.tar ../vendor.tar - -rm -rf vendor && cd .. - -# Back into cosmic-packaging - -ls - -if [ "$pop_repo" != "$name" ]; then - mv $pop_repo $name -else - echo "names are equal. continuing..." -fi - -tar -czf $name.tar.gz $name - -rm -rf $name - -cp cosmic-packaging/$path_to_spec . - -rm -rf cosmic-packaging - -current_date=$(date +'%Y%m%d.%H') - -sed -i "/^Version: / s/.*/Version: $version~$current_date.$short_commit/" $name.spec From f51605c367ff07d5dc248387feda2aa6ae416d16 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 27 2024 19:24:02 +0000 Subject: [PATCH 68/220] hopefully fix cosmic-greeter? --- diff --git a/rpms/cosmic-greeter/cosmic-greeter.spec b/rpms/cosmic-greeter/cosmic-greeter.spec index 765ffc8..80efc35 100644 --- a/rpms/cosmic-greeter/cosmic-greeter.spec +++ b/rpms/cosmic-greeter/cosmic-greeter.spec @@ -52,8 +52,7 @@ cat .vendor/config.toml >> .cargo/config %{cargo_vendor_manifest} %install -install -Dm0755 target/release/cosmic-greeter %{buildroot}/%{_bindir}/cosmic-greeter -install -Dm0755 target/release/cosmic-greeter-daemon %{buildroot}/%{_bindir}/cosmic-greeter-daemon +%cargo_install install -Dm0644 dbus/com.system76.CosmicGreeter.conf %{buildroot}/%{_datadir}/dbus-1/system.d/com.system76.CosmicGreeter.conf install -Dm0644 debian/cosmic-greeter.sysusers %{buildroot}/%{_sysusersdir}/cosmic-greeter.conf install -Dm0644 debian/cosmic-greeter.tmpfiles %{buildroot}/%{_tmpfilesdir}/cosmic-greeter.conf From e0b1903f3cc0375882f9315920e7931ee92b5584 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 27 2024 19:42:32 +0000 Subject: [PATCH 69/220] fix cosmic-launcher --- diff --git a/rpms/cosmic-launcher/cosmic-launcher.spec b/rpms/cosmic-launcher/cosmic-launcher.spec index 2a815cd..371b0d5 100644 --- a/rpms/cosmic-launcher/cosmic-launcher.spec +++ b/rpms/cosmic-launcher/cosmic-launcher.spec @@ -44,6 +44,7 @@ Requires: pop-launcher cat .vendor/config.toml >> .cargo/config %build +export RUSTFLAGS="$RUSTFLAGS --cfg tokio_unstable" %cargo_build %{cargo_license_summary} %{cargo_license} > LICENSE.dependencies diff --git a/rpms/cosmic-session/cosmic-session.spec b/rpms/cosmic-session/cosmic-session.spec new file mode 100644 index 0000000..ba3b9d5 --- /dev/null +++ b/rpms/cosmic-session/cosmic-session.spec @@ -0,0 +1,55 @@ +# Generated by rust2rpm 26 +%bcond_without check + +# prevent library files from being installed +%global cargo_install_lib 0 + +%global crate cosmic-session + +Name: cosmic-session +Version: 0.1.0 +Release: %autorelease +Summary: Session manager for the COSMIC desktop environment + +SourceLicense: GPL-3.0-only +# FIXME: paste output of %%cargo_license_summary here +License: # FIXME +# LICENSE.dependencies contains a full license breakdown + +URL: # FIXME +Source: # FIXME +Source: cosmic-session-0.1.0-vendor.tar.xz + +BuildRequires: cargo-rpm-macros >= 26 + +%global _description %{expand: +The session manager for the COSMIC desktop environment.} + +%description %{_description} + +%prep +%autosetup -n %{crate}-%{version} -p1 -a1 +%cargo_prep -v vendor + +%build +%cargo_build +%{cargo_license_summary} +%{cargo_license} > LICENSE.dependencies +%{cargo_vendor_manifest} + +%install +%cargo_install + +%if %{with check} +%check +%cargo_test +%endif + +%files +%license LICENSE.md +%license LICENSE.dependencies +%license cargo-vendor.txt +%{_bindir}/cosmic-session + +%changelog +%autochangelog From b8c503b22b2dbec622cc69ee12a54c75a630a596 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 27 2024 19:55:39 +0000 Subject: [PATCH 70/220] cosmic-session and cosmic-settings --- diff --git a/cosmic-session/cosmic-session.spec b/cosmic-session/cosmic-session.spec deleted file mode 100644 index eca1ca3..0000000 --- a/cosmic-session/cosmic-session.spec +++ /dev/null @@ -1,93 +0,0 @@ - -# Generated by rust2rpm 25 - -# prevent library files from being installed - -%global crate cosmic-session -%global repo https://github.com/pop-os/cosmic-session - -Name: cosmic-session -Version: # TO BE REPLACED AUTOMATICALLY - -Release: %autorelease -Summary: Session manager for the COSMIC desktop environment - -License: GPL-3.0 - -URL: https://github.com/pop-os/cosmic-session - -Source: %{crate}.tar.gz -Source: vendor.tar - - - -# For now, we require all deps for all of cosmic-epoch -BuildRequires: make -BuildRequires: which -BuildRequires: git-core -BuildRequires: just -BuildRequires: rustc -BuildRequires: lld -BuildRequires: cargo -BuildRequires: glib2-devel -BuildRequires: gtk3-devel -BuildRequires: dbus-devel -BuildRequires: wayland-devel -BuildRequires: clang-devel -BuildRequires: libxkbcommon-devel -BuildRequires: mesa-libgbm-devel -BuildRequires: rust-rav1e+nasm-rs-devel -BuildRequires: libappstream-glib -BuildRequires: pipewire-devel -BuildRequires: libglvnd-devel -BuildRequires: libseat-devel -BuildRequires: libinput-devel -BuildRequires: pam-devel -BuildRequires: flatpak-devel - -BuildRequires: systemd-rpm-macros - - -# For now, we require all deps for all of cosmic-epoch -Requires: libseat -Requires: pop-icon-theme -Requires: greetd -Requires: greetd-selinux -Requires: cage -Requires: mozilla-fira-mono-fonts -Requires: mozilla-fira-sans-fonts - - -%global _description %{expand: -%{summary}.} - -%description %{_description} - -%prep - -%autosetup -n %{crate} -p1 -mv %{_sourcedir}/vendor.tar vendor.tar -ls -a -mkdir -p .cargo -cp .vendor/config.toml .cargo/config.toml - - -%build -just vendor=1 all - -%install -just rootdir=%{buildroot} install - -%files - -%{_bindir}/cosmic-session - -%{_bindir}/start-cosmic -%{_userunitdir}/cosmic-session.target -%{_datadir}/wayland-sessions/cosmic.desktop -%{_datadir}/applications/cosmic-mimeapps.list - - -%changelog -%autochangelog - \ No newline at end of file diff --git a/cosmic-session/srpm.sh b/cosmic-session/srpm.sh deleted file mode 100644 index a515bc5..0000000 --- a/cosmic-session/srpm.sh +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/bash -x - -# Variables. LOOK CLOSELY AND MAKE SURE THESE ARE CORRECT - -name='cosmic-session' -version='0.1.0' - -path_to_spec='cosmic-session/*' -pop_repo='cosmic-session' - -# Commit to target. Use "latest" if you want master -commit="latest" - -# Don't edit anything past this line -# ===================================================== # - -LATEST="latest" - -cd ../.. -# We should be in the base directory now - -git clone --recurse-submodules https://github.com/pop-os/$pop_repo - -cd $pop_repo - -if [[ "$commit" == "$LATEST" ]] -then - commit=$(git rev-parse HEAD) -fi - -echo $commit -short_commit=${commit:0:6} - -git reset --hard $commit - -mkdir .vendor - -cargo vendor > .vendor/config.toml - -tar -pcf vendor.tar vendor && mv vendor.tar ../vendor.tar - -rm -rf vendor && cd .. - -# Back into cosmic-packaging - -ls - -if [ "$pop_repo" != "$name" ]; then - mv $pop_repo $name -else - echo "names are equal. continuing..." -fi - -tar -czf $name.tar.gz $name - -rm -rf $name - -cp cosmic-packaging/$path_to_spec . - -rm -rf cosmic-packaging - -current_date=$(date +'%Y%m%d.%H') - -sed -i "/^Version: / s/.*/Version: $version~$current_date.$short_commit/" $name.spec diff --git a/cosmic-settings-daemon.spec b/cosmic-settings-daemon.spec new file mode 100644 index 0000000..fbf16ed --- /dev/null +++ b/cosmic-settings-daemon.spec @@ -0,0 +1,55 @@ +# Generated by rust2rpm 26 +%bcond_without check + +# prevent library files from being installed +%global cargo_install_lib 0 + +%global crate cosmic-settings-daemon + +Name: cosmic-settings-daemon +Version: 0.1.0 +Release: %autorelease +Summary: # FIXME + +SourceLicense: GPL-3.0-or-later +# FIXME: paste output of %%cargo_license_summary here +License: # FIXME +# LICENSE.dependencies contains a full license breakdown + +URL: # FIXME +Source: # FIXME +Source: cosmic-settings-daemon-0.1.0-vendor.tar.xz + +BuildRequires: cargo-rpm-macros >= 26 + +%global _description %{expand: +%{summary}.} + +%description %{_description} + +%prep +%autosetup -n %{crate}-%{version} -p1 -a1 +%cargo_prep -v vendor + +%build +%cargo_build +%{cargo_license_summary} +%{cargo_license} > LICENSE.dependencies +%{cargo_vendor_manifest} + +%install +%cargo_install + +%if %{with check} +%check +%cargo_test +%endif + +%files +%license LICENSE +%license LICENSE.dependencies +%license cargo-vendor.txt +%{_bindir}/cosmic-settings-daemon + +%changelog +%autochangelog diff --git a/cosmic-settings/cosmic-settings.spec b/cosmic-settings/cosmic-settings.spec deleted file mode 100644 index 2b288a2..0000000 --- a/cosmic-settings/cosmic-settings.spec +++ /dev/null @@ -1,125 +0,0 @@ -%define debug_package %{nil} -# Generated by rust2rpm 25 - -# prevent library files from being installed - -%global crate cosmic-settings -%global repo https://github.com/pop-os/cosmic-settings - -Name: cosmic-settings -Version: # TO BE REPLACED AUTOMATICALLY - -Release: %autorelease -Summary: The settings application for the COSMIC desktop environment - -License: GPL-3.0 - -URL: https://github.com/pop-os/cosmic-settings - -Source: %{crate}.tar.gz -Source: vendor.tar - - - -# For now, we require all deps for all of cosmic-epoch -BuildRequires: make -BuildRequires: which -BuildRequires: git-core -BuildRequires: just -BuildRequires: rustc -BuildRequires: lld -BuildRequires: cargo -BuildRequires: glib2-devel -BuildRequires: gtk3-devel -BuildRequires: dbus-devel -BuildRequires: wayland-devel -BuildRequires: clang-devel -BuildRequires: libxkbcommon-devel -BuildRequires: mesa-libgbm-devel -BuildRequires: rust-rav1e+nasm-rs-devel -BuildRequires: libappstream-glib -BuildRequires: pipewire-devel -BuildRequires: libglvnd-devel -BuildRequires: libseat-devel -BuildRequires: libinput-devel -BuildRequires: pam-devel -BuildRequires: flatpak-devel - - - -# For now, we require all deps for all of cosmic-epoch -Requires: libseat -Requires: pop-icon-theme -Requires: greetd -Requires: greetd-selinux -Requires: cage -Requires: mozilla-fira-mono-fonts -Requires: mozilla-fira-sans-fonts - - -%global _description %{expand: -%{summary}.} - -%description %{_description} - -%prep - -%autosetup -n %{crate} -p1 -mv %{_sourcedir}/vendor.tar vendor.tar -ls -a -mkdir -p .cargo -cp .vendor/config.toml .cargo/config.toml - - -%build -just build-vendored - -%install -just rootdir=%{buildroot} install - -%files - -%{_bindir}/cosmic-settings -%{_datadir}/applications/com.system76.CosmicSettings.desktop -%{_metainfodir}/com.system76.CosmicSettings.metainfo.xml - -%{_datadir}/cosmic/com.system76.CosmicTheme.Dark.Builder/v1/* -%{_datadir}/cosmic/com.system76.CosmicTheme.Dark/v1/* -%{_datadir}/cosmic/com.system76.CosmicTheme.Light.Builder/v1/* -%{_datadir}/cosmic/com.system76.CosmicTheme.Light/v1/* -%{_datadir}/cosmic/com.system76.CosmicTheme.Mode/v1/* -%{_datadir}/icons/hicolor/scalable/status/illustration-appearance-dark-style-round.svg -%{_datadir}/icons/hicolor/scalable/status/illustration-appearance-dark-style-slightly-round.svg -%{_datadir}/icons/hicolor/scalable/status/illustration-appearance-dark-style-square.svg -%{_datadir}/icons/hicolor/scalable/status/illustration-appearance-light-style-round.svg -%{_datadir}/icons/hicolor/scalable/status/illustration-appearance-light-style-slightly-round.svg -%{_datadir}/icons/hicolor/scalable/status/illustration-appearance-light-style-square.svg -%{_datadir}/icons/hicolor/scalable/status/illustration-appearance-mode-dark.svg -%{_datadir}/icons/hicolor/scalable/status/illustration-appearance-mode-light.svg -%{_datadir}/icons/hicolor/128x128/apps/com.system76.CosmicSettings.svg -%{_datadir}/icons/hicolor/16x16/apps/com.system76.CosmicSettings.svg -%{_datadir}/icons/hicolor/24x24/apps/com.system76.CosmicSettings.svg -%{_datadir}/icons/hicolor/256x256/apps/com.system76.CosmicSettings.svg -%{_datadir}/icons/hicolor/32x32/apps/com.system76.CosmicSettings.svg -%{_datadir}/icons/hicolor/48x48/apps/com.system76.CosmicSettings.svg -%{_datadir}/icons/hicolor/64x64/apps/com.system76.CosmicSettings.svg -%{_datadir}/applications/com.system76.CosmicSettings.About.desktop -%{_datadir}/applications/com.system76.CosmicSettings.Appearance.desktop -%{_datadir}/applications/com.system76.CosmicSettings.DateTime.desktop -%{_datadir}/applications/com.system76.CosmicSettings.Desktop.desktop -%{_datadir}/applications/com.system76.CosmicSettings.Displays.desktop -%{_datadir}/applications/com.system76.CosmicSettings.Firmware.desktop -%{_datadir}/applications/com.system76.CosmicSettings.Keyboard.desktop -%{_datadir}/applications/com.system76.CosmicSettings.Mouse.desktop -%{_datadir}/applications/com.system76.CosmicSettings.Notifications.desktop -%{_datadir}/applications/com.system76.CosmicSettings.RegionLanguage.desktop -%{_datadir}/applications/com.system76.CosmicSettings.Sound.desktop -%{_datadir}/applications/com.system76.CosmicSettings.Touchpad.desktop -%{_datadir}/applications/com.system76.CosmicSettings.Users.desktop -%{_datadir}/applications/com.system76.CosmicSettings.Wallpaper.desktop -%{_datadir}/applications/com.system76.CosmicSettings.Workspaces.desktop - - -%changelog -%autochangelog - \ No newline at end of file diff --git a/cosmic-settings/srpm.sh b/cosmic-settings/srpm.sh deleted file mode 100644 index b21831a..0000000 --- a/cosmic-settings/srpm.sh +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/bash -x - -# Variables. LOOK CLOSELY AND MAKE SURE THESE ARE CORRECT - -name='cosmic-settings' -version='0.1.0' - -path_to_spec='cosmic-settings/*' -pop_repo='cosmic-settings' - -# Commit to target. Use "latest" if you want master -commit="latest" - -# Don't edit anything past this line -# ===================================================== # - -LATEST="latest" - -cd ../.. -# We should be in the base directory now - -git clone --recurse-submodules https://github.com/pop-os/$pop_repo - -cd $pop_repo - -if [[ "$commit" == "$LATEST" ]] -then - commit=$(git rev-parse HEAD) -fi - -echo $commit -short_commit=${commit:0:6} - -git reset --hard $commit - -mkdir .vendor - -cargo vendor > .vendor/config.toml - -tar -pcf vendor.tar vendor && mv vendor.tar ../vendor.tar - -rm -rf vendor && cd .. - -# Back into cosmic-packaging - -ls - -if [ "$pop_repo" != "$name" ]; then - mv $pop_repo $name -else - echo "names are equal. continuing..." -fi - -tar -czf $name.tar.gz $name - -rm -rf $name - -cp cosmic-packaging/$path_to_spec . - -rm -rf cosmic-packaging - -current_date=$(date +'%Y%m%d.%H') - -sed -i "/^Version: / s/.*/Version: $version~$current_date.$short_commit/" $name.spec diff --git a/metadata/all_deps.txt b/metadata/all_deps.txt index d85cdd2..bf78785 100644 --- a/metadata/all_deps.txt +++ b/metadata/all_deps.txt @@ -175,4 +175,14 @@ cosmic-screenshot rustc lld cargo +just + +cosmic-settings +rustc +lld +cargo +libinput-devel +wayland-devel +libxkbcommon-devel +systemd-devel just \ No newline at end of file diff --git a/rpms/cosmic-session/cosmic-session.spec b/rpms/cosmic-session/cosmic-session.spec index ba3b9d5..543519a 100644 --- a/rpms/cosmic-session/cosmic-session.spec +++ b/rpms/cosmic-session/cosmic-session.spec @@ -6,21 +6,48 @@ %global crate cosmic-session +%global ver ### +%global commit ### +%global date ### + Name: cosmic-session -Version: 0.1.0 +Version: %{ver}~%{date} Release: %autorelease Summary: Session manager for the COSMIC desktop environment SourceLicense: GPL-3.0-only -# FIXME: paste output of %%cargo_license_summary here -License: # FIXME +License: GPL-3.0 # LICENSE.dependencies contains a full license breakdown -URL: # FIXME -Source: # FIXME -Source: cosmic-session-0.1.0-vendor.tar.xz +URL: https://github.com/pop-os/cosmic-session +Source: cosmic-session-%{ver}.tar.xz +Source: cosmic-session-%{ver}-vendor.tar.xz BuildRequires: cargo-rpm-macros >= 26 +BuildRequires: rustc +BuildRequires: lld +BuildRequires: cargo +BuildRequires: just + + +Requires: cosmic-app-library +Requires: cosmic-applets +Requires: cosmic-bg +Requires: cosmic-comp +Requires: cosmic-greeter +Requires: cosmic-icons +Requires: cosmic-launcher +Requires: cosmic-notifications +Requires: cosmic-osd +Requires: cosmic-panel +Requires: cosmic-randr +Requires: cosmic-screenshot +Requires: cosmic-settings +Requires: cosmic-settings-daemon +Requires: cosmic-workspaces +Requires: pop-fonts +Requires: xdg-desktop-portal-cosmic +Requires: xwayland %global _description %{expand: The session manager for the COSMIC desktop environment.} @@ -28,8 +55,9 @@ The session manager for the COSMIC desktop environment.} %description %{_description} %prep -%autosetup -n %{crate}-%{version} -p1 -a1 -%cargo_prep -v vendor +%autosetup -n %{crate}-%{ver} -p1 -a1 +%cargo_prep -N +cat .vendor/config.toml >> .cargo/config %build %cargo_build @@ -38,7 +66,7 @@ The session manager for the COSMIC desktop environment.} %{cargo_vendor_manifest} %install -%cargo_install +just rootdir=%{buildroot} install %if %{with check} %check @@ -48,8 +76,12 @@ The session manager for the COSMIC desktop environment.} %files %license LICENSE.md %license LICENSE.dependencies -%license cargo-vendor.txt +# %%license cargo-vendor.txt %{_bindir}/cosmic-session +%{_bindir}/start-cosmic +%{_userunitdir}/cosmic-session.target +%{_datadir}/wayland-sessions/cosmic.desktop +%{_datadir}/applications/cosmic-mimeapps.list %changelog %autochangelog diff --git a/rpms/cosmic-settings/cosmic-settings.spec b/rpms/cosmic-settings/cosmic-settings.spec new file mode 100644 index 0000000..ab2a72f --- /dev/null +++ b/rpms/cosmic-settings/cosmic-settings.spec @@ -0,0 +1,100 @@ +# Generated by rust2rpm 26 +%bcond_without check + +%global ver ### +%global commit ### +%global date ### + +Name: cosmic-settings +Version: %{ver}~%{date} +Release: %autorelease +Summary: Settings app for the COSMIC Desktop Environment. + +SourceLicense: GPL-3.0 AND GPL-3.0-only +License: GPL-3.0 +# LICENSE.dependencies contains a full license breakdown + +URL: https://github.com/pop-os/cosmic-settings +Source: cosmic-settings-%{ver}.tar.xz +Source: cosmic-settings-%{ver}-vendor.tar.xz + +BuildRequires: cargo-rpm-macros >= 25 +BuildRequires: rustc +BuildRequires: lld +BuildRequires: cargo +BuildRequires: libinput-devel +BuildRequires: wayland-devel +BuildRequires: libxkbcommon-devel +BuildRequires: systemd-devel +BuildRequires: just + +%global _description %{expand: +%{summary}.} + +%description %{_description} + +%prep +%autosetup -n cosmic-settings-%{ver} -p1 -a1 +%cargo_prep -N +cat .vendor/config.toml >> .cargo/config + +%build +%cargo_build +%{cargo_license_summary} +%{cargo_license} > LICENSE.dependencies +%{cargo_vendor_manifest} + +%install +just rootdir=%{buildroot} install + +%if %{with check} +%check +%cargo_test +%endif + +%files +%license LICENSE.md +%license LICENSE.dependencies +# %%license cargo-vendor.txt +%doc README.md +%{_bindir}/cosmic-settings +%{_datadir}/applications/com.system76.CosmicSettings.desktop +%{_metainfodir}/com.system76.CosmicSettings.metainfo.xml +%{_datadir}/cosmic/com.system76.CosmicTheme.Dark.Builder/v1/* +%{_datadir}/cosmic/com.system76.CosmicTheme.Dark/v1/* +%{_datadir}/cosmic/com.system76.CosmicTheme.Light.Builder/v1/* +%{_datadir}/cosmic/com.system76.CosmicTheme.Light/v1/* +%{_datadir}/cosmic/com.system76.CosmicTheme.Mode/v1/* +%{_datadir}/icons/hicolor/scalable/status/illustration-appearance-dark-style-round.svg +%{_datadir}/icons/hicolor/scalable/status/illustration-appearance-dark-style-slightly-round.svg +%{_datadir}/icons/hicolor/scalable/status/illustration-appearance-dark-style-square.svg +%{_datadir}/icons/hicolor/scalable/status/illustration-appearance-light-style-round.svg +%{_datadir}/icons/hicolor/scalable/status/illustration-appearance-light-style-slightly-round.svg +%{_datadir}/icons/hicolor/scalable/status/illustration-appearance-light-style-square.svg +%{_datadir}/icons/hicolor/scalable/status/illustration-appearance-mode-dark.svg +%{_datadir}/icons/hicolor/scalable/status/illustration-appearance-mode-light.svg +%{_datadir}/icons/hicolor/128x128/apps/com.system76.CosmicSettings.svg +%{_datadir}/icons/hicolor/16x16/apps/com.system76.CosmicSettings.svg +%{_datadir}/icons/hicolor/24x24/apps/com.system76.CosmicSettings.svg +%{_datadir}/icons/hicolor/256x256/apps/com.system76.CosmicSettings.svg +%{_datadir}/icons/hicolor/32x32/apps/com.system76.CosmicSettings.svg +%{_datadir}/icons/hicolor/48x48/apps/com.system76.CosmicSettings.svg +%{_datadir}/icons/hicolor/64x64/apps/com.system76.CosmicSettings.svg +%{_datadir}/applications/com.system76.CosmicSettings.About.desktop +%{_datadir}/applications/com.system76.CosmicSettings.Appearance.desktop +%{_datadir}/applications/com.system76.CosmicSettings.DateTime.desktop +%{_datadir}/applications/com.system76.CosmicSettings.Desktop.desktop +%{_datadir}/applications/com.system76.CosmicSettings.Displays.desktop +%{_datadir}/applications/com.system76.CosmicSettings.Firmware.desktop +%{_datadir}/applications/com.system76.CosmicSettings.Keyboard.desktop +%{_datadir}/applications/com.system76.CosmicSettings.Mouse.desktop +%{_datadir}/applications/com.system76.CosmicSettings.Notifications.desktop +%{_datadir}/applications/com.system76.CosmicSettings.RegionLanguage.desktop +%{_datadir}/applications/com.system76.CosmicSettings.Sound.desktop +%{_datadir}/applications/com.system76.CosmicSettings.Touchpad.desktop +%{_datadir}/applications/com.system76.CosmicSettings.Users.desktop +%{_datadir}/applications/com.system76.CosmicSettings.Wallpaper.desktop +%{_datadir}/applications/com.system76.CosmicSettings.Workspaces.desktop + +%changelog +%autochangelog From f6d0cb7e64f2ab9b9c3520396e13127745aca252 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 27 2024 19:55:59 +0000 Subject: [PATCH 71/220] s --- diff --git a/cosmic-settings-daemon.spec b/cosmic-settings-daemon.spec deleted file mode 100644 index fbf16ed..0000000 --- a/cosmic-settings-daemon.spec +++ /dev/null @@ -1,55 +0,0 @@ -# Generated by rust2rpm 26 -%bcond_without check - -# prevent library files from being installed -%global cargo_install_lib 0 - -%global crate cosmic-settings-daemon - -Name: cosmic-settings-daemon -Version: 0.1.0 -Release: %autorelease -Summary: # FIXME - -SourceLicense: GPL-3.0-or-later -# FIXME: paste output of %%cargo_license_summary here -License: # FIXME -# LICENSE.dependencies contains a full license breakdown - -URL: # FIXME -Source: # FIXME -Source: cosmic-settings-daemon-0.1.0-vendor.tar.xz - -BuildRequires: cargo-rpm-macros >= 26 - -%global _description %{expand: -%{summary}.} - -%description %{_description} - -%prep -%autosetup -n %{crate}-%{version} -p1 -a1 -%cargo_prep -v vendor - -%build -%cargo_build -%{cargo_license_summary} -%{cargo_license} > LICENSE.dependencies -%{cargo_vendor_manifest} - -%install -%cargo_install - -%if %{with check} -%check -%cargo_test -%endif - -%files -%license LICENSE -%license LICENSE.dependencies -%license cargo-vendor.txt -%{_bindir}/cosmic-settings-daemon - -%changelog -%autochangelog diff --git a/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec b/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec new file mode 100644 index 0000000..fbf16ed --- /dev/null +++ b/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec @@ -0,0 +1,55 @@ +# Generated by rust2rpm 26 +%bcond_without check + +# prevent library files from being installed +%global cargo_install_lib 0 + +%global crate cosmic-settings-daemon + +Name: cosmic-settings-daemon +Version: 0.1.0 +Release: %autorelease +Summary: # FIXME + +SourceLicense: GPL-3.0-or-later +# FIXME: paste output of %%cargo_license_summary here +License: # FIXME +# LICENSE.dependencies contains a full license breakdown + +URL: # FIXME +Source: # FIXME +Source: cosmic-settings-daemon-0.1.0-vendor.tar.xz + +BuildRequires: cargo-rpm-macros >= 26 + +%global _description %{expand: +%{summary}.} + +%description %{_description} + +%prep +%autosetup -n %{crate}-%{version} -p1 -a1 +%cargo_prep -v vendor + +%build +%cargo_build +%{cargo_license_summary} +%{cargo_license} > LICENSE.dependencies +%{cargo_vendor_manifest} + +%install +%cargo_install + +%if %{with check} +%check +%cargo_test +%endif + +%files +%license LICENSE +%license LICENSE.dependencies +%license cargo-vendor.txt +%{_bindir}/cosmic-settings-daemon + +%changelog +%autochangelog From 85335e5a6a0f9d0ecb3b882569831a6b1a074844 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 27 2024 20:00:53 +0000 Subject: [PATCH 72/220] temp solution for cosmic-greeter --- diff --git a/rpms/cosmic-greeter/cosmic-greeter.spec b/rpms/cosmic-greeter/cosmic-greeter.spec index 80efc35..e9d2dba 100644 --- a/rpms/cosmic-greeter/cosmic-greeter.spec +++ b/rpms/cosmic-greeter/cosmic-greeter.spec @@ -46,7 +46,9 @@ Requires: cosmic-comp cat .vendor/config.toml >> .cargo/config %build -%cargo_build +# FIXME: cargo_build doesn't compile greeter daemon +# %%cargo_build +cargo build --all --offline --frozen %{cargo_license_summary} %{cargo_license} > LICENSE.dependencies %{cargo_vendor_manifest} From 232b21a7eacd7d6ecca60d509eab0b8f757e37e5 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 27 2024 20:15:30 +0000 Subject: [PATCH 73/220] cosmic-settings-daemon, fix cosmmic-greeter --- diff --git a/rpms/cosmic-greeter/cosmic-greeter.spec b/rpms/cosmic-greeter/cosmic-greeter.spec index e9d2dba..4e09c41 100644 --- a/rpms/cosmic-greeter/cosmic-greeter.spec +++ b/rpms/cosmic-greeter/cosmic-greeter.spec @@ -30,6 +30,9 @@ BuildRequires: libxkbcommon-devel BuildRequires: pam-devel BuildRequires: just +BuildRequires: systemd-rpm-macros +%{?sysusers_requires_compat} + Requires: dbus Requires: greetd Requires: greetd-selinux @@ -67,6 +70,21 @@ install -Dm0644 debian/cosmic-greeter-daemon.service %{buildroot}/%{_unitdir}/co %cargo_test %endif +%pre +%sysusers_create_compat debian/cosmic-greeter.sysusers + +%post +%systemd_post cosmic-greeter.service +%systemd_post cosmic-greeter-daemon.service + +%preun +%systemd_preun cosmic-greeter.service +%systemd_preun cosmic-greeter-daemon.service + +%postun +%systemd_postun cosmic-greeter.service +%systemd_postun cosmic-greeter-daemon.service + %files %license LICENSE %license LICENSE.dependencies diff --git a/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec b/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec index fbf16ed..cf90da3 100644 --- a/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec +++ b/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec @@ -6,21 +6,29 @@ %global crate cosmic-settings-daemon +%global ver ### +%global commit ### +%global date ### + Name: cosmic-settings-daemon -Version: 0.1.0 +Version: %{ver}~%{date} Release: %autorelease Summary: # FIXME SourceLicense: GPL-3.0-or-later -# FIXME: paste output of %%cargo_license_summary here -License: # FIXME +License: GPL-3.0 # LICENSE.dependencies contains a full license breakdown -URL: # FIXME -Source: # FIXME -Source: cosmic-settings-daemon-0.1.0-vendor.tar.xz +URL: https://github.com/pop-os/cosmic-settings-daemon +Source: cosmic-settings-daemon-%{ver}.tar.xz +Source: cosmic-settings-daemon-%{ver}-vendor.tar.xz BuildRequires: cargo-rpm-macros >= 26 +BuildRequires: rustc +BuildRequires: lld +BuildRequires: cargo +BuildRequires: systemd-devel +BuildRequires: just %global _description %{expand: %{summary}.} @@ -28,8 +36,9 @@ BuildRequires: cargo-rpm-macros >= 26 %description %{_description} %prep -%autosetup -n %{crate}-%{version} -p1 -a1 -%cargo_prep -v vendor +%autosetup -n %{crate}-%{ver} -p1 -a1 +%cargo_prep -N +cat .vendor/config.toml >> .cargo/config %build %cargo_build @@ -38,7 +47,7 @@ BuildRequires: cargo-rpm-macros >= 26 %{cargo_vendor_manifest} %install -%cargo_install +make install DESTDIR=%{buildroot} prefix=%{_prefix} %if %{with check} %check @@ -48,7 +57,7 @@ BuildRequires: cargo-rpm-macros >= 26 %files %license LICENSE %license LICENSE.dependencies -%license cargo-vendor.txt +# %%license cargo-vendor.txt %{_bindir}/cosmic-settings-daemon %changelog diff --git a/rpms/cosmic-store/cosmic-store.spec b/rpms/cosmic-store/cosmic-store.spec new file mode 100644 index 0000000..ac7a33f --- /dev/null +++ b/rpms/cosmic-store/cosmic-store.spec @@ -0,0 +1,52 @@ +# Generated by rust2rpm 26 +%bcond_without check + +Name: cosmic-store +Version: 0.1.0 +Release: %autorelease +Summary: # FIXME + +SourceLicense: +# FIXME: paste output of %%cargo_license_summary here +License: # FIXME +# LICENSE.dependencies contains a full license breakdown + +URL: # FIXME +Source: # FIXME +Source: cosmic-store-0.1.0-vendor.tar.xz + +BuildRequires: cargo-rpm-macros >= 25 + +%global _description %{expand: +%{summary}.} + +%description %{_description} + +%prep +%autosetup -n cosmic-store-%{version} -p1 -a1 +%cargo_prep -v vendor + +%build +%cargo_build +%{cargo_license_summary} +%{cargo_license} > LICENSE.dependencies +%{cargo_vendor_manifest} + +%install +%cargo_install + +%if %{with check} +%check +%cargo_test +%endif + +%files +%license LICENSE +%license LICENSE.dependencies +%license cargo-vendor.txt +%doc README.md +%{_bindir}/cosmic-store +%{_bindir}/flathub-stats + +%changelog +%autochangelog diff --git a/rpms/cosmic-term/cosmic-term.spec b/rpms/cosmic-term/cosmic-term.spec new file mode 100644 index 0000000..e721307 --- /dev/null +++ b/rpms/cosmic-term/cosmic-term.spec @@ -0,0 +1,56 @@ +# Generated by rust2rpm 26 +%bcond_without check + +# prevent library files from being installed +%global cargo_install_lib 0 + +%global crate cosmic-term + +Name: cosmic-term +Version: 0.1.0 +Release: %autorelease +Summary: # FIXME + +SourceLicense: GPL-3.0-only +# FIXME: paste output of %%cargo_license_summary here +License: # FIXME +# LICENSE.dependencies contains a full license breakdown + +URL: # FIXME +Source: # FIXME +Source: cosmic-term-0.1.0-vendor.tar.xz + +BuildRequires: cargo-rpm-macros >= 26 + +%global _description %{expand: +%{summary}.} + +%description %{_description} + +%prep +%autosetup -n %{crate}-%{version} -p1 -a1 +%cargo_prep -v vendor + +%build +%cargo_build +%{cargo_license_summary} +%{cargo_license} > LICENSE.dependencies +%{cargo_vendor_manifest} + +%install +%cargo_install + +%if %{with check} +%check +%cargo_test +%endif + +%files +%license LICENSE +%license LICENSE.dependencies +%license cargo-vendor.txt +%doc README.md +%{_bindir}/cosmic-term + +%changelog +%autochangelog diff --git a/rpms/cosmic-workspaces/cosmic-workspaces.spec b/rpms/cosmic-workspaces/cosmic-workspaces.spec new file mode 100644 index 0000000..4539b9b --- /dev/null +++ b/rpms/cosmic-workspaces/cosmic-workspaces.spec @@ -0,0 +1,56 @@ +# Generated by rust2rpm 26 +%bcond_without check + +# prevent library files from being installed +%global cargo_install_lib 0 + +%global crate cosmic-workspaces + +Name: cosmic-workspaces +Version: 0.1.0 +Release: %autorelease +Summary: # FIXME + +SourceLicense: None +# FIXME: paste output of %%cargo_license_summary here +License: # FIXME +# LICENSE.dependencies contains a full license breakdown +# FIXME: No license information in crate metadata. + +URL: # FIXME +Source: # FIXME +Source: cosmic-workspaces-0.1.0-vendor.tar.xz + +BuildRequires: cargo-rpm-macros >= 26 + +%global _description %{expand: +%{summary}.} + +%description %{_description} + +%prep +%autosetup -n %{crate}-%{version} -p1 -a1 +%cargo_prep -v vendor + +%build +%cargo_build +%{cargo_license_summary} +%{cargo_license} > LICENSE.dependencies +%{cargo_vendor_manifest} + +%install +%cargo_install + +%if %{with check} +%check +%cargo_test +%endif + +%files +%license LICENSE +%license LICENSE.dependencies +%license cargo-vendor.txt +%{_bindir}/cosmic-workspaces + +%changelog +%autochangelog From 3650be219186858008f31686a2e30a4475526834 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 27 2024 20:18:30 +0000 Subject: [PATCH 74/220] fix cosmic-session --- diff --git a/rpms/cosmic-session/cosmic-session.spec b/rpms/cosmic-session/cosmic-session.spec index 543519a..2be8667 100644 --- a/rpms/cosmic-session/cosmic-session.spec +++ b/rpms/cosmic-session/cosmic-session.spec @@ -29,6 +29,7 @@ BuildRequires: lld BuildRequires: cargo BuildRequires: just +BuildRequires: systemd-rpm-macros Requires: cosmic-app-library Requires: cosmic-applets From 038c7058d22132523ff469ef91ce0ec6aa122754 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 27 2024 20:48:42 +0000 Subject: [PATCH 75/220] mostly done --- diff --git a/bootstrap.sh b/bootstrap.sh deleted file mode 100644 index ee96b71..0000000 --- a/bootstrap.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -x - -PACKAGE= - -git clone --recurse-submodules https://pagure.io/fedora-cosmic/cosmic-packaging.git -cd cosmic-packaging/$PACKAGE -. ./srpm.sh \ No newline at end of file diff --git a/cosmic-greeter/cosmic-greeter.spec b/cosmic-greeter/cosmic-greeter.spec deleted file mode 100644 index 1add49e..0000000 --- a/cosmic-greeter/cosmic-greeter.spec +++ /dev/null @@ -1,121 +0,0 @@ - -# Generated by rust2rpm 25 - -# prevent library files from being installed - -%global crate cosmic-greeter -%global repo https://github.com/pop-os/cosmic-greeter - -Name: cosmic-greeter -Version: # TO BE REPLACED AUTOMATICALLY - -Release: %autorelease -Summary: Libcosmic greeter for greetd, which can be run inside cosmic-comp - -License: GPL-3.0 - -URL: https://github.com/pop-os/cosmic-greeter - -Source: %{crate}.tar.gz -Source: vendor.tar - -Patch1: service.patch - - -# For now, we require all deps for all of cosmic-epoch -BuildRequires: make -BuildRequires: which -BuildRequires: git-core -BuildRequires: just -BuildRequires: rustc -BuildRequires: lld -BuildRequires: cargo -BuildRequires: glib2-devel -BuildRequires: gtk3-devel -BuildRequires: dbus-devel -BuildRequires: wayland-devel -BuildRequires: clang-devel -BuildRequires: libxkbcommon-devel -BuildRequires: mesa-libgbm-devel -BuildRequires: rust-rav1e+nasm-rs-devel -BuildRequires: libappstream-glib -BuildRequires: pipewire-devel -BuildRequires: libglvnd-devel -BuildRequires: libseat-devel -BuildRequires: libinput-devel -BuildRequires: pam-devel -BuildRequires: flatpak-devel - -BuildRequires: systemd-rpm-macros -%{?sysusers_requires_compat} - - -# For now, we require all deps for all of cosmic-epoch -Requires: libseat -Requires: pop-icon-theme -Requires: greetd -Requires: greetd-selinux -Requires: cage -Requires: mozilla-fira-mono-fonts -Requires: mozilla-fira-sans-fonts - - -%global _description %{expand: -%{summary}.} - -%description %{_description} - -%prep - -%autosetup -n %{crate} -p1 -mv %{_sourcedir}/vendor.tar vendor.tar -ls -a -mkdir -p .cargo -cp .vendor/config.toml .cargo/config.toml - - -%build -just build-vendored - -%install - -install -Dm0755 target/release//cosmic-greeter %{buildroot}/%{_bindir}/cosmic-greeter -install -Dm0755 target/release//cosmic-greeter-daemon %{buildroot}/%{_bindir}/cosmic-greeter-daemon -install -Dm0644 dbus/com.system76.CosmicGreeter.conf %{buildroot}/%{_datadir}/dbus-1/system.d/com.system76.CosmicGreeter.conf -install -Dm0644 debian/cosmic-greeter.sysusers %{buildroot}/%{_sysusersdir}/cosmic-greeter.conf -install -Dm0644 debian/cosmic-greeter.tmpfiles %{buildroot}/%{_tmpfilesdir}/cosmic-greeter.conf -install -Dm0644 cosmic-greeter.toml %{buildroot}/%{_prefix}/etc/greetd/cosmic-greeter.toml -install -Dm0644 debian/cosmic-greeter.service %{buildroot}/%{_unitdir}/cosmic-greeter.service -install -Dm0644 debian/cosmic-greeter-daemon.service %{buildroot}/%{_unitdir}/cosmic-greeter-daemon.service - -%pre -%sysusers_create_compat debian/cosmic-greeter.sysusers - -%post -%systemd_post cosmic-greeter.service -%systemd_post cosmic-greeter-daemon.service - -%preun -%systemd_preun cosmic-greeter.service -%systemd_preun cosmic-greeter-daemon.service - -%postun -%systemd_postun cosmic-greeter.service -%systemd_postun cosmic-greeter-daemon.service - - -%files - -%{_bindir}/cosmic-greeter -%{_bindir}/cosmic-greeter-daemon -%{_datadir}/dbus-1/system.d/com.system76.CosmicGreeter.conf -%{_sysusersdir}/cosmic-greeter.conf -%{_tmpfilesdir}/cosmic-greeter.conf -%{_prefix}/etc/greetd/cosmic-greeter.toml -%{_unitdir}/cosmic-greeter.service -%{_unitdir}/cosmic-greeter-daemon.service - - -%changelog -%autochangelog - \ No newline at end of file diff --git a/cosmic-greeter/service.patch b/cosmic-greeter/service.patch deleted file mode 100644 index 3602bbd..0000000 --- a/cosmic-greeter/service.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- ./debian/cosmic-greeter.service 2024-02-27 11:31:17.946973142 -0600 -+++ ./debian/cosmic-greeter.patched.service 2024-02-27 11:32:11.538968615 -0600 -@@ -16,6 +16,5 @@ RestartSec=1 - StartLimitBurst=5 - StartLimitInterval=30 - --# Managed by debconf --#[Install] --#Alias=display-manager.service -+[Install] -+Alias=display-manager.service -\ No newline at end of file diff --git a/cosmic-greeter/srpm.sh b/cosmic-greeter/srpm.sh deleted file mode 100644 index 39cb963..0000000 --- a/cosmic-greeter/srpm.sh +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/bash -x - -# Variables. LOOK CLOSELY AND MAKE SURE THESE ARE CORRECT - -name='cosmic-greeter' -version='0.1.0' - -path_to_spec='cosmic-greeter/*' -pop_repo='cosmic-greeter' - -# Commit to target. Use "latest" if you want master -commit="latest" - -# Don't edit anything past this line -# ===================================================== # - -LATEST="latest" - -cd ../.. -# We should be in the base directory now - -git clone --recurse-submodules https://github.com/pop-os/$pop_repo - -cd $pop_repo - -if [[ "$commit" == "$LATEST" ]] -then - commit=$(git rev-parse HEAD) -fi - -echo $commit -short_commit=${commit:0:6} - -git reset --hard $commit - -mkdir .vendor - -cargo vendor > .vendor/config.toml - -tar -pcf vendor.tar vendor && mv vendor.tar ../vendor.tar - -rm -rf vendor && cd .. - -# Back into cosmic-packaging - -ls - -if [ "$pop_repo" != "$name" ]; then - mv $pop_repo $name -else - echo "names are equal. continuing..." -fi - -tar -czf $name.tar.gz $name - -rm -rf $name - -cp cosmic-packaging/$path_to_spec . - -rm -rf cosmic-packaging - -current_date=$(date +'%Y%m%d.%H') - -sed -i "/^Version: / s/.*/Version: $version~$current_date.$short_commit/" $name.spec diff --git a/cosmic-settings-daemon/cosmic-settings-daemon.spec b/cosmic-settings-daemon/cosmic-settings-daemon.spec deleted file mode 100644 index 8a9a34e..0000000 --- a/cosmic-settings-daemon/cosmic-settings-daemon.spec +++ /dev/null @@ -1,88 +0,0 @@ - -# Generated by rust2rpm 25 - -# prevent library files from being installed - -%global crate cosmic-settings-daemon -%global repo https://github.com/pop-os/cosmic-settings-daemon - -Name: cosmic-settings-daemon -Version: # TO BE REPLACED AUTOMATICALLY - -Release: %autorelease -Summary: Settings daemon for cosmic-settings - -License: GPL-3.0 - -URL: https://github.com/pop-os/cosmic-settings-daemon - -Source: %{crate}.tar.gz -Source: vendor.tar - - - -# For now, we require all deps for all of cosmic-epoch -BuildRequires: make -BuildRequires: which -BuildRequires: git-core -BuildRequires: just -BuildRequires: rustc -BuildRequires: lld -BuildRequires: cargo -BuildRequires: glib2-devel -BuildRequires: gtk3-devel -BuildRequires: dbus-devel -BuildRequires: wayland-devel -BuildRequires: clang-devel -BuildRequires: libxkbcommon-devel -BuildRequires: mesa-libgbm-devel -BuildRequires: rust-rav1e+nasm-rs-devel -BuildRequires: libappstream-glib -BuildRequires: pipewire-devel -BuildRequires: libglvnd-devel -BuildRequires: libseat-devel -BuildRequires: libinput-devel -BuildRequires: pam-devel -BuildRequires: flatpak-devel - - - -# For now, we require all deps for all of cosmic-epoch -Requires: libseat -Requires: pop-icon-theme -Requires: greetd -Requires: greetd-selinux -Requires: cage -Requires: mozilla-fira-mono-fonts -Requires: mozilla-fira-sans-fonts - - -%global _description %{expand: -%{summary}.} - -%description %{_description} - -%prep - -%autosetup -n %{crate} -p1 -mv %{_sourcedir}/vendor.tar vendor.tar -ls -a -mkdir -p .cargo -cp .vendor/config.toml .cargo/config.toml - - -%build -make all VENDOR=1 - -%install -make install DESTDIR=%{buildroot} prefix=%{_prefix} - -%files - -%{_bindir}/cosmic-settings-daemon - - - -%changelog -%autochangelog - \ No newline at end of file diff --git a/cosmic-settings-daemon/srpm.sh b/cosmic-settings-daemon/srpm.sh deleted file mode 100644 index acc1243..0000000 --- a/cosmic-settings-daemon/srpm.sh +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/bash -x - -# Variables. LOOK CLOSELY AND MAKE SURE THESE ARE CORRECT - -name='cosmic-settings-daemon' -version='0.1.0' - -path_to_spec='cosmic-settings-daemon/*' -pop_repo='cosmic-settings-daemon' - -# Commit to target. Use "latest" if you want master -commit="latest" - -# Don't edit anything past this line -# ===================================================== # - -LATEST="latest" - -cd ../.. -# We should be in the base directory now - -git clone --recurse-submodules https://github.com/pop-os/$pop_repo - -cd $pop_repo - -if [[ "$commit" == "$LATEST" ]] -then - commit=$(git rev-parse HEAD) -fi - -echo $commit -short_commit=${commit:0:6} - -git reset --hard $commit - -mkdir .vendor - -cargo vendor > .vendor/config.toml - -tar -pcf vendor.tar vendor && mv vendor.tar ../vendor.tar - -rm -rf vendor && cd .. - -# Back into cosmic-packaging - -ls - -if [ "$pop_repo" != "$name" ]; then - mv $pop_repo $name -else - echo "names are equal. continuing..." -fi - -tar -czf $name.tar.gz $name - -rm -rf $name - -cp cosmic-packaging/$path_to_spec . - -rm -rf cosmic-packaging - -current_date=$(date +'%Y%m%d.%H') - -sed -i "/^Version: / s/.*/Version: $version~$current_date.$short_commit/" $name.spec diff --git a/cosmic-store/cosmic-store.spec b/cosmic-store/cosmic-store.spec deleted file mode 100644 index ecd6793..0000000 --- a/cosmic-store/cosmic-store.spec +++ /dev/null @@ -1,97 +0,0 @@ - -# Generated by rust2rpm 25 - -# prevent library files from being installed - -%global crate cosmic-store -%global repo https://github.com/pop-os/cosmic-store - -Name: cosmic-store -Version: # TO BE REPLACED AUTOMATICALLY - -Release: %autorelease -Summary: COSMIC App Store - -License: GPL-3.0 - -URL: https://github.com/pop-os/cosmic-store - -Source: %{crate}.tar.gz -Source: vendor.tar - - - -# For now, we require all deps for all of cosmic-epoch -BuildRequires: make -BuildRequires: which -BuildRequires: git-core -BuildRequires: just -BuildRequires: rustc -BuildRequires: lld -BuildRequires: cargo -BuildRequires: glib2-devel -BuildRequires: gtk3-devel -BuildRequires: dbus-devel -BuildRequires: wayland-devel -BuildRequires: clang-devel -BuildRequires: libxkbcommon-devel -BuildRequires: mesa-libgbm-devel -BuildRequires: rust-rav1e+nasm-rs-devel -BuildRequires: libappstream-glib -BuildRequires: pipewire-devel -BuildRequires: libglvnd-devel -BuildRequires: libseat-devel -BuildRequires: libinput-devel -BuildRequires: pam-devel -BuildRequires: flatpak-devel - - - -# For now, we require all deps for all of cosmic-epoch -Requires: libseat -Requires: pop-icon-theme -Requires: greetd -Requires: greetd-selinux -Requires: cage -Requires: mozilla-fira-mono-fonts -Requires: mozilla-fira-sans-fonts - - -%global _description %{expand: -%{summary}.} - -%description %{_description} - -%prep - -%autosetup -n %{crate} -p1 -mv %{_sourcedir}/vendor.tar vendor.tar -ls -a -mkdir -p .cargo -cp .vendor/config.toml .cargo/config.toml - - -%build -just build-vendored - -%install -just rootdir=%{buildroot} prefix=%{_prefix} install - -%files - -%{_bindir}/cosmic-store -%{_datadir}/applications/com.system76.CosmicStore.desktop -%{_metainfodir}/com.system76.CosmicStore.metainfo.xml - -%{_datadir}/icons/hicolor/128x128/apps/com.system76.CosmicStore.svg -%{_datadir}/icons/hicolor/16x16/apps/com.system76.CosmicStore.svg -%{_datadir}/icons/hicolor/24x24/apps/com.system76.CosmicStore.svg -%{_datadir}/icons/hicolor/256x256/apps/com.system76.CosmicStore.svg -%{_datadir}/icons/hicolor/32x32/apps/com.system76.CosmicStore.svg -%{_datadir}/icons/hicolor/48x48/apps/com.system76.CosmicStore.svg -%{_datadir}/icons/hicolor/64x64/apps/com.system76.CosmicStore.svg - - -%changelog -%autochangelog - \ No newline at end of file diff --git a/cosmic-store/srpm.sh b/cosmic-store/srpm.sh deleted file mode 100644 index 4c63d02..0000000 --- a/cosmic-store/srpm.sh +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/bash -x - -# Variables. LOOK CLOSELY AND MAKE SURE THESE ARE CORRECT - -name='cosmic-store' -version='0.1.0' - -path_to_spec='cosmic-store/*' -pop_repo='cosmic-store' - -# Commit to target. Use "latest" if you want master -commit="latest" - -# Don't edit anything past this line -# ===================================================== # - -LATEST="latest" - -cd ../.. -# We should be in the base directory now - -git clone --recurse-submodules https://github.com/pop-os/$pop_repo - -cd $pop_repo - -if [[ "$commit" == "$LATEST" ]] -then - commit=$(git rev-parse HEAD) -fi - -echo $commit -short_commit=${commit:0:6} - -git reset --hard $commit - -mkdir .vendor - -cargo vendor > .vendor/config.toml - -tar -pcf vendor.tar vendor && mv vendor.tar ../vendor.tar - -rm -rf vendor && cd .. - -# Back into cosmic-packaging - -ls - -if [ "$pop_repo" != "$name" ]; then - mv $pop_repo $name -else - echo "names are equal. continuing..." -fi - -tar -czf $name.tar.gz $name - -rm -rf $name - -cp cosmic-packaging/$path_to_spec . - -rm -rf cosmic-packaging - -current_date=$(date +'%Y%m%d.%H') - -sed -i "/^Version: / s/.*/Version: $version~$current_date.$short_commit/" $name.spec diff --git a/cosmic-term/cosmic-term.spec b/cosmic-term/cosmic-term.spec deleted file mode 100644 index 79ff267..0000000 --- a/cosmic-term/cosmic-term.spec +++ /dev/null @@ -1,97 +0,0 @@ - -# Generated by rust2rpm 25 - -# prevent library files from being installed - -%global crate cosmic-term -%global repo https://github.com/pop-os/cosmic-term - -Name: cosmic-term -Version: # TO BE REPLACED AUTOMATICALLY - -Release: %autorelease -Summary: WIP COSMIC terminal emulator, built using alacritty_terminal that is provided by the alacritty project. cosmic-term provides bidirectional rendering and ligatures with a custom renderer based on cosmic-text. - -License: GPL-3.0 - -URL: https://github.com/pop-os/cosmic-term - -Source: %{crate}.tar.gz -Source: vendor.tar - - - -# For now, we require all deps for all of cosmic-epoch -BuildRequires: make -BuildRequires: which -BuildRequires: git-core -BuildRequires: just -BuildRequires: rustc -BuildRequires: lld -BuildRequires: cargo -BuildRequires: glib2-devel -BuildRequires: gtk3-devel -BuildRequires: dbus-devel -BuildRequires: wayland-devel -BuildRequires: clang-devel -BuildRequires: libxkbcommon-devel -BuildRequires: mesa-libgbm-devel -BuildRequires: rust-rav1e+nasm-rs-devel -BuildRequires: libappstream-glib -BuildRequires: pipewire-devel -BuildRequires: libglvnd-devel -BuildRequires: libseat-devel -BuildRequires: libinput-devel -BuildRequires: pam-devel -BuildRequires: flatpak-devel - - - -# For now, we require all deps for all of cosmic-epoch -Requires: libseat -Requires: pop-icon-theme -Requires: greetd -Requires: greetd-selinux -Requires: cage -Requires: mozilla-fira-mono-fonts -Requires: mozilla-fira-sans-fonts - - -%global _description %{expand: -%{summary}.} - -%description %{_description} - -%prep - -%autosetup -n %{crate} -p1 -mv %{_sourcedir}/vendor.tar vendor.tar -ls -a -mkdir -p .cargo -cp .vendor/config.toml .cargo/config.toml - - -%build -just build-vendored - -%install -just rootdir=%{buildroot} prefix=%{_prefix} install - -%files - -%{_bindir}/cosmic-term -%{_datadir}/applications/com.system76.CosmicTerm.desktop -%{_metainfodir}/com.system76.CosmicTerm.metainfo.xml - -%{_datadir}/icons/hicolor/128x128/apps/com.system76.CosmicTerm.svg -%{_datadir}/icons/hicolor/16x16/apps/com.system76.CosmicTerm.svg -%{_datadir}/icons/hicolor/24x24/apps/com.system76.CosmicTerm.svg -%{_datadir}/icons/hicolor/256x256/apps/com.system76.CosmicTerm.svg -%{_datadir}/icons/hicolor/32x32/apps/com.system76.CosmicTerm.svg -%{_datadir}/icons/hicolor/48x48/apps/com.system76.CosmicTerm.svg -%{_datadir}/icons/hicolor/64x64/apps/com.system76.CosmicTerm.svg - - -%changelog -%autochangelog - \ No newline at end of file diff --git a/cosmic-term/srpm.sh b/cosmic-term/srpm.sh deleted file mode 100644 index 8531f9e..0000000 --- a/cosmic-term/srpm.sh +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/bash -x - -# Variables. LOOK CLOSELY AND MAKE SURE THESE ARE CORRECT - -name='cosmic-term' -version='0.1.0' - -path_to_spec='cosmic-term/*' -pop_repo='cosmic-term' - -# Commit to target. Use "latest" if you want master -commit="latest" - -# Don't edit anything past this line -# ===================================================== # - -LATEST="latest" - -cd ../.. -# We should be in the base directory now - -git clone --recurse-submodules https://github.com/pop-os/$pop_repo - -cd $pop_repo - -if [[ "$commit" == "$LATEST" ]] -then - commit=$(git rev-parse HEAD) -fi - -echo $commit -short_commit=${commit:0:6} - -git reset --hard $commit - -mkdir .vendor - -cargo vendor > .vendor/config.toml - -tar -pcf vendor.tar vendor && mv vendor.tar ../vendor.tar - -rm -rf vendor && cd .. - -# Back into cosmic-packaging - -ls - -if [ "$pop_repo" != "$name" ]; then - mv $pop_repo $name -else - echo "names are equal. continuing..." -fi - -tar -czf $name.tar.gz $name - -rm -rf $name - -cp cosmic-packaging/$path_to_spec . - -rm -rf cosmic-packaging - -current_date=$(date +'%Y%m%d.%H') - -sed -i "/^Version: / s/.*/Version: $version~$current_date.$short_commit/" $name.spec diff --git a/cosmic-workspaces/cosmic-workspaces.spec b/cosmic-workspaces/cosmic-workspaces.spec deleted file mode 100644 index f4c2737..0000000 --- a/cosmic-workspaces/cosmic-workspaces.spec +++ /dev/null @@ -1,90 +0,0 @@ - -# Generated by rust2rpm 25 - -# prevent library files from being installed - -%global crate cosmic-workspaces -%global repo https://github.com/pop-os/cosmic-workspaces-epoch - -Name: cosmic-workspaces -Version: # TO BE REPLACED AUTOMATICALLY - -Release: %autorelease -Summary: COSMIC Workspaces - -License: GPL-3.0 - -URL: https://github.com/pop-os/cosmic-workspaces-epoch - -Source: %{crate}.tar.gz -Source: vendor.tar - - - -# For now, we require all deps for all of cosmic-epoch -BuildRequires: make -BuildRequires: which -BuildRequires: git-core -BuildRequires: just -BuildRequires: rustc -BuildRequires: lld -BuildRequires: cargo -BuildRequires: glib2-devel -BuildRequires: gtk3-devel -BuildRequires: dbus-devel -BuildRequires: wayland-devel -BuildRequires: clang-devel -BuildRequires: libxkbcommon-devel -BuildRequires: mesa-libgbm-devel -BuildRequires: rust-rav1e+nasm-rs-devel -BuildRequires: libappstream-glib -BuildRequires: pipewire-devel -BuildRequires: libglvnd-devel -BuildRequires: libseat-devel -BuildRequires: libinput-devel -BuildRequires: pam-devel -BuildRequires: flatpak-devel - - - -# For now, we require all deps for all of cosmic-epoch -Requires: libseat -Requires: pop-icon-theme -Requires: greetd -Requires: greetd-selinux -Requires: cage -Requires: mozilla-fira-mono-fonts -Requires: mozilla-fira-sans-fonts - - -%global _description %{expand: -%{summary}.} - -%description %{_description} - -%prep - -%autosetup -n %{crate} -p1 -mv %{_sourcedir}/vendor.tar vendor.tar -ls -a -mkdir -p .cargo -cp .vendor/config.toml .cargo/config.toml - - -%build -make all VENDOR=1 - -%install -make install DESTDIR=%{buildroot} prefix=%{_prefix} - -%files - -%{_bindir}/cosmic-workspaces -%{_datadir}/applications/com.system76.CosmicWorkspaces.desktop -%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicWorkspaces.svg - - - -%changelog -%autochangelog - \ No newline at end of file diff --git a/cosmic-workspaces/srpm.sh b/cosmic-workspaces/srpm.sh deleted file mode 100644 index 947ee01..0000000 --- a/cosmic-workspaces/srpm.sh +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/bash -x - -# Variables. LOOK CLOSELY AND MAKE SURE THESE ARE CORRECT - -name='cosmic-workspaces' -version='0.1.0' - -path_to_spec='cosmic-workspaces/*' -pop_repo='cosmic-workspaces-epoch' - -# Commit to target. Use "latest" if you want master -commit="latest" - -# Don't edit anything past this line -# ===================================================== # - -LATEST="latest" - -cd ../.. -# We should be in the base directory now - -git clone --recurse-submodules https://github.com/pop-os/$pop_repo - -cd $pop_repo - -if [[ "$commit" == "$LATEST" ]] -then - commit=$(git rev-parse HEAD) -fi - -echo $commit -short_commit=${commit:0:6} - -git reset --hard $commit - -mkdir .vendor - -cargo vendor > .vendor/config.toml - -tar -pcf vendor.tar vendor && mv vendor.tar ../vendor.tar - -rm -rf vendor && cd .. - -# Back into cosmic-packaging - -ls - -if [ "$pop_repo" != "$name" ]; then - mv $pop_repo $name -else - echo "names are equal. continuing..." -fi - -tar -czf $name.tar.gz $name - -rm -rf $name - -cp cosmic-packaging/$path_to_spec . - -rm -rf cosmic-packaging - -current_date=$(date +'%Y%m%d.%H') - -sed -i "/^Version: / s/.*/Version: $version~$current_date.$short_commit/" $name.spec diff --git a/cosmic_apps.py b/cosmic_apps.py deleted file mode 100644 index dfac784..0000000 --- a/cosmic_apps.py +++ /dev/null @@ -1,813 +0,0 @@ -GPL3 = "GPL-3.0" -MPL2 = "MPL-2.0" -CC = "CC-BY-SA-4.0" - -ROOTDIR = f"%{{buildroot}}" -BUILD_TARGET = f"target/release/" - -def install_(path_from, path_to, perms): - return f"""install -Dm{perms} {path_from} {ROOTDIR}/{path_to}""" - -def contains_(path): - return f"""{path}""" - -def install_app(bin_name, appid, add_bin, add_desktop, add_scaled, add_symbolic, add_metainfo, prescriptor, resdir): - res = """""" - if add_bin: - res += install_(f"target/release/{bin_name}", f"%{{_bindir}}/{bin_name}", "0755") + "\n" - if add_desktop: - res += install_(f"{prescriptor}{resdir}/{appid}.desktop", f"%{{_datadir}}/applications/{appid}.desktop", "0644") + "\n" - if add_scaled: - res += install_(f"{prescriptor}{resdir}/icons/{appid}.svg", f"%{{_datadir}}/icons/hicolor/scalable/apps/{appid}.svg", "0644") + "\n" - if add_symbolic: - res += install_(f"{prescriptor}{resdir}/icons/{appid}-symbolic.svg", f"%{{_datadir}}/icons/hicolor/symbolic/apps/{appid}-symbolic.svg", "0644") + "\n" # TODO - if add_metainfo: - res += install_(f"{prescriptor}{resdir}/{appid}.metainfo.xml", f"%{{_metainfodir}}/{appid}.metainfo.xml", "0644") + "\n" - return res - - - -def contains_app(bin_name, appid, add_bin, add_desktop, add_scaled, add_symbolic, add_metainfo, prescriptor): - res = """""" - if add_bin: - res += contains_(f"""%{{_bindir}}/{bin_name}\n""") - if add_desktop: - res += contains_(f"""%{{_datadir}}/applications/{appid}.desktop\n""") - if add_scaled: - res += contains_(f"""%{{_datadir}}/icons/hicolor/scalable/apps/{appid}.svg\n""") - if add_symbolic: - res += contains_(f"""%{{_datadir}}/icons/hicolor/symbolic/apps/{appid}-symbolic.svg\n""") # TODO - if add_metainfo: - res += contains_(f"""%{{_metainfodir}}/{appid}.metainfo.xml\n""") - return res - -STANDARD_SOURCES = f""" -Source: %{{crate}}.tar.gz -Source: vendor.tar -""" - -STANDARD_REQUIRES = f""" -# For now, we require all deps for all of cosmic-epoch -Requires: libseat -Requires: pop-icon-theme -Requires: greetd -Requires: greetd-selinux -Requires: cage -Requires: mozilla-fira-mono-fonts -Requires: mozilla-fira-sans-fonts -""" - -RUST_PACKAGING_REQUIRES = f""" -BuildRequires: cargo-rpm-macros >= 26.1 -""" - -STANDARD_BUILDREQUIRES = f""" -# For now, we require all deps for all of cosmic-epoch -BuildRequires: make -BuildRequires: which -BuildRequires: git-core -BuildRequires: just -BuildRequires: rustc -BuildRequires: lld -BuildRequires: cargo -BuildRequires: glib2-devel -BuildRequires: gtk3-devel -BuildRequires: dbus-devel -BuildRequires: wayland-devel -BuildRequires: clang-devel -BuildRequires: libxkbcommon-devel -BuildRequires: mesa-libgbm-devel -BuildRequires: rust-rav1e+nasm-rs-devel -BuildRequires: libappstream-glib -BuildRequires: pipewire-devel -BuildRequires: libglvnd-devel -BuildRequires: libseat-devel -BuildRequires: libinput-devel -BuildRequires: pam-devel -BuildRequires: flatpak-devel -""" - -OLDSTANDARD_PREP = f""" -%autosetup -n %{{crate}} -p1 -a1 -ls -a -mkdir -p .cargo -cp .vendor/config.toml .cargo/config.toml -""" - -STANDARD_PREP = f""" -%autosetup -n %{{crate}} -p1 -mv %{{_sourcedir}}/vendor.tar vendor.tar -ls -a -mkdir -p .cargo -cp .vendor/config.toml .cargo/config.toml -""" - -STANDARD_BUILD_RUST_PACKAGING = f""" -%{{cargo_license_summary}} -%{{cargo_license}} > LICENSE.dependencies -%{{cargo_vendor_manifest}} -""" - -STANDARD_FILES = f"""""" - -STANDARD_FILES_RUST_PACKAGING = f""" -%license LICENSE.md -%license LICENSE.dependencies -%license cargo-vendor.txt -%doc README.md -""" - -STANDARD_GLOBALS_RUST_PACKAGING = f""" -%bcond_without check -%global __cargo_is_lib() 0 -""" - - -COSMIC_APP_LIBRARY = { -"globals": "", -"name": "cosmic-app-library", -"version": "0.1.0", -"repo": "https://github.com/pop-os/cosmic-applibrary", -"reposhort": "cosmic-applibrary", -"commit": "latest", -"summary": "A boilerplate template to get started with GTK, Rust, Meson, Flatpak, Debian made for Cosmic.", -"license": GPL3, -"sources": STANDARD_SOURCES, -"buildrequires": STANDARD_BUILDREQUIRES, -"requires": STANDARD_REQUIRES, -"prep": STANDARD_PREP, -"build": f"just build-vendored", -"install": f"just rootdir=%{{buildroot}} prefix=%{{_prefix}} install", -"files": f""" -{contains_app("cosmic-app-library","com.system76.CosmicAppLibrary",True, True, True, False, True, "")} -""", -} - -COSMIC_APPLETS = { -"globals": f"%define debug_package %{{nil}}", -"name": "cosmic-applets", -"version": "0.1.0", -"repo": "https://github.com/pop-os/cosmic-applets", -"reposhort": "cosmic-applets", -"commit": "latest", -"summary": "WIP applets for cosmic-panel", -"license": GPL3, -"sources": STANDARD_SOURCES + "\nPatch1: better_compile.patch\nPatch2: symlink.patch", -"buildrequires": STANDARD_BUILDREQUIRES, -"requires": STANDARD_REQUIRES, -"prep": STANDARD_PREP, -"build": f""" -just build-vendored -""", -"install": f"just rootdir=%{{buildroot}} prefix=%{{_prefix}} install", -"files": f""" -%{{_bindir}}/cosmic-applets -%{{_bindir}}/cosmic-panel-button -%{{_bindir}}/cosmic-app-list -%{{_bindir}}/cosmic-applet-audio -%{{_bindir}}/cosmic-applet-battery -%{{_bindir}}/cosmic-applet-bluetooth -%{{_bindir}}/cosmic-applet-minimize -%{{_bindir}}/cosmic-applet-network -%{{_bindir}}/cosmic-applet-notifications -%{{_bindir}}/cosmic-applet-power -%{{_bindir}}/cosmic-applet-status-area -%{{_bindir}}/cosmic-applet-tiling -%{{_bindir}}/cosmic-applet-time -%{{_bindir}}/cosmic-applet-workspaces -%{{_datadir}}/applications/com.system76.CosmicAppList.desktop -%{{_datadir}}/applications/com.system76.CosmicAppletAudio.desktop -%{{_datadir}}/applications/com.system76.CosmicAppletBattery.desktop -%{{_datadir}}/applications/com.system76.CosmicAppletBluetooth.desktop -%{{_datadir}}/applications/com.system76.CosmicAppletMinimize.desktop -%{{_datadir}}/applications/com.system76.CosmicAppletNetwork.desktop -%{{_datadir}}/applications/com.system76.CosmicAppletNotifications.desktop -%{{_datadir}}/applications/com.system76.CosmicAppletPower.desktop -%{{_datadir}}/applications/com.system76.CosmicAppletStatusArea.desktop -%{{_datadir}}/applications/com.system76.CosmicAppletTiling.desktop -%{{_datadir}}/applications/com.system76.CosmicAppletTime.desktop -%{{_datadir}}/applications/com.system76.CosmicAppletWorkspaces.desktop -%{{_datadir}}/applications/com.system76.CosmicPanelAppButton.desktop -%{{_datadir}}/applications/com.system76.CosmicPanelWorkspacesButton.desktop -%{{_datadir}}/cosmic/com.system76.CosmicAppList/v1/favorites -%{{_datadir}}/cosmic/com.system76.CosmicAppList/v1/filter_top_levels -%{{_datadir}}/icons/hicolor/scalable/app/com.system76.CosmicAppletStatusArea.svg -%{{_datadir}}/icons/hicolor/scalable/apps/com.system76.CosmicAppList.svg -%{{_datadir}}/icons/hicolor/scalable/apps/com.system76.CosmicAppletAudio.svg -%{{_datadir}}/icons/hicolor/scalable/apps/com.system76.CosmicAppletBattery.svg -%{{_datadir}}/icons/hicolor/scalable/apps/com.system76.CosmicAppletBluetooth.svg -%{{_datadir}}/icons/hicolor/scalable/apps/com.system76.CosmicAppletMinimize.svg -%{{_datadir}}/icons/hicolor/scalable/apps/com.system76.CosmicAppletNetwork.svg -%{{_datadir}}/icons/hicolor/scalable/apps/com.system76.CosmicAppletNotifications.svg -%{{_datadir}}/icons/hicolor/scalable/apps/com.system76.CosmicAppletPower.svg -%{{_datadir}}/icons/hicolor/scalable/apps/com.system76.CosmicAppletTiling.Off.svg -%{{_datadir}}/icons/hicolor/scalable/apps/com.system76.CosmicAppletTiling.On.svg -%{{_datadir}}/icons/hicolor/scalable/apps/com.system76.CosmicAppletTime.svg -%{{_datadir}}/icons/hicolor/scalable/apps/com.system76.CosmicAppletWorkspaces.svg -%{{_datadir}}/icons/hicolor/scalable/apps/com.system76.CosmicPanelAppButton.svg -%{{_datadir}}/icons/hicolor/scalable/apps/com.system76.CosmicPanelWorkspacesButton.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-display-brightness-high-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-display-brightness-low-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-display-brightness-medium-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-display-brightness-off-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-0-charging-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-0-limited-charging-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-0-limited-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-0-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-10-charging-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-10-limited-charging-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-10-limited-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-10-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-100-charging-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-100-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-20-charging-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-20-limited-charging-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-20-limited-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-20-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-35-charging-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-35-limited-charging-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-35-limited-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-35-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-5-charging-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-5-limited-charging-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-5-limited-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-5-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-50-charging-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-50-limited-charging-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-50-limited-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-50-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-65-charging-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-65-limited-charging-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-65-limited-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-65-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-80-charging-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-80-limited-charging-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-80-limited-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-80-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-90-charging-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-battery-level-90-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-bluetooth-active-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-bluetooth-disabled-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-notification-disabled-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-notification-new-symbolic.svg -%{{_datadir}}/icons/hicolor/scalable/status/cosmic-applet-notification-symbolic.svg -""" -} - -COSMIC_BG = { -"globals": "", -"name": "cosmic-bg", -"version": "0.1.0", -"repo": "https://github.com/pop-os/cosmic-bg", -"reposhort": "cosmic-bg", -"commit": "latest", -"summary": "COSMIC session service which applies backgrounds to displays", -"license": MPL2, -"sources": STANDARD_SOURCES, -"buildrequires": STANDARD_BUILDREQUIRES, -"requires": STANDARD_REQUIRES, -"prep": STANDARD_PREP, -"build": f"just build-vendored", -"install": f"just rootdir=%{{buildroot}} prefix=%{{_prefix}} install", -"files": f""" -{contains_app("cosmic-bg","com.system76.CosmicBackground",True, True, True, True, True, "")} -{contains_(f"%{{_datadir}}/cosmic/com.system76.CosmicBackground/*")} -""", -} - -COSMIC_COMP = { -"globals": "", -"name": "cosmic-comp", -"version": "0.1.0", -"repo": "https://github.com/pop-os/cosmic-comp", -"reposhort": "cosmic-comp", -"commit": "latest", -"summary": "Compositor for the COSMIC Desktop Environment", -"license": GPL3, -"sources": STANDARD_SOURCES, -"buildrequires": STANDARD_BUILDREQUIRES, -"requires": STANDARD_REQUIRES, -"prep": STANDARD_PREP, -"build": f"make all VENDOR=1", -"install": f""" -make install DESTDIR=%{{buildroot}} prefix=%{{_prefix}} -install -Dm0644 config.ron %{{buildroot}}/%{{_sysconfdir}}/cosmic-comp/config.ron -""", -"files": f""" -{contains_app("cosmic-comp","com.system76.CosmicComp",True, False, False, False, False, "")} -{contains_(f"%{{_sysconfdir}}/cosmic-comp/config.ron")} -""", -} - -COSMIC_EDIT = { -"globals": "", -"name": "cosmic-edit", -"version": "0.1.0", -"repo": "https://github.com/pop-os/cosmic-edit", -"reposhort": "cosmic-edit", -"commit": "latest", -"summary": "Text editor built using libcosmic for the COSMIC Desktop Environment", -"license": GPL3, -"sources": STANDARD_SOURCES, -"buildrequires": STANDARD_BUILDREQUIRES, -"requires": STANDARD_REQUIRES, -"prep": STANDARD_PREP, -"build": f"just build-vendored", -"install": f"just rootdir=%{{buildroot}} prefix=%{{_prefix}} install", -"files": f""" -{contains_app("cosmic-edit","com.system76.CosmicEdit",True, True, False, False, True, "")} -%{{_datadir}}/icons/hicolor/128x128/apps/com.system76.CosmicEdit.svg -%{{_datadir}}/icons/hicolor/16x16/apps/com.system76.CosmicEdit.svg -%{{_datadir}}/icons/hicolor/24x24/apps/com.system76.CosmicEdit.svg -%{{_datadir}}/icons/hicolor/256x256/apps/com.system76.CosmicEdit.svg -%{{_datadir}}/icons/hicolor/32x32/apps/com.system76.CosmicEdit.svg -%{{_datadir}}/icons/hicolor/48x48/apps/com.system76.CosmicEdit.svg -%{{_datadir}}/icons/hicolor/64x64/apps/com.system76.CosmicEdit.svg -""", -} - -COSMIC_FILES = { -"globals": "", -"name": "cosmic-files", -"version": "0.1.0", -"repo": "https://github.com/pop-os/cosmic-files", -"reposhort": "cosmic-files", -"commit": "latest", -"summary": "File browser built using libcosmic for the COSMIC Desktop Environment", -"license": GPL3, -"sources": STANDARD_SOURCES, -"buildrequires": STANDARD_BUILDREQUIRES, -"requires": STANDARD_REQUIRES, -"prep": STANDARD_PREP, -"build": f"just build-vendored", -"install": f"just rootdir=%{{buildroot}} prefix=%{{_prefix}} install", -"files": f""" -{contains_app("cosmic-files","com.system76.CosmicFiles",True, True, False, False, True, "")} -%{{_datadir}}/icons/hicolor/128x128/apps/com.system76.CosmicFiles.svg -%{{_datadir}}/icons/hicolor/16x16/apps/com.system76.CosmicFiles.svg -%{{_datadir}}/icons/hicolor/24x24/apps/com.system76.CosmicFiles.svg -%{{_datadir}}/icons/hicolor/256x256/apps/com.system76.CosmicFiles.svg -%{{_datadir}}/icons/hicolor/32x32/apps/com.system76.CosmicFiles.svg -%{{_datadir}}/icons/hicolor/48x48/apps/com.system76.CosmicFiles.svg -%{{_datadir}}/icons/hicolor/64x64/apps/com.system76.CosmicFiles.svg -""", -} - -COSMIC_GREETER = { -"globals": "", -"name": "cosmic-greeter", -"version": "0.1.0", -"repo": "https://github.com/pop-os/cosmic-greeter", -"reposhort": "cosmic-greeter", -"commit": "latest", -"summary": "Libcosmic greeter for greetd, which can be run inside cosmic-comp", -"license": GPL3, -"sources": STANDARD_SOURCES + "\nPatch1: service.patch", -"buildrequires": STANDARD_BUILDREQUIRES + f"\nBuildRequires: systemd-rpm-macros\n%{{?sysusers_requires_compat}}", -"requires": STANDARD_REQUIRES, -"prep": STANDARD_PREP, -"build": f"just build-vendored", -"install": f""" -install -Dm0755 {BUILD_TARGET}/cosmic-greeter %{{buildroot}}/%{{_bindir}}/cosmic-greeter -install -Dm0755 {BUILD_TARGET}/cosmic-greeter-daemon %{{buildroot}}/%{{_bindir}}/cosmic-greeter-daemon -install -Dm0644 dbus/com.system76.CosmicGreeter.conf %{{buildroot}}/%{{_datadir}}/dbus-1/system.d/com.system76.CosmicGreeter.conf -install -Dm0644 debian/cosmic-greeter.sysusers %{{buildroot}}/%{{_sysusersdir}}/cosmic-greeter.conf -install -Dm0644 debian/cosmic-greeter.tmpfiles %{{buildroot}}/%{{_tmpfilesdir}}/cosmic-greeter.conf -install -Dm0644 cosmic-greeter.toml %{{buildroot}}/%{{_prefix}}/etc/greetd/cosmic-greeter.toml -install -Dm0644 debian/cosmic-greeter.service %{{buildroot}}/%{{_unitdir}}/cosmic-greeter.service -install -Dm0644 debian/cosmic-greeter-daemon.service %{{buildroot}}/%{{_unitdir}}/cosmic-greeter-daemon.service - -%pre -%sysusers_create_compat debian/cosmic-greeter.sysusers - -%post -%systemd_post cosmic-greeter.service -%systemd_post cosmic-greeter-daemon.service - -%preun -%systemd_preun cosmic-greeter.service -%systemd_preun cosmic-greeter-daemon.service - -%postun -%systemd_postun cosmic-greeter.service -%systemd_postun cosmic-greeter-daemon.service -""", -"files": f""" -%{{_bindir}}/cosmic-greeter -%{{_bindir}}/cosmic-greeter-daemon -%{{_datadir}}/dbus-1/system.d/com.system76.CosmicGreeter.conf -%{{_sysusersdir}}/cosmic-greeter.conf -%{{_tmpfilesdir}}/cosmic-greeter.conf -%{{_prefix}}/etc/greetd/cosmic-greeter.toml -%{{_unitdir}}/cosmic-greeter.service -%{{_unitdir}}/cosmic-greeter-daemon.service -""", -} - -COSMIC_ICONS = { -"globals": f"%define debug_package %{{nil}}", -"name": "cosmic-icons", -"version": "0.1.0", -"repo": "https://github.com/pop-os/cosmic-icons", -"reposhort": "cosmic-icons", -"commit": "latest", -"summary": "System76 Cosmic icon theme for Linux", -"license": CC, -"sources": f"Source: %{{crate}}.tar.gz", -"buildrequires": STANDARD_BUILDREQUIRES, -"requires": STANDARD_REQUIRES, -"prep": f"%autosetup -n cosmic-icons", -"build": f"echo done", -"install": f"just rootdir=%{{buildroot}} install", -"files": f""" -{contains_(f"%{{_datadir}}/icons/Cosmic/scalable/*")} -{contains_(f"%{{_datadir}}/icons/Cosmic/index.theme")} -""", -} - -COSMIC_LAUNCHER = { -"globals": "", -"name": "cosmic-launcher", -"version": "0.1.0", -"repo": "https://github.com/pop-os/cosmic-launcher", -"reposhort": "cosmic-launcher", -"commit": "latest", -"summary": "Layer shell frontend for Pop Launcher", -"license": GPL3, -"sources": STANDARD_SOURCES, -"buildrequires": STANDARD_BUILDREQUIRES, -"requires": STANDARD_REQUIRES, -"prep": STANDARD_PREP, -"build": f"just build-vendored", -"install": f"just rootdir=%{{buildroot}} prefix=%{{_prefix}} install", -"files": f""" -{contains_app("cosmic-launcher","com.system76.CosmicLauncher",True, True, True, False, True, "")} -""", -} - -COSMIC_NOTIFICATIONS = { -"globals": "", -"name": "cosmic-notifications", -"version": "0.1.0", -"repo": "https://github.com/pop-os/cosmic-notifications", -"reposhort": "cosmic-notifications", -"commit": "latest", -"summary": "Layer Shell notifications daemon which integrates with COSMIC", -"license": GPL3, -"sources": STANDARD_SOURCES, -"buildrequires": STANDARD_BUILDREQUIRES, -"requires": STANDARD_REQUIRES, -"prep": STANDARD_PREP, -"build": f"just build-vendored", -"install": f"just rootdir=%{{buildroot}} prefix=%{{_prefix}} install", -"files": f""" -{contains_app("cosmic-notifications","com.system76.CosmicNotifications",True, True, True, False, True, "")} -""", -} - -COSMIC_OSD = { -"globals": "", -"name": "cosmic-osd", -"version": "0.1.0", -"repo": "https://github.com/pop-os/cosmic-osd", -"reposhort": "cosmic-osd", -"commit": "latest", -"summary": "OSDs for the COSMIC desktop environment", -"license": GPL3, -"sources": STANDARD_SOURCES, -"buildrequires": STANDARD_BUILDREQUIRES, -"requires": STANDARD_REQUIRES, -"prep": STANDARD_PREP, -"build": f"make all VENDOR=1", -"install": f"make install DESTDIR=%{{buildroot}} prefix=%{{_prefix}}", -"files": f""" -{contains_app("cosmic-osd","com.system76.CosmicOsd",True, False, False, False, False, "")} -""", -} - -COSMIC_PANEL = { -"globals": "", -"name": "cosmic-panel", -"version": "0.1.0", -"repo": "https://github.com/pop-os/cosmic-panel", -"reposhort": "cosmic-panel", -"commit": "latest", -"summary": "Panel for COSMIC Desktop Environment", -"license": GPL3, -"sources": STANDARD_SOURCES, -"buildrequires": STANDARD_BUILDREQUIRES, -"requires": STANDARD_REQUIRES, -"prep": STANDARD_PREP, -"build": f"just build-vendored", -"install": f"just rootdir=%{{buildroot}} prefix=%{{_prefix}} install", -"files": f""" -{contains_app("cosmic-panel","com.system76.CosmicPanel",True, False, False, False, False, "")} -{contains_(f"%{{_datadir}}/cosmic/com.system76.CosmicPanel.Dock/*")} -{contains_(f"%{{_datadir}}/cosmic/com.system76.CosmicPanel.Panel/*")} -{contains_(f"%{{_datadir}}/cosmic/com.system76.CosmicPanel/*")} -""", -} - -COSMIC_PLAYER = { -"globals": "", -"name": "cosmic-player", -"version": "0.1.0", -"repo": "https://github.com/pop-os/cosmic-player", -"reposhort": "cosmic-player", -"commit": "latest", -"summary": "WIP COSMIC media player", -"license": GPL3, -"sources": STANDARD_SOURCES, -"buildrequires": STANDARD_BUILDREQUIRES, -"requires": STANDARD_REQUIRES, -"prep": STANDARD_PREP, -"build": f"just build-vendored", -"install": f"just rootdir=%{{buildroot}} prefix=%{{_prefix}} install", -"files": f""" -{contains_app("cosmic-files","com.system76.CosmicFiles",True, True, False, False, False, "")} -""", -} - -COSMIC_RANDR = { -"globals": "", -"name": "cosmic-randr", -"version": "0.1.0", -"repo": "https://github.com/pop-os/cosmic-randr", -"reposhort": "cosmic-randr", -"commit": "latest", -"summary": "Library and utility for displaying and configuring Wayland outputs", -"license": MPL2, -"sources": STANDARD_SOURCES, -"buildrequires": STANDARD_BUILDREQUIRES, -"requires": STANDARD_REQUIRES, -"prep": STANDARD_PREP, -"build": f"just build-vendored", -"install": f"just rootdir=%{{buildroot}} prefix=%{{_prefix}} install", -"files": f""" -{contains_app("cosmic-randr","",True, False, False, False, False, "")} -""", -} - -COSMIC_SCREENSHOT = { -"globals": "", -"name": "cosmic-screenshot", -"version": "0.1.0", -"repo": "https://github.com/pop-os/cosmic-screenshot", -"reposhort": "cosmic-screenshot", -"commit": "latest", -"summary": "Utility for capturing screenshots via XDG Desktop Portal", -"license": GPL3, -"sources": STANDARD_SOURCES, -"buildrequires": STANDARD_BUILDREQUIRES, -"requires": STANDARD_REQUIRES, -"prep": STANDARD_PREP, -"build": f"just build-vendored", -"install": f"just rootdir=%{{buildroot}} prefix=%{{_prefix}} install", -"files": f""" -{contains_app("cosmic-screenshot","com.system76.CosmicScreenshot",True, True, False, False, False, "")} -""", -} - -COSMIC_SESSION = { -"globals": "", -"name": "cosmic-session", -"version": "0.1.0", -"repo": "https://github.com/pop-os/cosmic-session", -"reposhort": "cosmic-session", -"commit": "latest", -"summary": "Session manager for the COSMIC desktop environment", -"license": GPL3, -"sources": STANDARD_SOURCES, -"buildrequires": STANDARD_BUILDREQUIRES + "\nBuildRequires: systemd-rpm-macros", -"requires": STANDARD_REQUIRES, -"prep": STANDARD_PREP, -"build": f"just vendor=1 all", -"install": f"just rootdir=%{{buildroot}} install", -"files": f""" -{contains_app("cosmic-session","",True, False, False, False, False, "")} -{contains_(f"%{{_bindir}}/start-cosmic")} -{contains_(f"%{{_userunitdir}}/cosmic-session.target")} -{contains_(f"%{{_datadir}}/wayland-sessions/cosmic.desktop")} -{contains_(f"%{{_datadir}}/applications/cosmic-mimeapps.list")} -""", -} - -COSMIC_SETTINGS_DAEMON = { -"globals": "", -"name": "cosmic-settings-daemon", -"version": "0.1.0", -"repo": "https://github.com/pop-os/cosmic-settings-daemon", -"reposhort": "cosmic-settings-daemon", -"commit": "latest", -"summary": "Settings daemon for cosmic-settings", -"license": GPL3, -"sources": STANDARD_SOURCES, -"buildrequires": STANDARD_BUILDREQUIRES, -"requires": STANDARD_REQUIRES, -"prep": STANDARD_PREP, -"build": f"make all VENDOR=1", -"install": f"make install DESTDIR=%{{buildroot}} prefix=%{{_prefix}}", -"files": f""" -{contains_app("cosmic-settings-daemon","",True, False, False, False, False, "")} -""", -} - -COSMIC_SETTINGS = { -"globals": f"%define debug_package %{{nil}}", -"name": "cosmic-settings", -"version": "0.1.0", -"repo": "https://github.com/pop-os/cosmic-settings", -"reposhort": "cosmic-settings", -"commit": "latest", -"summary": "The settings application for the COSMIC desktop environment", -"license": GPL3, -"sources": STANDARD_SOURCES, -"buildrequires": STANDARD_BUILDREQUIRES, -"requires": STANDARD_REQUIRES, -"prep": STANDARD_PREP, -"build": f"just build-vendored", -"install": f"just rootdir=%{{buildroot}} install", -"files": f""" -{contains_app("cosmic-settings","com.system76.CosmicSettings",True, True, False, False, True, "")} -{contains_(f"%{{_datadir}}/cosmic/com.system76.CosmicTheme.Dark.Builder/v1/*")} -{contains_(f"%{{_datadir}}/cosmic/com.system76.CosmicTheme.Dark/v1/*")} -{contains_(f"%{{_datadir}}/cosmic/com.system76.CosmicTheme.Light.Builder/v1/*")} -{contains_(f"%{{_datadir}}/cosmic/com.system76.CosmicTheme.Light/v1/*")} -{contains_(f"%{{_datadir}}/cosmic/com.system76.CosmicTheme.Mode/v1/*")} -{contains_(f"%{{_datadir}}/icons/hicolor/scalable/status/illustration-appearance-dark-style-round.svg")} -{contains_(f"%{{_datadir}}/icons/hicolor/scalable/status/illustration-appearance-dark-style-slightly-round.svg")} -{contains_(f"%{{_datadir}}/icons/hicolor/scalable/status/illustration-appearance-dark-style-square.svg")} -{contains_(f"%{{_datadir}}/icons/hicolor/scalable/status/illustration-appearance-light-style-round.svg")} -{contains_(f"%{{_datadir}}/icons/hicolor/scalable/status/illustration-appearance-light-style-slightly-round.svg")} -{contains_(f"%{{_datadir}}/icons/hicolor/scalable/status/illustration-appearance-light-style-square.svg")} -{contains_(f"%{{_datadir}}/icons/hicolor/scalable/status/illustration-appearance-mode-dark.svg")} -{contains_(f"%{{_datadir}}/icons/hicolor/scalable/status/illustration-appearance-mode-light.svg")} -%{{_datadir}}/icons/hicolor/128x128/apps/com.system76.CosmicSettings.svg -%{{_datadir}}/icons/hicolor/16x16/apps/com.system76.CosmicSettings.svg -%{{_datadir}}/icons/hicolor/24x24/apps/com.system76.CosmicSettings.svg -%{{_datadir}}/icons/hicolor/256x256/apps/com.system76.CosmicSettings.svg -%{{_datadir}}/icons/hicolor/32x32/apps/com.system76.CosmicSettings.svg -%{{_datadir}}/icons/hicolor/48x48/apps/com.system76.CosmicSettings.svg -%{{_datadir}}/icons/hicolor/64x64/apps/com.system76.CosmicSettings.svg -%{{_datadir}}/applications/com.system76.CosmicSettings.About.desktop -%{{_datadir}}/applications/com.system76.CosmicSettings.Appearance.desktop -%{{_datadir}}/applications/com.system76.CosmicSettings.DateTime.desktop -%{{_datadir}}/applications/com.system76.CosmicSettings.Desktop.desktop -%{{_datadir}}/applications/com.system76.CosmicSettings.Displays.desktop -%{{_datadir}}/applications/com.system76.CosmicSettings.Firmware.desktop -%{{_datadir}}/applications/com.system76.CosmicSettings.Keyboard.desktop -%{{_datadir}}/applications/com.system76.CosmicSettings.Mouse.desktop -%{{_datadir}}/applications/com.system76.CosmicSettings.Notifications.desktop -%{{_datadir}}/applications/com.system76.CosmicSettings.RegionLanguage.desktop -%{{_datadir}}/applications/com.system76.CosmicSettings.Sound.desktop -%{{_datadir}}/applications/com.system76.CosmicSettings.Touchpad.desktop -%{{_datadir}}/applications/com.system76.CosmicSettings.Users.desktop -%{{_datadir}}/applications/com.system76.CosmicSettings.Wallpaper.desktop -%{{_datadir}}/applications/com.system76.CosmicSettings.Workspaces.desktop -""", -} - -COSMIC_STORE = { -"globals": "", -"name": "cosmic-store", -"version": "0.1.0", -"repo": "https://github.com/pop-os/cosmic-store", -"reposhort": "cosmic-store", -"commit": "latest", -"summary": "COSMIC App Store", -"license": GPL3, -"sources": STANDARD_SOURCES, -"buildrequires": STANDARD_BUILDREQUIRES, -"requires": STANDARD_REQUIRES, -"prep": STANDARD_PREP, -"build": f"just build-vendored", -"install": f"just rootdir=%{{buildroot}} prefix=%{{_prefix}} install", -"files": f""" -{contains_app("cosmic-store","com.system76.CosmicStore",True, True, False, False, True, "")} -%{{_datadir}}/icons/hicolor/128x128/apps/com.system76.CosmicStore.svg -%{{_datadir}}/icons/hicolor/16x16/apps/com.system76.CosmicStore.svg -%{{_datadir}}/icons/hicolor/24x24/apps/com.system76.CosmicStore.svg -%{{_datadir}}/icons/hicolor/256x256/apps/com.system76.CosmicStore.svg -%{{_datadir}}/icons/hicolor/32x32/apps/com.system76.CosmicStore.svg -%{{_datadir}}/icons/hicolor/48x48/apps/com.system76.CosmicStore.svg -%{{_datadir}}/icons/hicolor/64x64/apps/com.system76.CosmicStore.svg -""", -} - -COSMIC_TERM = { -"globals": "", -"name": "cosmic-term", -"version": "0.1.0", -"repo": "https://github.com/pop-os/cosmic-term", -"reposhort": "cosmic-term", -"commit": "latest", -"summary": "WIP COSMIC terminal emulator, built using alacritty_terminal that is provided by the alacritty project. cosmic-term provides bidirectional rendering and ligatures with a custom renderer based on cosmic-text.", -"license": GPL3, -"sources": STANDARD_SOURCES, -"buildrequires": STANDARD_BUILDREQUIRES, -"requires": STANDARD_REQUIRES, -"prep": STANDARD_PREP, -"build": f"just build-vendored", -"install": f"just rootdir=%{{buildroot}} prefix=%{{_prefix}} install", -"files": f""" -{contains_app("cosmic-term","com.system76.CosmicTerm",True, True, False, False, True, "")} -%{{_datadir}}/icons/hicolor/128x128/apps/com.system76.CosmicTerm.svg -%{{_datadir}}/icons/hicolor/16x16/apps/com.system76.CosmicTerm.svg -%{{_datadir}}/icons/hicolor/24x24/apps/com.system76.CosmicTerm.svg -%{{_datadir}}/icons/hicolor/256x256/apps/com.system76.CosmicTerm.svg -%{{_datadir}}/icons/hicolor/32x32/apps/com.system76.CosmicTerm.svg -%{{_datadir}}/icons/hicolor/48x48/apps/com.system76.CosmicTerm.svg -%{{_datadir}}/icons/hicolor/64x64/apps/com.system76.CosmicTerm.svg -""", -} - -COSMIC_WORKSPACES = { -"globals": "", -"name": "cosmic-workspaces", -"version": "0.1.0", -"repo": "https://github.com/pop-os/cosmic-workspaces-epoch", -"reposhort": "cosmic-workspaces-epoch", -"commit": "latest", -"summary": "COSMIC Workspaces", -"license": GPL3, -"sources": STANDARD_SOURCES, -"buildrequires": STANDARD_BUILDREQUIRES, -"requires": STANDARD_REQUIRES, -"prep": STANDARD_PREP, -"build": f"make all VENDOR=1", -"install": f"make install DESTDIR=%{{buildroot}} prefix=%{{_prefix}}", -"files": f""" -{contains_app("cosmic-workspaces","com.system76.CosmicWorkspaces",True, True, True, False, False, "")} -""", -} - -COSMIC_XDG_DESKTOP_PORTAL = { -"globals": "", -"name": "xdg-desktop-portal-cosmic", -"version": "0.1.0", -"repo": "https://github.com/pop-os/xdg-desktop-portal-cosmic", -"reposhort": "xdg-desktop-portal-cosmic", -"commit": "latest", -"summary": "XDG Desktop Portals for the COSMIC Desktop Environment", -"license": GPL3, -"sources": STANDARD_SOURCES, -"buildrequires": STANDARD_BUILDREQUIRES, -"requires": STANDARD_REQUIRES, -"prep": STANDARD_PREP, -"build": f"make all VENDOR=1", -"install": f"make install DESTDIR=%{{buildroot}} prefix=%{{_prefix}}", -"files": f""" -{contains_(f"%{{_libexecdir}}/xdg-desktop-portal-cosmic")} -{contains_(f"%{{_datadir}}/dbus-1/services/org.freedesktop.impl.portal.desktop.cosmic.service")} -{contains_(f"%{{_datadir}}/xdg-desktop-portal/portals/cosmic.portal")} -{contains_(f"%{{_datadir}}/xdg-desktop-portal/cosmic-portals.conf")} -{contains_(f"%{{_datadir}}/icons/hicolor/scalable/actions/screenshot-screen-symbolic.svg")} -{contains_(f"%{{_datadir}}/icons/hicolor/scalable/actions/screenshot-selection-symbolic.svg")} -{contains_(f"%{{_datadir}}/icons/hicolor/scalable/actions/screenshot-window-symbolic.svg")} -""", -} - -POP_LAUNCHER = { -"globals": "", -"name": "pop-launcher", -"version": "0.1.0", -"repo": "https://github.com/pop-os/launcher", -"reposhort": "launcher", -"commit": "latest", -"summary": "Modular IPC-based desktop launcher service ", -"license": GPL3, -"sources": STANDARD_SOURCES + f"\nPatch1: symlink.patch", -"buildrequires": STANDARD_BUILDREQUIRES, -"requires": STANDARD_REQUIRES, -"prep": STANDARD_PREP, -"build": f"just build-vendored", -"install": f"just rootdir=%{{buildroot}} install", -"files": f""" -{contains_(f"%{{_bindir}}/pop-launcher")} -{contains_(f"%{{_prefix}}/lib/pop-launcher/*")} -""", -} - -SYSTEM76_POWER = { -"globals": f"%define debug_package %{{nil}}", -"name": "system76-power", -"version": "1.1.25", -"repo": "https://github.com/pop-os/system76-power", -"reposhort": "system76-power", -"commit": "latest", -"summary": "System76 Power Management", -"license": GPL3, -"sources": STANDARD_SOURCES, -"buildrequires": STANDARD_BUILDREQUIRES + "\nBuildRequires: rust-hidapi+linux-shared-libusb-devel\nBuildRequires: libusb1-devel\nBuildRequires: systemd-rpm-macros", -"requires": STANDARD_REQUIRES, -"prep": STANDARD_PREP + f"\ntar -pxf vendor.tar", -"build": f"""cargo build --release --offline --frozen""", -"install": f"""make install DESTDIR=%{{buildroot}} prefix=%{{_prefix}}""", -"files": f""" -%{{_bindir}}/system76-power -%{{_unitdir}}/com.system76.PowerDaemon.service -%{{_datadir}}/dbus-1/interfaces/com.system76.PowerDaemon.xml -%{{_datadir}}/dbus-1/system.d/com.system76.PowerDaemon.conf -%{{_datadir}}/polkit-1/actions/com.system76.PowerDaemon.policy -""" -} \ No newline at end of file diff --git a/metadata/all_deps.txt b/metadata/all_deps.txt index bf78785..98b2cad 100644 --- a/metadata/all_deps.txt +++ b/metadata/all_deps.txt @@ -185,4 +185,16 @@ libinput-devel wayland-devel libxkbcommon-devel systemd-devel +just + +xdg-desktop-portal-cosmic +rustc +lld +cargo +libxkbcommon-devel +wayland-devel +pipewire-devel +clang-devel +mesa-libEGL-devel +mesa-libgbm-devel just \ No newline at end of file diff --git a/pop-launcher/pop-launcher.spec b/pop-launcher/pop-launcher.spec deleted file mode 100644 index bc42d6b..0000000 --- a/pop-launcher/pop-launcher.spec +++ /dev/null @@ -1,89 +0,0 @@ - -# Generated by rust2rpm 25 - -# prevent library files from being installed - -%global crate pop-launcher -%global repo https://github.com/pop-os/launcher - -Name: pop-launcher -Version: # TO BE REPLACED AUTOMATICALLY - -Release: %autorelease -Summary: Modular IPC-based desktop launcher service - -License: GPL-3.0 - -URL: https://github.com/pop-os/launcher - -Source: %{crate}.tar.gz -Source: vendor.tar - -Patch1: symlink.patch - - -# For now, we require all deps for all of cosmic-epoch -BuildRequires: make -BuildRequires: which -BuildRequires: git-core -BuildRequires: just -BuildRequires: rustc -BuildRequires: lld -BuildRequires: cargo -BuildRequires: glib2-devel -BuildRequires: gtk3-devel -BuildRequires: dbus-devel -BuildRequires: wayland-devel -BuildRequires: clang-devel -BuildRequires: libxkbcommon-devel -BuildRequires: mesa-libgbm-devel -BuildRequires: rust-rav1e+nasm-rs-devel -BuildRequires: libappstream-glib -BuildRequires: pipewire-devel -BuildRequires: libglvnd-devel -BuildRequires: libseat-devel -BuildRequires: libinput-devel -BuildRequires: pam-devel -BuildRequires: flatpak-devel - - - -# For now, we require all deps for all of cosmic-epoch -Requires: libseat -Requires: pop-icon-theme -Requires: greetd -Requires: greetd-selinux -Requires: cage -Requires: mozilla-fira-mono-fonts -Requires: mozilla-fira-sans-fonts - - -%global _description %{expand: -%{summary}.} - -%description %{_description} - -%prep - -%autosetup -n %{crate} -p1 -mv %{_sourcedir}/vendor.tar vendor.tar -ls -a -mkdir -p .cargo -cp .vendor/config.toml .cargo/config.toml - - -%build -just build-vendored - -%install -just rootdir=%{buildroot} install - -%files - -%{_bindir}/pop-launcher -%{_prefix}/lib/pop-launcher/* - - -%changelog -%autochangelog - \ No newline at end of file diff --git a/pop-launcher/srpm.sh b/pop-launcher/srpm.sh deleted file mode 100644 index 206f092..0000000 --- a/pop-launcher/srpm.sh +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/bash -x - -# Variables. LOOK CLOSELY AND MAKE SURE THESE ARE CORRECT - -name='pop-launcher' -version='0.1.0' - -path_to_spec='pop-launcher/*' -pop_repo='launcher' - -# Commit to target. Use "latest" if you want master -commit="latest" - -# Don't edit anything past this line -# ===================================================== # - -LATEST="latest" - -cd ../.. -# We should be in the base directory now - -git clone --recurse-submodules https://github.com/pop-os/$pop_repo - -cd $pop_repo - -if [[ "$commit" == "$LATEST" ]] -then - commit=$(git rev-parse HEAD) -fi - -echo $commit -short_commit=${commit:0:6} - -git reset --hard $commit - -mkdir .vendor - -cargo vendor > .vendor/config.toml - -tar -pcf vendor.tar vendor && mv vendor.tar ../vendor.tar - -rm -rf vendor && cd .. - -# Back into cosmic-packaging - -ls - -if [ "$pop_repo" != "$name" ]; then - mv $pop_repo $name -else - echo "names are equal. continuing..." -fi - -tar -czf $name.tar.gz $name - -rm -rf $name - -cp cosmic-packaging/$path_to_spec . - -rm -rf cosmic-packaging - -current_date=$(date +'%Y%m%d.%H') - -sed -i "/^Version: / s/.*/Version: $version~$current_date.$short_commit/" $name.spec diff --git a/pop-launcher/symlink.patch b/pop-launcher/symlink.patch deleted file mode 100644 index fe52f83..0000000 --- a/pop-launcher/symlink.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./justfile 2024-03-15 15:00:57.529628363 -0500 -+++ ./justfile.new 2024-03-15 15:18:09.912712637 -0500 -@@ -67,7 +67,7 @@ - dest={{plugin-dir}}${plugin} - mkdir -p ${dest} - install -Dm0644 plugins/src/${plugin}/*.ron ${dest} -- ln -sf {{bin-path}} {{plugin-dir}}${plugin}/$(echo ${plugin} | sed 's/_/-/') -+ ln -srf {{bin-path}} {{plugin-dir}}${plugin}/$(echo ${plugin} | sed 's/_/-/') - done - - # Install pop-launcher scripts diff --git a/rpms/cosmic-desktop/cosmic-desktop.spec b/rpms/cosmic-desktop/cosmic-desktop.spec index 761dd5d..5d42da9 100644 --- a/rpms/cosmic-desktop/cosmic-desktop.spec +++ b/rpms/cosmic-desktop/cosmic-desktop.spec @@ -34,7 +34,6 @@ Recommends: cosmic-files Recommends: cosmic-greeter Recommends: cosmic-store Recommends: cosmic-term -Recommends: system76-power %global _description %{expand: %{summary}.} diff --git a/rpms/cosmic-settings/cosmic-settings.spec b/rpms/cosmic-settings/cosmic-settings.spec index ab2a72f..6632427 100644 --- a/rpms/cosmic-settings/cosmic-settings.spec +++ b/rpms/cosmic-settings/cosmic-settings.spec @@ -1,3 +1,5 @@ +# FIXME: Debug artifacts get in the way +%define debug_package %{nil} # Generated by rust2rpm 26 %bcond_without check diff --git a/rpms/cosmic-store/cosmic-store.spec b/rpms/cosmic-store/cosmic-store.spec index ac7a33f..0388361 100644 --- a/rpms/cosmic-store/cosmic-store.spec +++ b/rpms/cosmic-store/cosmic-store.spec @@ -1,21 +1,30 @@ # Generated by rust2rpm 26 %bcond_without check +%global ver ### +%global commit ### +%global date ### + Name: cosmic-store -Version: 0.1.0 +Version: %{ver}~%{date} Release: %autorelease -Summary: # FIXME +Summary: App store for the COSMIC Desktop Environment. -SourceLicense: -# FIXME: paste output of %%cargo_license_summary here -License: # FIXME +SourceLicense: GPL-3.0 +License: GPL-3.0 # LICENSE.dependencies contains a full license breakdown -URL: # FIXME -Source: # FIXME -Source: cosmic-store-0.1.0-vendor.tar.xz +URL: https://github.com/pop-os/cosmic-store +Source: cosmic-store-%{ver}.tar.xz +Source: cosmic-store-%{ver}-vendor.tar.xz BuildRequires: cargo-rpm-macros >= 25 +BuildRequires: rustc +BuildRequires: lld +BuildRequires: cargo +BuildRequires: flatpak-devel +BuildRequires: libappstream-glib +BuildRequires: just %global _description %{expand: %{summary}.} @@ -23,8 +32,9 @@ BuildRequires: cargo-rpm-macros >= 25 %description %{_description} %prep -%autosetup -n cosmic-store-%{version} -p1 -a1 -%cargo_prep -v vendor +%autosetup -n cosmic-store-%{ver} -p1 -a1 +%cargo_prep -N +cat .vendor/config.toml >> .cargo/config %build %cargo_build @@ -33,7 +43,7 @@ BuildRequires: cargo-rpm-macros >= 25 %{cargo_vendor_manifest} %install -%cargo_install +just rootdir=%{buildroot} prefix=%{_prefix} install %if %{with check} %check @@ -43,10 +53,19 @@ BuildRequires: cargo-rpm-macros >= 25 %files %license LICENSE %license LICENSE.dependencies -%license cargo-vendor.txt +# %%license cargo-vendor.txt %doc README.md %{_bindir}/cosmic-store %{_bindir}/flathub-stats +%{_datadir}/applications/com.system76.CosmicStore.desktop +%{_metainfodir}/com.system76.CosmicStore.metainfo.xml +%{_datadir}/icons/hicolor/128x128/apps/com.system76.CosmicStore.svg +%{_datadir}/icons/hicolor/16x16/apps/com.system76.CosmicStore.svg +%{_datadir}/icons/hicolor/24x24/apps/com.system76.CosmicStore.svg +%{_datadir}/icons/hicolor/256x256/apps/com.system76.CosmicStore.svg +%{_datadir}/icons/hicolor/32x32/apps/com.system76.CosmicStore.svg +%{_datadir}/icons/hicolor/48x48/apps/com.system76.CosmicStore.svg +%{_datadir}/icons/hicolor/64x64/apps/com.system76.CosmicStore.svg %changelog %autochangelog diff --git a/rpms/cosmic-term/cosmic-term.spec b/rpms/cosmic-term/cosmic-term.spec index e721307..d9ecd83 100644 --- a/rpms/cosmic-term/cosmic-term.spec +++ b/rpms/cosmic-term/cosmic-term.spec @@ -6,21 +6,31 @@ %global crate cosmic-term +%global ver ### +%global commit ### +%global date ### + Name: cosmic-term -Version: 0.1.0 +Version: %{ver}~%{date} Release: %autorelease -Summary: # FIXME +Summary: Terminal emulator built with Libcosmic. SourceLicense: GPL-3.0-only # FIXME: paste output of %%cargo_license_summary here -License: # FIXME +License: GPL-3.0 # LICENSE.dependencies contains a full license breakdown -URL: # FIXME -Source: # FIXME -Source: cosmic-term-0.1.0-vendor.tar.xz +URL: https://github.com/pop-os/cosmic-term +Source: cosmic-term-%{ver}.tar.xz +Source: cosmic-term-%{ver}-vendor.tar.xz BuildRequires: cargo-rpm-macros >= 26 +BuildRequires: rustc +BuildRequires: lld +BuildRequires: cargo +BuildRequires: just + +BuildRequires: git-core %global _description %{expand: %{summary}.} @@ -28,8 +38,9 @@ BuildRequires: cargo-rpm-macros >= 26 %description %{_description} %prep -%autosetup -n %{crate}-%{version} -p1 -a1 -%cargo_prep -v vendor +%autosetup -n %{crate}-%{ver} -p1 -a1 +%cargo_prep -N +cat .vendor/config.toml >> .cargo/config %build %cargo_build @@ -38,7 +49,7 @@ BuildRequires: cargo-rpm-macros >= 26 %{cargo_vendor_manifest} %install -%cargo_install +just rootdir=%{buildroot} prefix=%{_prefix} install %if %{with check} %check @@ -48,9 +59,18 @@ BuildRequires: cargo-rpm-macros >= 26 %files %license LICENSE %license LICENSE.dependencies -%license cargo-vendor.txt +# %%license cargo-vendor.txt %doc README.md %{_bindir}/cosmic-term +%{_datadir}/applications/com.system76.CosmicTerm.desktop +%{_metainfodir}/com.system76.CosmicTerm.metainfo.xml +%{_datadir}/icons/hicolor/128x128/apps/com.system76.CosmicTerm.svg +%{_datadir}/icons/hicolor/16x16/apps/com.system76.CosmicTerm.svg +%{_datadir}/icons/hicolor/24x24/apps/com.system76.CosmicTerm.svg +%{_datadir}/icons/hicolor/256x256/apps/com.system76.CosmicTerm.svg +%{_datadir}/icons/hicolor/32x32/apps/com.system76.CosmicTerm.svg +%{_datadir}/icons/hicolor/48x48/apps/com.system76.CosmicTerm.svg +%{_datadir}/icons/hicolor/64x64/apps/com.system76.CosmicTerm.svg %changelog %autochangelog diff --git a/rpms/cosmic-workspaces/cosmic-workspaces.spec b/rpms/cosmic-workspaces/cosmic-workspaces.spec index 4539b9b..a2d09d7 100644 --- a/rpms/cosmic-workspaces/cosmic-workspaces.spec +++ b/rpms/cosmic-workspaces/cosmic-workspaces.spec @@ -6,22 +6,37 @@ %global crate cosmic-workspaces +%global ver ### +%global commit ### +%global date ### + Name: cosmic-workspaces -Version: 0.1.0 +Version: %{ver}~%{date} Release: %autorelease -Summary: # FIXME +Summary: Workspaces overview for the COSMIC Desktop Environment. -SourceLicense: None -# FIXME: paste output of %%cargo_license_summary here -License: # FIXME +SourceLicense: GPL-3.0 +License: GPL-3.0 # LICENSE.dependencies contains a full license breakdown -# FIXME: No license information in crate metadata. -URL: # FIXME -Source: # FIXME -Source: cosmic-workspaces-0.1.0-vendor.tar.xz +URL: https://github.com/pop-os/cosmic-workspaces-epoch +Source: cosmic-workspaces-%{ver}.tar.xz +Source: cosmic-workspaces-%{ver}-vendor.tar.xz BuildRequires: cargo-rpm-macros >= 26 +BuildRequires: rustc +BuildRequires: lld +BuildRequires: cargo +BuildRequires: wayland-devel +BuildRequires: systemd-devel +BuildRequires: libxkbcommon-devel +BuildRequires: libglvnd-devel +BuildRequires: libseat-devel +BuildRequires: libinput-devel +BuildRequires: mesa-libgbm-devel +BuildRequires: make + +Requires: cosmic-comp %global _description %{expand: %{summary}.} @@ -29,8 +44,9 @@ BuildRequires: cargo-rpm-macros >= 26 %description %{_description} %prep -%autosetup -n %{crate}-%{version} -p1 -a1 -%cargo_prep -v vendor +%autosetup -n %{crate}-%{ver} -p1 -a1 +%cargo_prep -N +cat .vendor/config.toml >> .cargo/config %build %cargo_build @@ -39,7 +55,7 @@ BuildRequires: cargo-rpm-macros >= 26 %{cargo_vendor_manifest} %install -%cargo_install +make install DESTDIR=%{buildroot} prefix=%{_prefix} %if %{with check} %check @@ -49,8 +65,10 @@ BuildRequires: cargo-rpm-macros >= 26 %files %license LICENSE %license LICENSE.dependencies -%license cargo-vendor.txt +# %%license cargo-vendor.txt %{_bindir}/cosmic-workspaces +%{_datadir}/applications/com.system76.CosmicWorkspaces.desktop +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicWorkspaces.svg %changelog %autochangelog diff --git a/rpms/pop-launcher/pop-launcher.spec b/rpms/pop-launcher/pop-launcher.spec new file mode 100644 index 0000000..28a8236 --- /dev/null +++ b/rpms/pop-launcher/pop-launcher.spec @@ -0,0 +1,59 @@ +# Generated by rust2rpm 26 +%bcond_without check + +%global ver ### +%global commit ### +%global date ### + +Name: pop-launcher +Version: %{ver}~%{date} +Release: %autorelease +Summary: Modular IPC-based desktop launcher service. + +SourceLicense: GPL-3.0-only AND MPL-2.0 +License: GPL-3.0 +# LICENSE.dependencies contains a full license breakdown + +URL: https://github.com/pop-os/launcher +Source: pop-launcher-%{ver}.tar.xz +Source: pop-launcher-%{ver}-vendor.tar.xz + +Patch: symlink.patch + +BuildRequires: cargo-rpm-macros >= 25 + +%global _description %{expand: +%{summary}.} + +%description %{_description} + +%prep +%autosetup -n pop-launcher-%{ver} -p1 -a1 +%cargo_prep -N +cat .vendor/config.toml >> .cargo/config + +%build +%cargo_build +%{cargo_license_summary} +%{cargo_license} > LICENSE.dependencies +%{cargo_vendor_manifest} + +%install +just rootdir=%{buildroot} install + +%if %{with check} +%check +%cargo_test +%endif + +%files +%license LICENSE +%license plugins/COPYING +%license LICENSE.dependencies +# %% license cargo-vendor.txt +%doc README.md +%{_bindir}/pop-launcher +%{_prefix}/lib/pop-launcher/* + +%changelog +%autochangelog diff --git a/rpms/pop-launcher/symlink.patch b/rpms/pop-launcher/symlink.patch new file mode 100644 index 0000000..fe52f83 --- /dev/null +++ b/rpms/pop-launcher/symlink.patch @@ -0,0 +1,11 @@ +--- ./justfile 2024-03-15 15:00:57.529628363 -0500 ++++ ./justfile.new 2024-03-15 15:18:09.912712637 -0500 +@@ -67,7 +67,7 @@ + dest={{plugin-dir}}${plugin} + mkdir -p ${dest} + install -Dm0644 plugins/src/${plugin}/*.ron ${dest} +- ln -sf {{bin-path}} {{plugin-dir}}${plugin}/$(echo ${plugin} | sed 's/_/-/') ++ ln -srf {{bin-path}} {{plugin-dir}}${plugin}/$(echo ${plugin} | sed 's/_/-/') + done + + # Install pop-launcher scripts diff --git a/rpms/system76-power/system76-power.old.spec b/rpms/system76-power/system76-power.old.spec new file mode 100644 index 0000000..dd21c4c --- /dev/null +++ b/rpms/system76-power/system76-power.old.spec @@ -0,0 +1,95 @@ +%define debug_package %{nil} +# Generated by rust2rpm 25 + +# prevent library files from being installed + +%global crate system76-power +%global repo https://github.com/pop-os/system76-power + +Name: system76-power +Version: # TO BE REPLACED AUTOMATICALLY + +Release: %autorelease +Summary: System76 Power Management + +License: GPL-3.0 + +URL: https://github.com/pop-os/system76-power + +Source: %{crate}.tar.gz +Source: vendor.tar + + + +# For now, we require all deps for all of cosmic-epoch +BuildRequires: make +BuildRequires: which +BuildRequires: git-core +BuildRequires: just +BuildRequires: rustc +BuildRequires: lld +BuildRequires: cargo +BuildRequires: glib2-devel +BuildRequires: gtk3-devel +BuildRequires: dbus-devel +BuildRequires: wayland-devel +BuildRequires: clang-devel +BuildRequires: libxkbcommon-devel +BuildRequires: mesa-libgbm-devel +BuildRequires: rust-rav1e+nasm-rs-devel +BuildRequires: libappstream-glib +BuildRequires: pipewire-devel +BuildRequires: libglvnd-devel +BuildRequires: libseat-devel +BuildRequires: libinput-devel +BuildRequires: pam-devel +BuildRequires: flatpak-devel + +BuildRequires: rust-hidapi+linux-shared-libusb-devel +BuildRequires: libusb1-devel +BuildRequires: systemd-rpm-macros + + +# For now, we require all deps for all of cosmic-epoch +Requires: libseat +Requires: pop-icon-theme +Requires: greetd +Requires: greetd-selinux +Requires: cage +Requires: mozilla-fira-mono-fonts +Requires: mozilla-fira-sans-fonts + + +%global _description %{expand: +%{summary}.} + +%description %{_description} + +%prep + +%autosetup -n %{crate} -p1 +mv %{_sourcedir}/vendor.tar vendor.tar +ls -a +mkdir -p .cargo +cp .vendor/config.toml .cargo/config.toml + +tar -pxf vendor.tar + +%build +cargo build --release --offline --frozen + +%install +make install DESTDIR=%{buildroot} prefix=%{_prefix} + +%files + +%{_bindir}/system76-power +%{_unitdir}/com.system76.PowerDaemon.service +%{_datadir}/dbus-1/interfaces/com.system76.PowerDaemon.xml +%{_datadir}/dbus-1/system.d/com.system76.PowerDaemon.conf +%{_datadir}/polkit-1/actions/com.system76.PowerDaemon.policy + + +%changelog +%autochangelog + \ No newline at end of file diff --git a/rpms/system76-power/system76-power.spec b/rpms/system76-power/system76-power.spec new file mode 100644 index 0000000..a17490e --- /dev/null +++ b/rpms/system76-power/system76-power.spec @@ -0,0 +1,58 @@ +# Generated by rust2rpm 26 +%bcond_without check + +# prevent library files from being installed +%global cargo_install_lib 0 + +%global crate system76-power + +Name: system76-power +Version: 1.1.25 +Release: %autorelease +Summary: # FIXME + +SourceLicense: None +# FIXME: paste output of %%cargo_license_summary here +License: # FIXME +# LICENSE.dependencies contains a full license breakdown +# FIXME: No license information in crate metadata. + +URL: # FIXME +Source: # FIXME +Source: system76-power-1.1.25-vendor.tar.xz + +BuildRequires: cargo-rpm-macros >= 26 + +%global _description %{expand: +%{summary}.} + +%description %{_description} + +%prep +%autosetup -n %{crate}-%{version} -p1 -a1 +%cargo_prep -v vendor + +%build +%cargo_build +%{cargo_license_summary} +%{cargo_license} > LICENSE.dependencies +%{cargo_vendor_manifest} + +%install +%cargo_install + +%if %{with check} +%check +%cargo_test +%endif + +%files +%license LICENSE +%license LICENSE.dependencies +%license cargo-vendor.txt +%doc README.md +%doc TESTING.md +%{_bindir}/system76-power + +%changelog +%autochangelog diff --git a/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec b/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec new file mode 100644 index 0000000..01875d8 --- /dev/null +++ b/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec @@ -0,0 +1,75 @@ +# Generated by rust2rpm 26 +%bcond_without check + +# prevent library files from being installed +%global cargo_install_lib 0 + +%global crate xdg-desktop-portal-cosmic + +%global ver ### +%global commit ### +%global date ### + +Name: xdg-desktop-portal-cosmic +Version: %{ver}~%{date} +Release: %autorelease +Summary: XDG Desktop Portals implementation for the COSMIC Desktop Environment. + +SourceLicense: GPL-3.0-or-later +License: GPL-3.0 +# LICENSE.dependencies contains a full license breakdown + +URL: https://github.com/pop-os/xdg-desktop-portal-cosmic +Source: xdg-desktop-portal-cosmic-%{ver}.tar.xz +Source: xdg-desktop-portal-cosmic-%{ver}-vendor.tar.xz + +BuildRequires: cargo-rpm-macros >= 26 +BuildRequires: rustc +BuildRequires: lld +BuildRequires: cargo +BuildRequires: libxkbcommon-devel +BuildRequires: wayland-devel +BuildRequires: pipewire-devel +BuildRequires: clang-devel +BuildRequires: mesa-libEGL-devel +BuildRequires: mesa-libgbm-devel +BuildRequires: just + +%global _description %{expand: +%{summary}.} + +%description %{_description} + +%prep +%autosetup -n %{crate}-%{ver} -p1 -a1 +%cargo_prep -N +cat .vendor/config.toml >> .cargo/config + +%build +%cargo_build +%{cargo_license_summary} +%{cargo_license} > LICENSE.dependencies +%{cargo_vendor_manifest} + +%install +make install DESTDIR=%{buildroot} prefix=%{_prefix} + +%if %{with check} +%check +%cargo_test +%endif + +%files +%license LICENSE +%license LICENSE.dependencies +# %%license cargo-vendor.txt +%{_libexecdir}/xdg-desktop-portal-cosmic +%{_datadir}/dbus-1/services/org.freedesktop.impl.portal.desktop.cosmic.service +%{_datadir}/xdg-desktop-portal/portals/cosmic.portal +%{_datadir}/xdg-desktop-portal/cosmic-portals.conf +%{_datadir}/icons/hicolor/scalable/actions/screenshot-screen-symbolic.svg +%{_datadir}/icons/hicolor/scalable/actions/screenshot-selection-symbolic.svg +%{_datadir}/icons/hicolor/scalable/actions/screenshot-window-symbolic.svg + +%changelog +%autochangelog diff --git a/specgen.py b/specgen.py deleted file mode 100644 index d0761e7..0000000 --- a/specgen.py +++ /dev/null @@ -1,167 +0,0 @@ -import cosmic_apps -import subprocess - -SPEC_FOLDER = "SPECS" -BUILD_SCRIPTS_FOLDER = "BUILD_SCRIPTS" - - -BUILD_APPS = [ - cosmic_apps.COSMIC_APP_LIBRARY, - cosmic_apps.COSMIC_APPLETS, - cosmic_apps.COSMIC_BG, - cosmic_apps.COSMIC_COMP, - cosmic_apps.COSMIC_EDIT, - cosmic_apps.COSMIC_FILES, - cosmic_apps.COSMIC_GREETER, - cosmic_apps.COSMIC_LAUNCHER, - cosmic_apps.COSMIC_NOTIFICATIONS, - cosmic_apps.COSMIC_OSD, - cosmic_apps.COSMIC_PANEL, - cosmic_apps.COSMIC_RANDR, - cosmic_apps.COSMIC_SCREENSHOT, - cosmic_apps.COSMIC_SESSION, - cosmic_apps.COSMIC_SETTINGS, - cosmic_apps.COSMIC_SETTINGS_DAEMON, - cosmic_apps.COSMIC_STORE, - cosmic_apps.COSMIC_TERM, - cosmic_apps.COSMIC_WORKSPACES, - cosmic_apps.COSMIC_XDG_DESKTOP_PORTAL, - cosmic_apps.POP_LAUNCHER, - cosmic_apps.SYSTEM76_POWER -] - -BUILD_ETC = [cosmic_apps.COSMIC_ICONS] - -def make_spec(specinfo): - spec = f"""{specinfo["globals"]} -# Generated by rust2rpm 25 - -# prevent library files from being installed - -%global crate {specinfo["name"]} -%global repo {specinfo["repo"]} - -Name: {specinfo["name"]} -Version: # TO BE REPLACED AUTOMATICALLY - -Release: %autorelease -Summary: {specinfo["summary"]} - -License: {specinfo["license"]} - -URL: {specinfo["repo"]} -{specinfo["sources"]} - -{specinfo["buildrequires"]} - -{specinfo["requires"]} - -%global _description %{{expand: -%{{summary}}.}} - -%description %{{_description}} - -%prep -{specinfo["prep"]} - -%build -{specinfo["build"]} - -%install -{specinfo["install"]} - -%files -{specinfo["files"]} - -%changelog -%autochangelog - """ - - with open(f'{specinfo["name"]}/{specinfo["name"]}.spec', 'w') as f: - f.write(spec) - -def make_build_srpm_script(specinfo): - scr = f"""#!/bin/bash -x - -# Variables. LOOK CLOSELY AND MAKE SURE THESE ARE CORRECT - -name='{specinfo["name"]}' -version='{specinfo["version"]}' - -path_to_spec='{specinfo["name"]}/*' -pop_repo='{specinfo["reposhort"]}' - -# Commit to target. Use "latest" if you want master -commit="{specinfo["commit"]}" - -# Don't edit anything past this line -# ===================================================== # - -LATEST="latest" - -cd ../.. -# We should be in the base directory now - -git clone --recurse-submodules https://github.com/pop-os/$pop_repo - -cd $pop_repo - -if [[ "$commit" == "$LATEST" ]] -then - commit=$(git rev-parse HEAD) -fi - -echo $commit -short_commit=${{commit:0:6}} - -git reset --hard $commit - -mkdir .vendor - -cargo vendor > .vendor/config.toml - -tar -pcf vendor.tar vendor && mv vendor.tar ../vendor.tar - -rm -rf vendor && cd .. - -# Back into cosmic-packaging - -ls - -if [ "$pop_repo" != "$name" ]; then - mv $pop_repo $name -else - echo "names are equal. continuing..." -fi - -tar -czf $name.tar.gz $name - -rm -rf $name - -cp cosmic-packaging/$path_to_spec . - -rm -rf cosmic-packaging - -current_date=$(date +'%Y%m%d.%H') - -sed -i "/^Version: / s/.*/Version: $version~$current_date.$short_commit/" $name.spec -""" - with open(f'{specinfo["name"]}/srpm.sh', 'w') as f: - f.write(scr) - -def make_makefile(specinfo): - mkf = f"""srpm: - sudo dnf install -y rustc cargo git - . build.sh""" - with open(f'{specinfo["name"]}/.spec/Makefile', 'w') as f: - f.write(mkf) - -for app in BUILD_APPS: - subprocess.run(f"mkdir -p {app["name"]}", shell=True) - make_spec(app) - make_build_srpm_script(app) - -for etc in BUILD_ETC: - subprocess.run(f"mkdir -p {etc["name"]}", shell=True) - make_spec(etc) - # make_simple_srpm(etc) \ No newline at end of file diff --git a/system76-power/srpm.sh b/system76-power/srpm.sh deleted file mode 100644 index 948d660..0000000 --- a/system76-power/srpm.sh +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/bash -x - -# Variables. LOOK CLOSELY AND MAKE SURE THESE ARE CORRECT - -name='system76-power' -version='1.1.25' - -path_to_spec='system76-power/*' -pop_repo='system76-power' - -# Commit to target. Use "latest" if you want master -commit="latest" - -# Don't edit anything past this line -# ===================================================== # - -LATEST="latest" - -cd ../.. -# We should be in the base directory now - -git clone --recurse-submodules https://github.com/pop-os/$pop_repo - -cd $pop_repo - -if [[ "$commit" == "$LATEST" ]] -then - commit=$(git rev-parse HEAD) -fi - -echo $commit -short_commit=${commit:0:6} - -git reset --hard $commit - -mkdir .vendor - -cargo vendor > .vendor/config.toml - -tar -pcf vendor.tar vendor && mv vendor.tar ../vendor.tar - -rm -rf vendor && cd .. - -# Back into cosmic-packaging - -ls - -if [ "$pop_repo" != "$name" ]; then - mv $pop_repo $name -else - echo "names are equal. continuing..." -fi - -tar -czf $name.tar.gz $name - -rm -rf $name - -cp cosmic-packaging/$path_to_spec . - -rm -rf cosmic-packaging - -current_date=$(date +'%Y%m%d.%H') - -sed -i "/^Version: / s/.*/Version: $version~$current_date.$short_commit/" $name.spec diff --git a/system76-power/system76-power.spec b/system76-power/system76-power.spec deleted file mode 100644 index dd21c4c..0000000 --- a/system76-power/system76-power.spec +++ /dev/null @@ -1,95 +0,0 @@ -%define debug_package %{nil} -# Generated by rust2rpm 25 - -# prevent library files from being installed - -%global crate system76-power -%global repo https://github.com/pop-os/system76-power - -Name: system76-power -Version: # TO BE REPLACED AUTOMATICALLY - -Release: %autorelease -Summary: System76 Power Management - -License: GPL-3.0 - -URL: https://github.com/pop-os/system76-power - -Source: %{crate}.tar.gz -Source: vendor.tar - - - -# For now, we require all deps for all of cosmic-epoch -BuildRequires: make -BuildRequires: which -BuildRequires: git-core -BuildRequires: just -BuildRequires: rustc -BuildRequires: lld -BuildRequires: cargo -BuildRequires: glib2-devel -BuildRequires: gtk3-devel -BuildRequires: dbus-devel -BuildRequires: wayland-devel -BuildRequires: clang-devel -BuildRequires: libxkbcommon-devel -BuildRequires: mesa-libgbm-devel -BuildRequires: rust-rav1e+nasm-rs-devel -BuildRequires: libappstream-glib -BuildRequires: pipewire-devel -BuildRequires: libglvnd-devel -BuildRequires: libseat-devel -BuildRequires: libinput-devel -BuildRequires: pam-devel -BuildRequires: flatpak-devel - -BuildRequires: rust-hidapi+linux-shared-libusb-devel -BuildRequires: libusb1-devel -BuildRequires: systemd-rpm-macros - - -# For now, we require all deps for all of cosmic-epoch -Requires: libseat -Requires: pop-icon-theme -Requires: greetd -Requires: greetd-selinux -Requires: cage -Requires: mozilla-fira-mono-fonts -Requires: mozilla-fira-sans-fonts - - -%global _description %{expand: -%{summary}.} - -%description %{_description} - -%prep - -%autosetup -n %{crate} -p1 -mv %{_sourcedir}/vendor.tar vendor.tar -ls -a -mkdir -p .cargo -cp .vendor/config.toml .cargo/config.toml - -tar -pxf vendor.tar - -%build -cargo build --release --offline --frozen - -%install -make install DESTDIR=%{buildroot} prefix=%{_prefix} - -%files - -%{_bindir}/system76-power -%{_unitdir}/com.system76.PowerDaemon.service -%{_datadir}/dbus-1/interfaces/com.system76.PowerDaemon.xml -%{_datadir}/dbus-1/system.d/com.system76.PowerDaemon.conf -%{_datadir}/polkit-1/actions/com.system76.PowerDaemon.policy - - -%changelog -%autochangelog - \ No newline at end of file diff --git a/xdg-desktop-portal-cosmic/srpm.sh b/xdg-desktop-portal-cosmic/srpm.sh deleted file mode 100644 index 1c518e1..0000000 --- a/xdg-desktop-portal-cosmic/srpm.sh +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/bash -x - -# Variables. LOOK CLOSELY AND MAKE SURE THESE ARE CORRECT - -name='xdg-desktop-portal-cosmic' -version='0.1.0' - -path_to_spec='xdg-desktop-portal-cosmic/*' -pop_repo='xdg-desktop-portal-cosmic' - -# Commit to target. Use "latest" if you want master -commit="latest" - -# Don't edit anything past this line -# ===================================================== # - -LATEST="latest" - -cd ../.. -# We should be in the base directory now - -git clone --recurse-submodules https://github.com/pop-os/$pop_repo - -cd $pop_repo - -if [[ "$commit" == "$LATEST" ]] -then - commit=$(git rev-parse HEAD) -fi - -echo $commit -short_commit=${commit:0:6} - -git reset --hard $commit - -mkdir .vendor - -cargo vendor > .vendor/config.toml - -tar -pcf vendor.tar vendor && mv vendor.tar ../vendor.tar - -rm -rf vendor && cd .. - -# Back into cosmic-packaging - -ls - -if [ "$pop_repo" != "$name" ]; then - mv $pop_repo $name -else - echo "names are equal. continuing..." -fi - -tar -czf $name.tar.gz $name - -rm -rf $name - -cp cosmic-packaging/$path_to_spec . - -rm -rf cosmic-packaging - -current_date=$(date +'%Y%m%d.%H') - -sed -i "/^Version: / s/.*/Version: $version~$current_date.$short_commit/" $name.spec diff --git a/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec b/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec deleted file mode 100644 index 8535e49..0000000 --- a/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec +++ /dev/null @@ -1,93 +0,0 @@ - -# Generated by rust2rpm 25 - -# prevent library files from being installed - -%global crate xdg-desktop-portal-cosmic -%global repo https://github.com/pop-os/xdg-desktop-portal-cosmic - -Name: xdg-desktop-portal-cosmic -Version: # TO BE REPLACED AUTOMATICALLY - -Release: %autorelease -Summary: XDG Desktop Portals for the COSMIC Desktop Environment - -License: GPL-3.0 - -URL: https://github.com/pop-os/xdg-desktop-portal-cosmic - -Source: %{crate}.tar.gz -Source: vendor.tar - - - -# For now, we require all deps for all of cosmic-epoch -BuildRequires: make -BuildRequires: which -BuildRequires: git-core -BuildRequires: just -BuildRequires: rustc -BuildRequires: lld -BuildRequires: cargo -BuildRequires: glib2-devel -BuildRequires: gtk3-devel -BuildRequires: dbus-devel -BuildRequires: wayland-devel -BuildRequires: clang-devel -BuildRequires: libxkbcommon-devel -BuildRequires: mesa-libgbm-devel -BuildRequires: rust-rav1e+nasm-rs-devel -BuildRequires: libappstream-glib -BuildRequires: pipewire-devel -BuildRequires: libglvnd-devel -BuildRequires: libseat-devel -BuildRequires: libinput-devel -BuildRequires: pam-devel -BuildRequires: flatpak-devel - - - -# For now, we require all deps for all of cosmic-epoch -Requires: libseat -Requires: pop-icon-theme -Requires: greetd -Requires: greetd-selinux -Requires: cage -Requires: mozilla-fira-mono-fonts -Requires: mozilla-fira-sans-fonts - - -%global _description %{expand: -%{summary}.} - -%description %{_description} - -%prep - -%autosetup -n %{crate} -p1 -mv %{_sourcedir}/vendor.tar vendor.tar -ls -a -mkdir -p .cargo -cp .vendor/config.toml .cargo/config.toml - - -%build -make all VENDOR=1 - -%install -make install DESTDIR=%{buildroot} prefix=%{_prefix} - -%files - -%{_libexecdir}/xdg-desktop-portal-cosmic -%{_datadir}/dbus-1/services/org.freedesktop.impl.portal.desktop.cosmic.service -%{_datadir}/xdg-desktop-portal/portals/cosmic.portal -%{_datadir}/xdg-desktop-portal/cosmic-portals.conf -%{_datadir}/icons/hicolor/scalable/actions/screenshot-screen-symbolic.svg -%{_datadir}/icons/hicolor/scalable/actions/screenshot-selection-symbolic.svg -%{_datadir}/icons/hicolor/scalable/actions/screenshot-window-symbolic.svg - - -%changelog -%autochangelog - \ No newline at end of file From 7bf96745c73a5001213ee5c8a2bf23e2ff95302c Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 27 2024 20:49:38 +0000 Subject: [PATCH 76/220] modify bootstrap script --- diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 1b49498..831a01c 100644 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -1,9 +1,11 @@ #!/bin/bash -x PACKAGE= +VERSION=0.1.0 +COMMIT=latest REPO=https://github.com/pop-os/$PACKAGE git clone --recurse-submodules https://pagure.io/forks/ryanabx/fedora-cosmic/cosmic-packaging.git cp cosmic-packaging/rpms/$PACKAGE/* . cp cosmic-packaging/scripts/vendor-srpm.sh . -. vendor-srpm.sh $PACKAGE 0.1.0 latest $PACKAGE.spec $REPO \ No newline at end of file +. vendor-srpm.sh $PACKAGE $VERSION $COMMIT $PACKAGE.spec $REPO \ No newline at end of file From 36ea8a62c628e5b0b6319e223c0493b349861940 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 27 2024 21:05:08 +0000 Subject: [PATCH 77/220] s --- diff --git a/scripts/no-sources-srpm.sh b/scripts/no-sources-srpm.sh new file mode 100644 index 0000000..f00c38a --- /dev/null +++ b/scripts/no-sources-srpm.sh @@ -0,0 +1,27 @@ +#!/bin/bash -x + +# name of the crate/package +name=$1 +# version of the crate/package +version=$2 +# commit to target (latest == master) +commit=$3 +# path to the spec file on the pc +path_to_spec=$4 +# repo link +repo=$5 + +# Get specfile +cp $path_to_spec $name.spec 2>/dev/null || : + +# Make replacements to specfile +sed -i "/^%global ver / s/.*/%global ver $version/" $name.spec +sed -i "/^%global commit / s/.*/%global commit none/" $name.spec +current_date=$(date +'%Y%m%d.%H') +sed -i "/^%global date / s/.*/%global date $current_date/" $name.spec + + +ls -a +pwd + +echo Done! $1 $2 $3 $4 $5 \ No newline at end of file From 884900edcfef9af3cc34bbef2c8319abdbd2b4ef Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 27 2024 21:17:21 +0000 Subject: [PATCH 78/220] fix pop-launcher --- diff --git a/metadata/all_deps.txt b/metadata/all_deps.txt index 98b2cad..a98e146 100644 --- a/metadata/all_deps.txt +++ b/metadata/all_deps.txt @@ -197,4 +197,13 @@ pipewire-devel clang-devel mesa-libEGL-devel mesa-libgbm-devel -just \ No newline at end of file +just + +pop-launcher + +rustc +lld +cargo +mesa-libEGL-devel +libxkbcommon-devel +just diff --git a/rpms/pop-launcher/pop-launcher.spec b/rpms/pop-launcher/pop-launcher.spec index 28a8236..40e37af 100644 --- a/rpms/pop-launcher/pop-launcher.spec +++ b/rpms/pop-launcher/pop-launcher.spec @@ -21,6 +21,15 @@ Source: pop-launcher-%{ver}-vendor.tar.xz Patch: symlink.patch BuildRequires: cargo-rpm-macros >= 25 +BuildRequires: rustc +BuildRequires: lld +BuildRequires: cargo +BuildRequires: mesa-libEGL-devel +BuildRequires: libxkbcommon-devel +BuildRequires: just + +Requires: libqalculate +Requires: rust-fd-find %global _description %{expand: %{summary}.} From b141b2b95e474ee8403f22fa0dd1d690f6ba74cb Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 27 2024 21:22:09 +0000 Subject: [PATCH 79/220] fixes --- diff --git a/rpms/cosmic-store/cosmic-store.spec b/rpms/cosmic-store/cosmic-store.spec index 0388361..ea384b2 100644 --- a/rpms/cosmic-store/cosmic-store.spec +++ b/rpms/cosmic-store/cosmic-store.spec @@ -56,7 +56,6 @@ just rootdir=%{buildroot} prefix=%{_prefix} install # %%license cargo-vendor.txt %doc README.md %{_bindir}/cosmic-store -%{_bindir}/flathub-stats %{_datadir}/applications/com.system76.CosmicStore.desktop %{_metainfodir}/com.system76.CosmicStore.metainfo.xml %{_datadir}/icons/hicolor/128x128/apps/com.system76.CosmicStore.svg diff --git a/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec b/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec index 01875d8..c488a38 100644 --- a/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec +++ b/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec @@ -33,6 +33,7 @@ BuildRequires: pipewire-devel BuildRequires: clang-devel BuildRequires: mesa-libEGL-devel BuildRequires: mesa-libgbm-devel +BuildRequires: glib2-devel BuildRequires: just %global _description %{expand: From 4fd741ede8c3e39155be48897c9fe951d233a440 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 27 2024 22:58:19 +0000 Subject: [PATCH 80/220] add license info --- diff --git a/rpms/cosmic-comp/cosmic-comp.spec b/rpms/cosmic-comp/cosmic-comp.spec index 952444d..9b0cd93 100644 --- a/rpms/cosmic-comp/cosmic-comp.spec +++ b/rpms/cosmic-comp/cosmic-comp.spec @@ -11,7 +11,32 @@ Release: %autorelease Summary: Compositor for the COSMIC Desktop Environment. Can also be used as a standalone compositor. SourceLicense: GPL-3.0-only -License: GPL-3.0 +# (Apache-2.0 OR MIT) AND BSD-3-Clause +# 0BSD OR MIT OR Apache-2.0 +# Apache-2.0 +# Apache-2.0 OR BSD-3-Clause +# Apache-2.0 OR BSL-1.0 +# Apache-2.0 OR MIT +# Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT +# BSD-2-Clause +# BSD-2-Clause OR Apache-2.0 OR MIT +# BSD-3-Clause +# BSD-3-Clause OR MIT OR Apache-2.0 +# BSL-1.0 +# CC0-1.0 +# GPL-3.0 +# GPL-3.0-only +# ISC +# MIT +# MIT OR Apache-2.0 +# MIT OR Apache-2.0 OR CC0-1.0 +# MIT OR Apache-2.0 OR Zlib +# MIT OR Zlib OR Apache-2.0 +# MPL-2.0 +# Unlicense OR MIT +# Zlib +# Zlib OR Apache-2.0 OR MIT +License: GPL-3.0 AND (Apache-2.0 OR MIT) AND BSD-3-Clause AND 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 AND Apache-2.0 OR BSD-3-Clause AND Apache-2.0 OR BSL-1.0 AND Apache-2.0 OR MIT AND Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT AND BSD-2-Clause AND BSD-2-Clause OR Apache-2.0 OR MIT AND BSD-3-Clause AND BSD-3-Clause OR MIT OR Apache-2.0 AND BSL-1.0 AND CC0-1.0 AND GPL-3.0 AND GPL-3.0-only AND ISC AND MIT AND MIT OR Apache-2.0 AND MIT OR Apache-2.0 OR CC0-1.0 AND MIT OR Apache-2.0 OR Zlib AND MIT OR Zlib OR Apache-2.0 AND MPL-2.0 AND Unlicense OR MIT AND Zlib AND Zlib OR Apache-2.0 OR MIT # LICENSE.dependencies contains a full license breakdown URL: https://github.com/pop-os/cosmic-comp From 0f68d8fcf6bafe9549ab362a201023422ad4b5f7 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 28 2024 00:31:03 +0000 Subject: [PATCH 81/220] s --- diff --git a/rpms/cosmic-app-library/cosmic-app-library.spec b/rpms/cosmic-app-library/cosmic-app-library.spec index d8bdc3f..0941e00 100644 --- a/rpms/cosmic-app-library/cosmic-app-library.spec +++ b/rpms/cosmic-app-library/cosmic-app-library.spec @@ -16,8 +16,26 @@ Release: %autorelease Summary: App Library program for the COSMIC Desktop Environment. SourceLicense: GPL-3.0 -License: GPL-3.0 -# LICENSE.dependencies contains a full license breakdown +# 0BSD OR MIT OR Apache-2.0 +# Apache-2.0 +# Apache-2.0 OR MIT +# Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT +# BSD-2-Clause +# BSD-3-Clause +# BSL-1.0 +# CC0-1.0 +# GPL-3.0 +# ISC +# MIT +# MIT OR Apache-2.0 +# MIT OR Apache-2.0 OR CC0-1.0 +# MIT OR Apache-2.0 OR Zlib +# MIT OR Zlib OR Apache-2.0 +# MPL-2.0 +# Unlicense OR MIT +# Zlib +# Zlib OR Apache-2.0 OR MIT +License: 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 AND Apache-2.0 OR MIT AND Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT AND BSD-2-Clause AND BSD-3-Clause AND BSL-1.0 AND CC0-1.0 AND GPL-3.0 AND ISC AND MIT AND MIT OR Apache-2.0 AND MIT OR Apache-2.0 OR CC0-1.0 AND MIT OR Apache-2.0 OR Zlib AND MIT OR Zlib OR Apache-2.0 AND MPL-2.0 AND Unlicense OR MIT AND Zlib AND Zlib OR Apache-2.0 OR MIT AND LICENSE.dependencies contains a full license breakdown URL: https://github.com/pop-os/cosmic-applibrary Source: cosmic-app-library-%{ver}.tar.xz diff --git a/rpms/cosmic-applets/cosmic-applets.spec b/rpms/cosmic-applets/cosmic-applets.spec index 964e69f..5557e8e 100644 --- a/rpms/cosmic-applets/cosmic-applets.spec +++ b/rpms/cosmic-applets/cosmic-applets.spec @@ -11,7 +11,27 @@ Release: %autorelease Summary: Applets for the COSMIC Desktop Environment. SourceLicense: GPL-3.0-or-later -License: GPL-3.0 +# 0BSD OR MIT OR Apache-2.0 +# Apache-2.0 +# Apache-2.0 OR MIT +# Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT +# BSD-2-Clause +# BSD-3-Clause +# BSL-1.0 +# CC0-1.0 +# GPL-3.0 +# GPL-3.0-or-later +# ISC +# MIT +# MIT OR Apache-2.0 +# MIT OR Apache-2.0 OR CC0-1.0 +# MIT OR Apache-2.0 OR Zlib +# MIT OR Zlib OR Apache-2.0 +# MPL-2.0 +# Unlicense OR MIT +# Zlib +# Zlib OR Apache-2.0 OR MIT +License: 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 AND Apache-2.0 OR MIT AND Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT AND BSD-2-Clause AND BSD-3-Clause AND BSL-1.0 AND CC0-1.0 AND GPL-3.0 AND GPL-3.0-or-later AND ISC AND MIT AND MIT OR Apache-2.0 AND MIT OR Apache-2.0 OR CC0-1.0 AND MIT OR Apache-2.0 OR Zlib AND MIT OR Zlib OR Apache-2.0 AND MPL-2.0 AND Unlicense OR MIT AND Zlib AND Zlib OR Apache-2.0 OR MIT # LICENSE.dependencies contains a full license breakdown URL: https://github.com/pop-os/cosmic-applets diff --git a/rpms/cosmic-bg/cosmic-bg.spec b/rpms/cosmic-bg/cosmic-bg.spec index ac4cbb8..6ed8815 100644 --- a/rpms/cosmic-bg/cosmic-bg.spec +++ b/rpms/cosmic-bg/cosmic-bg.spec @@ -11,7 +11,21 @@ Release: %autorelease Summary: Background manager for the COSMIC Desktop Environment. SourceLicense: MPL-2.0 -License: GPL-3.0 +# 0BSD OR MIT OR Apache-2.0 +# Apache-2.0 OR MIT +# Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT +# BSD-3-Clause +# BSL-1.0 +# CC0-1.0 +# ISC +# MIT +# MIT OR Apache-2.0 +# MIT OR Apache-2.0 OR Zlib +# MIT OR Zlib OR Apache-2.0 +# MPL-2.0 +# Unlicense OR MIT +# Zlib OR Apache-2.0 OR MIT +License: 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 OR MIT AND Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT AND BSD-3-Clause AND BSL-1.0 AND CC0-1.0 AND ISC AND MIT AND MIT OR Apache-2.0 AND MIT OR Apache-2.0 OR Zlib AND MIT OR Zlib OR Apache-2.0 AND MPL-2.0 AND Unlicense OR MIT AND Zlib OR Apache-2.0 OR MIT # LICENSE.dependencies contains a full license breakdown URL: https://github.com/pop-os/cosmic-bg diff --git a/rpms/cosmic-comp/cosmic-comp.spec b/rpms/cosmic-comp/cosmic-comp.spec index 9b0cd93..856bf7e 100644 --- a/rpms/cosmic-comp/cosmic-comp.spec +++ b/rpms/cosmic-comp/cosmic-comp.spec @@ -57,7 +57,7 @@ BuildRequires: make Requires: libseat -Recommends: cosmic-session +Recommends: cosmic-session %global _description %{expand: %{summary}.} diff --git a/rpms/cosmic-edit/cosmic-edit.spec b/rpms/cosmic-edit/cosmic-edit.spec index 6df5ef3..48e6973 100644 --- a/rpms/cosmic-edit/cosmic-edit.spec +++ b/rpms/cosmic-edit/cosmic-edit.spec @@ -16,7 +16,30 @@ Release: %autorelease Summary: Libcosmic text editor. SourceLicense: GPL-3.0-only -License: GPL-3.0 +# (Apache-2.0 OR MIT) AND BSD-3-Clause +# 0BSD OR MIT OR Apache-2.0 +# Apache-2.0 +# Apache-2.0 OR BSL-1.0 +# Apache-2.0 OR MIT +# Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT +# BSD-2-Clause +# BSD-2-Clause OR Apache-2.0 OR MIT +# BSD-3-Clause +# BSD-3-Clause OR MIT OR Apache-2.0 +# BSL-1.0 +# CC0-1.0 +# GPL-3.0-only +# ISC +# MIT +# MIT OR Apache-2.0 +# MIT OR Apache-2.0 OR CC0-1.0 +# MIT OR Apache-2.0 OR Zlib +# MIT OR Zlib OR Apache-2.0 +# MPL-2.0 +# Unlicense OR MIT +# Zlib +# Zlib OR Apache-2.0 OR MIT +License: (Apache-2.0 OR MIT) AND BSD-3-Clause AND 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 AND Apache-2.0 OR BSL-1.0 AND Apache-2.0 OR MIT AND Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT AND BSD-2-Clause AND BSD-2-Clause OR Apache-2.0 OR MIT AND BSD-3-Clause AND BSD-3-Clause OR MIT OR Apache-2.0 AND BSL-1.0 AND CC0-1.0 AND GPL-3.0-only AND ISC AND MIT AND MIT OR Apache-2.0 AND MIT OR Apache-2.0 OR CC0-1.0 AND MIT OR Apache-2.0 OR Zlib AND MIT OR Zlib OR Apache-2.0 AND MPL-2.0 AND Unlicense OR MIT AND Zlib AND Zlib OR Apache-2.0 OR MIT # LICENSE.dependencies contains a full license breakdown URL: https://github.com/pop-os/cosmic-edit diff --git a/rpms/cosmic-files/cosmic-files.spec b/rpms/cosmic-files/cosmic-files.spec index 18ab745..bd50285 100644 --- a/rpms/cosmic-files/cosmic-files.spec +++ b/rpms/cosmic-files/cosmic-files.spec @@ -16,7 +16,29 @@ Release: %autorelease Summary: Libcosmic file manager. SourceLicense: GPL-3.0-only -License: GPL-3.0 +# 0BSD OR MIT OR Apache-2.0 +# Apache-2.0 +# Apache-2.0 OR BSL-1.0 +# Apache-2.0 OR MIT +# Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT +# BSD-2-Clause +# BSD-2-Clause OR Apache-2.0 OR MIT +# BSD-3-Clause +# BSD-3-Clause OR MIT OR Apache-2.0 +# BSL-1.0 +# CC0-1.0 +# GPL-3.0-only +# ISC +# MIT +# MIT OR Apache-2.0 +# MIT OR Apache-2.0 OR CC0-1.0 +# MIT OR Apache-2.0 OR Zlib +# MIT OR Zlib OR Apache-2.0 +# MPL-2.0 +# Unlicense OR MIT +# Zlib +# Zlib OR Apache-2.0 OR MIT +License: 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 AND Apache-2.0 OR BSL-1.0 AND Apache-2.0 OR MIT AND Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT AND BSD-2-Clause AND BSD-2-Clause OR Apache-2.0 OR MIT AND BSD-3-Clause AND BSD-3-Clause OR MIT OR Apache-2.0 AND BSL-1.0 AND CC0-1.0 AND GPL-3.0-only AND ISC AND MIT AND MIT OR Apache-2.0 AND MIT OR Apache-2.0 OR CC0-1.0 AND MIT OR Apache-2.0 OR Zlib AND MIT OR Zlib OR Apache-2.0 AND MPL-2.0 AND Unlicense OR MIT AND Zlib AND Zlib OR Apache-2.0 OR MIT # LICENSE.dependencies contains a full license breakdown URL: https://github.com/pop-os/cosmic-files diff --git a/rpms/cosmic-greeter/cosmic-greeter.spec b/rpms/cosmic-greeter/cosmic-greeter.spec index 4e09c41..59d1a5b 100644 --- a/rpms/cosmic-greeter/cosmic-greeter.spec +++ b/rpms/cosmic-greeter/cosmic-greeter.spec @@ -51,7 +51,7 @@ cat .vendor/config.toml >> .cargo/config %build # FIXME: cargo_build doesn't compile greeter daemon # %%cargo_build -cargo build --all --offline --frozen +cargo build --release --all --offline --frozen %{cargo_license_summary} %{cargo_license} > LICENSE.dependencies %{cargo_vendor_manifest} From 7d5d0c1908e762c48af20d70302f0a44582f412f Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 28 2024 00:51:14 +0000 Subject: [PATCH 82/220] fix pop-launcher --- diff --git a/rpms/pop-launcher/pop-launcher.spec b/rpms/pop-launcher/pop-launcher.spec index 40e37af..d651400 100644 --- a/rpms/pop-launcher/pop-launcher.spec +++ b/rpms/pop-launcher/pop-launcher.spec @@ -42,7 +42,8 @@ Requires: rust-fd-find cat .vendor/config.toml >> .cargo/config %build -%cargo_build +# %%cargo_build +cargo build -p pop-launcher-bin --release --offline --frozen %{cargo_license_summary} %{cargo_license} > LICENSE.dependencies %{cargo_vendor_manifest} @@ -61,7 +62,7 @@ just rootdir=%{buildroot} install %license LICENSE.dependencies # %% license cargo-vendor.txt %doc README.md -%{_bindir}/pop-launcher +%{_bindir}/pop-launcher-bin %{_prefix}/lib/pop-launcher/* %changelog From d25e6df77944c201656295c53154a03ad5ba9b9c Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 28 2024 00:53:02 +0000 Subject: [PATCH 83/220] f --- diff --git a/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec b/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec index c488a38..80ad06a 100644 --- a/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec +++ b/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec @@ -33,6 +33,7 @@ BuildRequires: pipewire-devel BuildRequires: clang-devel BuildRequires: mesa-libEGL-devel BuildRequires: mesa-libgbm-devel +BuildRequires: gstreamer-1.0-devel BuildRequires: glib2-devel BuildRequires: just From edb3bdeb113103129d306d0b42ff3059ca1dc705 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 28 2024 00:57:11 +0000 Subject: [PATCH 84/220] s --- diff --git a/rpms/cosmic-launcher/cosmic-launcher.spec b/rpms/cosmic-launcher/cosmic-launcher.spec index 371b0d5..a9f90c7 100644 --- a/rpms/cosmic-launcher/cosmic-launcher.spec +++ b/rpms/cosmic-launcher/cosmic-launcher.spec @@ -45,7 +45,7 @@ cat .vendor/config.toml >> .cargo/config %build export RUSTFLAGS="$RUSTFLAGS --cfg tokio_unstable" -%cargo_build +cargo build --release --frozen --offline %{cargo_license_summary} %{cargo_license} > LICENSE.dependencies %{cargo_vendor_manifest} From e58fe4c352d0eeb1f57870196282d5e23b4bd824 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 28 2024 01:10:42 +0000 Subject: [PATCH 85/220] Update xdg-desktop-portal-cosmic.spec --- diff --git a/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec b/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec index 80ad06a..8322fa7 100644 --- a/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec +++ b/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec @@ -33,7 +33,7 @@ BuildRequires: pipewire-devel BuildRequires: clang-devel BuildRequires: mesa-libEGL-devel BuildRequires: mesa-libgbm-devel -BuildRequires: gstreamer-1.0-devel +BuildRequires: gstreamer1-devel BuildRequires: glib2-devel BuildRequires: just From 9ed1410e08cd91275614cce9e9a415e6f80b7f2d Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 28 2024 01:14:32 +0000 Subject: [PATCH 86/220] Update cosmic-greeter.spec --- diff --git a/rpms/cosmic-greeter/cosmic-greeter.spec b/rpms/cosmic-greeter/cosmic-greeter.spec index 59d1a5b..e430a43 100644 --- a/rpms/cosmic-greeter/cosmic-greeter.spec +++ b/rpms/cosmic-greeter/cosmic-greeter.spec @@ -57,7 +57,8 @@ cargo build --release --all --offline --frozen %{cargo_vendor_manifest} %install -%cargo_install +install -Dm0755 target/release/cosmic-greeter %{_bindir}/cosmic-greeter +install -Dm0755 target/release/cosmic-greeter-daemon %{_bindir}/cosmic-greeter-daemon install -Dm0644 dbus/com.system76.CosmicGreeter.conf %{buildroot}/%{_datadir}/dbus-1/system.d/com.system76.CosmicGreeter.conf install -Dm0644 debian/cosmic-greeter.sysusers %{buildroot}/%{_sysusersdir}/cosmic-greeter.conf install -Dm0644 debian/cosmic-greeter.tmpfiles %{buildroot}/%{_tmpfilesdir}/cosmic-greeter.conf From e08a369ae05694442c8f6d527a1bbdd1e31cc1e8 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 28 2024 01:34:14 +0000 Subject: [PATCH 87/220] add licenses, fix cosmic-launcher --- diff --git a/rpms/cosmic-launcher/cosmic-launcher.spec b/rpms/cosmic-launcher/cosmic-launcher.spec index a9f90c7..f4e84b8 100644 --- a/rpms/cosmic-launcher/cosmic-launcher.spec +++ b/rpms/cosmic-launcher/cosmic-launcher.spec @@ -16,7 +16,29 @@ Release: %autorelease Summary: Pop launcher frontend for the COSMIC Desktop Environment. SourceLicense: GPL-3.0 -License: GPL-3.0 +# 0BSD OR MIT OR Apache-2.0 +# Apache-2.0 +# Apache-2.0 OR BSL-1.0 +# Apache-2.0 OR MIT +# Apache-2.0 WITH LLVM-exception +# Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT +# BSD-2-Clause +# BSD-3-Clause +# BSL-1.0 +# CC0-1.0 +# GPL-3.0 +# ISC +# MIT +# MIT AND BSD-3-Clause +# MIT OR Apache-2.0 +# MIT OR Apache-2.0 OR CC0-1.0 +# MIT OR Apache-2.0 OR Zlib +# MIT OR Zlib OR Apache-2.0 +# MPL-2.0 +# Unlicense OR MIT +# Zlib +# Zlib OR Apache-2.0 OR MIT +License: 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 AND Apache-2.0 OR BSL-1.0 AND Apache-2.0 OR MIT AND Apache-2.0 WITH LLVM-exception AND Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT AND BSD-2-Clause AND BSD-3-Clause AND BSL-1.0 AND CC0-1.0 AND GPL-3.0 AND ISC AND MIT AND MIT AND BSD-3-Clause AND MIT OR Apache-2.0 AND MIT OR Apache-2.0 OR CC0-1.0 AND MIT OR Apache-2.0 OR Zlib AND MIT OR Zlib OR Apache-2.0 AND MPL-2.0 AND Unlicense OR MIT AND Zlib AND Zlib OR Apache-2.0 OR MIT # LICENSE.dependencies contains a full license breakdown URL: https://github.com/pop-os/cosmic-launcher @@ -54,6 +76,7 @@ cargo build --release --frozen --offline just rootdir=%{buildroot} prefix=%{_prefix} install %if %{with check} +export RUSTFLAGS="$RUSTFLAGS --cfg tokio_unstable" %check %cargo_test %endif diff --git a/rpms/cosmic-notifications/cosmic-notifications.spec b/rpms/cosmic-notifications/cosmic-notifications.spec index 66b79d0..7882716 100644 --- a/rpms/cosmic-notifications/cosmic-notifications.spec +++ b/rpms/cosmic-notifications/cosmic-notifications.spec @@ -11,7 +11,29 @@ Release: %autorelease Summary: Notifications daemon for the COSMIC Desktop Environment. SourceLicense: GPL-3.0 -License: GPL-3.0 +# 0BSD OR MIT OR Apache-2.0 +# Apache-2.0 +# Apache-2.0 OR BSD-3-Clause +# Apache-2.0 OR BSL-1.0 +# Apache-2.0 OR MIT +# Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT +# BSD-2-Clause +# BSD-3-Clause +# BSL-1.0 +# CC0-1.0 +# GPL-3.0 +# ISC +# MIT +# MIT AND BSD-3-Clause +# MIT OR Apache-2.0 +# MIT OR Apache-2.0 OR CC0-1.0 +# MIT OR Apache-2.0 OR Zlib +# MIT OR Zlib OR Apache-2.0 +# MPL-2.0 +# Unlicense OR MIT +# Zlib +# Zlib OR Apache-2.0 OR MIT +License: 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 AND Apache-2.0 OR BSD-3-Clause AND Apache-2.0 OR BSL-1.0 AND Apache-2.0 OR MIT AND Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT AND BSD-2-Clause AND BSD-3-Clause AND BSL-1.0 AND CC0-1.0 AND GPL-3.0 AND ISC AND MIT AND MIT AND BSD-3-Clause AND MIT OR Apache-2.0 AND MIT OR Apache-2.0 OR CC0-1.0 AND MIT OR Apache-2.0 OR Zlib AND MIT OR Zlib OR Apache-2.0 AND MPL-2.0 AND Unlicense OR MIT AND Zlib AND Zlib OR Apache-2.0 OR MIT # LICENSE.dependencies contains a full license breakdown URL: https://github.com/pop-os/cosmic-notifications diff --git a/rpms/cosmic-osd/cosmic-osd.spec b/rpms/cosmic-osd/cosmic-osd.spec index 49ac070..0cafd1b 100644 --- a/rpms/cosmic-osd/cosmic-osd.spec +++ b/rpms/cosmic-osd/cosmic-osd.spec @@ -16,7 +16,27 @@ Release: %autorelease Summary: OSDs for the COSMIC Desktop Environment. SourceLicense: GPL-3.0-or-later -License: GPL-3.0 +# 0BSD OR MIT OR Apache-2.0 +# Apache-2.0 +# Apache-2.0 OR MIT +# Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT +# BSD-2-Clause +# BSD-3-Clause +# BSL-1.0 +# CC0-1.0 +# GPL-3.0 +# GPL-3.0-or-later +# ISC +# MIT +# MIT OR Apache-2.0 +# MIT OR Apache-2.0 OR CC0-1.0 +# MIT OR Apache-2.0 OR Zlib +# MIT OR Zlib OR Apache-2.0 +# MPL-2.0 +# Unlicense OR MIT +# Zlib +# Zlib OR Apache-2.0 OR MIT +License: 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 AND Apache-2.0 OR MIT AND Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT AND BSD-2-Clause AND BSD-3-Clause AND BSL-1.0 AND CC0-1.0 AND GPL-3.0 AND GPL-3.0-or-later AND ISC AND MIT AND MIT OR Apache-2.0 AND MIT OR Apache-2.0 OR CC0-1.0 AND MIT OR Apache-2.0 OR Zlib AND MIT OR Zlib OR Apache-2.0 AND MPL-2.0 AND Unlicense OR MIT AND Zlib AND Zlib OR Apache-2.0 OR MIT # LICENSE.dependencies contains a full license breakdown URL: https://github.com/pop-os/cosmic-osd diff --git a/rpms/cosmic-panel/cosmic-panel.spec b/rpms/cosmic-panel/cosmic-panel.spec index dc0ff4f..301d62d 100644 --- a/rpms/cosmic-panel/cosmic-panel.spec +++ b/rpms/cosmic-panel/cosmic-panel.spec @@ -11,7 +11,26 @@ Release: %autorelease Summary: Panel for the COSMIC Desktop Environment. SourceLicense: GPL-3.0 -License: GPL-3.0 +# 0BSD OR MIT OR Apache-2.0 +# Apache-2.0 +# Apache-2.0 OR BSD-3-Clause +# Apache-2.0 OR MIT +# Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT +# BSD-3-Clause +# BSL-1.0 +# CC0-1.0 +# GPL-3.0 +# ISC +# MIT +# MIT OR Apache-2.0 +# MIT OR Apache-2.0 OR CC0-1.0 +# MIT OR Apache-2.0 OR Zlib +# MIT OR Zlib OR Apache-2.0 +# MPL-2.0 +# Unlicense OR MIT +# Zlib +# Zlib OR Apache-2.0 OR MIT +License: 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 AND Apache-2.0 OR BSD-3-Clause AND Apache-2.0 OR MIT AND Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT AND BSD-3-Clause AND BSL-1.0 AND CC0-1.0 AND GPL-3.0 AND ISC AND MIT AND MIT OR Apache-2.0 AND MIT OR Apache-2.0 OR CC0-1.0 AND MIT OR Apache-2.0 OR Zlib AND MIT OR Zlib OR Apache-2.0 AND MPL-2.0 AND Unlicense OR MIT AND Zlib AND Zlib OR Apache-2.0 OR MIT # LICENSE.dependencies contains a full license breakdown URL: https://github.com/pop-os/cosmic-panel diff --git a/rpms/cosmic-randr/cosmic-randr.spec b/rpms/cosmic-randr/cosmic-randr.spec index f3f3cfc..f877573 100644 --- a/rpms/cosmic-randr/cosmic-randr.spec +++ b/rpms/cosmic-randr/cosmic-randr.spec @@ -11,7 +11,18 @@ Release: %autorelease Summary: Cosmic-randr command line interface SourceLicense: MPL-2.0 -License: GPL-3.0 +# 0BSD OR MIT OR Apache-2.0 +# Apache-2.0 +# Apache-2.0 OR MIT +# Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT +# ISC +# MIT +# MIT OR Apache-2.0 +# MIT OR Zlib OR Apache-2.0 +# MPL-2.0 +# Unlicense OR MIT +# Zlib +License: 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 AND Apache-2.0 OR MIT AND Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT AND ISC AND MIT AND MIT OR Apache-2.0 AND MIT OR Zlib OR Apache-2.0 AND MPL-2.0 AND Unlicense OR MIT AND Zlib # LICENSE.dependencies contains a full license breakdown URL: https://github.com/pop-os/cosmic-randr diff --git a/rpms/cosmic-screenshot/cosmic-screenshot.spec b/rpms/cosmic-screenshot/cosmic-screenshot.spec index fa9a15b..1acddc3 100644 --- a/rpms/cosmic-screenshot/cosmic-screenshot.spec +++ b/rpms/cosmic-screenshot/cosmic-screenshot.spec @@ -16,8 +16,18 @@ Release: %autorelease Summary: Screenshot utility for the COSMIC Desktop Environment. SourceLicense: GPL-3.0 -License: GPL-3.0 -# LICENSE.dependencies contains a full license breakdown +# 0BSD OR MIT OR Apache-2.0 +# Apache-2.0 OR MIT +# Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT +# BSD-3-Clause +# MIT +# MIT OR Apache-2.0 +# MIT OR Apache-2.0 OR Zlib +# MIT OR Zlib OR Apache-2.0 +# MPL-2.0 +# Unlicense OR MIT +# Zlib OR Apache-2.0 OR MIT +License: 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 OR MIT AND Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT AND BSD-3-Clause AND MIT AND MIT OR Apache-2.0 AND MIT OR Apache-2.0 OR Zlib AND MIT OR Zlib OR Apache-2.0 AND MPL-2.0 AND Unlicense OR MIT AND Zlib OR Apache-2.0 OR MIT AND LICENSE.dependencies contains a full license breakdown URL: https://github.com/pop-os/cosmic-screenshot Source: cosmic-screenshot-%{ver}.tar.xz diff --git a/rpms/cosmic-session/cosmic-session.spec b/rpms/cosmic-session/cosmic-session.spec index 2be8667..ce77c69 100644 --- a/rpms/cosmic-session/cosmic-session.spec +++ b/rpms/cosmic-session/cosmic-session.spec @@ -16,7 +16,21 @@ Release: %autorelease Summary: Session manager for the COSMIC desktop environment SourceLicense: GPL-3.0-only -License: GPL-3.0 +# 0BSD OR MIT OR Apache-2.0 +# Apache-2.0 OR BSD-3-Clause +# Apache-2.0 OR BSL-1.0 +# Apache-2.0 OR MIT +# Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT +# BSD-3-Clause +# GPL-3.0-only +# MIT +# MIT OR Apache-2.0 +# MIT OR Zlib OR Apache-2.0 +# MPL-2.0 +# Unlicense OR MIT +# Zlib +# Zlib OR Apache-2.0 OR MIT +License: 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 OR BSD-3-Clause AND Apache-2.0 OR BSL-1.0 AND Apache-2.0 OR MIT AND Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT AND BSD-3-Clause AND GPL-3.0-only AND MIT AND MIT OR Apache-2.0 AND MIT OR Zlib OR Apache-2.0 AND MPL-2.0 AND Unlicense OR MIT AND Zlib AND Zlib OR Apache-2.0 OR MIT # LICENSE.dependencies contains a full license breakdown URL: https://github.com/pop-os/cosmic-session diff --git a/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec b/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec index cf90da3..54011e0 100644 --- a/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec +++ b/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec @@ -13,10 +13,29 @@ Name: cosmic-settings-daemon Version: %{ver}~%{date} Release: %autorelease -Summary: # FIXME +Summary: Settings daemon for the COSMIC Desktop Environment. SourceLicense: GPL-3.0-or-later -License: GPL-3.0 +# 0BSD OR MIT OR Apache-2.0 +# Apache-2.0 +# Apache-2.0 OR MIT +# Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT +# BSD-2-Clause +# BSD-3-Clause +# BSL-1.0 +# CC0-1.0 +# GPL-3.0-or-later +# ISC +# MIT +# MIT OR Apache-2.0 +# MIT OR Apache-2.0 OR CC0-1.0 +# MIT OR Apache-2.0 OR Zlib +# MIT OR Zlib OR Apache-2.0 +# MPL-2.0 +# Unlicense OR MIT +# Zlib +# Zlib OR Apache-2.0 OR MIT +License: 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 AND Apache-2.0 OR MIT AND Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT AND BSD-2-Clause AND BSD-3-Clause AND BSL-1.0 AND CC0-1.0 AND GPL-3.0-or-later AND ISC AND MIT AND MIT OR Apache-2.0 AND MIT OR Apache-2.0 OR CC0-1.0 AND MIT OR Apache-2.0 OR Zlib AND MIT OR Zlib OR Apache-2.0 AND MPL-2.0 AND Unlicense OR MIT AND Zlib AND Zlib OR Apache-2.0 OR MIT # LICENSE.dependencies contains a full license breakdown URL: https://github.com/pop-os/cosmic-settings-daemon diff --git a/rpms/cosmic-settings/cosmic-settings.spec b/rpms/cosmic-settings/cosmic-settings.spec index 6632427..5ac8f61 100644 --- a/rpms/cosmic-settings/cosmic-settings.spec +++ b/rpms/cosmic-settings/cosmic-settings.spec @@ -13,7 +13,30 @@ Release: %autorelease Summary: Settings app for the COSMIC Desktop Environment. SourceLicense: GPL-3.0 AND GPL-3.0-only -License: GPL-3.0 +# 0BSD OR MIT OR Apache-2.0 +# Apache-2.0 +# Apache-2.0 OR MIT +# Apache-2.0 WITH LLVM-exception +# Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT +# BSD-2-Clause +# BSD-3-Clause +# BSL-1.0 +# CC0-1.0 +# CC0-1.0 OR Apache-2.0 +# GPL-3.0 +# GPL-3.0-only +# ISC +# MIT +# MIT OR Apache-2.0 +# MIT OR Apache-2.0 OR CC0-1.0 +# MIT OR Apache-2.0 OR NCSA +# MIT OR Apache-2.0 OR Zlib +# MIT OR Zlib OR Apache-2.0 +# MPL-2.0 +# Unlicense OR MIT +# Zlib +# Zlib OR Apache-2.0 OR MIT +License: 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 AND Apache-2.0 OR MIT AND Apache-2.0 WITH LLVM-exception AND Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT AND BSD-2-Clause AND BSD-3-Clause AND BSL-1.0 AND CC0-1.0 AND CC0-1.0 OR Apache-2.0 AND GPL-3.0 AND GPL-3.0-only AND ISC AND MIT AND MIT OR Apache-2.0 AND MIT OR Apache-2.0 OR CC0-1.0 AND MIT OR Apache-2.0 OR NCSA AND MIT OR Apache-2.0 OR Zlib AND MIT OR Zlib OR Apache-2.0 AND MPL-2.0 AND Unlicense OR MIT AND Zlib AND Zlib OR Apache-2.0 OR MIT # LICENSE.dependencies contains a full license breakdown URL: https://github.com/pop-os/cosmic-settings diff --git a/rpms/cosmic-store/cosmic-store.spec b/rpms/cosmic-store/cosmic-store.spec index ea384b2..ec673ad 100644 --- a/rpms/cosmic-store/cosmic-store.spec +++ b/rpms/cosmic-store/cosmic-store.spec @@ -11,7 +11,30 @@ Release: %autorelease Summary: App store for the COSMIC Desktop Environment. SourceLicense: GPL-3.0 -License: GPL-3.0 +# (Apache-2.0 OR MIT) AND BSD-3-Clause +# 0BSD OR MIT OR Apache-2.0 +# Apache-2.0 +# Apache-2.0 OR BSL-1.0 +# Apache-2.0 OR ISC OR MIT +# Apache-2.0 OR MIT +# Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT +# BSD-2-Clause +# BSD-2-Clause OR Apache-2.0 OR MIT +# BSD-3-Clause +# BSD-3-Clause OR MIT OR Apache-2.0 +# BSL-1.0 +# CC0-1.0 +# ISC +# MIT +# MIT OR Apache-2.0 +# MIT OR Apache-2.0 OR CC0-1.0 +# MIT OR Apache-2.0 OR Zlib +# MIT OR Zlib OR Apache-2.0 +# MPL-2.0 +# Unlicense OR MIT +# Zlib +# Zlib OR Apache-2.0 OR MIT +License: (Apache-2.0 OR MIT) AND BSD-3-Clause AND 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 AND Apache-2.0 OR BSL-1.0 AND Apache-2.0 OR ISC OR MIT AND Apache-2.0 OR MIT AND Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT AND BSD-2-Clause AND BSD-2-Clause OR Apache-2.0 OR MIT AND BSD-3-Clause AND BSD-3-Clause OR MIT OR Apache-2.0 AND BSL-1.0 AND CC0-1.0 AND ISC AND MIT AND MIT OR Apache-2.0 AND MIT OR Apache-2.0 OR CC0-1.0 AND MIT OR Apache-2.0 OR Zlib AND MIT OR Zlib OR Apache-2.0 AND MPL-2.0 AND Unlicense OR MIT AND Zlib AND Zlib OR Apache-2.0 OR MIT # LICENSE.dependencies contains a full license breakdown URL: https://github.com/pop-os/cosmic-store diff --git a/rpms/cosmic-term/cosmic-term.spec b/rpms/cosmic-term/cosmic-term.spec index d9ecd83..9723931 100644 --- a/rpms/cosmic-term/cosmic-term.spec +++ b/rpms/cosmic-term/cosmic-term.spec @@ -16,8 +16,29 @@ Release: %autorelease Summary: Terminal emulator built with Libcosmic. SourceLicense: GPL-3.0-only -# FIXME: paste output of %%cargo_license_summary here -License: GPL-3.0 +# 0BSD OR MIT OR Apache-2.0 +# Apache-2.0 +# Apache-2.0 OR BSL-1.0 +# Apache-2.0 OR MIT +# Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT +# BSD-2-Clause +# BSD-2-Clause OR Apache-2.0 OR MIT +# BSD-3-Clause +# BSD-3-Clause OR MIT OR Apache-2.0 +# BSL-1.0 +# CC0-1.0 +# GPL-3.0-only +# ISC +# MIT +# MIT OR Apache-2.0 +# MIT OR Apache-2.0 OR CC0-1.0 +# MIT OR Apache-2.0 OR Zlib +# MIT OR Zlib OR Apache-2.0 +# MPL-2.0 +# Unlicense OR MIT +# Zlib +# Zlib OR Apache-2.0 OR MIT +License: 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 AND Apache-2.0 OR BSL-1.0 AND Apache-2.0 OR MIT AND Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT AND BSD-2-Clause AND BSD-2-Clause OR Apache-2.0 OR MIT AND BSD-3-Clause AND BSD-3-Clause OR MIT OR Apache-2.0 AND BSL-1.0 AND CC0-1.0 AND GPL-3.0-only AND ISC AND MIT AND MIT OR Apache-2.0 AND MIT OR Apache-2.0 OR CC0-1.0 AND MIT OR Apache-2.0 OR Zlib AND MIT OR Zlib OR Apache-2.0 AND MPL-2.0 AND Unlicense OR MIT AND Zlib AND Zlib OR Apache-2.0 OR MIT # LICENSE.dependencies contains a full license breakdown URL: https://github.com/pop-os/cosmic-term diff --git a/rpms/cosmic-workspaces/cosmic-workspaces.spec b/rpms/cosmic-workspaces/cosmic-workspaces.spec index a2d09d7..76db636 100644 --- a/rpms/cosmic-workspaces/cosmic-workspaces.spec +++ b/rpms/cosmic-workspaces/cosmic-workspaces.spec @@ -16,7 +16,27 @@ Release: %autorelease Summary: Workspaces overview for the COSMIC Desktop Environment. SourceLicense: GPL-3.0 -License: GPL-3.0 +# 0BSD OR MIT OR Apache-2.0 +# Apache-2.0 +# Apache-2.0 OR MIT +# Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT +# BSD-2-Clause +# BSD-2-Clause OR Apache-2.0 OR MIT +# BSD-3-Clause +# BSL-1.0 +# CC0-1.0 +# GPL-3.0 +# ISC +# MIT +# MIT OR Apache-2.0 +# MIT OR Apache-2.0 OR CC0-1.0 +# MIT OR Apache-2.0 OR Zlib +# MIT OR Zlib OR Apache-2.0 +# MPL-2.0 +# Unlicense OR MIT +# Zlib +# Zlib OR Apache-2.0 OR MIT +License: 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 AND Apache-2.0 OR MIT AND Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT AND BSD-2-Clause AND BSD-2-Clause OR Apache-2.0 OR MIT AND BSD-3-Clause AND BSL-1.0 AND CC0-1.0 AND GPL-3.0 AND ISC AND MIT AND MIT OR Apache-2.0 AND MIT OR Apache-2.0 OR CC0-1.0 AND MIT OR Apache-2.0 OR Zlib AND MIT OR Zlib OR Apache-2.0 AND MPL-2.0 AND Unlicense OR MIT AND Zlib AND Zlib OR Apache-2.0 OR MIT # LICENSE.dependencies contains a full license breakdown URL: https://github.com/pop-os/cosmic-workspaces-epoch From 948a8628fd44d8a5663df17f145211c109b6ca75 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 28 2024 02:02:23 +0000 Subject: [PATCH 88/220] Update xdg-desktop-portal-cosmic.spec --- diff --git a/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec b/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec index 8322fa7..0e09f58 100644 --- a/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec +++ b/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec @@ -16,7 +16,27 @@ Release: %autorelease Summary: XDG Desktop Portals implementation for the COSMIC Desktop Environment. SourceLicense: GPL-3.0-or-later -License: GPL-3.0 +# 0BSD OR MIT OR Apache-2.0 +# Apache-2.0 +# Apache-2.0 OR MIT +# Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT +# BSD-2-Clause +# BSD-3-Clause +# BSL-1.0 +# CC0-1.0 +# GPL-3.0 +# GPL-3.0-or-later +# ISC +# MIT +# MIT OR Apache-2.0 +# MIT OR Apache-2.0 OR CC0-1.0 +# MIT OR Apache-2.0 OR Zlib +# MIT OR Zlib OR Apache-2.0 +# MPL-2.0 +# Unlicense OR MIT +# Zlib +# Zlib OR Apache-2.0 OR MIT +License: 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 AND Apache-2.0 OR MIT AND Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT AND BSD-2-Clause AND BSD-3-Clause AND BSL-1.0 AND CC0-1.0 AND GPL-3.0 AND GPL-3.0-or-later AND ISC AND MIT AND MIT OR Apache-2.0 AND MIT OR Apache-2.0 OR CC0-1.0 AND MIT OR Apache-2.0 OR Zlib AND MIT OR Zlib OR Apache-2.0 AND MPL-2.0 AND Unlicense OR MIT AND Zlib AND Zlib OR Apache-2.0 OR MIT # LICENSE.dependencies contains a full license breakdown URL: https://github.com/pop-os/xdg-desktop-portal-cosmic From a3518644b794b4e6be775da3b719f33c0a1b6fc7 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 28 2024 02:22:15 +0000 Subject: [PATCH 89/220] Update pop-launcher.spec --- diff --git a/rpms/pop-launcher/pop-launcher.spec b/rpms/pop-launcher/pop-launcher.spec index d651400..fdd96ac 100644 --- a/rpms/pop-launcher/pop-launcher.spec +++ b/rpms/pop-launcher/pop-launcher.spec @@ -43,7 +43,7 @@ cat .vendor/config.toml >> .cargo/config %build # %%cargo_build -cargo build -p pop-launcher-bin --release --offline --frozen +just build-release --offline --frozen %{cargo_license_summary} %{cargo_license} > LICENSE.dependencies %{cargo_vendor_manifest} From 193e06e2a8a3fa0689845e7a504f543ba73f1a5f Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 28 2024 02:51:11 +0000 Subject: [PATCH 90/220] update cosmic-comp and create checklist --- diff --git a/data/checklist.md b/data/checklist.md new file mode 100644 index 0000000..0196faf --- /dev/null +++ b/data/checklist.md @@ -0,0 +1,5 @@ +* cosmic-comp +* cosmic-app-library +* xdg-desktop-portal-cosmic +* cosmic-edit +* cosmic-files diff --git a/rpms/cosmic-comp/cosmic-comp.spec b/rpms/cosmic-comp/cosmic-comp.spec index 856bf7e..3296fe4 100644 --- a/rpms/cosmic-comp/cosmic-comp.spec +++ b/rpms/cosmic-comp/cosmic-comp.spec @@ -44,6 +44,7 @@ Source: cosmic-comp-%{ver}.tar.xz Source: cosmic-comp-%{ver}-vendor.tar.xz BuildRequires: cargo-rpm-macros >= 25 +BuildRequires: gcc BuildRequires: rustc BuildRequires: lld BuildRequires: cargo From 1712beb523030a22c63cda33514988d871fd405b Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 28 2024 06:05:23 +0000 Subject: [PATCH 91/220] Update pop-launcher.spec --- diff --git a/rpms/pop-launcher/pop-launcher.spec b/rpms/pop-launcher/pop-launcher.spec index fdd96ac..5b6557d 100644 --- a/rpms/pop-launcher/pop-launcher.spec +++ b/rpms/pop-launcher/pop-launcher.spec @@ -62,7 +62,7 @@ just rootdir=%{buildroot} install %license LICENSE.dependencies # %% license cargo-vendor.txt %doc README.md -%{_bindir}/pop-launcher-bin +%{_bindir}/pop-launcher %{_prefix}/lib/pop-launcher/* %changelog From 2e521adfd9123af15b1aeee9303b788fd22a8762 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 28 2024 06:06:54 +0000 Subject: [PATCH 92/220] Update cosmic-greeter.spec --- diff --git a/rpms/cosmic-greeter/cosmic-greeter.spec b/rpms/cosmic-greeter/cosmic-greeter.spec index e430a43..5e70b75 100644 --- a/rpms/cosmic-greeter/cosmic-greeter.spec +++ b/rpms/cosmic-greeter/cosmic-greeter.spec @@ -57,8 +57,8 @@ cargo build --release --all --offline --frozen %{cargo_vendor_manifest} %install -install -Dm0755 target/release/cosmic-greeter %{_bindir}/cosmic-greeter -install -Dm0755 target/release/cosmic-greeter-daemon %{_bindir}/cosmic-greeter-daemon +install -Dm0755 target/release/cosmic-greeter %{buildroot}/%{_bindir}/cosmic-greeter +install -Dm0755 target/release/cosmic-greeter-daemon %{buildroot}/%{_bindir}/cosmic-greeter-daemon install -Dm0644 dbus/com.system76.CosmicGreeter.conf %{buildroot}/%{_datadir}/dbus-1/system.d/com.system76.CosmicGreeter.conf install -Dm0644 debian/cosmic-greeter.sysusers %{buildroot}/%{_sysusersdir}/cosmic-greeter.conf install -Dm0644 debian/cosmic-greeter.tmpfiles %{buildroot}/%{_tmpfilesdir}/cosmic-greeter.conf From ed0f5022a9b9742ba64dc4c3d2809ba2d5cc5786 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 28 2024 06:18:21 +0000 Subject: [PATCH 93/220] add gcc --- diff --git a/data/checklist.md b/data/checklist.md index 0196faf..0416d6b 100644 --- a/data/checklist.md +++ b/data/checklist.md @@ -3,3 +3,4 @@ * xdg-desktop-portal-cosmic * cosmic-edit * cosmic-files +* cosmic-randr \ No newline at end of file diff --git a/rpms/cosmic-app-library/cosmic-app-library.spec b/rpms/cosmic-app-library/cosmic-app-library.spec index 0941e00..cdf8303 100644 --- a/rpms/cosmic-app-library/cosmic-app-library.spec +++ b/rpms/cosmic-app-library/cosmic-app-library.spec @@ -35,13 +35,15 @@ SourceLicense: GPL-3.0 # Unlicense OR MIT # Zlib # Zlib OR Apache-2.0 OR MIT -License: 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 AND Apache-2.0 OR MIT AND Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT AND BSD-2-Clause AND BSD-3-Clause AND BSL-1.0 AND CC0-1.0 AND GPL-3.0 AND ISC AND MIT AND MIT OR Apache-2.0 AND MIT OR Apache-2.0 OR CC0-1.0 AND MIT OR Apache-2.0 OR Zlib AND MIT OR Zlib OR Apache-2.0 AND MPL-2.0 AND Unlicense OR MIT AND Zlib AND Zlib OR Apache-2.0 OR MIT AND LICENSE.dependencies contains a full license breakdown +License: 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 AND Apache-2.0 OR MIT AND Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT AND BSD-2-Clause AND BSD-3-Clause AND BSL-1.0 AND CC0-1.0 AND GPL-3.0 AND ISC AND MIT AND MIT OR Apache-2.0 AND MIT OR Apache-2.0 OR CC0-1.0 AND MIT OR Apache-2.0 OR Zlib AND MIT OR Zlib OR Apache-2.0 AND MPL-2.0 AND Unlicense OR MIT AND Zlib AND Zlib OR Apache-2.0 OR MIT +# LICENSE.dependencies contains a full license breakdown URL: https://github.com/pop-os/cosmic-applibrary Source: cosmic-app-library-%{ver}.tar.xz Source: cosmic-app-library-%{ver}-vendor.tar.xz BuildRequires: cargo-rpm-macros >= 26 +BuildRequires: gcc BuildRequires: rustc BuildRequires: lld BuildRequires: cargo diff --git a/rpms/cosmic-applets/cosmic-applets.spec b/rpms/cosmic-applets/cosmic-applets.spec index 5557e8e..26d37ab 100644 --- a/rpms/cosmic-applets/cosmic-applets.spec +++ b/rpms/cosmic-applets/cosmic-applets.spec @@ -42,6 +42,7 @@ Patch: better_compile.patch Patch: symlink.patch BuildRequires: cargo-rpm-macros >= 25 +BuildRequires: gcc BuildRequires: rustc BuildRequires: lld BuildRequires: cargo diff --git a/rpms/cosmic-bg/cosmic-bg.spec b/rpms/cosmic-bg/cosmic-bg.spec index 6ed8815..b5f87b8 100644 --- a/rpms/cosmic-bg/cosmic-bg.spec +++ b/rpms/cosmic-bg/cosmic-bg.spec @@ -33,6 +33,7 @@ Source: cosmic-bg-%{ver}.tar.xz Source: cosmic-bg-%{ver}-vendor.tar.xz BuildRequires: cargo-rpm-macros >= 25 +BuildRequires: gcc BuildRequires: rustc BuildRequires: lld BuildRequires: cargo diff --git a/rpms/cosmic-edit/cosmic-edit.spec b/rpms/cosmic-edit/cosmic-edit.spec index 48e6973..6e83bc9 100644 --- a/rpms/cosmic-edit/cosmic-edit.spec +++ b/rpms/cosmic-edit/cosmic-edit.spec @@ -47,6 +47,7 @@ Source: cosmic-edit-%{ver}.tar.xz Source: cosmic-edit-%{ver}-vendor.tar.xz BuildRequires: cargo-rpm-macros >= 26 +BuildRequires: gcc BuildRequires: rustc BuildRequires: lld BuildRequires: cargo diff --git a/rpms/cosmic-files/cosmic-files.spec b/rpms/cosmic-files/cosmic-files.spec index bd50285..b994e15 100644 --- a/rpms/cosmic-files/cosmic-files.spec +++ b/rpms/cosmic-files/cosmic-files.spec @@ -46,6 +46,7 @@ Source: cosmic-files-%{ver}.tar.xz Source: cosmic-files-%{ver}-vendor.tar.xz BuildRequires: cargo-rpm-macros >= 26 +BuildRequires: gcc BuildRequires: rustc BuildRequires: lld BuildRequires: cargo diff --git a/rpms/cosmic-greeter/cosmic-greeter.spec b/rpms/cosmic-greeter/cosmic-greeter.spec index 5e70b75..6ccd7f8 100644 --- a/rpms/cosmic-greeter/cosmic-greeter.spec +++ b/rpms/cosmic-greeter/cosmic-greeter.spec @@ -21,6 +21,7 @@ Source: cosmic-greeter-%{ver}-vendor.tar.xz Patch: service.patch BuildRequires: cargo-rpm-macros >= 25 +BuildRequires: gcc BuildRequires: rustc BuildRequires: lld BuildRequires: cargo diff --git a/rpms/cosmic-launcher/cosmic-launcher.spec b/rpms/cosmic-launcher/cosmic-launcher.spec index f4e84b8..ac68062 100644 --- a/rpms/cosmic-launcher/cosmic-launcher.spec +++ b/rpms/cosmic-launcher/cosmic-launcher.spec @@ -46,6 +46,7 @@ Source: cosmic-launcher-%{ver}.tar.xz Source: cosmic-launcher-%{ver}-vendor.tar.xz BuildRequires: cargo-rpm-macros >= 26 +BuildRequires: gcc BuildRequires: rustc BuildRequires: lld BuildRequires: cargo diff --git a/rpms/cosmic-notifications/cosmic-notifications.spec b/rpms/cosmic-notifications/cosmic-notifications.spec index 7882716..083c225 100644 --- a/rpms/cosmic-notifications/cosmic-notifications.spec +++ b/rpms/cosmic-notifications/cosmic-notifications.spec @@ -41,6 +41,7 @@ Source: cosmic-notifications-%{ver}.tar.xz Source: cosmic-notifications-%{ver}-vendor.tar.xz BuildRequires: cargo-rpm-macros >= 25 +BuildRequires: gcc BuildRequires: rustc BuildRequires: lld BuildRequires: cargo diff --git a/rpms/cosmic-osd/cosmic-osd.spec b/rpms/cosmic-osd/cosmic-osd.spec index 0cafd1b..a95c436 100644 --- a/rpms/cosmic-osd/cosmic-osd.spec +++ b/rpms/cosmic-osd/cosmic-osd.spec @@ -44,6 +44,7 @@ Source: cosmic-osd-%{ver}.tar.xz Source: cosmic-osd-%{ver}-vendor.tar.xz BuildRequires: cargo-rpm-macros >= 26 +BuildRequires: gcc BuildRequires: rustc BuildRequires: lld BuildRequires: cargo diff --git a/rpms/cosmic-panel/cosmic-panel.spec b/rpms/cosmic-panel/cosmic-panel.spec index 301d62d..c2cf893 100644 --- a/rpms/cosmic-panel/cosmic-panel.spec +++ b/rpms/cosmic-panel/cosmic-panel.spec @@ -38,6 +38,7 @@ Source: cosmic-panel-%{ver}.tar.xz Source: cosmic-panel-%{ver}-vendor.tar.xz BuildRequires: cargo-rpm-macros >= 25 +BuildRequires: gcc BuildRequires: rustc BuildRequires: lld BuildRequires: cargo diff --git a/rpms/cosmic-randr/cosmic-randr.spec b/rpms/cosmic-randr/cosmic-randr.spec index f877573..3fc5d4c 100644 --- a/rpms/cosmic-randr/cosmic-randr.spec +++ b/rpms/cosmic-randr/cosmic-randr.spec @@ -30,6 +30,7 @@ Source: cosmic-randr-%{ver}.tar.xz Source: cosmic-randr-%{ver}-vendor.tar.xz BuildRequires: cargo-rpm-macros >= 25 +BuildRequires: gcc BuildRequires: rustc BuildRequires: lld BuildRequires: cargo diff --git a/rpms/cosmic-screenshot/cosmic-screenshot.spec b/rpms/cosmic-screenshot/cosmic-screenshot.spec index 1acddc3..464b5b3 100644 --- a/rpms/cosmic-screenshot/cosmic-screenshot.spec +++ b/rpms/cosmic-screenshot/cosmic-screenshot.spec @@ -34,6 +34,7 @@ Source: cosmic-screenshot-%{ver}.tar.xz Source: cosmic-screenshot-%{ver}-vendor.tar.xz BuildRequires: cargo-rpm-macros >= 26 +BuildRequires: gcc BuildRequires: rustc BuildRequires: lld BuildRequires: cargo diff --git a/rpms/cosmic-session/cosmic-session.spec b/rpms/cosmic-session/cosmic-session.spec index ce77c69..1c75ddc 100644 --- a/rpms/cosmic-session/cosmic-session.spec +++ b/rpms/cosmic-session/cosmic-session.spec @@ -38,6 +38,7 @@ Source: cosmic-session-%{ver}.tar.xz Source: cosmic-session-%{ver}-vendor.tar.xz BuildRequires: cargo-rpm-macros >= 26 +BuildRequires: gcc BuildRequires: rustc BuildRequires: lld BuildRequires: cargo diff --git a/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec b/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec index 54011e0..cc866d9 100644 --- a/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec +++ b/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec @@ -43,6 +43,7 @@ Source: cosmic-settings-daemon-%{ver}.tar.xz Source: cosmic-settings-daemon-%{ver}-vendor.tar.xz BuildRequires: cargo-rpm-macros >= 26 +BuildRequires: gcc BuildRequires: rustc BuildRequires: lld BuildRequires: cargo diff --git a/rpms/cosmic-settings/cosmic-settings.spec b/rpms/cosmic-settings/cosmic-settings.spec index 5ac8f61..46f8176 100644 --- a/rpms/cosmic-settings/cosmic-settings.spec +++ b/rpms/cosmic-settings/cosmic-settings.spec @@ -44,6 +44,7 @@ Source: cosmic-settings-%{ver}.tar.xz Source: cosmic-settings-%{ver}-vendor.tar.xz BuildRequires: cargo-rpm-macros >= 25 +BuildRequires: gcc BuildRequires: rustc BuildRequires: lld BuildRequires: cargo diff --git a/rpms/cosmic-store/cosmic-store.spec b/rpms/cosmic-store/cosmic-store.spec index ec673ad..eab0a89 100644 --- a/rpms/cosmic-store/cosmic-store.spec +++ b/rpms/cosmic-store/cosmic-store.spec @@ -42,6 +42,7 @@ Source: cosmic-store-%{ver}.tar.xz Source: cosmic-store-%{ver}-vendor.tar.xz BuildRequires: cargo-rpm-macros >= 25 +BuildRequires: gcc BuildRequires: rustc BuildRequires: lld BuildRequires: cargo diff --git a/rpms/cosmic-term/cosmic-term.spec b/rpms/cosmic-term/cosmic-term.spec index 9723931..e12461d 100644 --- a/rpms/cosmic-term/cosmic-term.spec +++ b/rpms/cosmic-term/cosmic-term.spec @@ -46,6 +46,7 @@ Source: cosmic-term-%{ver}.tar.xz Source: cosmic-term-%{ver}-vendor.tar.xz BuildRequires: cargo-rpm-macros >= 26 +BuildRequires: gcc BuildRequires: rustc BuildRequires: lld BuildRequires: cargo diff --git a/rpms/cosmic-workspaces/cosmic-workspaces.spec b/rpms/cosmic-workspaces/cosmic-workspaces.spec index 76db636..a5918e5 100644 --- a/rpms/cosmic-workspaces/cosmic-workspaces.spec +++ b/rpms/cosmic-workspaces/cosmic-workspaces.spec @@ -44,6 +44,7 @@ Source: cosmic-workspaces-%{ver}.tar.xz Source: cosmic-workspaces-%{ver}-vendor.tar.xz BuildRequires: cargo-rpm-macros >= 26 +BuildRequires: gcc BuildRequires: rustc BuildRequires: lld BuildRequires: cargo diff --git a/rpms/pop-launcher/pop-launcher.spec b/rpms/pop-launcher/pop-launcher.spec index 5b6557d..b5fbfe7 100644 --- a/rpms/pop-launcher/pop-launcher.spec +++ b/rpms/pop-launcher/pop-launcher.spec @@ -21,6 +21,7 @@ Source: pop-launcher-%{ver}-vendor.tar.xz Patch: symlink.patch BuildRequires: cargo-rpm-macros >= 25 +BuildRequires: gcc BuildRequires: rustc BuildRequires: lld BuildRequires: cargo diff --git a/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec b/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec index 0e09f58..d9bb5c1 100644 --- a/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec +++ b/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec @@ -44,6 +44,7 @@ Source: xdg-desktop-portal-cosmic-%{ver}.tar.xz Source: xdg-desktop-portal-cosmic-%{ver}-vendor.tar.xz BuildRequires: cargo-rpm-macros >= 26 +BuildRequires: gcc BuildRequires: rustc BuildRequires: lld BuildRequires: cargo From f14e0de326fec7a99b2e2bf5e4310ced71e5aacb Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 28 2024 12:55:06 +0000 Subject: [PATCH 94/220] s --- diff --git a/rpms/cosmic-greeter/cosmic-greeter.spec b/rpms/cosmic-greeter/cosmic-greeter.spec index 6ccd7f8..fd7e38b 100644 --- a/rpms/cosmic-greeter/cosmic-greeter.spec +++ b/rpms/cosmic-greeter/cosmic-greeter.spec @@ -11,7 +11,28 @@ Release: %autorelease Summary: Login and display manager built using GreetD for the COSMIC Desktop Environment. SourceLicense: GPL-3.0 -License: GPL-3.0 +# 0BSD OR MIT OR Apache-2.0 +# Apache-2.0 +# Apache-2.0 OR BSL-1.0 +# Apache-2.0 OR MIT +# Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT +# BSD-2-Clause +# BSD-3-Clause +# BSL-1.0 +# CC-PDDC +# CC0-1.0 +# GPL-3.0 +# ISC +# MIT +# MIT OR Apache-2.0 +# MIT OR Apache-2.0 OR CC0-1.0 +# MIT OR Apache-2.0 OR Zlib +# MIT OR Zlib OR Apache-2.0 +# MPL-2.0 +# Unlicense OR MIT +# Zlib +# Zlib OR Apache-2.0 OR MIT +License: 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 AND Apache-2.0 OR BSL-1.0 AND Apache-2.0 OR MIT AND Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT AND BSD-2-Clause AND BSD-3-Clause AND BSL-1.0 AND CC-PDDC AND CC0-1.0 AND GPL-3.0 AND ISC AND MIT AND MIT OR Apache-2.0 AND MIT OR Apache-2.0 OR CC0-1.0 AND MIT OR Apache-2.0 OR Zlib AND MIT OR Zlib OR Apache-2.0 AND MPL-2.0 AND Unlicense OR MIT AND Zlib AND Zlib OR Apache-2.0 OR MIT # LICENSE.dependencies contains a full license breakdown URL: https://github.com/pop-os/cosmic-greeter diff --git a/rpms/cosmic-launcher/cosmic-launcher.spec b/rpms/cosmic-launcher/cosmic-launcher.spec index ac68062..ac2251b 100644 --- a/rpms/cosmic-launcher/cosmic-launcher.spec +++ b/rpms/cosmic-launcher/cosmic-launcher.spec @@ -68,7 +68,7 @@ cat .vendor/config.toml >> .cargo/config %build export RUSTFLAGS="$RUSTFLAGS --cfg tokio_unstable" -cargo build --release --frozen --offline +%cargo_build %{cargo_license_summary} %{cargo_license} > LICENSE.dependencies %{cargo_vendor_manifest} diff --git a/rpms/cosmic-osd/cosmic-osd.spec b/rpms/cosmic-osd/cosmic-osd.spec index a95c436..a5312b3 100644 --- a/rpms/cosmic-osd/cosmic-osd.spec +++ b/rpms/cosmic-osd/cosmic-osd.spec @@ -51,6 +51,7 @@ BuildRequires: cargo BuildRequires: wayland-devel BuildRequires: libxkbcommon-devel BuildRequires: systemd-devel +BuildRequires: pulseaudio-libs-devel BuildRequires: just %global _description %{expand: diff --git a/rpms/pop-launcher/pop-launcher.spec b/rpms/pop-launcher/pop-launcher.spec index b5fbfe7..81ae1ba 100644 --- a/rpms/pop-launcher/pop-launcher.spec +++ b/rpms/pop-launcher/pop-launcher.spec @@ -11,7 +11,27 @@ Release: %autorelease Summary: Modular IPC-based desktop launcher service. SourceLicense: GPL-3.0-only AND MPL-2.0 -License: GPL-3.0 +# (Apache-2.0 OR MIT) AND BSD-3-Clause +# Apache-2.0 +# Apache-2.0 OR BSL-1.0 +# Apache-2.0 OR ISC OR MIT +# Apache-2.0 OR MIT +# Apache-2.0 WITH LLVM-exception +# Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT +# BSD-3-Clause +# GPL-3.0 +# GPL-3.0-only +# ISC +# MIT +# MIT OR Apache-2.0 +# MIT OR Apache-2.0 OR BSD-2-Clause +# MIT OR Apache-2.0 OR Zlib +# MPL-2.0 +# MPL-2.0 OR MIT OR Apache-2.0 +# Unlicense OR MIT +# Zlib +# Zlib OR Apache-2.0 OR MIT +License: (Apache-2.0 OR MIT) AND BSD-3-Clause AND Apache-2.0 AND Apache-2.0 OR BSL-1.0 AND Apache-2.0 OR ISC OR MIT AND Apache-2.0 OR MIT AND Apache-2.0 WITH LLVM-exception AND Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT AND BSD-3-Clause AND GPL-3.0 AND GPL-3.0-only AND ISC AND MIT AND MIT OR Apache-2.0 AND MIT OR Apache-2.0 OR BSD-2-Clause AND MIT OR Apache-2.0 OR Zlib AND MPL-2.0 AND MPL-2.0 OR MIT OR Apache-2.0 AND Unlicense OR MIT AND Zlib AND Zlib OR Apache-2.0 OR MIT # LICENSE.dependencies contains a full license breakdown URL: https://github.com/pop-os/launcher From d9d05ae2a38da2a6e283c213c0af31b77e690fc7 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 28 2024 13:07:59 +0000 Subject: [PATCH 95/220] s --- diff --git a/metadata/all_deps.txt b/metadata/all_deps.txt index a98e146..bf5596c 100644 --- a/metadata/all_deps.txt +++ b/metadata/all_deps.txt @@ -11,7 +11,7 @@ glib2-devel gtk3-devel dbus-devel wayland-devel -clang-devel +clang-libs libxkbcommon-devel mesa-libgbm-devel rust-rav1e+nasm-rs-devel @@ -112,7 +112,7 @@ rustc lld cargo wayland-devel -clang-devel +clang-libs libxkbcommon-devel pam-devel just @@ -194,7 +194,7 @@ cargo libxkbcommon-devel wayland-devel pipewire-devel -clang-devel +clang-libs mesa-libEGL-devel mesa-libgbm-devel just diff --git a/rpms/cosmic-app-library/cosmic-app-library.spec b/rpms/cosmic-app-library/cosmic-app-library.spec index cdf8303..a304af9 100644 --- a/rpms/cosmic-app-library/cosmic-app-library.spec +++ b/rpms/cosmic-app-library/cosmic-app-library.spec @@ -43,7 +43,6 @@ Source: cosmic-app-library-%{ver}.tar.xz Source: cosmic-app-library-%{ver}-vendor.tar.xz BuildRequires: cargo-rpm-macros >= 26 -BuildRequires: gcc BuildRequires: rustc BuildRequires: lld BuildRequires: cargo diff --git a/rpms/cosmic-applets/cosmic-applets.spec b/rpms/cosmic-applets/cosmic-applets.spec index 26d37ab..5557e8e 100644 --- a/rpms/cosmic-applets/cosmic-applets.spec +++ b/rpms/cosmic-applets/cosmic-applets.spec @@ -42,7 +42,6 @@ Patch: better_compile.patch Patch: symlink.patch BuildRequires: cargo-rpm-macros >= 25 -BuildRequires: gcc BuildRequires: rustc BuildRequires: lld BuildRequires: cargo diff --git a/rpms/cosmic-bg/cosmic-bg.spec b/rpms/cosmic-bg/cosmic-bg.spec index b5f87b8..6ed8815 100644 --- a/rpms/cosmic-bg/cosmic-bg.spec +++ b/rpms/cosmic-bg/cosmic-bg.spec @@ -33,7 +33,6 @@ Source: cosmic-bg-%{ver}.tar.xz Source: cosmic-bg-%{ver}-vendor.tar.xz BuildRequires: cargo-rpm-macros >= 25 -BuildRequires: gcc BuildRequires: rustc BuildRequires: lld BuildRequires: cargo diff --git a/rpms/cosmic-comp/cosmic-comp.spec b/rpms/cosmic-comp/cosmic-comp.spec index 3296fe4..856bf7e 100644 --- a/rpms/cosmic-comp/cosmic-comp.spec +++ b/rpms/cosmic-comp/cosmic-comp.spec @@ -44,7 +44,6 @@ Source: cosmic-comp-%{ver}.tar.xz Source: cosmic-comp-%{ver}-vendor.tar.xz BuildRequires: cargo-rpm-macros >= 25 -BuildRequires: gcc BuildRequires: rustc BuildRequires: lld BuildRequires: cargo diff --git a/rpms/cosmic-edit/cosmic-edit.spec b/rpms/cosmic-edit/cosmic-edit.spec index 6e83bc9..48e6973 100644 --- a/rpms/cosmic-edit/cosmic-edit.spec +++ b/rpms/cosmic-edit/cosmic-edit.spec @@ -47,7 +47,6 @@ Source: cosmic-edit-%{ver}.tar.xz Source: cosmic-edit-%{ver}-vendor.tar.xz BuildRequires: cargo-rpm-macros >= 26 -BuildRequires: gcc BuildRequires: rustc BuildRequires: lld BuildRequires: cargo diff --git a/rpms/cosmic-files/cosmic-files.spec b/rpms/cosmic-files/cosmic-files.spec index b994e15..bd50285 100644 --- a/rpms/cosmic-files/cosmic-files.spec +++ b/rpms/cosmic-files/cosmic-files.spec @@ -46,7 +46,6 @@ Source: cosmic-files-%{ver}.tar.xz Source: cosmic-files-%{ver}-vendor.tar.xz BuildRequires: cargo-rpm-macros >= 26 -BuildRequires: gcc BuildRequires: rustc BuildRequires: lld BuildRequires: cargo diff --git a/rpms/cosmic-greeter/cosmic-greeter.spec b/rpms/cosmic-greeter/cosmic-greeter.spec index fd7e38b..372594e 100644 --- a/rpms/cosmic-greeter/cosmic-greeter.spec +++ b/rpms/cosmic-greeter/cosmic-greeter.spec @@ -42,12 +42,11 @@ Source: cosmic-greeter-%{ver}-vendor.tar.xz Patch: service.patch BuildRequires: cargo-rpm-macros >= 25 -BuildRequires: gcc BuildRequires: rustc BuildRequires: lld BuildRequires: cargo BuildRequires: wayland-devel -BuildRequires: clang-devel +BuildRequires: clang-libs BuildRequires: libxkbcommon-devel BuildRequires: pam-devel BuildRequires: just diff --git a/rpms/cosmic-launcher/cosmic-launcher.spec b/rpms/cosmic-launcher/cosmic-launcher.spec index ac2251b..5cda548 100644 --- a/rpms/cosmic-launcher/cosmic-launcher.spec +++ b/rpms/cosmic-launcher/cosmic-launcher.spec @@ -46,7 +46,6 @@ Source: cosmic-launcher-%{ver}.tar.xz Source: cosmic-launcher-%{ver}-vendor.tar.xz BuildRequires: cargo-rpm-macros >= 26 -BuildRequires: gcc BuildRequires: rustc BuildRequires: lld BuildRequires: cargo diff --git a/rpms/cosmic-notifications/cosmic-notifications.spec b/rpms/cosmic-notifications/cosmic-notifications.spec index 083c225..7882716 100644 --- a/rpms/cosmic-notifications/cosmic-notifications.spec +++ b/rpms/cosmic-notifications/cosmic-notifications.spec @@ -41,7 +41,6 @@ Source: cosmic-notifications-%{ver}.tar.xz Source: cosmic-notifications-%{ver}-vendor.tar.xz BuildRequires: cargo-rpm-macros >= 25 -BuildRequires: gcc BuildRequires: rustc BuildRequires: lld BuildRequires: cargo diff --git a/rpms/cosmic-osd/cosmic-osd.spec b/rpms/cosmic-osd/cosmic-osd.spec index a5312b3..9644e5b 100644 --- a/rpms/cosmic-osd/cosmic-osd.spec +++ b/rpms/cosmic-osd/cosmic-osd.spec @@ -44,7 +44,6 @@ Source: cosmic-osd-%{ver}.tar.xz Source: cosmic-osd-%{ver}-vendor.tar.xz BuildRequires: cargo-rpm-macros >= 26 -BuildRequires: gcc BuildRequires: rustc BuildRequires: lld BuildRequires: cargo diff --git a/rpms/cosmic-panel/cosmic-panel.spec b/rpms/cosmic-panel/cosmic-panel.spec index c2cf893..301d62d 100644 --- a/rpms/cosmic-panel/cosmic-panel.spec +++ b/rpms/cosmic-panel/cosmic-panel.spec @@ -38,7 +38,6 @@ Source: cosmic-panel-%{ver}.tar.xz Source: cosmic-panel-%{ver}-vendor.tar.xz BuildRequires: cargo-rpm-macros >= 25 -BuildRequires: gcc BuildRequires: rustc BuildRequires: lld BuildRequires: cargo diff --git a/rpms/cosmic-randr/cosmic-randr.spec b/rpms/cosmic-randr/cosmic-randr.spec index 3fc5d4c..f877573 100644 --- a/rpms/cosmic-randr/cosmic-randr.spec +++ b/rpms/cosmic-randr/cosmic-randr.spec @@ -30,7 +30,6 @@ Source: cosmic-randr-%{ver}.tar.xz Source: cosmic-randr-%{ver}-vendor.tar.xz BuildRequires: cargo-rpm-macros >= 25 -BuildRequires: gcc BuildRequires: rustc BuildRequires: lld BuildRequires: cargo diff --git a/rpms/cosmic-screenshot/cosmic-screenshot.spec b/rpms/cosmic-screenshot/cosmic-screenshot.spec index 464b5b3..1acddc3 100644 --- a/rpms/cosmic-screenshot/cosmic-screenshot.spec +++ b/rpms/cosmic-screenshot/cosmic-screenshot.spec @@ -34,7 +34,6 @@ Source: cosmic-screenshot-%{ver}.tar.xz Source: cosmic-screenshot-%{ver}-vendor.tar.xz BuildRequires: cargo-rpm-macros >= 26 -BuildRequires: gcc BuildRequires: rustc BuildRequires: lld BuildRequires: cargo diff --git a/rpms/cosmic-session/cosmic-session.spec b/rpms/cosmic-session/cosmic-session.spec index 1c75ddc..ce77c69 100644 --- a/rpms/cosmic-session/cosmic-session.spec +++ b/rpms/cosmic-session/cosmic-session.spec @@ -38,7 +38,6 @@ Source: cosmic-session-%{ver}.tar.xz Source: cosmic-session-%{ver}-vendor.tar.xz BuildRequires: cargo-rpm-macros >= 26 -BuildRequires: gcc BuildRequires: rustc BuildRequires: lld BuildRequires: cargo diff --git a/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec b/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec index cc866d9..54011e0 100644 --- a/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec +++ b/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec @@ -43,7 +43,6 @@ Source: cosmic-settings-daemon-%{ver}.tar.xz Source: cosmic-settings-daemon-%{ver}-vendor.tar.xz BuildRequires: cargo-rpm-macros >= 26 -BuildRequires: gcc BuildRequires: rustc BuildRequires: lld BuildRequires: cargo diff --git a/rpms/cosmic-settings/cosmic-settings.spec b/rpms/cosmic-settings/cosmic-settings.spec index 46f8176..5ac8f61 100644 --- a/rpms/cosmic-settings/cosmic-settings.spec +++ b/rpms/cosmic-settings/cosmic-settings.spec @@ -44,7 +44,6 @@ Source: cosmic-settings-%{ver}.tar.xz Source: cosmic-settings-%{ver}-vendor.tar.xz BuildRequires: cargo-rpm-macros >= 25 -BuildRequires: gcc BuildRequires: rustc BuildRequires: lld BuildRequires: cargo diff --git a/rpms/cosmic-store/cosmic-store.spec b/rpms/cosmic-store/cosmic-store.spec index eab0a89..ec673ad 100644 --- a/rpms/cosmic-store/cosmic-store.spec +++ b/rpms/cosmic-store/cosmic-store.spec @@ -42,7 +42,6 @@ Source: cosmic-store-%{ver}.tar.xz Source: cosmic-store-%{ver}-vendor.tar.xz BuildRequires: cargo-rpm-macros >= 25 -BuildRequires: gcc BuildRequires: rustc BuildRequires: lld BuildRequires: cargo diff --git a/rpms/cosmic-term/cosmic-term.spec b/rpms/cosmic-term/cosmic-term.spec index e12461d..9723931 100644 --- a/rpms/cosmic-term/cosmic-term.spec +++ b/rpms/cosmic-term/cosmic-term.spec @@ -46,7 +46,6 @@ Source: cosmic-term-%{ver}.tar.xz Source: cosmic-term-%{ver}-vendor.tar.xz BuildRequires: cargo-rpm-macros >= 26 -BuildRequires: gcc BuildRequires: rustc BuildRequires: lld BuildRequires: cargo diff --git a/rpms/cosmic-workspaces/cosmic-workspaces.spec b/rpms/cosmic-workspaces/cosmic-workspaces.spec index a5918e5..76db636 100644 --- a/rpms/cosmic-workspaces/cosmic-workspaces.spec +++ b/rpms/cosmic-workspaces/cosmic-workspaces.spec @@ -44,7 +44,6 @@ Source: cosmic-workspaces-%{ver}.tar.xz Source: cosmic-workspaces-%{ver}-vendor.tar.xz BuildRequires: cargo-rpm-macros >= 26 -BuildRequires: gcc BuildRequires: rustc BuildRequires: lld BuildRequires: cargo diff --git a/rpms/pop-launcher/pop-launcher.spec b/rpms/pop-launcher/pop-launcher.spec index 81ae1ba..0d8c079 100644 --- a/rpms/pop-launcher/pop-launcher.spec +++ b/rpms/pop-launcher/pop-launcher.spec @@ -41,7 +41,6 @@ Source: pop-launcher-%{ver}-vendor.tar.xz Patch: symlink.patch BuildRequires: cargo-rpm-macros >= 25 -BuildRequires: gcc BuildRequires: rustc BuildRequires: lld BuildRequires: cargo diff --git a/rpms/system76-power/system76-power.old.spec b/rpms/system76-power/system76-power.old.spec index dd21c4c..7cd5dd7 100644 --- a/rpms/system76-power/system76-power.old.spec +++ b/rpms/system76-power/system76-power.old.spec @@ -33,7 +33,7 @@ BuildRequires: glib2-devel BuildRequires: gtk3-devel BuildRequires: dbus-devel BuildRequires: wayland-devel -BuildRequires: clang-devel +BuildRequires: clang-libs BuildRequires: libxkbcommon-devel BuildRequires: mesa-libgbm-devel BuildRequires: rust-rav1e+nasm-rs-devel diff --git a/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec b/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec index d9bb5c1..a4febe7 100644 --- a/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec +++ b/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec @@ -44,14 +44,13 @@ Source: xdg-desktop-portal-cosmic-%{ver}.tar.xz Source: xdg-desktop-portal-cosmic-%{ver}-vendor.tar.xz BuildRequires: cargo-rpm-macros >= 26 -BuildRequires: gcc BuildRequires: rustc BuildRequires: lld BuildRequires: cargo BuildRequires: libxkbcommon-devel BuildRequires: wayland-devel BuildRequires: pipewire-devel -BuildRequires: clang-devel +BuildRequires: clang-libs BuildRequires: mesa-libEGL-devel BuildRequires: mesa-libgbm-devel BuildRequires: gstreamer1-devel From de093e5bb037e4bf9a7dae14e544c2beaf6ab7d6 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 28 2024 13:25:44 +0000 Subject: [PATCH 96/220] Update cosmic-launcher.spec --- diff --git a/rpms/cosmic-launcher/cosmic-launcher.spec b/rpms/cosmic-launcher/cosmic-launcher.spec index 5cda548..6f8ea72 100644 --- a/rpms/cosmic-launcher/cosmic-launcher.spec +++ b/rpms/cosmic-launcher/cosmic-launcher.spec @@ -66,7 +66,6 @@ Requires: pop-launcher cat .vendor/config.toml >> .cargo/config %build -export RUSTFLAGS="$RUSTFLAGS --cfg tokio_unstable" %cargo_build %{cargo_license_summary} %{cargo_license} > LICENSE.dependencies @@ -76,7 +75,6 @@ export RUSTFLAGS="$RUSTFLAGS --cfg tokio_unstable" just rootdir=%{buildroot} prefix=%{_prefix} install %if %{with check} -export RUSTFLAGS="$RUSTFLAGS --cfg tokio_unstable" %check %cargo_test %endif From 6d9d6e509eab320e84844fa6d82adcc7e38344fc Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 28 2024 13:48:04 +0000 Subject: [PATCH 97/220] s --- diff --git a/metadata/all_deps.txt b/metadata/all_deps.txt index bf5596c..a98e146 100644 --- a/metadata/all_deps.txt +++ b/metadata/all_deps.txt @@ -11,7 +11,7 @@ glib2-devel gtk3-devel dbus-devel wayland-devel -clang-libs +clang-devel libxkbcommon-devel mesa-libgbm-devel rust-rav1e+nasm-rs-devel @@ -112,7 +112,7 @@ rustc lld cargo wayland-devel -clang-libs +clang-devel libxkbcommon-devel pam-devel just @@ -194,7 +194,7 @@ cargo libxkbcommon-devel wayland-devel pipewire-devel -clang-libs +clang-devel mesa-libEGL-devel mesa-libgbm-devel just diff --git a/rpms/cosmic-greeter/cosmic-greeter.spec b/rpms/cosmic-greeter/cosmic-greeter.spec index 372594e..e555eea 100644 --- a/rpms/cosmic-greeter/cosmic-greeter.spec +++ b/rpms/cosmic-greeter/cosmic-greeter.spec @@ -46,7 +46,7 @@ BuildRequires: rustc BuildRequires: lld BuildRequires: cargo BuildRequires: wayland-devel -BuildRequires: clang-libs +BuildRequires: clang-devel BuildRequires: libxkbcommon-devel BuildRequires: pam-devel BuildRequires: just diff --git a/rpms/system76-power/system76-power.old.spec b/rpms/system76-power/system76-power.old.spec index 7cd5dd7..dd21c4c 100644 --- a/rpms/system76-power/system76-power.old.spec +++ b/rpms/system76-power/system76-power.old.spec @@ -33,7 +33,7 @@ BuildRequires: glib2-devel BuildRequires: gtk3-devel BuildRequires: dbus-devel BuildRequires: wayland-devel -BuildRequires: clang-libs +BuildRequires: clang-devel BuildRequires: libxkbcommon-devel BuildRequires: mesa-libgbm-devel BuildRequires: rust-rav1e+nasm-rs-devel diff --git a/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec b/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec index a4febe7..0e09f58 100644 --- a/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec +++ b/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec @@ -50,7 +50,7 @@ BuildRequires: cargo BuildRequires: libxkbcommon-devel BuildRequires: wayland-devel BuildRequires: pipewire-devel -BuildRequires: clang-libs +BuildRequires: clang-devel BuildRequires: mesa-libEGL-devel BuildRequires: mesa-libgbm-devel BuildRequires: gstreamer1-devel From a1ebfb4f6e0db6c112fb41d1cfd81514777ac91f Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 28 2024 19:56:17 +0000 Subject: [PATCH 98/220] Update cosmic-launcher.spec --- diff --git a/rpms/cosmic-launcher/cosmic-launcher.spec b/rpms/cosmic-launcher/cosmic-launcher.spec index 6f8ea72..bab2c86 100644 --- a/rpms/cosmic-launcher/cosmic-launcher.spec +++ b/rpms/cosmic-launcher/cosmic-launcher.spec @@ -64,6 +64,7 @@ Requires: pop-launcher %autosetup -n %{crate}-%{ver} -p1 -a1 %cargo_prep -N cat .vendor/config.toml >> .cargo/config +cat "\n[build]\nrustflags = ["--cfg", "tokio_unstable"]\nrustdocflags = ["--cfg", "tokio_unstable"]" >> .cargo/config %build %cargo_build From c88f939f0b7b243255e6059a4bd4f083a3cc357c Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 28 2024 20:07:33 +0000 Subject: [PATCH 99/220] Update cosmic-launcher.spec --- diff --git a/rpms/cosmic-launcher/cosmic-launcher.spec b/rpms/cosmic-launcher/cosmic-launcher.spec index bab2c86..8906831 100644 --- a/rpms/cosmic-launcher/cosmic-launcher.spec +++ b/rpms/cosmic-launcher/cosmic-launcher.spec @@ -64,7 +64,7 @@ Requires: pop-launcher %autosetup -n %{crate}-%{ver} -p1 -a1 %cargo_prep -N cat .vendor/config.toml >> .cargo/config -cat "\n[build]\nrustflags = ["--cfg", "tokio_unstable"]\nrustdocflags = ["--cfg", "tokio_unstable"]" >> .cargo/config +cat "\n[build]\nrustflags = [\"--cfg\", "tokio_unstable\"]\nrustdocflags = [\"--cfg\", \"tokio_unstable\"]" >> .cargo/config %build %cargo_build From 1d35c40f6bf1fc5d6374a8a035bc8fc0bb9109ab Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 28 2024 20:19:53 +0000 Subject: [PATCH 100/220] Update cosmic-launcher.spec --- diff --git a/rpms/cosmic-launcher/cosmic-launcher.spec b/rpms/cosmic-launcher/cosmic-launcher.spec index 8906831..c340587 100644 --- a/rpms/cosmic-launcher/cosmic-launcher.spec +++ b/rpms/cosmic-launcher/cosmic-launcher.spec @@ -64,7 +64,7 @@ Requires: pop-launcher %autosetup -n %{crate}-%{ver} -p1 -a1 %cargo_prep -N cat .vendor/config.toml >> .cargo/config -cat "\n[build]\nrustflags = [\"--cfg\", "tokio_unstable\"]\nrustdocflags = [\"--cfg\", \"tokio_unstable\"]" >> .cargo/config +cat "\n[build]\nrustflags = [\"--cfg\", \"tokio_unstable\"]\nrustdocflags = [\"--cfg\", \"tokio_unstable\"]" >> .cargo/config %build %cargo_build From 9d6fb0f3f9df69ae52239153ce0e33159abab096 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 28 2024 20:31:17 +0000 Subject: [PATCH 101/220] Update cosmic-launcher.spec --- diff --git a/rpms/cosmic-launcher/cosmic-launcher.spec b/rpms/cosmic-launcher/cosmic-launcher.spec index c340587..8668598 100644 --- a/rpms/cosmic-launcher/cosmic-launcher.spec +++ b/rpms/cosmic-launcher/cosmic-launcher.spec @@ -64,7 +64,7 @@ Requires: pop-launcher %autosetup -n %{crate}-%{ver} -p1 -a1 %cargo_prep -N cat .vendor/config.toml >> .cargo/config -cat "\n[build]\nrustflags = [\"--cfg\", \"tokio_unstable\"]\nrustdocflags = [\"--cfg\", \"tokio_unstable\"]" >> .cargo/config +echo "\n[build]\nrustflags = [\"--cfg\", \"tokio_unstable\"]\nrustdocflags = [\"--cfg\", \"tokio_unstable\"]" >> .cargo/config %build %cargo_build From c7fd66786b8bdf7241282067a1efaf9edecda069 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 28 2024 21:08:03 +0000 Subject: [PATCH 102/220] Update cosmic-launcher.spec --- diff --git a/rpms/cosmic-launcher/cosmic-launcher.spec b/rpms/cosmic-launcher/cosmic-launcher.spec index 8668598..e1e0bd4 100644 --- a/rpms/cosmic-launcher/cosmic-launcher.spec +++ b/rpms/cosmic-launcher/cosmic-launcher.spec @@ -64,7 +64,9 @@ Requires: pop-launcher %autosetup -n %{crate}-%{ver} -p1 -a1 %cargo_prep -N cat .vendor/config.toml >> .cargo/config -echo "\n[build]\nrustflags = [\"--cfg\", \"tokio_unstable\"]\nrustdocflags = [\"--cfg\", \"tokio_unstable\"]" >> .cargo/config +echo "[build] +rustflags = [\"--cfg\", \"tokio_unstable\"] +rustdocflags = [\"--cfg\", \"tokio_unstable\"]" >> .cargo/config %build %cargo_build From 14817cd54772035032010cc76a53fd8b6e3dcb36 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 28 2024 21:20:22 +0000 Subject: [PATCH 103/220] Update cosmic-launcher.spec --- diff --git a/rpms/cosmic-launcher/cosmic-launcher.spec b/rpms/cosmic-launcher/cosmic-launcher.spec index e1e0bd4..b190860 100644 --- a/rpms/cosmic-launcher/cosmic-launcher.spec +++ b/rpms/cosmic-launcher/cosmic-launcher.spec @@ -64,6 +64,7 @@ Requires: pop-launcher %autosetup -n %{crate}-%{ver} -p1 -a1 %cargo_prep -N cat .vendor/config.toml >> .cargo/config +cat .cargo/config echo "[build] rustflags = [\"--cfg\", \"tokio_unstable\"] rustdocflags = [\"--cfg\", \"tokio_unstable\"]" >> .cargo/config From 988aa60a16c59f6e99eba8b07ec0c5bb1a2e6155 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 28 2024 21:34:32 +0000 Subject: [PATCH 104/220] Update cosmic-launcher.spec --- diff --git a/rpms/cosmic-launcher/cosmic-launcher.spec b/rpms/cosmic-launcher/cosmic-launcher.spec index b190860..8185ffa 100644 --- a/rpms/cosmic-launcher/cosmic-launcher.spec +++ b/rpms/cosmic-launcher/cosmic-launcher.spec @@ -64,18 +64,16 @@ Requires: pop-launcher %autosetup -n %{crate}-%{ver} -p1 -a1 %cargo_prep -N cat .vendor/config.toml >> .cargo/config -cat .cargo/config -echo "[build] -rustflags = [\"--cfg\", \"tokio_unstable\"] -rustdocflags = [\"--cfg\", \"tokio_unstable\"]" >> .cargo/config %build +export RUSTFLAGS := env_var_or_default('RUSTFLAGS', '') + ' --cfg tokio_unstable ' %cargo_build %{cargo_license_summary} %{cargo_license} > LICENSE.dependencies %{cargo_vendor_manifest} %install +export RUSTFLAGS := env_var_or_default('RUSTFLAGS', '') + ' --cfg tokio_unstable ' just rootdir=%{buildroot} prefix=%{_prefix} install %if %{with check} From a4109285111c80170a85ac92e2e47ec0a66203db Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 29 2024 00:35:26 +0000 Subject: [PATCH 105/220] Update cosmic-launcher.spec --- diff --git a/rpms/cosmic-launcher/cosmic-launcher.spec b/rpms/cosmic-launcher/cosmic-launcher.spec index 8185ffa..6f8ea72 100644 --- a/rpms/cosmic-launcher/cosmic-launcher.spec +++ b/rpms/cosmic-launcher/cosmic-launcher.spec @@ -66,14 +66,12 @@ Requires: pop-launcher cat .vendor/config.toml >> .cargo/config %build -export RUSTFLAGS := env_var_or_default('RUSTFLAGS', '') + ' --cfg tokio_unstable ' %cargo_build %{cargo_license_summary} %{cargo_license} > LICENSE.dependencies %{cargo_vendor_manifest} %install -export RUSTFLAGS := env_var_or_default('RUSTFLAGS', '') + ' --cfg tokio_unstable ' just rootdir=%{buildroot} prefix=%{_prefix} install %if %{with check} From 86fe549474e69050a1d8615fd521eaca2e28857e Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 29 2024 01:44:56 +0000 Subject: [PATCH 106/220] s --- diff --git a/data/checklist.md b/data/checklist.md index 0416d6b..1a6c1f5 100644 --- a/data/checklist.md +++ b/data/checklist.md @@ -1,6 +1,8 @@ -* cosmic-comp * cosmic-app-library -* xdg-desktop-portal-cosmic +* cosmic-comp * cosmic-edit * cosmic-files -* cosmic-randr \ No newline at end of file +* cosmic-randr +* cosmic-settings +* cosmic-settings-daemon +* xdg-desktop-portal-cosmic \ No newline at end of file diff --git a/rpms/cosmic-applets/cosmic-applets.spec b/rpms/cosmic-applets/cosmic-applets.spec index 5557e8e..3ec29a6 100644 --- a/rpms/cosmic-applets/cosmic-applets.spec +++ b/rpms/cosmic-applets/cosmic-applets.spec @@ -175,6 +175,8 @@ just rootdir=%{buildroot} prefix=%{_prefix} install %{_datadir}/icons/hicolor/scalable/status/cosmic-applet-notification-disabled-symbolic.svg %{_datadir}/icons/hicolor/scalable/status/cosmic-applet-notification-new-symbolic.svg %{_datadir}/icons/hicolor/scalable/status/cosmic-applet-notification-symbolic.svg +%{_datadir}/applications/com.system76.CosmicPanelLauncherButton.desktop +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicPanelLauncherButton.svg %changelog %autochangelog From 5661eb513727c8811fa08c60be68b5a4238a22d8 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 29 2024 01:49:36 +0000 Subject: [PATCH 107/220] Update cosmic-icons.spec --- diff --git a/rpms/cosmic-icons/cosmic-icons.spec b/rpms/cosmic-icons/cosmic-icons.spec index a4d671e..f3ce941 100644 --- a/rpms/cosmic-icons/cosmic-icons.spec +++ b/rpms/cosmic-icons/cosmic-icons.spec @@ -16,6 +16,7 @@ URL: https://github.com/pop-os/cosmic-icons Source: cosmic-icons-%{ver}.tar.xz BuildRequires: just +BuildRequires: pop-icon-theme %global _description %{expand: %{summary}.} From a689228b3a0686e5a9e60eed6a33e53aab8e61e8 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 29 2024 03:12:50 +0000 Subject: [PATCH 108/220] Update checklist.md --- diff --git a/data/checklist.md b/data/checklist.md index 1a6c1f5..7bd34db 100644 --- a/data/checklist.md +++ b/data/checklist.md @@ -1,8 +1,23 @@ * cosmic-app-library +* cosmic-applets +* cosmic-bg * cosmic-comp +-- cosmic-desktop -- * cosmic-edit * cosmic-files +* cosmic-greeter +* cosmic-icons +* cosmic-launcher +* cosmic-notifications +* cosmic-osd +* cosmic-panel * cosmic-randr +* cosmic-screenshot +* cosmic-session * cosmic-settings * cosmic-settings-daemon +* cosmic-store +* cosmic-term +* cosmic-workspaces +* pop-launcher * xdg-desktop-portal-cosmic \ No newline at end of file From a3807175a80cbabd6e79ddbd2a3c3120371c3c4f Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 31 2024 23:31:30 +0000 Subject: [PATCH 109/220] fix unavailable buildrequires --- diff --git a/rpms/cosmic-session/cosmic-session.spec b/rpms/cosmic-session/cosmic-session.spec index ce77c69..4751165 100644 --- a/rpms/cosmic-session/cosmic-session.spec +++ b/rpms/cosmic-session/cosmic-session.spec @@ -60,9 +60,10 @@ Requires: cosmic-screenshot Requires: cosmic-settings Requires: cosmic-settings-daemon Requires: cosmic-workspaces -Requires: pop-fonts +Requires: mozilla-fira-mono-fonts +Requires: mozilla-fira-sans-fonts Requires: xdg-desktop-portal-cosmic -Requires: xwayland +Requires: xorg-x11-server-Xwayland %global _description %{expand: The session manager for the COSMIC desktop environment.} diff --git a/rpms/pop-launcher/pop-launcher.spec b/rpms/pop-launcher/pop-launcher.spec index 0d8c079..e9e0d20 100644 --- a/rpms/pop-launcher/pop-launcher.spec +++ b/rpms/pop-launcher/pop-launcher.spec @@ -49,7 +49,7 @@ BuildRequires: libxkbcommon-devel BuildRequires: just Requires: libqalculate -Requires: rust-fd-find +Requires: fd-find %global _description %{expand: %{summary}.} From 49a95e2dd83f14d14cd054ef7568d20f2792a7dd Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Apr 01 2024 15:10:02 +0000 Subject: [PATCH 110/220] fix cosmic-icons --- diff --git a/rpms/cosmic-icons/cosmic-icons.spec b/rpms/cosmic-icons/cosmic-icons.spec index f3ce941..4b94138 100644 --- a/rpms/cosmic-icons/cosmic-icons.spec +++ b/rpms/cosmic-icons/cosmic-icons.spec @@ -9,14 +9,14 @@ Version: %{ver}~%{date} Release: %autorelease Summary: Icon theme for the COSMIC Desktop Environment. -SourceLicense: CC-BY-SA-4.0 -License: GPL-3.0 +License: CC-BY-SA-4.0 URL: https://github.com/pop-os/cosmic-icons Source: cosmic-icons-%{ver}.tar.xz BuildRequires: just -BuildRequires: pop-icon-theme + +Requires: pop-icon-theme %global _description %{expand: %{summary}.} From c2f8583239459f63ce1d961f31c9de6240338e22 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Apr 11 2024 13:25:26 +0000 Subject: [PATCH 111/220] Fix cosmic-settings --- diff --git a/rpms/cosmic-settings/cosmic-settings.spec b/rpms/cosmic-settings/cosmic-settings.spec index 5ac8f61..52555f4 100644 --- a/rpms/cosmic-settings/cosmic-settings.spec +++ b/rpms/cosmic-settings/cosmic-settings.spec @@ -120,6 +120,7 @@ just rootdir=%{buildroot} install %{_datadir}/applications/com.system76.CosmicSettings.Users.desktop %{_datadir}/applications/com.system76.CosmicSettings.Wallpaper.desktop %{_datadir}/applications/com.system76.CosmicSettings.Workspaces.desktop +%{_datadir}/polkit-1/rules.d/cosmic-settings.rules %changelog %autochangelog From b5a7f8d4b23626f26289f569da80b3e297e5bac8 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Apr 12 2024 00:37:02 +0000 Subject: [PATCH 112/220] Update cosmic-files.spec --- diff --git a/rpms/cosmic-files/cosmic-files.spec b/rpms/cosmic-files/cosmic-files.spec index bd50285..ada85e9 100644 --- a/rpms/cosmic-files/cosmic-files.spec +++ b/rpms/cosmic-files/cosmic-files.spec @@ -2,7 +2,7 @@ %bcond_without check # prevent library files from being installed -%global cargo_install_lib 0 +# %%global cargo_install_lib 0 %global crate cosmic-files From 842e4cc4040b69ae81607de01dc917a63896023d Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Apr 12 2024 01:28:12 +0000 Subject: [PATCH 113/220] Update cosmic-files.spec --- diff --git a/rpms/cosmic-files/cosmic-files.spec b/rpms/cosmic-files/cosmic-files.spec index ada85e9..641175f 100644 --- a/rpms/cosmic-files/cosmic-files.spec +++ b/rpms/cosmic-files/cosmic-files.spec @@ -2,7 +2,7 @@ %bcond_without check # prevent library files from being installed -# %%global cargo_install_lib 0 +%global cargo_install_lib 0 %global crate cosmic-files @@ -73,8 +73,8 @@ cat .vendor/config.toml >> .cargo/config just rootdir=%{buildroot} prefix=%{_prefix} install %if %{with check} -%check -%cargo_test +# %% check TODO: Fix --lib +# %%cargo_test %endif %files From 8c58fe0ad1c4dcfdc43027cda2238fe80dd3c969 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Apr 12 2024 22:07:49 +0000 Subject: [PATCH 114/220] Update cosmic-osd.spec --- diff --git a/rpms/cosmic-osd/cosmic-osd.spec b/rpms/cosmic-osd/cosmic-osd.spec index 9644e5b..a5bd74f 100644 --- a/rpms/cosmic-osd/cosmic-osd.spec +++ b/rpms/cosmic-osd/cosmic-osd.spec @@ -51,7 +51,7 @@ BuildRequires: wayland-devel BuildRequires: libxkbcommon-devel BuildRequires: systemd-devel BuildRequires: pulseaudio-libs-devel -BuildRequires: just +BuildRequires: make %global _description %{expand: %{summary}.} @@ -64,7 +64,8 @@ BuildRequires: just cat .vendor/config.toml >> .cargo/config %build -%cargo_build +make all polkit-agent-helper-1=/usr/lib/polkit-1/polkit-agent-helper-1 +# %%cargo_build %{cargo_license_summary} %{cargo_license} > LICENSE.dependencies %{cargo_vendor_manifest} From c032bf59ab2229afcda0f99daf0edfa1a0636426 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Apr 17 2024 19:06:04 +0000 Subject: [PATCH 115/220] new dep for cosmic-comp --- diff --git a/rpms/cosmic-comp/cosmic-comp.spec b/rpms/cosmic-comp/cosmic-comp.spec index 856bf7e..e8eeb22 100644 --- a/rpms/cosmic-comp/cosmic-comp.spec +++ b/rpms/cosmic-comp/cosmic-comp.spec @@ -53,6 +53,7 @@ BuildRequires: libglvnd-devel BuildRequires: libseat-devel BuildRequires: libinput-devel BuildRequires: mesa-libgbm-devel +BuildRequires: pixman-devel BuildRequires: make Requires: libseat From 4bb1d621916954db817be420f5f74580940856a7 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Apr 17 2024 19:10:17 +0000 Subject: [PATCH 116/220] add packagekit --- diff --git a/rpms/cosmic-store/cosmic-store.spec b/rpms/cosmic-store/cosmic-store.spec index ec673ad..4657c83 100644 --- a/rpms/cosmic-store/cosmic-store.spec +++ b/rpms/cosmic-store/cosmic-store.spec @@ -49,6 +49,8 @@ BuildRequires: flatpak-devel BuildRequires: libappstream-glib BuildRequires: just +Requires: PackageKit + %global _description %{expand: %{summary}.} From 3bd540ee58150090ceba5f34be58805f8d016ef6 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Apr 17 2024 19:11:45 +0000 Subject: [PATCH 117/220] Add flatpak libs --- diff --git a/rpms/cosmic-store/cosmic-store.spec b/rpms/cosmic-store/cosmic-store.spec index 4657c83..2e4f7cd 100644 --- a/rpms/cosmic-store/cosmic-store.spec +++ b/rpms/cosmic-store/cosmic-store.spec @@ -50,6 +50,7 @@ BuildRequires: libappstream-glib BuildRequires: just Requires: PackageKit +Requires: flatpak-libs %global _description %{expand: %{summary}.} From 14df97eb1b3db9070a2332e68d5c9158a077ad98 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Apr 18 2024 15:12:37 +0000 Subject: [PATCH 118/220] Update cosmic-settings-daemon.spec --- diff --git a/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec b/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec index 54011e0..3abceba 100644 --- a/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec +++ b/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec @@ -47,8 +47,11 @@ BuildRequires: rustc BuildRequires: lld BuildRequires: cargo BuildRequires: systemd-devel +BuildRequires: libudev-devel BuildRequires: just +Requires: acpid + %global _description %{expand: %{summary}.} From 34438c75d9f755f62f833727164f924e427645d5 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Apr 18 2024 17:32:17 +0000 Subject: [PATCH 119/220] Update cosmic-comp.spec --- diff --git a/rpms/cosmic-comp/cosmic-comp.spec b/rpms/cosmic-comp/cosmic-comp.spec index e8eeb22..77690ba 100644 --- a/rpms/cosmic-comp/cosmic-comp.spec +++ b/rpms/cosmic-comp/cosmic-comp.spec @@ -90,7 +90,7 @@ install -Dm0644 config.ron %{buildroot}/%{_sysconfdir}/cosmic-comp/config.ron %license LICENSE.dependencies # %%license cargo-vendor.txt %{_bindir}/cosmic-comp -%{_sysconfdir}/cosmic-comp/config.ron +%config(noreplace) %{_sysconfdir}/cosmic-comp/config.ron %changelog %autochangelog From 7c89b78d4fe1bcfd84e5a718c3690a04e55867d0 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Apr 18 2024 23:52:39 +0000 Subject: [PATCH 120/220] Better snapshot versioning --- diff --git a/metadata/all_deps.txt b/metadata/all_deps.txt index a98e146..3ae97b6 100644 --- a/metadata/all_deps.txt +++ b/metadata/all_deps.txt @@ -1,27 +1,6 @@ Build Requirements -make -which -git-core -just -rustc -lld -cargo -glib2-devel -gtk3-devel -dbus-devel -wayland-devel -clang-devel -libxkbcommon-devel -mesa-libgbm-devel -rust-rav1e+nasm-rs-devel -libappstream-glib -pipewire-devel -libglvnd-devel -libseat-devel -libinput-devel -pam-devel -flatpak-devel +sudo dnf install -y make which git-core just rustc lld cargo glib2-devel gtk3-devel dbus-devel wayland-devel clang-devel libxkbcommon-devel mesa-libgbm-devel rust-rav1e+nasm-rs-devel libappstream-glib pipewire-devel libglvnd-devel libseat-devel libinput-devel pam-devel flatpak-devel Requirements @@ -33,6 +12,10 @@ Requires: cage Requires: mozilla-fira-mono-fonts Requires: mozilla-fira-sans-fonts + + +rustc lld cargo dbus-devel wayland-devel libinput-devel libudev-devel pulseaudio-libs-devel mesa-libEGL-devel libxkbcommon-devel just + cosmic-app-library BR: rustc diff --git a/rpms/cosmic-app-library/cosmic-app-library.spec b/rpms/cosmic-app-library/cosmic-app-library.spec index a304af9..5e8ff9d 100644 --- a/rpms/cosmic-app-library/cosmic-app-library.spec +++ b/rpms/cosmic-app-library/cosmic-app-library.spec @@ -11,7 +11,7 @@ %global crate cosmic-app-library Name: cosmic-app-library -Version: %{ver}~%{date} +Version: %{ver}~git%{date}.%{sub %{commit} 1 7} Release: %autorelease Summary: App Library program for the COSMIC Desktop Environment. @@ -39,8 +39,8 @@ License: 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 AND Apache-2.0 OR MIT A # LICENSE.dependencies contains a full license breakdown URL: https://github.com/pop-os/cosmic-applibrary -Source: cosmic-app-library-%{ver}.tar.xz -Source: cosmic-app-library-%{ver}-vendor.tar.xz +Source: cosmic-app-library-%{commit}.tar.xz +Source: cosmic-app-library-%{commit}-vendor.tar.xz BuildRequires: cargo-rpm-macros >= 26 BuildRequires: rustc diff --git a/rpms/cosmic-applets/cosmic-applets.spec b/rpms/cosmic-applets/cosmic-applets.spec index 3ec29a6..6eddf33 100644 --- a/rpms/cosmic-applets/cosmic-applets.spec +++ b/rpms/cosmic-applets/cosmic-applets.spec @@ -6,7 +6,7 @@ %global date ### Name: cosmic-applets -Version: %{ver}~%{date} +Version: %{ver}~git%{date}.%{sub %{commit} 1 7} Release: %autorelease Summary: Applets for the COSMIC Desktop Environment. @@ -35,8 +35,8 @@ License: 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 AND Apache-2.0 OR MIT A # LICENSE.dependencies contains a full license breakdown URL: https://github.com/pop-os/cosmic-applets -Source: cosmic-applets-%{ver}.tar.xz -Source: cosmic-applets-%{ver}-vendor.tar.xz +Source: cosmic-applets-%{commit}.tar.xz +Source: cosmic-applets-%{commit}-vendor.tar.xz Patch: better_compile.patch Patch: symlink.patch diff --git a/rpms/cosmic-bg/cosmic-bg.spec b/rpms/cosmic-bg/cosmic-bg.spec index 6ed8815..0a1bcd1 100644 --- a/rpms/cosmic-bg/cosmic-bg.spec +++ b/rpms/cosmic-bg/cosmic-bg.spec @@ -6,7 +6,7 @@ %global date ### Name: cosmic-bg -Version: %{ver}~%{date} +Version: %{ver}~git%{date}.%{sub %{commit} 1 7} Release: %autorelease Summary: Background manager for the COSMIC Desktop Environment. @@ -29,8 +29,8 @@ License: 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 OR MIT AND Apache-2.0 W # LICENSE.dependencies contains a full license breakdown URL: https://github.com/pop-os/cosmic-bg -Source: cosmic-bg-%{ver}.tar.xz -Source: cosmic-bg-%{ver}-vendor.tar.xz +Source: cosmic-bg-%{commit}.tar.xz +Source: cosmic-bg-%{commit}-vendor.tar.xz BuildRequires: cargo-rpm-macros >= 25 BuildRequires: rustc diff --git a/rpms/cosmic-comp/cosmic-comp.spec b/rpms/cosmic-comp/cosmic-comp.spec index 77690ba..e16c7b3 100644 --- a/rpms/cosmic-comp/cosmic-comp.spec +++ b/rpms/cosmic-comp/cosmic-comp.spec @@ -6,7 +6,7 @@ %global date ### Name: cosmic-comp -Version: %{ver}~%{date} +Version: %{ver}~git%{date}.%{sub %{commit} 1 7} Release: %autorelease Summary: Compositor for the COSMIC Desktop Environment. Can also be used as a standalone compositor. @@ -40,8 +40,8 @@ License: GPL-3.0 AND (Apache-2.0 OR MIT) AND BSD-3-Clause AND 0BSD OR MIT # LICENSE.dependencies contains a full license breakdown URL: https://github.com/pop-os/cosmic-comp -Source: cosmic-comp-%{ver}.tar.xz -Source: cosmic-comp-%{ver}-vendor.tar.xz +Source: cosmic-comp-%{commit}.tar.xz +Source: cosmic-comp-%{commit}-vendor.tar.xz BuildRequires: cargo-rpm-macros >= 25 BuildRequires: rustc diff --git a/rpms/cosmic-desktop/cosmic-desktop.spec b/rpms/cosmic-desktop/cosmic-desktop.spec index 5d42da9..1a464db 100644 --- a/rpms/cosmic-desktop/cosmic-desktop.spec +++ b/rpms/cosmic-desktop/cosmic-desktop.spec @@ -3,7 +3,7 @@ %global date ### Name: cosmic-desktop -Version: %{ver}~%{date} +Version: %{ver}~git%{date}.%{sub %{commit} 1 7} Release: %autorelease Summary: The next generation COSMIC Desktop Environment diff --git a/rpms/cosmic-edit/cosmic-edit.spec b/rpms/cosmic-edit/cosmic-edit.spec index 48e6973..c8fc814 100644 --- a/rpms/cosmic-edit/cosmic-edit.spec +++ b/rpms/cosmic-edit/cosmic-edit.spec @@ -11,7 +11,7 @@ %global date ### Name: cosmic-edit -Version: %{ver}~%{date} +Version: %{ver}~git%{date}.%{sub %{commit} 1 7} Release: %autorelease Summary: Libcosmic text editor. @@ -43,8 +43,8 @@ License: (Apache-2.0 OR MIT) AND BSD-3-Clause AND 0BSD OR MIT OR Apache-2 # LICENSE.dependencies contains a full license breakdown URL: https://github.com/pop-os/cosmic-edit -Source: cosmic-edit-%{ver}.tar.xz -Source: cosmic-edit-%{ver}-vendor.tar.xz +Source: cosmic-edit-%{commit}.tar.xz +Source: cosmic-edit-%{commit}-vendor.tar.xz BuildRequires: cargo-rpm-macros >= 26 BuildRequires: rustc diff --git a/rpms/cosmic-files/cosmic-files.spec b/rpms/cosmic-files/cosmic-files.spec index 641175f..483157e 100644 --- a/rpms/cosmic-files/cosmic-files.spec +++ b/rpms/cosmic-files/cosmic-files.spec @@ -11,7 +11,7 @@ %global date ### Name: cosmic-files -Version: %{ver}~%{date} +Version: %{ver}~git%{date}.%{sub %{commit} 1 7} Release: %autorelease Summary: Libcosmic file manager. @@ -42,8 +42,8 @@ License: 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 AND Apache-2.0 OR BSL-1 # LICENSE.dependencies contains a full license breakdown URL: https://github.com/pop-os/cosmic-files -Source: cosmic-files-%{ver}.tar.xz -Source: cosmic-files-%{ver}-vendor.tar.xz +Source: cosmic-files-%{commit}.tar.xz +Source: cosmic-files-%{commit}-vendor.tar.xz BuildRequires: cargo-rpm-macros >= 26 BuildRequires: rustc diff --git a/rpms/cosmic-greeter/cosmic-greeter.spec b/rpms/cosmic-greeter/cosmic-greeter.spec index e555eea..8df9278 100644 --- a/rpms/cosmic-greeter/cosmic-greeter.spec +++ b/rpms/cosmic-greeter/cosmic-greeter.spec @@ -6,7 +6,7 @@ %global date ### Name: cosmic-greeter -Version: %{ver}~%{date} +Version: %{ver}~git%{date}.%{sub %{commit} 1 7} Release: %autorelease Summary: Login and display manager built using GreetD for the COSMIC Desktop Environment. @@ -36,8 +36,8 @@ License: 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 AND Apache-2.0 OR BSL-1 # LICENSE.dependencies contains a full license breakdown URL: https://github.com/pop-os/cosmic-greeter -Source: cosmic-greeter-%{ver}.tar.xz -Source: cosmic-greeter-%{ver}-vendor.tar.xz +Source: cosmic-greeter-%{commit}.tar.xz +Source: cosmic-greeter-%{commit}-vendor.tar.xz Patch: service.patch diff --git a/rpms/cosmic-icons/cosmic-icons.spec b/rpms/cosmic-icons/cosmic-icons.spec index 4b94138..681f50d 100644 --- a/rpms/cosmic-icons/cosmic-icons.spec +++ b/rpms/cosmic-icons/cosmic-icons.spec @@ -5,14 +5,14 @@ %global date ### Name: cosmic-icons -Version: %{ver}~%{date} +Version: %{ver}~git%{date}.%{sub %{commit} 1 7} Release: %autorelease Summary: Icon theme for the COSMIC Desktop Environment. License: CC-BY-SA-4.0 URL: https://github.com/pop-os/cosmic-icons -Source: cosmic-icons-%{ver}.tar.xz +Source: cosmic-icons-%{commit}.tar.xz BuildRequires: just diff --git a/rpms/cosmic-launcher/cosmic-launcher.spec b/rpms/cosmic-launcher/cosmic-launcher.spec index 6f8ea72..f59ff38 100644 --- a/rpms/cosmic-launcher/cosmic-launcher.spec +++ b/rpms/cosmic-launcher/cosmic-launcher.spec @@ -11,7 +11,7 @@ %global date ### Name: cosmic-launcher -Version: %{ver}~%{date} +Version: %{ver}~git%{date}.%{sub %{commit} 1 7} Release: %autorelease Summary: Pop launcher frontend for the COSMIC Desktop Environment. @@ -42,8 +42,8 @@ License: 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 AND Apache-2.0 OR BSL-1 # LICENSE.dependencies contains a full license breakdown URL: https://github.com/pop-os/cosmic-launcher -Source: cosmic-launcher-%{ver}.tar.xz -Source: cosmic-launcher-%{ver}-vendor.tar.xz +Source: cosmic-launcher-%{commit}.tar.xz +Source: cosmic-launcher-%{commit}-vendor.tar.xz BuildRequires: cargo-rpm-macros >= 26 BuildRequires: rustc diff --git a/rpms/cosmic-notifications/cosmic-notifications.spec b/rpms/cosmic-notifications/cosmic-notifications.spec index 7882716..7ebf982 100644 --- a/rpms/cosmic-notifications/cosmic-notifications.spec +++ b/rpms/cosmic-notifications/cosmic-notifications.spec @@ -6,7 +6,7 @@ %global date ### Name: cosmic-notifications -Version: %{ver}~%{date} +Version: %{ver}~git%{date}.%{sub %{commit} 1 7} Release: %autorelease Summary: Notifications daemon for the COSMIC Desktop Environment. @@ -37,8 +37,8 @@ License: 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 AND Apache-2.0 OR BSD-3 # LICENSE.dependencies contains a full license breakdown URL: https://github.com/pop-os/cosmic-notifications -Source: cosmic-notifications-%{ver}.tar.xz -Source: cosmic-notifications-%{ver}-vendor.tar.xz +Source: cosmic-notifications-%{commit}.tar.xz +Source: cosmic-notifications-%{commit}-vendor.tar.xz BuildRequires: cargo-rpm-macros >= 25 BuildRequires: rustc diff --git a/rpms/cosmic-osd/cosmic-osd.spec b/rpms/cosmic-osd/cosmic-osd.spec index a5bd74f..16ca145 100644 --- a/rpms/cosmic-osd/cosmic-osd.spec +++ b/rpms/cosmic-osd/cosmic-osd.spec @@ -11,7 +11,7 @@ %global date ### Name: cosmic-osd -Version: %{ver}~%{date} +Version: %{ver}~git%{date}.%{sub %{commit} 1 7} Release: %autorelease Summary: OSDs for the COSMIC Desktop Environment. @@ -40,8 +40,8 @@ License: 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 AND Apache-2.0 OR MIT A # LICENSE.dependencies contains a full license breakdown URL: https://github.com/pop-os/cosmic-osd -Source: cosmic-osd-%{ver}.tar.xz -Source: cosmic-osd-%{ver}-vendor.tar.xz +Source: cosmic-osd-%{commit}.tar.xz +Source: cosmic-osd-%{commit}-vendor.tar.xz BuildRequires: cargo-rpm-macros >= 26 BuildRequires: rustc diff --git a/rpms/cosmic-panel/cosmic-panel.spec b/rpms/cosmic-panel/cosmic-panel.spec index 301d62d..4de539c 100644 --- a/rpms/cosmic-panel/cosmic-panel.spec +++ b/rpms/cosmic-panel/cosmic-panel.spec @@ -6,7 +6,7 @@ %global date ### Name: cosmic-panel -Version: %{ver}~%{date} +Version: %{ver}~git%{date}.%{sub %{commit} 1 7} Release: %autorelease Summary: Panel for the COSMIC Desktop Environment. @@ -34,8 +34,8 @@ License: 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 AND Apache-2.0 OR BSD-3 # LICENSE.dependencies contains a full license breakdown URL: https://github.com/pop-os/cosmic-panel -Source: cosmic-panel-%{ver}.tar.xz -Source: cosmic-panel-%{ver}-vendor.tar.xz +Source: cosmic-panel-%{commit}.tar.xz +Source: cosmic-panel-%{commit}-vendor.tar.xz BuildRequires: cargo-rpm-macros >= 25 BuildRequires: rustc diff --git a/rpms/cosmic-randr/cosmic-randr.spec b/rpms/cosmic-randr/cosmic-randr.spec index f877573..72eb296 100644 --- a/rpms/cosmic-randr/cosmic-randr.spec +++ b/rpms/cosmic-randr/cosmic-randr.spec @@ -6,7 +6,7 @@ %global date ### Name: cosmic-randr -Version: %{ver}~%{date} +Version: %{ver}~git%{date}.%{sub %{commit} 1 7} Release: %autorelease Summary: Cosmic-randr command line interface @@ -26,8 +26,8 @@ License: 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 AND Apache-2.0 OR MIT A # LICENSE.dependencies contains a full license breakdown URL: https://github.com/pop-os/cosmic-randr -Source: cosmic-randr-%{ver}.tar.xz -Source: cosmic-randr-%{ver}-vendor.tar.xz +Source: cosmic-randr-%{commit}.tar.xz +Source: cosmic-randr-%{commit}-vendor.tar.xz BuildRequires: cargo-rpm-macros >= 25 BuildRequires: rustc diff --git a/rpms/cosmic-screenshot/cosmic-screenshot.spec b/rpms/cosmic-screenshot/cosmic-screenshot.spec index 1acddc3..a45238c 100644 --- a/rpms/cosmic-screenshot/cosmic-screenshot.spec +++ b/rpms/cosmic-screenshot/cosmic-screenshot.spec @@ -11,7 +11,7 @@ %global date ### Name: cosmic-screenshot -Version: %{ver}~%{date} +Version: %{ver}~git%{date}.%{sub %{commit} 1 7} Release: %autorelease Summary: Screenshot utility for the COSMIC Desktop Environment. @@ -30,8 +30,8 @@ SourceLicense: GPL-3.0 License: 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 OR MIT AND Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT AND BSD-3-Clause AND MIT AND MIT OR Apache-2.0 AND MIT OR Apache-2.0 OR Zlib AND MIT OR Zlib OR Apache-2.0 AND MPL-2.0 AND Unlicense OR MIT AND Zlib OR Apache-2.0 OR MIT AND LICENSE.dependencies contains a full license breakdown URL: https://github.com/pop-os/cosmic-screenshot -Source: cosmic-screenshot-%{ver}.tar.xz -Source: cosmic-screenshot-%{ver}-vendor.tar.xz +Source: cosmic-screenshot-%{commit}.tar.xz +Source: cosmic-screenshot-%{commit}-vendor.tar.xz BuildRequires: cargo-rpm-macros >= 26 BuildRequires: rustc diff --git a/rpms/cosmic-session/cosmic-session.spec b/rpms/cosmic-session/cosmic-session.spec index 4751165..79cee14 100644 --- a/rpms/cosmic-session/cosmic-session.spec +++ b/rpms/cosmic-session/cosmic-session.spec @@ -11,7 +11,7 @@ %global date ### Name: cosmic-session -Version: %{ver}~%{date} +Version: %{ver}~git%{date}.%{sub %{commit} 1 7} Release: %autorelease Summary: Session manager for the COSMIC desktop environment @@ -34,8 +34,8 @@ License: 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 OR BSD-3-Clause AND Apa # LICENSE.dependencies contains a full license breakdown URL: https://github.com/pop-os/cosmic-session -Source: cosmic-session-%{ver}.tar.xz -Source: cosmic-session-%{ver}-vendor.tar.xz +Source: cosmic-session-%{commit}.tar.xz +Source: cosmic-session-%{commit}-vendor.tar.xz BuildRequires: cargo-rpm-macros >= 26 BuildRequires: rustc diff --git a/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec b/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec index 3abceba..6ece492 100644 --- a/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec +++ b/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec @@ -11,7 +11,7 @@ %global date ### Name: cosmic-settings-daemon -Version: %{ver}~%{date} +Version: %{ver}~git%{date}.%{sub %{commit} 1 7} Release: %autorelease Summary: Settings daemon for the COSMIC Desktop Environment. @@ -39,8 +39,8 @@ License: 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 AND Apache-2.0 OR MIT A # LICENSE.dependencies contains a full license breakdown URL: https://github.com/pop-os/cosmic-settings-daemon -Source: cosmic-settings-daemon-%{ver}.tar.xz -Source: cosmic-settings-daemon-%{ver}-vendor.tar.xz +Source: cosmic-settings-daemon-%{commit}.tar.xz +Source: cosmic-settings-daemon-%{commit}-vendor.tar.xz BuildRequires: cargo-rpm-macros >= 26 BuildRequires: rustc diff --git a/rpms/cosmic-settings/cosmic-settings.spec b/rpms/cosmic-settings/cosmic-settings.spec index 52555f4..55b5dd8 100644 --- a/rpms/cosmic-settings/cosmic-settings.spec +++ b/rpms/cosmic-settings/cosmic-settings.spec @@ -8,7 +8,7 @@ %global date ### Name: cosmic-settings -Version: %{ver}~%{date} +Version: %{ver}~git%{date}.%{sub %{commit} 1 7} Release: %autorelease Summary: Settings app for the COSMIC Desktop Environment. @@ -40,8 +40,8 @@ License: 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 AND Apache-2.0 OR MIT A # LICENSE.dependencies contains a full license breakdown URL: https://github.com/pop-os/cosmic-settings -Source: cosmic-settings-%{ver}.tar.xz -Source: cosmic-settings-%{ver}-vendor.tar.xz +Source: cosmic-settings-%{commit}.tar.xz +Source: cosmic-settings-%{commit}-vendor.tar.xz BuildRequires: cargo-rpm-macros >= 25 BuildRequires: rustc diff --git a/rpms/cosmic-store/cosmic-store.spec b/rpms/cosmic-store/cosmic-store.spec index 2e4f7cd..7d2f579 100644 --- a/rpms/cosmic-store/cosmic-store.spec +++ b/rpms/cosmic-store/cosmic-store.spec @@ -6,7 +6,7 @@ %global date ### Name: cosmic-store -Version: %{ver}~%{date} +Version: %{ver}~git%{date}.%{sub %{commit} 1 7} Release: %autorelease Summary: App store for the COSMIC Desktop Environment. @@ -38,8 +38,8 @@ License: (Apache-2.0 OR MIT) AND BSD-3-Clause AND 0BSD OR MIT OR Apache-2 # LICENSE.dependencies contains a full license breakdown URL: https://github.com/pop-os/cosmic-store -Source: cosmic-store-%{ver}.tar.xz -Source: cosmic-store-%{ver}-vendor.tar.xz +Source: cosmic-store-%{commit}.tar.xz +Source: cosmic-store-%{commit}-vendor.tar.xz BuildRequires: cargo-rpm-macros >= 25 BuildRequires: rustc diff --git a/rpms/cosmic-term/cosmic-term.spec b/rpms/cosmic-term/cosmic-term.spec index 9723931..52d13a5 100644 --- a/rpms/cosmic-term/cosmic-term.spec +++ b/rpms/cosmic-term/cosmic-term.spec @@ -11,7 +11,7 @@ %global date ### Name: cosmic-term -Version: %{ver}~%{date} +Version: %{ver}~git%{date}.%{sub %{commit} 1 7} Release: %autorelease Summary: Terminal emulator built with Libcosmic. @@ -42,8 +42,8 @@ License: 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 AND Apache-2.0 OR BSL-1 # LICENSE.dependencies contains a full license breakdown URL: https://github.com/pop-os/cosmic-term -Source: cosmic-term-%{ver}.tar.xz -Source: cosmic-term-%{ver}-vendor.tar.xz +Source: cosmic-term-%{commit}.tar.xz +Source: cosmic-term-%{commit}-vendor.tar.xz BuildRequires: cargo-rpm-macros >= 26 BuildRequires: rustc diff --git a/rpms/cosmic-workspaces/cosmic-workspaces.spec b/rpms/cosmic-workspaces/cosmic-workspaces.spec index 76db636..b6f78f0 100644 --- a/rpms/cosmic-workspaces/cosmic-workspaces.spec +++ b/rpms/cosmic-workspaces/cosmic-workspaces.spec @@ -11,7 +11,7 @@ %global date ### Name: cosmic-workspaces -Version: %{ver}~%{date} +Version: %{ver}~git%{date}.%{sub %{commit} 1 7} Release: %autorelease Summary: Workspaces overview for the COSMIC Desktop Environment. @@ -40,8 +40,8 @@ License: 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 AND Apache-2.0 OR MIT A # LICENSE.dependencies contains a full license breakdown URL: https://github.com/pop-os/cosmic-workspaces-epoch -Source: cosmic-workspaces-%{ver}.tar.xz -Source: cosmic-workspaces-%{ver}-vendor.tar.xz +Source: cosmic-workspaces-%{commit}.tar.xz +Source: cosmic-workspaces-%{commit}-vendor.tar.xz BuildRequires: cargo-rpm-macros >= 26 BuildRequires: rustc diff --git a/rpms/pop-launcher/pop-launcher.spec b/rpms/pop-launcher/pop-launcher.spec index e9e0d20..22f33ca 100644 --- a/rpms/pop-launcher/pop-launcher.spec +++ b/rpms/pop-launcher/pop-launcher.spec @@ -6,7 +6,7 @@ %global date ### Name: pop-launcher -Version: %{ver}~%{date} +Version: %{ver}~git%{date}.%{sub %{commit} 1 7} Release: %autorelease Summary: Modular IPC-based desktop launcher service. @@ -35,8 +35,8 @@ License: (Apache-2.0 OR MIT) AND BSD-3-Clause AND Apache-2.0 AND Apache-2 # LICENSE.dependencies contains a full license breakdown URL: https://github.com/pop-os/launcher -Source: pop-launcher-%{ver}.tar.xz -Source: pop-launcher-%{ver}-vendor.tar.xz +Source: pop-launcher-%{commit}.tar.xz +Source: pop-launcher-%{commit}-vendor.tar.xz Patch: symlink.patch diff --git a/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec b/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec index 0e09f58..49aac4e 100644 --- a/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec +++ b/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec @@ -11,7 +11,7 @@ %global date ### Name: xdg-desktop-portal-cosmic -Version: %{ver}~%{date} +Version: %{ver}~git%{date}.%{sub %{commit} 1 7} Release: %autorelease Summary: XDG Desktop Portals implementation for the COSMIC Desktop Environment. @@ -40,8 +40,8 @@ License: 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 AND Apache-2.0 OR MIT A # LICENSE.dependencies contains a full license breakdown URL: https://github.com/pop-os/xdg-desktop-portal-cosmic -Source: xdg-desktop-portal-cosmic-%{ver}.tar.xz -Source: xdg-desktop-portal-cosmic-%{ver}-vendor.tar.xz +Source: xdg-desktop-portal-cosmic-%{commit}.tar.xz +Source: xdg-desktop-portal-cosmic-%{commit}-vendor.tar.xz BuildRequires: cargo-rpm-macros >= 26 BuildRequires: rustc diff --git a/scripts/srpm.sh b/scripts/srpm.sh index 153fa71..1cc3e98 100644 --- a/scripts/srpm.sh +++ b/scripts/srpm.sh @@ -14,7 +14,7 @@ repo=$5 LATEST="latest" # Clone repo and cd into it -mkdir $name-$version && cd $name-$version && git clone --recurse-submodules $repo . +mkdir $name-$commit && cd $name-$commit && git clone --recurse-submodules $repo . # Get latest commit hash if commit is set to latest if [[ "$commit" == "$LATEST" ]] @@ -22,9 +22,6 @@ then commit=$(git rev-parse HEAD) fi -# Short commit, used for versioning -short_commit=${commit:0:6} - # Reset to specified commit git reset --hard $commit @@ -32,8 +29,8 @@ git reset --hard $commit cd .. # Zip source -tar -pcJf $name-$version.tar.xz $name-$version -rm -rf $name-$version +tar -pcJf $name-$commit.tar.xz $name-$commit +rm -rf $name-$commit # Get specfile cp $path_to_spec $name.spec 2>/dev/null || : diff --git a/scripts/vendor-srpm.sh b/scripts/vendor-srpm.sh index 4cae3bb..4e0742d 100644 --- a/scripts/vendor-srpm.sh +++ b/scripts/vendor-srpm.sh @@ -14,7 +14,7 @@ repo=$5 LATEST="latest" # Clone repo and cd into it -mkdir $name-$version && cd $name-$version && git clone --recurse-submodules $repo . +mkdir $name-$commit && cd $name-$commit && git clone --recurse-submodules $repo . # Get latest commit hash if commit is set to latest if [[ "$commit" == "$LATEST" ]] @@ -22,22 +22,19 @@ then commit=$(git rev-parse HEAD) fi -# Short commit, used for versioning -short_commit=${commit:0:6} - # Reset to specified commit git reset --hard $commit # Vendor dependencies and zip vendor mkdir .vendor cargo vendor > .vendor/config.toml -tar -pcJf $name-$version-vendor.tar.xz vendor && mv $name-$version-vendor.tar.xz ../$name-$version-vendor.tar.xz +tar -pcJf $name-$commit-vendor.tar.xz vendor && mv $name-$commit-vendor.tar.xz ../$name-$commit-vendor.tar.xz # Back into parent directory rm -rf vendor && cd .. # Zip source -tar -pcJf $name-$version.tar.xz $name-$version -rm -rf $name-$version +tar -pcJf $name-$commit.tar.xz $name-$commit +rm -rf $name-$commit # Get specfile cp $path_to_spec $name.spec 2>/dev/null || : From c30092f8a3c9aa05df136796993df672084aac8b Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Apr 19 2024 00:05:33 +0000 Subject: [PATCH 121/220] fix (all) --- diff --git a/rpms/cosmic-app-library/cosmic-app-library.spec b/rpms/cosmic-app-library/cosmic-app-library.spec index 5e8ff9d..307d159 100644 --- a/rpms/cosmic-app-library/cosmic-app-library.spec +++ b/rpms/cosmic-app-library/cosmic-app-library.spec @@ -56,7 +56,7 @@ BuildRequires: just %description %{_description} %prep -%autosetup -n %{crate}-%{ver} -p1 -a1 +%autosetup -n %{crate}-%{commit} -p1 -a1 %cargo_prep -N cat .vendor/config.toml >> .cargo/config diff --git a/rpms/cosmic-applets/cosmic-applets.spec b/rpms/cosmic-applets/cosmic-applets.spec index 6eddf33..fb85906 100644 --- a/rpms/cosmic-applets/cosmic-applets.spec +++ b/rpms/cosmic-applets/cosmic-applets.spec @@ -63,7 +63,7 @@ Requires: cosmic-panel %description %{_description} %prep -%autosetup -n cosmic-applets-%{ver} -p1 -a1 +%autosetup -n cosmic-applets-%{commit} -p1 -a1 %cargo_prep -N cat .vendor/config.toml >> .cargo/config diff --git a/rpms/cosmic-bg/cosmic-bg.spec b/rpms/cosmic-bg/cosmic-bg.spec index 0a1bcd1..44ca2ef 100644 --- a/rpms/cosmic-bg/cosmic-bg.spec +++ b/rpms/cosmic-bg/cosmic-bg.spec @@ -48,7 +48,7 @@ Requires: cosmic-session %description %{_description} %prep -%autosetup -n cosmic-bg-%{ver} -p1 -a1 +%autosetup -n cosmic-bg-%{commit} -p1 -a1 %cargo_prep -N cat .vendor/config.toml >> .cargo/config diff --git a/rpms/cosmic-comp/cosmic-comp.spec b/rpms/cosmic-comp/cosmic-comp.spec index e16c7b3..a4965c6 100644 --- a/rpms/cosmic-comp/cosmic-comp.spec +++ b/rpms/cosmic-comp/cosmic-comp.spec @@ -66,7 +66,7 @@ Recommends: cosmic-session %description %{_description} %prep -%autosetup -n cosmic-comp-%{ver} -p1 -a1 +%autosetup -n cosmic-comp-%{commit} -p1 -a1 %cargo_prep -N cat .vendor/config.toml >> .cargo/config diff --git a/rpms/cosmic-edit/cosmic-edit.spec b/rpms/cosmic-edit/cosmic-edit.spec index c8fc814..e4776f0 100644 --- a/rpms/cosmic-edit/cosmic-edit.spec +++ b/rpms/cosmic-edit/cosmic-edit.spec @@ -60,7 +60,7 @@ BuildRequires: git-core %description %{_description} %prep -%autosetup -n %{crate}-%{ver} -p1 -a1 +%autosetup -n %{crate}-%{commit} -p1 -a1 %cargo_prep -N cat .vendor/config.toml >> .cargo/config diff --git a/rpms/cosmic-files/cosmic-files.spec b/rpms/cosmic-files/cosmic-files.spec index 483157e..4a60b5b 100644 --- a/rpms/cosmic-files/cosmic-files.spec +++ b/rpms/cosmic-files/cosmic-files.spec @@ -59,7 +59,7 @@ BuildRequires: git-core %description %{_description} %prep -%autosetup -n %{crate}-%{ver} -p1 -a1 +%autosetup -n %{crate}-%{commit} -p1 -a1 %cargo_prep -N cat .vendor/config.toml >> .cargo/config diff --git a/rpms/cosmic-greeter/cosmic-greeter.spec b/rpms/cosmic-greeter/cosmic-greeter.spec index 8df9278..4bb3680 100644 --- a/rpms/cosmic-greeter/cosmic-greeter.spec +++ b/rpms/cosmic-greeter/cosmic-greeter.spec @@ -65,7 +65,7 @@ Requires: cosmic-comp %description %{_description} %prep -%autosetup -n cosmic-greeter-%{ver} -p1 -a1 +%autosetup -n cosmic-greeter-%{commit} -p1 -a1 %cargo_prep -N cat .vendor/config.toml >> .cargo/config diff --git a/rpms/cosmic-launcher/cosmic-launcher.spec b/rpms/cosmic-launcher/cosmic-launcher.spec index f59ff38..052f3f5 100644 --- a/rpms/cosmic-launcher/cosmic-launcher.spec +++ b/rpms/cosmic-launcher/cosmic-launcher.spec @@ -61,7 +61,7 @@ Requires: pop-launcher %description %{_description} %prep -%autosetup -n %{crate}-%{ver} -p1 -a1 +%autosetup -n %{crate}-%{commit} -p1 -a1 %cargo_prep -N cat .vendor/config.toml >> .cargo/config diff --git a/rpms/cosmic-notifications/cosmic-notifications.spec b/rpms/cosmic-notifications/cosmic-notifications.spec index 7ebf982..3d621df 100644 --- a/rpms/cosmic-notifications/cosmic-notifications.spec +++ b/rpms/cosmic-notifications/cosmic-notifications.spec @@ -54,7 +54,7 @@ BuildRequires: just %description %{_description} %prep -%autosetup -n cosmic-notifications-%{ver} -p1 -a1 +%autosetup -n cosmic-notifications-%{commit} -p1 -a1 %cargo_prep -N cat .vendor/config.toml >> .cargo/config diff --git a/rpms/cosmic-osd/cosmic-osd.spec b/rpms/cosmic-osd/cosmic-osd.spec index 16ca145..1af704e 100644 --- a/rpms/cosmic-osd/cosmic-osd.spec +++ b/rpms/cosmic-osd/cosmic-osd.spec @@ -59,7 +59,7 @@ BuildRequires: make %description %{_description} %prep -%autosetup -n %{crate}-%{ver} -p1 -a1 +%autosetup -n %{crate}-%{commit} -p1 -a1 %cargo_prep -N cat .vendor/config.toml >> .cargo/config diff --git a/rpms/cosmic-panel/cosmic-panel.spec b/rpms/cosmic-panel/cosmic-panel.spec index 4de539c..b0001ea 100644 --- a/rpms/cosmic-panel/cosmic-panel.spec +++ b/rpms/cosmic-panel/cosmic-panel.spec @@ -51,7 +51,7 @@ BuildRequires: just %description %{_description} %prep -%autosetup -n cosmic-panel-%{ver} -p1 -a1 +%autosetup -n cosmic-panel-%{commit} -p1 -a1 %cargo_prep -N cat .vendor/config.toml >> .cargo/config diff --git a/rpms/cosmic-randr/cosmic-randr.spec b/rpms/cosmic-randr/cosmic-randr.spec index 72eb296..727bf66 100644 --- a/rpms/cosmic-randr/cosmic-randr.spec +++ b/rpms/cosmic-randr/cosmic-randr.spec @@ -42,7 +42,7 @@ Cosmic-randr command line interface.} %description %{_description} %prep -%autosetup -n cosmic-randr-%{ver} -p1 -a1 +%autosetup -n cosmic-randr-%{commit} -p1 -a1 %cargo_prep -N cat .vendor/config.toml >> .cargo/config diff --git a/rpms/cosmic-screenshot/cosmic-screenshot.spec b/rpms/cosmic-screenshot/cosmic-screenshot.spec index a45238c..ba8d328 100644 --- a/rpms/cosmic-screenshot/cosmic-screenshot.spec +++ b/rpms/cosmic-screenshot/cosmic-screenshot.spec @@ -45,7 +45,7 @@ BuildRequires: just %description %{_description} %prep -%autosetup -n %{crate}-%{ver} -p1 -a1 +%autosetup -n %{crate}-%{commit} -p1 -a1 %cargo_prep -N cat .vendor/config.toml >> .cargo/config diff --git a/rpms/cosmic-session/cosmic-session.spec b/rpms/cosmic-session/cosmic-session.spec index 79cee14..7ebd239 100644 --- a/rpms/cosmic-session/cosmic-session.spec +++ b/rpms/cosmic-session/cosmic-session.spec @@ -71,7 +71,7 @@ The session manager for the COSMIC desktop environment.} %description %{_description} %prep -%autosetup -n %{crate}-%{ver} -p1 -a1 +%autosetup -n %{crate}-%{commit} -p1 -a1 %cargo_prep -N cat .vendor/config.toml >> .cargo/config diff --git a/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec b/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec index 6ece492..47288ab 100644 --- a/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec +++ b/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec @@ -58,7 +58,7 @@ Requires: acpid %description %{_description} %prep -%autosetup -n %{crate}-%{ver} -p1 -a1 +%autosetup -n %{crate}-%{commit} -p1 -a1 %cargo_prep -N cat .vendor/config.toml >> .cargo/config diff --git a/rpms/cosmic-settings/cosmic-settings.spec b/rpms/cosmic-settings/cosmic-settings.spec index 55b5dd8..c2be155 100644 --- a/rpms/cosmic-settings/cosmic-settings.spec +++ b/rpms/cosmic-settings/cosmic-settings.spec @@ -59,7 +59,7 @@ BuildRequires: just %description %{_description} %prep -%autosetup -n cosmic-settings-%{ver} -p1 -a1 +%autosetup -n cosmic-settings-%{commit} -p1 -a1 %cargo_prep -N cat .vendor/config.toml >> .cargo/config diff --git a/rpms/cosmic-store/cosmic-store.spec b/rpms/cosmic-store/cosmic-store.spec index 7d2f579..0a4f3ed 100644 --- a/rpms/cosmic-store/cosmic-store.spec +++ b/rpms/cosmic-store/cosmic-store.spec @@ -58,7 +58,7 @@ Requires: flatpak-libs %description %{_description} %prep -%autosetup -n cosmic-store-%{ver} -p1 -a1 +%autosetup -n cosmic-store-%{commit} -p1 -a1 %cargo_prep -N cat .vendor/config.toml >> .cargo/config diff --git a/rpms/cosmic-term/cosmic-term.spec b/rpms/cosmic-term/cosmic-term.spec index 52d13a5..4ce5991 100644 --- a/rpms/cosmic-term/cosmic-term.spec +++ b/rpms/cosmic-term/cosmic-term.spec @@ -59,7 +59,7 @@ BuildRequires: git-core %description %{_description} %prep -%autosetup -n %{crate}-%{ver} -p1 -a1 +%autosetup -n %{crate}-%{commit} -p1 -a1 %cargo_prep -N cat .vendor/config.toml >> .cargo/config diff --git a/rpms/cosmic-workspaces/cosmic-workspaces.spec b/rpms/cosmic-workspaces/cosmic-workspaces.spec index b6f78f0..3b5af4b 100644 --- a/rpms/cosmic-workspaces/cosmic-workspaces.spec +++ b/rpms/cosmic-workspaces/cosmic-workspaces.spec @@ -64,7 +64,7 @@ Requires: cosmic-comp %description %{_description} %prep -%autosetup -n %{crate}-%{ver} -p1 -a1 +%autosetup -n %{crate}-%{commit} -p1 -a1 %cargo_prep -N cat .vendor/config.toml >> .cargo/config diff --git a/rpms/pop-launcher/pop-launcher.spec b/rpms/pop-launcher/pop-launcher.spec index 22f33ca..d2d5ed6 100644 --- a/rpms/pop-launcher/pop-launcher.spec +++ b/rpms/pop-launcher/pop-launcher.spec @@ -57,7 +57,7 @@ Requires: fd-find %description %{_description} %prep -%autosetup -n pop-launcher-%{ver} -p1 -a1 +%autosetup -n pop-launcher-%{commit} -p1 -a1 %cargo_prep -N cat .vendor/config.toml >> .cargo/config diff --git a/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec b/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec index 49aac4e..422fa10 100644 --- a/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec +++ b/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec @@ -63,7 +63,7 @@ BuildRequires: just %description %{_description} %prep -%autosetup -n %{crate}-%{ver} -p1 -a1 +%autosetup -n %{crate}-%{commit} -p1 -a1 %cargo_prep -N cat .vendor/config.toml >> .cargo/config From dea9392ddebc0506f215ecff45fb765d79763092 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Apr 19 2024 00:13:26 +0000 Subject: [PATCH 122/220] Update vendor-srpm.sh --- diff --git a/scripts/vendor-srpm.sh b/scripts/vendor-srpm.sh index 4e0742d..6c0b45e 100644 --- a/scripts/vendor-srpm.sh +++ b/scripts/vendor-srpm.sh @@ -20,6 +20,7 @@ mkdir $name-$commit && cd $name-$commit && git clone --recurse-submodules $repo if [[ "$commit" == "$LATEST" ]] then commit=$(git rev-parse HEAD) + cd .. && mv $name-latest $name-$commit fi # Reset to specified commit From 64ab3b75291996bc63a0066aecfc32660151d37f Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Apr 19 2024 02:15:44 +0000 Subject: [PATCH 123/220] Update vendor-srpm.sh --- diff --git a/scripts/vendor-srpm.sh b/scripts/vendor-srpm.sh index 6c0b45e..8cc2988 100644 --- a/scripts/vendor-srpm.sh +++ b/scripts/vendor-srpm.sh @@ -20,7 +20,7 @@ mkdir $name-$commit && cd $name-$commit && git clone --recurse-submodules $repo if [[ "$commit" == "$LATEST" ]] then commit=$(git rev-parse HEAD) - cd .. && mv $name-latest $name-$commit + cd .. && mv $name-latest $name-$commit && cd $name-$commit fi # Reset to specified commit From 97833877783e6ba3dc703f07f6dd43546a70ea23 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Apr 19 2024 02:31:48 +0000 Subject: [PATCH 124/220] Update cosmic-icons.spec --- diff --git a/rpms/cosmic-icons/cosmic-icons.spec b/rpms/cosmic-icons/cosmic-icons.spec index 681f50d..dc1c8d6 100644 --- a/rpms/cosmic-icons/cosmic-icons.spec +++ b/rpms/cosmic-icons/cosmic-icons.spec @@ -24,7 +24,7 @@ Requires: pop-icon-theme %description %{_description} %prep -%autosetup -n cosmic-icons-%{ver} +%autosetup -n cosmic-icons-%{commit} %build From d06c1168a323559554a9eed83ed607c2ee578fab Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Apr 19 2024 02:57:40 +0000 Subject: [PATCH 125/220] Add instructions to create sources --- diff --git a/rpms/cosmic-app-library/cosmic-app-library.spec b/rpms/cosmic-app-library/cosmic-app-library.spec index 307d159..311d359 100644 --- a/rpms/cosmic-app-library/cosmic-app-library.spec +++ b/rpms/cosmic-app-library/cosmic-app-library.spec @@ -39,6 +39,13 @@ License: 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 AND Apache-2.0 OR MIT A # LICENSE.dependencies contains a full license breakdown URL: https://github.com/pop-os/cosmic-applibrary + +# To create these sources: +# * git clone the repository +# * cargo vendor > .vendor/config.toml +# * tar -pcJf $name-$commit-vendor.tar.xz and move +# the tar out of the repo directory +# * tar -pcJf $name-$commit.tar.xz Source: cosmic-app-library-%{commit}.tar.xz Source: cosmic-app-library-%{commit}-vendor.tar.xz diff --git a/rpms/cosmic-applets/cosmic-applets.spec b/rpms/cosmic-applets/cosmic-applets.spec index fb85906..63beea0 100644 --- a/rpms/cosmic-applets/cosmic-applets.spec +++ b/rpms/cosmic-applets/cosmic-applets.spec @@ -35,6 +35,13 @@ License: 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 AND Apache-2.0 OR MIT A # LICENSE.dependencies contains a full license breakdown URL: https://github.com/pop-os/cosmic-applets + +# To create these sources: +# * git clone the repository +# * cargo vendor > .vendor/config.toml +# * tar -pcJf $name-$commit-vendor.tar.xz and move +# the tar out of the repo directory +# * tar -pcJf $name-$commit.tar.xz Source: cosmic-applets-%{commit}.tar.xz Source: cosmic-applets-%{commit}-vendor.tar.xz diff --git a/rpms/cosmic-bg/cosmic-bg.spec b/rpms/cosmic-bg/cosmic-bg.spec index 44ca2ef..8387f74 100644 --- a/rpms/cosmic-bg/cosmic-bg.spec +++ b/rpms/cosmic-bg/cosmic-bg.spec @@ -29,6 +29,13 @@ License: 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 OR MIT AND Apache-2.0 W # LICENSE.dependencies contains a full license breakdown URL: https://github.com/pop-os/cosmic-bg + +# To create these sources: +# * git clone the repository +# * cargo vendor > .vendor/config.toml +# * tar -pcJf $name-$commit-vendor.tar.xz and move +# the tar out of the repo directory +# * tar -pcJf $name-$commit.tar.xz Source: cosmic-bg-%{commit}.tar.xz Source: cosmic-bg-%{commit}-vendor.tar.xz diff --git a/rpms/cosmic-comp/cosmic-comp.spec b/rpms/cosmic-comp/cosmic-comp.spec index a4965c6..a5d5a8e 100644 --- a/rpms/cosmic-comp/cosmic-comp.spec +++ b/rpms/cosmic-comp/cosmic-comp.spec @@ -40,6 +40,13 @@ License: GPL-3.0 AND (Apache-2.0 OR MIT) AND BSD-3-Clause AND 0BSD OR MIT # LICENSE.dependencies contains a full license breakdown URL: https://github.com/pop-os/cosmic-comp + +# To create these sources: +# * git clone the repository +# * cargo vendor > .vendor/config.toml +# * tar -pcJf $name-$commit-vendor.tar.xz and move +# the tar out of the repo directory +# * tar -pcJf $name-$commit.tar.xz Source: cosmic-comp-%{commit}.tar.xz Source: cosmic-comp-%{commit}-vendor.tar.xz diff --git a/rpms/cosmic-edit/cosmic-edit.spec b/rpms/cosmic-edit/cosmic-edit.spec index e4776f0..26e50e9 100644 --- a/rpms/cosmic-edit/cosmic-edit.spec +++ b/rpms/cosmic-edit/cosmic-edit.spec @@ -43,6 +43,13 @@ License: (Apache-2.0 OR MIT) AND BSD-3-Clause AND 0BSD OR MIT OR Apache-2 # LICENSE.dependencies contains a full license breakdown URL: https://github.com/pop-os/cosmic-edit + +# To create these sources: +# * git clone the repository +# * cargo vendor > .vendor/config.toml +# * tar -pcJf $name-$commit-vendor.tar.xz and move +# the tar out of the repo directory +# * tar -pcJf $name-$commit.tar.xz Source: cosmic-edit-%{commit}.tar.xz Source: cosmic-edit-%{commit}-vendor.tar.xz diff --git a/rpms/cosmic-files/cosmic-files.spec b/rpms/cosmic-files/cosmic-files.spec index 4a60b5b..95bf9e7 100644 --- a/rpms/cosmic-files/cosmic-files.spec +++ b/rpms/cosmic-files/cosmic-files.spec @@ -42,6 +42,13 @@ License: 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 AND Apache-2.0 OR BSL-1 # LICENSE.dependencies contains a full license breakdown URL: https://github.com/pop-os/cosmic-files + +# To create these sources: +# * git clone the repository +# * cargo vendor > .vendor/config.toml +# * tar -pcJf $name-$commit-vendor.tar.xz and move +# the tar out of the repo directory +# * tar -pcJf $name-$commit.tar.xz Source: cosmic-files-%{commit}.tar.xz Source: cosmic-files-%{commit}-vendor.tar.xz diff --git a/rpms/cosmic-greeter/cosmic-greeter.spec b/rpms/cosmic-greeter/cosmic-greeter.spec index 4bb3680..a6bbefc 100644 --- a/rpms/cosmic-greeter/cosmic-greeter.spec +++ b/rpms/cosmic-greeter/cosmic-greeter.spec @@ -36,6 +36,13 @@ License: 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 AND Apache-2.0 OR BSL-1 # LICENSE.dependencies contains a full license breakdown URL: https://github.com/pop-os/cosmic-greeter + +# To create these sources: +# * git clone the repository +# * cargo vendor > .vendor/config.toml +# * tar -pcJf $name-$commit-vendor.tar.xz and move +# the tar out of the repo directory +# * tar -pcJf $name-$commit.tar.xz Source: cosmic-greeter-%{commit}.tar.xz Source: cosmic-greeter-%{commit}-vendor.tar.xz diff --git a/rpms/cosmic-icons/cosmic-icons.spec b/rpms/cosmic-icons/cosmic-icons.spec index dc1c8d6..7a5690f 100644 --- a/rpms/cosmic-icons/cosmic-icons.spec +++ b/rpms/cosmic-icons/cosmic-icons.spec @@ -12,6 +12,10 @@ Summary: Icon theme for the COSMIC Desktop Environment. License: CC-BY-SA-4.0 URL: https://github.com/pop-os/cosmic-icons + +# To create this source: +# * git clone the repository +# * tar -pcJf $name-$commit.tar.xz Source: cosmic-icons-%{commit}.tar.xz BuildRequires: just diff --git a/rpms/cosmic-launcher/cosmic-launcher.spec b/rpms/cosmic-launcher/cosmic-launcher.spec index 052f3f5..2884502 100644 --- a/rpms/cosmic-launcher/cosmic-launcher.spec +++ b/rpms/cosmic-launcher/cosmic-launcher.spec @@ -42,6 +42,13 @@ License: 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 AND Apache-2.0 OR BSL-1 # LICENSE.dependencies contains a full license breakdown URL: https://github.com/pop-os/cosmic-launcher + +# To create these sources: +# * git clone the repository +# * cargo vendor > .vendor/config.toml +# * tar -pcJf $name-$commit-vendor.tar.xz and move +# the tar out of the repo directory +# * tar -pcJf $name-$commit.tar.xz Source: cosmic-launcher-%{commit}.tar.xz Source: cosmic-launcher-%{commit}-vendor.tar.xz diff --git a/rpms/cosmic-notifications/cosmic-notifications.spec b/rpms/cosmic-notifications/cosmic-notifications.spec index 3d621df..1d8a273 100644 --- a/rpms/cosmic-notifications/cosmic-notifications.spec +++ b/rpms/cosmic-notifications/cosmic-notifications.spec @@ -37,6 +37,13 @@ License: 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 AND Apache-2.0 OR BSD-3 # LICENSE.dependencies contains a full license breakdown URL: https://github.com/pop-os/cosmic-notifications + +# To create these sources: +# * git clone the repository +# * cargo vendor > .vendor/config.toml +# * tar -pcJf $name-$commit-vendor.tar.xz and move +# the tar out of the repo directory +# * tar -pcJf $name-$commit.tar.xz Source: cosmic-notifications-%{commit}.tar.xz Source: cosmic-notifications-%{commit}-vendor.tar.xz diff --git a/rpms/cosmic-osd/cosmic-osd.spec b/rpms/cosmic-osd/cosmic-osd.spec index 1af704e..9842d51 100644 --- a/rpms/cosmic-osd/cosmic-osd.spec +++ b/rpms/cosmic-osd/cosmic-osd.spec @@ -40,6 +40,13 @@ License: 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 AND Apache-2.0 OR MIT A # LICENSE.dependencies contains a full license breakdown URL: https://github.com/pop-os/cosmic-osd + +# To create these sources: +# * git clone the repository +# * cargo vendor > .vendor/config.toml +# * tar -pcJf $name-$commit-vendor.tar.xz and move +# the tar out of the repo directory +# * tar -pcJf $name-$commit.tar.xz Source: cosmic-osd-%{commit}.tar.xz Source: cosmic-osd-%{commit}-vendor.tar.xz diff --git a/rpms/cosmic-panel/cosmic-panel.spec b/rpms/cosmic-panel/cosmic-panel.spec index b0001ea..b05e974 100644 --- a/rpms/cosmic-panel/cosmic-panel.spec +++ b/rpms/cosmic-panel/cosmic-panel.spec @@ -34,6 +34,13 @@ License: 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 AND Apache-2.0 OR BSD-3 # LICENSE.dependencies contains a full license breakdown URL: https://github.com/pop-os/cosmic-panel + +# To create these sources: +# * git clone the repository +# * cargo vendor > .vendor/config.toml +# * tar -pcJf $name-$commit-vendor.tar.xz and move +# the tar out of the repo directory +# * tar -pcJf $name-$commit.tar.xz Source: cosmic-panel-%{commit}.tar.xz Source: cosmic-panel-%{commit}-vendor.tar.xz diff --git a/rpms/cosmic-player/cosmic-player.spec b/rpms/cosmic-player/cosmic-player.spec index 8d17bd9..cf5b5db 100644 --- a/rpms/cosmic-player/cosmic-player.spec +++ b/rpms/cosmic-player/cosmic-player.spec @@ -18,6 +18,13 @@ License: # FIXME # FIXME: No license information in crate metadata. URL: # FIXME + +# To create these sources: +# * git clone the repository +# * cargo vendor > .vendor/config.toml +# * tar -pcJf $name-$commit-vendor.tar.xz and move +# the tar out of the repo directory +# * tar -pcJf $name-$commit.tar.xz Source: # FIXME Source: cosmic-player-0.1.0-vendor.tar.xz diff --git a/rpms/cosmic-randr/cosmic-randr.spec b/rpms/cosmic-randr/cosmic-randr.spec index 727bf66..3963cd3 100644 --- a/rpms/cosmic-randr/cosmic-randr.spec +++ b/rpms/cosmic-randr/cosmic-randr.spec @@ -26,6 +26,13 @@ License: 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 AND Apache-2.0 OR MIT A # LICENSE.dependencies contains a full license breakdown URL: https://github.com/pop-os/cosmic-randr + +# To create these sources: +# * git clone the repository +# * cargo vendor > .vendor/config.toml +# * tar -pcJf $name-$commit-vendor.tar.xz and move +# the tar out of the repo directory +# * tar -pcJf $name-$commit.tar.xz Source: cosmic-randr-%{commit}.tar.xz Source: cosmic-randr-%{commit}-vendor.tar.xz diff --git a/rpms/cosmic-screenshot/cosmic-screenshot.spec b/rpms/cosmic-screenshot/cosmic-screenshot.spec index ba8d328..76a867d 100644 --- a/rpms/cosmic-screenshot/cosmic-screenshot.spec +++ b/rpms/cosmic-screenshot/cosmic-screenshot.spec @@ -30,6 +30,13 @@ SourceLicense: GPL-3.0 License: 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 OR MIT AND Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT AND BSD-3-Clause AND MIT AND MIT OR Apache-2.0 AND MIT OR Apache-2.0 OR Zlib AND MIT OR Zlib OR Apache-2.0 AND MPL-2.0 AND Unlicense OR MIT AND Zlib OR Apache-2.0 OR MIT AND LICENSE.dependencies contains a full license breakdown URL: https://github.com/pop-os/cosmic-screenshot + +# To create these sources: +# * git clone the repository +# * cargo vendor > .vendor/config.toml +# * tar -pcJf $name-$commit-vendor.tar.xz and move +# the tar out of the repo directory +# * tar -pcJf $name-$commit.tar.xz Source: cosmic-screenshot-%{commit}.tar.xz Source: cosmic-screenshot-%{commit}-vendor.tar.xz diff --git a/rpms/cosmic-session/cosmic-session.spec b/rpms/cosmic-session/cosmic-session.spec index 7ebd239..aa0fa7c 100644 --- a/rpms/cosmic-session/cosmic-session.spec +++ b/rpms/cosmic-session/cosmic-session.spec @@ -34,6 +34,13 @@ License: 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 OR BSD-3-Clause AND Apa # LICENSE.dependencies contains a full license breakdown URL: https://github.com/pop-os/cosmic-session + +# To create these sources: +# * git clone the repository +# * cargo vendor > .vendor/config.toml +# * tar -pcJf $name-$commit-vendor.tar.xz and move +# the tar out of the repo directory +# * tar -pcJf $name-$commit.tar.xz Source: cosmic-session-%{commit}.tar.xz Source: cosmic-session-%{commit}-vendor.tar.xz diff --git a/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec b/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec index 47288ab..c60e0c5 100644 --- a/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec +++ b/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec @@ -39,6 +39,13 @@ License: 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 AND Apache-2.0 OR MIT A # LICENSE.dependencies contains a full license breakdown URL: https://github.com/pop-os/cosmic-settings-daemon + +# To create these sources: +# * git clone the repository +# * cargo vendor > .vendor/config.toml +# * tar -pcJf $name-$commit-vendor.tar.xz and move +# the tar out of the repo directory +# * tar -pcJf $name-$commit.tar.xz Source: cosmic-settings-daemon-%{commit}.tar.xz Source: cosmic-settings-daemon-%{commit}-vendor.tar.xz diff --git a/rpms/cosmic-settings/cosmic-settings.spec b/rpms/cosmic-settings/cosmic-settings.spec index c2be155..8f75d2b 100644 --- a/rpms/cosmic-settings/cosmic-settings.spec +++ b/rpms/cosmic-settings/cosmic-settings.spec @@ -40,6 +40,13 @@ License: 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 AND Apache-2.0 OR MIT A # LICENSE.dependencies contains a full license breakdown URL: https://github.com/pop-os/cosmic-settings + +# To create these sources: +# * git clone the repository +# * cargo vendor > .vendor/config.toml +# * tar -pcJf $name-$commit-vendor.tar.xz and move +# the tar out of the repo directory +# * tar -pcJf $name-$commit.tar.xz Source: cosmic-settings-%{commit}.tar.xz Source: cosmic-settings-%{commit}-vendor.tar.xz diff --git a/rpms/cosmic-store/cosmic-store.spec b/rpms/cosmic-store/cosmic-store.spec index 0a4f3ed..3a52cc1 100644 --- a/rpms/cosmic-store/cosmic-store.spec +++ b/rpms/cosmic-store/cosmic-store.spec @@ -38,6 +38,13 @@ License: (Apache-2.0 OR MIT) AND BSD-3-Clause AND 0BSD OR MIT OR Apache-2 # LICENSE.dependencies contains a full license breakdown URL: https://github.com/pop-os/cosmic-store + +# To create these sources: +# * git clone the repository +# * cargo vendor > .vendor/config.toml +# * tar -pcJf $name-$commit-vendor.tar.xz and move +# the tar out of the repo directory +# * tar -pcJf $name-$commit.tar.xz Source: cosmic-store-%{commit}.tar.xz Source: cosmic-store-%{commit}-vendor.tar.xz diff --git a/rpms/cosmic-term/cosmic-term.spec b/rpms/cosmic-term/cosmic-term.spec index 4ce5991..ffd814e 100644 --- a/rpms/cosmic-term/cosmic-term.spec +++ b/rpms/cosmic-term/cosmic-term.spec @@ -42,6 +42,13 @@ License: 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 AND Apache-2.0 OR BSL-1 # LICENSE.dependencies contains a full license breakdown URL: https://github.com/pop-os/cosmic-term + +# To create these sources: +# * git clone the repository +# * cargo vendor > .vendor/config.toml +# * tar -pcJf $name-$commit-vendor.tar.xz and move +# the tar out of the repo directory +# * tar -pcJf $name-$commit.tar.xz Source: cosmic-term-%{commit}.tar.xz Source: cosmic-term-%{commit}-vendor.tar.xz diff --git a/rpms/cosmic-workspaces/cosmic-workspaces.spec b/rpms/cosmic-workspaces/cosmic-workspaces.spec index 3b5af4b..33e0b3b 100644 --- a/rpms/cosmic-workspaces/cosmic-workspaces.spec +++ b/rpms/cosmic-workspaces/cosmic-workspaces.spec @@ -40,6 +40,13 @@ License: 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 AND Apache-2.0 OR MIT A # LICENSE.dependencies contains a full license breakdown URL: https://github.com/pop-os/cosmic-workspaces-epoch + +# To create these sources: +# * git clone the repository +# * cargo vendor > .vendor/config.toml +# * tar -pcJf $name-$commit-vendor.tar.xz and move +# the tar out of the repo directory +# * tar -pcJf $name-$commit.tar.xz Source: cosmic-workspaces-%{commit}.tar.xz Source: cosmic-workspaces-%{commit}-vendor.tar.xz diff --git a/rpms/pop-launcher/pop-launcher.spec b/rpms/pop-launcher/pop-launcher.spec index d2d5ed6..4cba5fb 100644 --- a/rpms/pop-launcher/pop-launcher.spec +++ b/rpms/pop-launcher/pop-launcher.spec @@ -35,6 +35,13 @@ License: (Apache-2.0 OR MIT) AND BSD-3-Clause AND Apache-2.0 AND Apache-2 # LICENSE.dependencies contains a full license breakdown URL: https://github.com/pop-os/launcher + +# To create these sources: +# * git clone the repository +# * cargo vendor > .vendor/config.toml +# * tar -pcJf $name-$commit-vendor.tar.xz and move +# the tar out of the repo directory +# * tar -pcJf $name-$commit.tar.xz Source: pop-launcher-%{commit}.tar.xz Source: pop-launcher-%{commit}-vendor.tar.xz diff --git a/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec b/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec index 422fa10..3fd8499 100644 --- a/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec +++ b/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec @@ -40,6 +40,13 @@ License: 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 AND Apache-2.0 OR MIT A # LICENSE.dependencies contains a full license breakdown URL: https://github.com/pop-os/xdg-desktop-portal-cosmic + +# To create these sources: +# * git clone the repository +# * cargo vendor > .vendor/config.toml +# * tar -pcJf $name-$commit-vendor.tar.xz and move +# the tar out of the repo directory +# * tar -pcJf $name-$commit.tar.xz Source: xdg-desktop-portal-cosmic-%{commit}.tar.xz Source: xdg-desktop-portal-cosmic-%{commit}-vendor.tar.xz From 079b621bf740f8c7e33b4da42634fa8381e18a32 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Apr 19 2024 02:59:37 +0000 Subject: [PATCH 126/220] Update srpm.sh --- diff --git a/scripts/srpm.sh b/scripts/srpm.sh index 1cc3e98..cb3f21d 100644 --- a/scripts/srpm.sh +++ b/scripts/srpm.sh @@ -20,6 +20,7 @@ mkdir $name-$commit && cd $name-$commit && git clone --recurse-submodules $repo if [[ "$commit" == "$LATEST" ]] then commit=$(git rev-parse HEAD) + cd .. && mv $name-latest $name-$commit && cd $name-$commit fi # Reset to specified commit From 85f31fa6f5fa694c3fd3c14e0a7acc6a8ac3f1fe Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Apr 23 2024 03:03:58 +0000 Subject: [PATCH 127/220] trying out cargo vendor again --- diff --git a/rpms/cosmic-comp/cosmic-comp.spec b/rpms/cosmic-comp/cosmic-comp.spec index a5d5a8e..ca13e2a 100644 --- a/rpms/cosmic-comp/cosmic-comp.spec +++ b/rpms/cosmic-comp/cosmic-comp.spec @@ -72,6 +72,8 @@ Recommends: cosmic-session %description %{_description} +%define git_versioning sed 's/\([[:alnum:][:punct:]]* v[0-9.]*\) (https:\/\/github.com\/[^#]*#\([a-f0-9]*\))/\1^git\2/' -i cargo-vendor.txt + %prep %autosetup -n cosmic-comp-%{commit} -p1 -a1 %cargo_prep -N @@ -82,6 +84,8 @@ cat .vendor/config.toml >> .cargo/config %{cargo_license_summary} %{cargo_license} > LICENSE.dependencies %{cargo_vendor_manifest} +%{git_versioning} + %install make install DESTDIR=%{buildroot} prefix=%{_prefix} @@ -95,7 +99,7 @@ install -Dm0644 config.ron %{buildroot}/%{_sysconfdir}/cosmic-comp/config.ron %files %license LICENSE %license LICENSE.dependencies -# %%license cargo-vendor.txt +%license cargo-vendor.txt %{_bindir}/cosmic-comp %config(noreplace) %{_sysconfdir}/cosmic-comp/config.ron diff --git a/scripts/cargo_license_vendor.txt b/scripts/cargo_license_vendor.txt new file mode 100644 index 0000000..5e4b3da --- /dev/null +++ b/scripts/cargo_license_vendor.txt @@ -0,0 +1,3 @@ +cargo tree --offline --workspace --edges normal,build,dev --no-dedupe --target all --all-features --prefix none --format "{p}" | grep -v "$(pwd)" | sed -e "s: (proc-macro)::" | sort -u > cargo-vendor.txt + +sed 's/\([[:alnum:][:punct:]]* v[0-9.]*\) (https:\/\/github.com\/[^#]*#\(.*\))/\1^git\2/' versions.txt \ No newline at end of file From 6cdef830cecf86affddc38c5a94c7aea231c4b03 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Apr 23 2024 03:07:18 +0000 Subject: [PATCH 128/220] s --- diff --git a/rpms/cosmic-bg/cosmic-bg.spec b/rpms/cosmic-bg/cosmic-bg.spec index 8387f74..116e28e 100644 --- a/rpms/cosmic-bg/cosmic-bg.spec +++ b/rpms/cosmic-bg/cosmic-bg.spec @@ -1,6 +1,8 @@ # Generated by rust2rpm 26 %bcond_without check +%define git_versioning sed 's/\([[:alnum:][:punct:]]* v[0-9.]*\) (https:\/\/github.com\/[^#]*#\([a-f0-9]*\))/\1^git\2/' -i cargo-vendor.txt + %global ver ### %global commit ### %global date ### @@ -64,6 +66,7 @@ cat .vendor/config.toml >> .cargo/config %{cargo_license_summary} %{cargo_license} > LICENSE.dependencies %{cargo_vendor_manifest} +%{git_versioning} %install just rootdir=%{buildroot} prefix=%{_prefix} install diff --git a/rpms/cosmic-comp/cosmic-comp.spec b/rpms/cosmic-comp/cosmic-comp.spec index ca13e2a..caa3c0d 100644 --- a/rpms/cosmic-comp/cosmic-comp.spec +++ b/rpms/cosmic-comp/cosmic-comp.spec @@ -1,6 +1,8 @@ # Generated by rust2rpm 26 %bcond_without check +%define git_versioning sed 's/\([[:alnum:][:punct:]]* v[0-9.]*\) (https:\/\/github.com\/[^#]*#\([a-f0-9]*\))/\1^git\2/' -i cargo-vendor.txt + %global ver ### %global commit ### %global date ### @@ -72,8 +74,6 @@ Recommends: cosmic-session %description %{_description} -%define git_versioning sed 's/\([[:alnum:][:punct:]]* v[0-9.]*\) (https:\/\/github.com\/[^#]*#\([a-f0-9]*\))/\1^git\2/' -i cargo-vendor.txt - %prep %autosetup -n cosmic-comp-%{commit} -p1 -a1 %cargo_prep -N From 135d858af4d7c971a958cdb9da0a685a0a00c30f Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Apr 23 2024 03:21:03 +0000 Subject: [PATCH 129/220] t --- diff --git a/rpms/cosmic-bg/cosmic-bg.spec b/rpms/cosmic-bg/cosmic-bg.spec index 116e28e..ae9503e 100644 --- a/rpms/cosmic-bg/cosmic-bg.spec +++ b/rpms/cosmic-bg/cosmic-bg.spec @@ -1,7 +1,7 @@ # Generated by rust2rpm 26 %bcond_without check -%define git_versioning sed 's/\([[:alnum:][:punct:]]* v[0-9.]*\) (https:\/\/github.com\/[^#]*#\([a-f0-9]*\))/\1^git\2/' -i cargo-vendor.txt +%define git_versioning sed 's/\([[:alnum:][:punct:]]* v[0-9.]*\) (https:\/\/github.com\/[^"#"]*"#"\(.*\))/\1^git\2/' -i cargo-vendor.txt %global ver ### %global commit ### diff --git a/scripts/cargo_license_vendor.txt b/scripts/cargo_license_vendor.txt index 5e4b3da..1bd13da 100644 --- a/scripts/cargo_license_vendor.txt +++ b/scripts/cargo_license_vendor.txt @@ -1,3 +1,3 @@ cargo tree --offline --workspace --edges normal,build,dev --no-dedupe --target all --all-features --prefix none --format "{p}" | grep -v "$(pwd)" | sed -e "s: (proc-macro)::" | sort -u > cargo-vendor.txt -sed 's/\([[:alnum:][:punct:]]* v[0-9.]*\) (https:\/\/github.com\/[^#]*#\(.*\))/\1^git\2/' versions.txt \ No newline at end of file +sed 's/\([[:alnum:][:punct:]]* v[0-9.]*\) (https:\/\/github.com\/[^#]*#\(.*\))/\1^git\2/' -i cargo-vendor.txt \ No newline at end of file From 4cf058a5c45cde554356ca26b520c07dd1ac524e Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Apr 23 2024 03:32:03 +0000 Subject: [PATCH 130/220] s --- diff --git a/rpms/cosmic-bg/cosmic-bg.spec b/rpms/cosmic-bg/cosmic-bg.spec index ae9503e..7279ba3 100644 --- a/rpms/cosmic-bg/cosmic-bg.spec +++ b/rpms/cosmic-bg/cosmic-bg.spec @@ -1,8 +1,6 @@ # Generated by rust2rpm 26 %bcond_without check -%define git_versioning sed 's/\([[:alnum:][:punct:]]* v[0-9.]*\) (https:\/\/github.com\/[^"#"]*"#"\(.*\))/\1^git\2/' -i cargo-vendor.txt - %global ver ### %global commit ### %global date ### @@ -66,7 +64,7 @@ cat .vendor/config.toml >> .cargo/config %{cargo_license_summary} %{cargo_license} > LICENSE.dependencies %{cargo_vendor_manifest} -%{git_versioning} +sed 's/\([[:alnum:][:punct:]]* v[0-9.]*\) (https:\/\/github.com\/[^#]*#\(.*\))/\1^git\2/' -i cargo-vendor.txt %install just rootdir=%{buildroot} prefix=%{_prefix} install diff --git a/rpms/cosmic-comp/cosmic-comp.spec b/rpms/cosmic-comp/cosmic-comp.spec index caa3c0d..55cb1ec 100644 --- a/rpms/cosmic-comp/cosmic-comp.spec +++ b/rpms/cosmic-comp/cosmic-comp.spec @@ -1,8 +1,6 @@ # Generated by rust2rpm 26 %bcond_without check -%define git_versioning sed 's/\([[:alnum:][:punct:]]* v[0-9.]*\) (https:\/\/github.com\/[^#]*#\([a-f0-9]*\))/\1^git\2/' -i cargo-vendor.txt - %global ver ### %global commit ### %global date ### @@ -84,7 +82,7 @@ cat .vendor/config.toml >> .cargo/config %{cargo_license_summary} %{cargo_license} > LICENSE.dependencies %{cargo_vendor_manifest} -%{git_versioning} +sed 's/\([[:alnum:][:punct:]]* v[0-9.]*\) (https:\/\/github.com\/[^#]*#\(.*\))/\1^git\2/' -i cargo-vendor.txt %install From 3e6eafc96452dfc022ac63323586e79d4dd1ca4b Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Apr 23 2024 03:43:18 +0000 Subject: [PATCH 131/220] License fix --- diff --git a/rpms/cosmic-app-library/cosmic-app-library.spec b/rpms/cosmic-app-library/cosmic-app-library.spec index 311d359..e2d3be6 100644 --- a/rpms/cosmic-app-library/cosmic-app-library.spec +++ b/rpms/cosmic-app-library/cosmic-app-library.spec @@ -72,6 +72,7 @@ cat .vendor/config.toml >> .cargo/config %{cargo_license_summary} %{cargo_license} > LICENSE.dependencies %{cargo_vendor_manifest} +sed 's/\(.*\) (.*#\(.*\))/\1^git\2/' -i cargo-vendor.txt %install just rootdir=%{buildroot} prefix=%{_prefix} install @@ -84,7 +85,7 @@ just rootdir=%{buildroot} prefix=%{_prefix} install %files %license LICENSE.md %license LICENSE.dependencies -# %%license cargo-vendor.txt +%license cargo-vendor.txt %doc README.md %{_bindir}/cosmic-app-library %{_datadir}/applications/com.system76.CosmicAppLibrary.desktop diff --git a/rpms/cosmic-applets/cosmic-applets.spec b/rpms/cosmic-applets/cosmic-applets.spec index 63beea0..f058001 100644 --- a/rpms/cosmic-applets/cosmic-applets.spec +++ b/rpms/cosmic-applets/cosmic-applets.spec @@ -79,6 +79,7 @@ cat .vendor/config.toml >> .cargo/config %{cargo_license_summary} %{cargo_license} > LICENSE.dependencies %{cargo_vendor_manifest} +sed 's/\(.*\) (.*#\(.*\))/\1^git\2/' -i cargo-vendor.txt %install just rootdir=%{buildroot} prefix=%{_prefix} install @@ -91,7 +92,7 @@ just rootdir=%{buildroot} prefix=%{_prefix} install %files %license LICENSE %license LICENSE.dependencies -# %%license cargo-vendor.txt +%license cargo-vendor.txt %{_bindir}/cosmic-applets %{_bindir}/cosmic-panel-button %{_bindir}/cosmic-app-list diff --git a/rpms/cosmic-bg/cosmic-bg.spec b/rpms/cosmic-bg/cosmic-bg.spec index 7279ba3..db75d24 100644 --- a/rpms/cosmic-bg/cosmic-bg.spec +++ b/rpms/cosmic-bg/cosmic-bg.spec @@ -64,7 +64,7 @@ cat .vendor/config.toml >> .cargo/config %{cargo_license_summary} %{cargo_license} > LICENSE.dependencies %{cargo_vendor_manifest} -sed 's/\([[:alnum:][:punct:]]* v[0-9.]*\) (https:\/\/github.com\/[^#]*#\(.*\))/\1^git\2/' -i cargo-vendor.txt +sed 's/\(.*\) (.*#\(.*\))/\1^git\2/' -i cargo-vendor.txt %install just rootdir=%{buildroot} prefix=%{_prefix} install @@ -77,7 +77,7 @@ just rootdir=%{buildroot} prefix=%{_prefix} install %files %license LICENSE.md %license LICENSE.dependencies -# %%license cargo-vendor.txt +%license cargo-vendor.txt %doc README.md %{_bindir}/cosmic-bg %{_datadir}/applications/com.system76.CosmicBackground.desktop diff --git a/rpms/cosmic-comp/cosmic-comp.spec b/rpms/cosmic-comp/cosmic-comp.spec index 55cb1ec..0574564 100644 --- a/rpms/cosmic-comp/cosmic-comp.spec +++ b/rpms/cosmic-comp/cosmic-comp.spec @@ -82,8 +82,7 @@ cat .vendor/config.toml >> .cargo/config %{cargo_license_summary} %{cargo_license} > LICENSE.dependencies %{cargo_vendor_manifest} -sed 's/\([[:alnum:][:punct:]]* v[0-9.]*\) (https:\/\/github.com\/[^#]*#\(.*\))/\1^git\2/' -i cargo-vendor.txt - +sed 's/\(.*\) (.*#\(.*\))/\1^git\2/' -i cargo-vendor.txt %install make install DESTDIR=%{buildroot} prefix=%{_prefix} diff --git a/rpms/cosmic-edit/cosmic-edit.spec b/rpms/cosmic-edit/cosmic-edit.spec index 26e50e9..fc6fcd9 100644 --- a/rpms/cosmic-edit/cosmic-edit.spec +++ b/rpms/cosmic-edit/cosmic-edit.spec @@ -76,6 +76,7 @@ cat .vendor/config.toml >> .cargo/config %{cargo_license_summary} %{cargo_license} > LICENSE.dependencies %{cargo_vendor_manifest} +sed 's/\(.*\) (.*#\(.*\))/\1^git\2/' -i cargo-vendor.txt %install just rootdir=%{buildroot} prefix=%{_prefix} install @@ -88,7 +89,7 @@ just rootdir=%{buildroot} prefix=%{_prefix} install %files %license LICENSE %license LICENSE.dependencies -# %%license cargo-vendor.txt +%license cargo-vendor.txt %doc README.md %{_bindir}/cosmic-edit %{_datadir}/applications/com.system76.CosmicEdit.desktop diff --git a/rpms/cosmic-files/cosmic-files.spec b/rpms/cosmic-files/cosmic-files.spec index 95bf9e7..920595f 100644 --- a/rpms/cosmic-files/cosmic-files.spec +++ b/rpms/cosmic-files/cosmic-files.spec @@ -75,6 +75,7 @@ cat .vendor/config.toml >> .cargo/config %{cargo_license_summary} %{cargo_license} > LICENSE.dependencies %{cargo_vendor_manifest} +sed 's/\(.*\) (.*#\(.*\))/\1^git\2/' -i cargo-vendor.txt %install just rootdir=%{buildroot} prefix=%{_prefix} install @@ -87,7 +88,7 @@ just rootdir=%{buildroot} prefix=%{_prefix} install %files %license LICENSE %license LICENSE.dependencies -# %%license cargo-vendor.txt +%license cargo-vendor.txt %doc README.md %{_bindir}/cosmic-files %{_datadir}/applications/com.system76.CosmicFiles.desktop diff --git a/rpms/cosmic-greeter/cosmic-greeter.spec b/rpms/cosmic-greeter/cosmic-greeter.spec index a6bbefc..30c95c1 100644 --- a/rpms/cosmic-greeter/cosmic-greeter.spec +++ b/rpms/cosmic-greeter/cosmic-greeter.spec @@ -83,6 +83,7 @@ cargo build --release --all --offline --frozen %{cargo_license_summary} %{cargo_license} > LICENSE.dependencies %{cargo_vendor_manifest} +sed 's/\(.*\) (.*#\(.*\))/\1^git\2/' -i cargo-vendor.txt %install install -Dm0755 target/release/cosmic-greeter %{buildroot}/%{_bindir}/cosmic-greeter @@ -117,7 +118,7 @@ install -Dm0644 debian/cosmic-greeter-daemon.service %{buildroot}/%{_unitdir}/co %files %license LICENSE %license LICENSE.dependencies -# %%license cargo-vendor.txt +%license cargo-vendor.txt %doc README.md %{_bindir}/cosmic-greeter %{_bindir}/cosmic-greeter-daemon diff --git a/rpms/cosmic-launcher/cosmic-launcher.spec b/rpms/cosmic-launcher/cosmic-launcher.spec index 2884502..65333fc 100644 --- a/rpms/cosmic-launcher/cosmic-launcher.spec +++ b/rpms/cosmic-launcher/cosmic-launcher.spec @@ -77,6 +77,7 @@ cat .vendor/config.toml >> .cargo/config %{cargo_license_summary} %{cargo_license} > LICENSE.dependencies %{cargo_vendor_manifest} +sed 's/\(.*\) (.*#\(.*\))/\1^git\2/' -i cargo-vendor.txt %install just rootdir=%{buildroot} prefix=%{_prefix} install @@ -89,7 +90,7 @@ just rootdir=%{buildroot} prefix=%{_prefix} install %files %license LICENSE.md %license LICENSE.dependencies -# %%license cargo-vendor.txt +%license cargo-vendor.txt %doc README.md %{_bindir}/cosmic-launcher %{_datadir}/applications/com.system76.CosmicLauncher.desktop diff --git a/rpms/cosmic-notifications/cosmic-notifications.spec b/rpms/cosmic-notifications/cosmic-notifications.spec index 1d8a273..99c7eb4 100644 --- a/rpms/cosmic-notifications/cosmic-notifications.spec +++ b/rpms/cosmic-notifications/cosmic-notifications.spec @@ -70,6 +70,7 @@ cat .vendor/config.toml >> .cargo/config %{cargo_license_summary} %{cargo_license} > LICENSE.dependencies %{cargo_vendor_manifest} +sed 's/\(.*\) (.*#\(.*\))/\1^git\2/' -i cargo-vendor.txt %install just rootdir=%{buildroot} prefix=%{_prefix} install @@ -82,7 +83,7 @@ just rootdir=%{buildroot} prefix=%{_prefix} install %files %license LICENSE.md %license LICENSE.dependencies -# %%license cargo-vendor.txt +%license cargo-vendor.txt %doc README.md %{_bindir}/cosmic-notifications %{_datadir}/applications/com.system76.CosmicNotifications.desktop diff --git a/rpms/cosmic-osd/cosmic-osd.spec b/rpms/cosmic-osd/cosmic-osd.spec index 9842d51..9d9444d 100644 --- a/rpms/cosmic-osd/cosmic-osd.spec +++ b/rpms/cosmic-osd/cosmic-osd.spec @@ -76,6 +76,7 @@ make all polkit-agent-helper-1=/usr/lib/polkit-1/polkit-agent-helper-1 %{cargo_license_summary} %{cargo_license} > LICENSE.dependencies %{cargo_vendor_manifest} +sed 's/\(.*\) (.*#\(.*\))/\1^git\2/' -i cargo-vendor.txt %install make install DESTDIR=%{buildroot} prefix=%{_prefix} @@ -88,7 +89,7 @@ make install DESTDIR=%{buildroot} prefix=%{_prefix} %files %license LICENSE %license LICENSE.dependencies -# %%license cargo-vendor.txt +%license cargo-vendor.txt %{_bindir}/cosmic-osd %changelog diff --git a/rpms/cosmic-panel/cosmic-panel.spec b/rpms/cosmic-panel/cosmic-panel.spec index b05e974..d8ce21a 100644 --- a/rpms/cosmic-panel/cosmic-panel.spec +++ b/rpms/cosmic-panel/cosmic-panel.spec @@ -67,6 +67,7 @@ cat .vendor/config.toml >> .cargo/config %{cargo_license_summary} %{cargo_license} > LICENSE.dependencies %{cargo_vendor_manifest} +sed 's/\(.*\) (.*#\(.*\))/\1^git\2/' -i cargo-vendor.txt %install just rootdir=%{buildroot} prefix=%{_prefix} install @@ -79,7 +80,7 @@ just rootdir=%{buildroot} prefix=%{_prefix} install %files %license LICENSE.md %license LICENSE.dependencies -# %%license cargo-vendor.txt +%license cargo-vendor.txt %doc README.md %{_bindir}/cosmic-panel %{_datadir}/cosmic/com.system76.CosmicPanel.Dock/* diff --git a/rpms/cosmic-player/cosmic-player.spec b/rpms/cosmic-player/cosmic-player.spec index cf5b5db..7cddad7 100644 --- a/rpms/cosmic-player/cosmic-player.spec +++ b/rpms/cosmic-player/cosmic-player.spec @@ -44,6 +44,7 @@ BuildRequires: cargo-rpm-macros >= 26 %{cargo_license_summary} %{cargo_license} > LICENSE.dependencies %{cargo_vendor_manifest} +sed 's/\(.*\) (.*#\(.*\))/\1^git\2/' -i cargo-vendor.txt %install %cargo_install diff --git a/rpms/cosmic-randr/cosmic-randr.spec b/rpms/cosmic-randr/cosmic-randr.spec index 3963cd3..48082b3 100644 --- a/rpms/cosmic-randr/cosmic-randr.spec +++ b/rpms/cosmic-randr/cosmic-randr.spec @@ -58,6 +58,7 @@ cat .vendor/config.toml >> .cargo/config %{cargo_license_summary} %{cargo_license} > LICENSE.dependencies %{cargo_vendor_manifest} +sed 's/\(.*\) (.*#\(.*\))/\1^git\2/' -i cargo-vendor.txt %install just rootdir=%{buildroot} prefix=%{_prefix} install @@ -70,7 +71,7 @@ just rootdir=%{buildroot} prefix=%{_prefix} install %files %license LICENSE %license LICENSE.dependencies -# %%license cargo-vendor.txt +%license cargo-vendor.txt %doc README.md %{_bindir}/cosmic-randr diff --git a/rpms/cosmic-screenshot/cosmic-screenshot.spec b/rpms/cosmic-screenshot/cosmic-screenshot.spec index 76a867d..f8e78fe 100644 --- a/rpms/cosmic-screenshot/cosmic-screenshot.spec +++ b/rpms/cosmic-screenshot/cosmic-screenshot.spec @@ -61,6 +61,7 @@ cat .vendor/config.toml >> .cargo/config %{cargo_license_summary} %{cargo_license} > LICENSE.dependencies %{cargo_vendor_manifest} +sed 's/\(.*\) (.*#\(.*\))/\1^git\2/' -i cargo-vendor.txt %install just rootdir=%{buildroot} prefix=%{_prefix} install @@ -73,7 +74,7 @@ just rootdir=%{buildroot} prefix=%{_prefix} install %files %license LICENSE %license LICENSE.dependencies -# %%license cargo-vendor.txt +%license cargo-vendor.txt %doc README.md %{_bindir}/cosmic-screenshot %{_datadir}/applications/com.system76.CosmicScreenshot.desktop diff --git a/rpms/cosmic-session/cosmic-session.spec b/rpms/cosmic-session/cosmic-session.spec index aa0fa7c..30020b2 100644 --- a/rpms/cosmic-session/cosmic-session.spec +++ b/rpms/cosmic-session/cosmic-session.spec @@ -87,6 +87,7 @@ cat .vendor/config.toml >> .cargo/config %{cargo_license_summary} %{cargo_license} > LICENSE.dependencies %{cargo_vendor_manifest} +sed 's/\(.*\) (.*#\(.*\))/\1^git\2/' -i cargo-vendor.txt %install just rootdir=%{buildroot} install @@ -99,7 +100,7 @@ just rootdir=%{buildroot} install %files %license LICENSE.md %license LICENSE.dependencies -# %%license cargo-vendor.txt +%license cargo-vendor.txt %{_bindir}/cosmic-session %{_bindir}/start-cosmic %{_userunitdir}/cosmic-session.target diff --git a/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec b/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec index c60e0c5..c842c1b 100644 --- a/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec +++ b/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec @@ -74,6 +74,7 @@ cat .vendor/config.toml >> .cargo/config %{cargo_license_summary} %{cargo_license} > LICENSE.dependencies %{cargo_vendor_manifest} +sed 's/\(.*\) (.*#\(.*\))/\1^git\2/' -i cargo-vendor.txt %install make install DESTDIR=%{buildroot} prefix=%{_prefix} @@ -86,7 +87,7 @@ make install DESTDIR=%{buildroot} prefix=%{_prefix} %files %license LICENSE %license LICENSE.dependencies -# %%license cargo-vendor.txt +%license cargo-vendor.txt %{_bindir}/cosmic-settings-daemon %changelog diff --git a/rpms/cosmic-settings/cosmic-settings.spec b/rpms/cosmic-settings/cosmic-settings.spec index 8f75d2b..e491947 100644 --- a/rpms/cosmic-settings/cosmic-settings.spec +++ b/rpms/cosmic-settings/cosmic-settings.spec @@ -75,6 +75,7 @@ cat .vendor/config.toml >> .cargo/config %{cargo_license_summary} %{cargo_license} > LICENSE.dependencies %{cargo_vendor_manifest} +sed 's/\(.*\) (.*#\(.*\))/\1^git\2/' -i cargo-vendor.txt %install just rootdir=%{buildroot} install @@ -87,7 +88,7 @@ just rootdir=%{buildroot} install %files %license LICENSE.md %license LICENSE.dependencies -# %%license cargo-vendor.txt +%license cargo-vendor.txt %doc README.md %{_bindir}/cosmic-settings %{_datadir}/applications/com.system76.CosmicSettings.desktop diff --git a/rpms/cosmic-store/cosmic-store.spec b/rpms/cosmic-store/cosmic-store.spec index 3a52cc1..ff4e71f 100644 --- a/rpms/cosmic-store/cosmic-store.spec +++ b/rpms/cosmic-store/cosmic-store.spec @@ -74,6 +74,7 @@ cat .vendor/config.toml >> .cargo/config %{cargo_license_summary} %{cargo_license} > LICENSE.dependencies %{cargo_vendor_manifest} +sed 's/\(.*\) (.*#\(.*\))/\1^git\2/' -i cargo-vendor.txt %install just rootdir=%{buildroot} prefix=%{_prefix} install @@ -86,7 +87,7 @@ just rootdir=%{buildroot} prefix=%{_prefix} install %files %license LICENSE %license LICENSE.dependencies -# %%license cargo-vendor.txt +%license cargo-vendor.txt %doc README.md %{_bindir}/cosmic-store %{_datadir}/applications/com.system76.CosmicStore.desktop diff --git a/rpms/cosmic-term/cosmic-term.spec b/rpms/cosmic-term/cosmic-term.spec index ffd814e..b81b7be 100644 --- a/rpms/cosmic-term/cosmic-term.spec +++ b/rpms/cosmic-term/cosmic-term.spec @@ -75,6 +75,7 @@ cat .vendor/config.toml >> .cargo/config %{cargo_license_summary} %{cargo_license} > LICENSE.dependencies %{cargo_vendor_manifest} +sed 's/\(.*\) (.*#\(.*\))/\1^git\2/' -i cargo-vendor.txt %install just rootdir=%{buildroot} prefix=%{_prefix} install @@ -87,7 +88,7 @@ just rootdir=%{buildroot} prefix=%{_prefix} install %files %license LICENSE %license LICENSE.dependencies -# %%license cargo-vendor.txt +%license cargo-vendor.txt %doc README.md %{_bindir}/cosmic-term %{_datadir}/applications/com.system76.CosmicTerm.desktop diff --git a/rpms/cosmic-workspaces/cosmic-workspaces.spec b/rpms/cosmic-workspaces/cosmic-workspaces.spec index 33e0b3b..dc49bec 100644 --- a/rpms/cosmic-workspaces/cosmic-workspaces.spec +++ b/rpms/cosmic-workspaces/cosmic-workspaces.spec @@ -80,6 +80,7 @@ cat .vendor/config.toml >> .cargo/config %{cargo_license_summary} %{cargo_license} > LICENSE.dependencies %{cargo_vendor_manifest} +sed 's/\(.*\) (.*#\(.*\))/\1^git\2/' -i cargo-vendor.txt %install make install DESTDIR=%{buildroot} prefix=%{_prefix} @@ -92,7 +93,7 @@ make install DESTDIR=%{buildroot} prefix=%{_prefix} %files %license LICENSE %license LICENSE.dependencies -# %%license cargo-vendor.txt +%license cargo-vendor.txt %{_bindir}/cosmic-workspaces %{_datadir}/applications/com.system76.CosmicWorkspaces.desktop %{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicWorkspaces.svg diff --git a/rpms/pop-launcher/pop-launcher.spec b/rpms/pop-launcher/pop-launcher.spec index 4cba5fb..b26961f 100644 --- a/rpms/pop-launcher/pop-launcher.spec +++ b/rpms/pop-launcher/pop-launcher.spec @@ -74,6 +74,7 @@ just build-release --offline --frozen %{cargo_license_summary} %{cargo_license} > LICENSE.dependencies %{cargo_vendor_manifest} +sed 's/\(.*\) (.*#\(.*\))/\1^git\2/' -i cargo-vendor.txt %install just rootdir=%{buildroot} install diff --git a/rpms/system76-power/system76-power.spec b/rpms/system76-power/system76-power.spec index a17490e..0f87aa4 100644 --- a/rpms/system76-power/system76-power.spec +++ b/rpms/system76-power/system76-power.spec @@ -37,6 +37,7 @@ BuildRequires: cargo-rpm-macros >= 26 %{cargo_license_summary} %{cargo_license} > LICENSE.dependencies %{cargo_vendor_manifest} +sed 's/\(.*\) (.*#\(.*\))/\1^git\2/' -i cargo-vendor.txt %install %cargo_install diff --git a/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec b/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec index 3fd8499..aadc22b 100644 --- a/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec +++ b/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec @@ -79,6 +79,7 @@ cat .vendor/config.toml >> .cargo/config %{cargo_license_summary} %{cargo_license} > LICENSE.dependencies %{cargo_vendor_manifest} +sed 's/\(.*\) (.*#\(.*\))/\1^git\2/' -i cargo-vendor.txt %install make install DESTDIR=%{buildroot} prefix=%{_prefix} @@ -91,7 +92,7 @@ make install DESTDIR=%{buildroot} prefix=%{_prefix} %files %license LICENSE %license LICENSE.dependencies -# %%license cargo-vendor.txt +%license cargo-vendor.txt %{_libexecdir}/xdg-desktop-portal-cosmic %{_datadir}/dbus-1/services/org.freedesktop.impl.portal.desktop.cosmic.service %{_datadir}/xdg-desktop-portal/portals/cosmic.portal diff --git a/scripts/cargo_license_vendor.txt b/scripts/cargo_license_vendor.txt index 1bd13da..9f20b3e 100644 --- a/scripts/cargo_license_vendor.txt +++ b/scripts/cargo_license_vendor.txt @@ -1,3 +1,3 @@ cargo tree --offline --workspace --edges normal,build,dev --no-dedupe --target all --all-features --prefix none --format "{p}" | grep -v "$(pwd)" | sed -e "s: (proc-macro)::" | sort -u > cargo-vendor.txt -sed 's/\([[:alnum:][:punct:]]* v[0-9.]*\) (https:\/\/github.com\/[^#]*#\(.*\))/\1^git\2/' -i cargo-vendor.txt \ No newline at end of file +sed 's/\(.*\) (.*#\(.*\))/\1^git\2/' -i cargo-vendor.txt \ No newline at end of file From df8338c7809d637505a577f0a7465c8dfca7ac8f Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Apr 23 2024 03:53:52 +0000 Subject: [PATCH 132/220] fix --- diff --git a/rpms/cosmic-app-library/cosmic-app-library.spec b/rpms/cosmic-app-library/cosmic-app-library.spec index e2d3be6..e8026eb 100644 --- a/rpms/cosmic-app-library/cosmic-app-library.spec +++ b/rpms/cosmic-app-library/cosmic-app-library.spec @@ -72,7 +72,7 @@ cat .vendor/config.toml >> .cargo/config %{cargo_license_summary} %{cargo_license} > LICENSE.dependencies %{cargo_vendor_manifest} -sed 's/\(.*\) (.*#\(.*\))/\1^git\2/' -i cargo-vendor.txt +sed 's/\(.*\) (.*#\(.*\))/\1+git\2/' -i cargo-vendor.txt %install just rootdir=%{buildroot} prefix=%{_prefix} install diff --git a/rpms/cosmic-applets/cosmic-applets.spec b/rpms/cosmic-applets/cosmic-applets.spec index f058001..5b27962 100644 --- a/rpms/cosmic-applets/cosmic-applets.spec +++ b/rpms/cosmic-applets/cosmic-applets.spec @@ -79,7 +79,7 @@ cat .vendor/config.toml >> .cargo/config %{cargo_license_summary} %{cargo_license} > LICENSE.dependencies %{cargo_vendor_manifest} -sed 's/\(.*\) (.*#\(.*\))/\1^git\2/' -i cargo-vendor.txt +sed 's/\(.*\) (.*#\(.*\))/\1+git\2/' -i cargo-vendor.txt %install just rootdir=%{buildroot} prefix=%{_prefix} install diff --git a/rpms/cosmic-bg/cosmic-bg.spec b/rpms/cosmic-bg/cosmic-bg.spec index db75d24..a0cc405 100644 --- a/rpms/cosmic-bg/cosmic-bg.spec +++ b/rpms/cosmic-bg/cosmic-bg.spec @@ -64,7 +64,7 @@ cat .vendor/config.toml >> .cargo/config %{cargo_license_summary} %{cargo_license} > LICENSE.dependencies %{cargo_vendor_manifest} -sed 's/\(.*\) (.*#\(.*\))/\1^git\2/' -i cargo-vendor.txt +sed 's/\(.*\) (.*#\(.*\))/\1+git\2/' -i cargo-vendor.txt %install just rootdir=%{buildroot} prefix=%{_prefix} install diff --git a/rpms/cosmic-comp/cosmic-comp.spec b/rpms/cosmic-comp/cosmic-comp.spec index 0574564..3c60d53 100644 --- a/rpms/cosmic-comp/cosmic-comp.spec +++ b/rpms/cosmic-comp/cosmic-comp.spec @@ -82,7 +82,7 @@ cat .vendor/config.toml >> .cargo/config %{cargo_license_summary} %{cargo_license} > LICENSE.dependencies %{cargo_vendor_manifest} -sed 's/\(.*\) (.*#\(.*\))/\1^git\2/' -i cargo-vendor.txt +sed 's/\(.*\) (.*#\(.*\))/\1+git\2/' -i cargo-vendor.txt %install make install DESTDIR=%{buildroot} prefix=%{_prefix} diff --git a/rpms/cosmic-edit/cosmic-edit.spec b/rpms/cosmic-edit/cosmic-edit.spec index fc6fcd9..d501ac4 100644 --- a/rpms/cosmic-edit/cosmic-edit.spec +++ b/rpms/cosmic-edit/cosmic-edit.spec @@ -76,7 +76,7 @@ cat .vendor/config.toml >> .cargo/config %{cargo_license_summary} %{cargo_license} > LICENSE.dependencies %{cargo_vendor_manifest} -sed 's/\(.*\) (.*#\(.*\))/\1^git\2/' -i cargo-vendor.txt +sed 's/\(.*\) (.*#\(.*\))/\1+git\2/' -i cargo-vendor.txt %install just rootdir=%{buildroot} prefix=%{_prefix} install diff --git a/rpms/cosmic-files/cosmic-files.spec b/rpms/cosmic-files/cosmic-files.spec index 920595f..9b79822 100644 --- a/rpms/cosmic-files/cosmic-files.spec +++ b/rpms/cosmic-files/cosmic-files.spec @@ -75,7 +75,7 @@ cat .vendor/config.toml >> .cargo/config %{cargo_license_summary} %{cargo_license} > LICENSE.dependencies %{cargo_vendor_manifest} -sed 's/\(.*\) (.*#\(.*\))/\1^git\2/' -i cargo-vendor.txt +sed 's/\(.*\) (.*#\(.*\))/\1+git\2/' -i cargo-vendor.txt %install just rootdir=%{buildroot} prefix=%{_prefix} install diff --git a/rpms/cosmic-greeter/cosmic-greeter.spec b/rpms/cosmic-greeter/cosmic-greeter.spec index 30c95c1..9611e5f 100644 --- a/rpms/cosmic-greeter/cosmic-greeter.spec +++ b/rpms/cosmic-greeter/cosmic-greeter.spec @@ -83,7 +83,7 @@ cargo build --release --all --offline --frozen %{cargo_license_summary} %{cargo_license} > LICENSE.dependencies %{cargo_vendor_manifest} -sed 's/\(.*\) (.*#\(.*\))/\1^git\2/' -i cargo-vendor.txt +sed 's/\(.*\) (.*#\(.*\))/\1+git\2/' -i cargo-vendor.txt %install install -Dm0755 target/release/cosmic-greeter %{buildroot}/%{_bindir}/cosmic-greeter diff --git a/rpms/cosmic-launcher/cosmic-launcher.spec b/rpms/cosmic-launcher/cosmic-launcher.spec index 65333fc..833cf9c 100644 --- a/rpms/cosmic-launcher/cosmic-launcher.spec +++ b/rpms/cosmic-launcher/cosmic-launcher.spec @@ -77,7 +77,7 @@ cat .vendor/config.toml >> .cargo/config %{cargo_license_summary} %{cargo_license} > LICENSE.dependencies %{cargo_vendor_manifest} -sed 's/\(.*\) (.*#\(.*\))/\1^git\2/' -i cargo-vendor.txt +sed 's/\(.*\) (.*#\(.*\))/\1+git\2/' -i cargo-vendor.txt %install just rootdir=%{buildroot} prefix=%{_prefix} install diff --git a/rpms/cosmic-notifications/cosmic-notifications.spec b/rpms/cosmic-notifications/cosmic-notifications.spec index 99c7eb4..e8d29e6 100644 --- a/rpms/cosmic-notifications/cosmic-notifications.spec +++ b/rpms/cosmic-notifications/cosmic-notifications.spec @@ -70,7 +70,7 @@ cat .vendor/config.toml >> .cargo/config %{cargo_license_summary} %{cargo_license} > LICENSE.dependencies %{cargo_vendor_manifest} -sed 's/\(.*\) (.*#\(.*\))/\1^git\2/' -i cargo-vendor.txt +sed 's/\(.*\) (.*#\(.*\))/\1+git\2/' -i cargo-vendor.txt %install just rootdir=%{buildroot} prefix=%{_prefix} install diff --git a/rpms/cosmic-osd/cosmic-osd.spec b/rpms/cosmic-osd/cosmic-osd.spec index 9d9444d..16f828f 100644 --- a/rpms/cosmic-osd/cosmic-osd.spec +++ b/rpms/cosmic-osd/cosmic-osd.spec @@ -76,7 +76,7 @@ make all polkit-agent-helper-1=/usr/lib/polkit-1/polkit-agent-helper-1 %{cargo_license_summary} %{cargo_license} > LICENSE.dependencies %{cargo_vendor_manifest} -sed 's/\(.*\) (.*#\(.*\))/\1^git\2/' -i cargo-vendor.txt +sed 's/\(.*\) (.*#\(.*\))/\1+git\2/' -i cargo-vendor.txt %install make install DESTDIR=%{buildroot} prefix=%{_prefix} diff --git a/rpms/cosmic-panel/cosmic-panel.spec b/rpms/cosmic-panel/cosmic-panel.spec index d8ce21a..1dcb300 100644 --- a/rpms/cosmic-panel/cosmic-panel.spec +++ b/rpms/cosmic-panel/cosmic-panel.spec @@ -67,7 +67,7 @@ cat .vendor/config.toml >> .cargo/config %{cargo_license_summary} %{cargo_license} > LICENSE.dependencies %{cargo_vendor_manifest} -sed 's/\(.*\) (.*#\(.*\))/\1^git\2/' -i cargo-vendor.txt +sed 's/\(.*\) (.*#\(.*\))/\1+git\2/' -i cargo-vendor.txt %install just rootdir=%{buildroot} prefix=%{_prefix} install diff --git a/rpms/cosmic-player/cosmic-player.spec b/rpms/cosmic-player/cosmic-player.spec index 7cddad7..2c1e836 100644 --- a/rpms/cosmic-player/cosmic-player.spec +++ b/rpms/cosmic-player/cosmic-player.spec @@ -44,7 +44,7 @@ BuildRequires: cargo-rpm-macros >= 26 %{cargo_license_summary} %{cargo_license} > LICENSE.dependencies %{cargo_vendor_manifest} -sed 's/\(.*\) (.*#\(.*\))/\1^git\2/' -i cargo-vendor.txt +sed 's/\(.*\) (.*#\(.*\))/\1+git\2/' -i cargo-vendor.txt %install %cargo_install diff --git a/rpms/cosmic-randr/cosmic-randr.spec b/rpms/cosmic-randr/cosmic-randr.spec index 48082b3..0fa7422 100644 --- a/rpms/cosmic-randr/cosmic-randr.spec +++ b/rpms/cosmic-randr/cosmic-randr.spec @@ -58,7 +58,7 @@ cat .vendor/config.toml >> .cargo/config %{cargo_license_summary} %{cargo_license} > LICENSE.dependencies %{cargo_vendor_manifest} -sed 's/\(.*\) (.*#\(.*\))/\1^git\2/' -i cargo-vendor.txt +sed 's/\(.*\) (.*#\(.*\))/\1+git\2/' -i cargo-vendor.txt %install just rootdir=%{buildroot} prefix=%{_prefix} install diff --git a/rpms/cosmic-screenshot/cosmic-screenshot.spec b/rpms/cosmic-screenshot/cosmic-screenshot.spec index f8e78fe..0f82db2 100644 --- a/rpms/cosmic-screenshot/cosmic-screenshot.spec +++ b/rpms/cosmic-screenshot/cosmic-screenshot.spec @@ -61,7 +61,7 @@ cat .vendor/config.toml >> .cargo/config %{cargo_license_summary} %{cargo_license} > LICENSE.dependencies %{cargo_vendor_manifest} -sed 's/\(.*\) (.*#\(.*\))/\1^git\2/' -i cargo-vendor.txt +sed 's/\(.*\) (.*#\(.*\))/\1+git\2/' -i cargo-vendor.txt %install just rootdir=%{buildroot} prefix=%{_prefix} install diff --git a/rpms/cosmic-session/cosmic-session.spec b/rpms/cosmic-session/cosmic-session.spec index 30020b2..bd296cc 100644 --- a/rpms/cosmic-session/cosmic-session.spec +++ b/rpms/cosmic-session/cosmic-session.spec @@ -87,7 +87,7 @@ cat .vendor/config.toml >> .cargo/config %{cargo_license_summary} %{cargo_license} > LICENSE.dependencies %{cargo_vendor_manifest} -sed 's/\(.*\) (.*#\(.*\))/\1^git\2/' -i cargo-vendor.txt +sed 's/\(.*\) (.*#\(.*\))/\1+git\2/' -i cargo-vendor.txt %install just rootdir=%{buildroot} install diff --git a/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec b/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec index c842c1b..3eaea56 100644 --- a/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec +++ b/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec @@ -74,7 +74,7 @@ cat .vendor/config.toml >> .cargo/config %{cargo_license_summary} %{cargo_license} > LICENSE.dependencies %{cargo_vendor_manifest} -sed 's/\(.*\) (.*#\(.*\))/\1^git\2/' -i cargo-vendor.txt +sed 's/\(.*\) (.*#\(.*\))/\1+git\2/' -i cargo-vendor.txt %install make install DESTDIR=%{buildroot} prefix=%{_prefix} diff --git a/rpms/cosmic-settings/cosmic-settings.spec b/rpms/cosmic-settings/cosmic-settings.spec index e491947..c20fa52 100644 --- a/rpms/cosmic-settings/cosmic-settings.spec +++ b/rpms/cosmic-settings/cosmic-settings.spec @@ -75,7 +75,7 @@ cat .vendor/config.toml >> .cargo/config %{cargo_license_summary} %{cargo_license} > LICENSE.dependencies %{cargo_vendor_manifest} -sed 's/\(.*\) (.*#\(.*\))/\1^git\2/' -i cargo-vendor.txt +sed 's/\(.*\) (.*#\(.*\))/\1+git\2/' -i cargo-vendor.txt %install just rootdir=%{buildroot} install diff --git a/rpms/cosmic-store/cosmic-store.spec b/rpms/cosmic-store/cosmic-store.spec index ff4e71f..c7da7bd 100644 --- a/rpms/cosmic-store/cosmic-store.spec +++ b/rpms/cosmic-store/cosmic-store.spec @@ -74,7 +74,7 @@ cat .vendor/config.toml >> .cargo/config %{cargo_license_summary} %{cargo_license} > LICENSE.dependencies %{cargo_vendor_manifest} -sed 's/\(.*\) (.*#\(.*\))/\1^git\2/' -i cargo-vendor.txt +sed 's/\(.*\) (.*#\(.*\))/\1+git\2/' -i cargo-vendor.txt %install just rootdir=%{buildroot} prefix=%{_prefix} install diff --git a/rpms/cosmic-term/cosmic-term.spec b/rpms/cosmic-term/cosmic-term.spec index b81b7be..beedce7 100644 --- a/rpms/cosmic-term/cosmic-term.spec +++ b/rpms/cosmic-term/cosmic-term.spec @@ -75,7 +75,7 @@ cat .vendor/config.toml >> .cargo/config %{cargo_license_summary} %{cargo_license} > LICENSE.dependencies %{cargo_vendor_manifest} -sed 's/\(.*\) (.*#\(.*\))/\1^git\2/' -i cargo-vendor.txt +sed 's/\(.*\) (.*#\(.*\))/\1+git\2/' -i cargo-vendor.txt %install just rootdir=%{buildroot} prefix=%{_prefix} install diff --git a/rpms/cosmic-workspaces/cosmic-workspaces.spec b/rpms/cosmic-workspaces/cosmic-workspaces.spec index dc49bec..772d8e6 100644 --- a/rpms/cosmic-workspaces/cosmic-workspaces.spec +++ b/rpms/cosmic-workspaces/cosmic-workspaces.spec @@ -80,7 +80,7 @@ cat .vendor/config.toml >> .cargo/config %{cargo_license_summary} %{cargo_license} > LICENSE.dependencies %{cargo_vendor_manifest} -sed 's/\(.*\) (.*#\(.*\))/\1^git\2/' -i cargo-vendor.txt +sed 's/\(.*\) (.*#\(.*\))/\1+git\2/' -i cargo-vendor.txt %install make install DESTDIR=%{buildroot} prefix=%{_prefix} diff --git a/rpms/pop-launcher/pop-launcher.spec b/rpms/pop-launcher/pop-launcher.spec index b26961f..504e745 100644 --- a/rpms/pop-launcher/pop-launcher.spec +++ b/rpms/pop-launcher/pop-launcher.spec @@ -74,7 +74,7 @@ just build-release --offline --frozen %{cargo_license_summary} %{cargo_license} > LICENSE.dependencies %{cargo_vendor_manifest} -sed 's/\(.*\) (.*#\(.*\))/\1^git\2/' -i cargo-vendor.txt +sed 's/\(.*\) (.*#\(.*\))/\1+git\2/' -i cargo-vendor.txt %install just rootdir=%{buildroot} install diff --git a/rpms/system76-power/system76-power.spec b/rpms/system76-power/system76-power.spec index 0f87aa4..20297d0 100644 --- a/rpms/system76-power/system76-power.spec +++ b/rpms/system76-power/system76-power.spec @@ -37,7 +37,7 @@ BuildRequires: cargo-rpm-macros >= 26 %{cargo_license_summary} %{cargo_license} > LICENSE.dependencies %{cargo_vendor_manifest} -sed 's/\(.*\) (.*#\(.*\))/\1^git\2/' -i cargo-vendor.txt +sed 's/\(.*\) (.*#\(.*\))/\1+git\2/' -i cargo-vendor.txt %install %cargo_install diff --git a/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec b/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec index aadc22b..c818ba0 100644 --- a/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec +++ b/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec @@ -79,7 +79,7 @@ cat .vendor/config.toml >> .cargo/config %{cargo_license_summary} %{cargo_license} > LICENSE.dependencies %{cargo_vendor_manifest} -sed 's/\(.*\) (.*#\(.*\))/\1^git\2/' -i cargo-vendor.txt +sed 's/\(.*\) (.*#\(.*\))/\1+git\2/' -i cargo-vendor.txt %install make install DESTDIR=%{buildroot} prefix=%{_prefix} diff --git a/scripts/cargo_license_vendor.txt b/scripts/cargo_license_vendor.txt index 9f20b3e..5683edb 100644 --- a/scripts/cargo_license_vendor.txt +++ b/scripts/cargo_license_vendor.txt @@ -1,3 +1,3 @@ cargo tree --offline --workspace --edges normal,build,dev --no-dedupe --target all --all-features --prefix none --format "{p}" | grep -v "$(pwd)" | sed -e "s: (proc-macro)::" | sort -u > cargo-vendor.txt -sed 's/\(.*\) (.*#\(.*\))/\1^git\2/' -i cargo-vendor.txt \ No newline at end of file +sed 's/\(.*\) (.*#\(.*\))/\1+git\2/' -i cargo-vendor.txt \ No newline at end of file From bfe4426500573d28c366212c4dc215d07e03f8df Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Apr 23 2024 04:55:49 +0000 Subject: [PATCH 133/220] Update cosmic-files.spec --- diff --git a/rpms/cosmic-files/cosmic-files.spec b/rpms/cosmic-files/cosmic-files.spec index 9b79822..fb2ce90 100644 --- a/rpms/cosmic-files/cosmic-files.spec +++ b/rpms/cosmic-files/cosmic-files.spec @@ -57,6 +57,7 @@ BuildRequires: rustc BuildRequires: lld BuildRequires: cargo BuildRequires: just +BuildRequires: glib2-devel BuildRequires: git-core From 7c4a63e94effbc6f02e6e2290a8a966abec36d9c Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Apr 23 2024 05:23:17 +0000 Subject: [PATCH 134/220] Update cosmic-files.spec --- diff --git a/rpms/cosmic-files/cosmic-files.spec b/rpms/cosmic-files/cosmic-files.spec index fb2ce90..54a363a 100644 --- a/rpms/cosmic-files/cosmic-files.spec +++ b/rpms/cosmic-files/cosmic-files.spec @@ -82,8 +82,7 @@ sed 's/\(.*\) (.*#\(.*\))/\1+git\2/' -i cargo-vendor.txt just rootdir=%{buildroot} prefix=%{_prefix} install %if %{with check} -# %% check TODO: Fix --lib -# %%cargo_test +%cargo_test %endif %files From 9cc31a3db6fd39a370accfd12b3af18f5e532628 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Apr 24 2024 21:02:07 +0000 Subject: [PATCH 135/220] Update cosmic-files.spec --- diff --git a/rpms/cosmic-files/cosmic-files.spec b/rpms/cosmic-files/cosmic-files.spec index 54a363a..45b9542 100644 --- a/rpms/cosmic-files/cosmic-files.spec +++ b/rpms/cosmic-files/cosmic-files.spec @@ -82,7 +82,8 @@ sed 's/\(.*\) (.*#\(.*\))/\1+git\2/' -i cargo-vendor.txt just rootdir=%{buildroot} prefix=%{_prefix} install %if %{with check} -%cargo_test +# FIXME: --lib test fails currently +# %%cargo_test %endif %files From 4508c35a8f1350d6e9602712f9ce79615a894bf1 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Apr 26 2024 18:22:06 +0000 Subject: [PATCH 136/220] Fixes for packaging compliance --- diff --git a/rpms/cosmic-app-library/cosmic-app-library.spec b/rpms/cosmic-app-library/cosmic-app-library.spec index e8026eb..d30f639 100644 --- a/rpms/cosmic-app-library/cosmic-app-library.spec +++ b/rpms/cosmic-app-library/cosmic-app-library.spec @@ -47,6 +47,10 @@ URL: https://github.com/pop-os/cosmic-applibrary # the tar out of the repo directory # * tar -pcJf $name-$commit.tar.xz Source: cosmic-app-library-%{commit}.tar.xz +# To create the vendor tarball: +# * git clone the repository +# * cargo vendor +# * tar -pcJf $name-$commit-vendor.tar.xz Source: cosmic-app-library-%{commit}-vendor.tar.xz BuildRequires: cargo-rpm-macros >= 26 diff --git a/rpms/cosmic-applets/cosmic-applets.spec b/rpms/cosmic-applets/cosmic-applets.spec index 5b27962..70fbb4e 100644 --- a/rpms/cosmic-applets/cosmic-applets.spec +++ b/rpms/cosmic-applets/cosmic-applets.spec @@ -43,6 +43,10 @@ URL: https://github.com/pop-os/cosmic-applets # the tar out of the repo directory # * tar -pcJf $name-$commit.tar.xz Source: cosmic-applets-%{commit}.tar.xz +# To create the vendor tarball: +# * git clone the repository +# * cargo vendor +# * tar -pcJf $name-$commit-vendor.tar.xz Source: cosmic-applets-%{commit}-vendor.tar.xz Patch: better_compile.patch @@ -121,6 +125,7 @@ just rootdir=%{buildroot} prefix=%{_prefix} install %{_datadir}/applications/com.system76.CosmicAppletWorkspaces.desktop %{_datadir}/applications/com.system76.CosmicPanelAppButton.desktop %{_datadir}/applications/com.system76.CosmicPanelWorkspacesButton.desktop +%dir %{_datadir}/cosmic/com.system76.CosmicAppList %{_datadir}/cosmic/com.system76.CosmicAppList/v1/favorites %{_datadir}/cosmic/com.system76.CosmicAppList/v1/filter_top_levels %{_datadir}/icons/hicolor/scalable/app/com.system76.CosmicAppletStatusArea.svg diff --git a/rpms/cosmic-bg/cosmic-bg.spec b/rpms/cosmic-bg/cosmic-bg.spec index a0cc405..38075e8 100644 --- a/rpms/cosmic-bg/cosmic-bg.spec +++ b/rpms/cosmic-bg/cosmic-bg.spec @@ -37,6 +37,10 @@ URL: https://github.com/pop-os/cosmic-bg # the tar out of the repo directory # * tar -pcJf $name-$commit.tar.xz Source: cosmic-bg-%{commit}.tar.xz +# To create the vendor tarball: +# * git clone the repository +# * cargo vendor +# * tar -pcJf $name-$commit-vendor.tar.xz Source: cosmic-bg-%{commit}-vendor.tar.xz BuildRequires: cargo-rpm-macros >= 25 @@ -83,6 +87,7 @@ just rootdir=%{buildroot} prefix=%{_prefix} install %{_datadir}/applications/com.system76.CosmicBackground.desktop %{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicBackground.svg %{_datadir}/icons/hicolor/symbolic/apps/com.system76.CosmicBackground-symbolic.svg +%dir %{_datadir}/cosmic/com.system76.CosmicBackground %{_datadir}/cosmic/com.system76.CosmicBackground/* %{_metainfodir}/com.system76.CosmicBackground.metainfo.xml diff --git a/rpms/cosmic-comp/cosmic-comp.spec b/rpms/cosmic-comp/cosmic-comp.spec index 3c60d53..e94a000 100644 --- a/rpms/cosmic-comp/cosmic-comp.spec +++ b/rpms/cosmic-comp/cosmic-comp.spec @@ -48,6 +48,10 @@ URL: https://github.com/pop-os/cosmic-comp # the tar out of the repo directory # * tar -pcJf $name-$commit.tar.xz Source: cosmic-comp-%{commit}.tar.xz +# To create the vendor tarball: +# * git clone the repository +# * cargo vendor +# * tar -pcJf $name-$commit-vendor.tar.xz Source: cosmic-comp-%{commit}-vendor.tar.xz BuildRequires: cargo-rpm-macros >= 25 @@ -98,6 +102,7 @@ install -Dm0644 config.ron %{buildroot}/%{_sysconfdir}/cosmic-comp/config.ron %license LICENSE.dependencies %license cargo-vendor.txt %{_bindir}/cosmic-comp +%dir %{_sysconfdir}/cosmic-comp %config(noreplace) %{_sysconfdir}/cosmic-comp/config.ron %changelog diff --git a/rpms/cosmic-edit/cosmic-edit.spec b/rpms/cosmic-edit/cosmic-edit.spec index d501ac4..dd642e3 100644 --- a/rpms/cosmic-edit/cosmic-edit.spec +++ b/rpms/cosmic-edit/cosmic-edit.spec @@ -51,6 +51,10 @@ URL: https://github.com/pop-os/cosmic-edit # the tar out of the repo directory # * tar -pcJf $name-$commit.tar.xz Source: cosmic-edit-%{commit}.tar.xz +# To create the vendor tarball: +# * git clone the repository +# * cargo vendor +# * tar -pcJf $name-$commit-vendor.tar.xz Source: cosmic-edit-%{commit}-vendor.tar.xz BuildRequires: cargo-rpm-macros >= 26 diff --git a/rpms/cosmic-files/cosmic-files.spec b/rpms/cosmic-files/cosmic-files.spec index 45b9542..6304fa3 100644 --- a/rpms/cosmic-files/cosmic-files.spec +++ b/rpms/cosmic-files/cosmic-files.spec @@ -50,6 +50,10 @@ URL: https://github.com/pop-os/cosmic-files # the tar out of the repo directory # * tar -pcJf $name-$commit.tar.xz Source: cosmic-files-%{commit}.tar.xz +# To create the vendor tarball: +# * git clone the repository +# * cargo vendor +# * tar -pcJf $name-$commit-vendor.tar.xz Source: cosmic-files-%{commit}-vendor.tar.xz BuildRequires: cargo-rpm-macros >= 26 @@ -82,8 +86,7 @@ sed 's/\(.*\) (.*#\(.*\))/\1+git\2/' -i cargo-vendor.txt just rootdir=%{buildroot} prefix=%{_prefix} install %if %{with check} -# FIXME: --lib test fails currently -# %%cargo_test +%cargo_test %endif %files diff --git a/rpms/cosmic-greeter/cosmic-greeter.spec b/rpms/cosmic-greeter/cosmic-greeter.spec index 9611e5f..b00654e 100644 --- a/rpms/cosmic-greeter/cosmic-greeter.spec +++ b/rpms/cosmic-greeter/cosmic-greeter.spec @@ -44,6 +44,10 @@ URL: https://github.com/pop-os/cosmic-greeter # the tar out of the repo directory # * tar -pcJf $name-$commit.tar.xz Source: cosmic-greeter-%{commit}.tar.xz +# To create the vendor tarball: +# * git clone the repository +# * cargo vendor +# * tar -pcJf $name-$commit-vendor.tar.xz Source: cosmic-greeter-%{commit}-vendor.tar.xz Patch: service.patch diff --git a/rpms/cosmic-launcher/cosmic-launcher.spec b/rpms/cosmic-launcher/cosmic-launcher.spec index 833cf9c..06114cc 100644 --- a/rpms/cosmic-launcher/cosmic-launcher.spec +++ b/rpms/cosmic-launcher/cosmic-launcher.spec @@ -50,6 +50,10 @@ URL: https://github.com/pop-os/cosmic-launcher # the tar out of the repo directory # * tar -pcJf $name-$commit.tar.xz Source: cosmic-launcher-%{commit}.tar.xz +# To create the vendor tarball: +# * git clone the repository +# * cargo vendor +# * tar -pcJf $name-$commit-vendor.tar.xz Source: cosmic-launcher-%{commit}-vendor.tar.xz BuildRequires: cargo-rpm-macros >= 26 diff --git a/rpms/cosmic-notifications/cosmic-notifications.spec b/rpms/cosmic-notifications/cosmic-notifications.spec index e8d29e6..a1595c0 100644 --- a/rpms/cosmic-notifications/cosmic-notifications.spec +++ b/rpms/cosmic-notifications/cosmic-notifications.spec @@ -45,6 +45,10 @@ URL: https://github.com/pop-os/cosmic-notifications # the tar out of the repo directory # * tar -pcJf $name-$commit.tar.xz Source: cosmic-notifications-%{commit}.tar.xz +# To create the vendor tarball: +# * git clone the repository +# * cargo vendor +# * tar -pcJf $name-$commit-vendor.tar.xz Source: cosmic-notifications-%{commit}-vendor.tar.xz BuildRequires: cargo-rpm-macros >= 25 diff --git a/rpms/cosmic-osd/cosmic-osd.spec b/rpms/cosmic-osd/cosmic-osd.spec index 16f828f..7b323c9 100644 --- a/rpms/cosmic-osd/cosmic-osd.spec +++ b/rpms/cosmic-osd/cosmic-osd.spec @@ -48,6 +48,10 @@ URL: https://github.com/pop-os/cosmic-osd # the tar out of the repo directory # * tar -pcJf $name-$commit.tar.xz Source: cosmic-osd-%{commit}.tar.xz +# To create the vendor tarball: +# * git clone the repository +# * cargo vendor +# * tar -pcJf $name-$commit-vendor.tar.xz Source: cosmic-osd-%{commit}-vendor.tar.xz BuildRequires: cargo-rpm-macros >= 26 diff --git a/rpms/cosmic-panel/cosmic-panel.spec b/rpms/cosmic-panel/cosmic-panel.spec index 1dcb300..22085c5 100644 --- a/rpms/cosmic-panel/cosmic-panel.spec +++ b/rpms/cosmic-panel/cosmic-panel.spec @@ -42,6 +42,10 @@ URL: https://github.com/pop-os/cosmic-panel # the tar out of the repo directory # * tar -pcJf $name-$commit.tar.xz Source: cosmic-panel-%{commit}.tar.xz +# To create the vendor tarball: +# * git clone the repository +# * cargo vendor +# * tar -pcJf $name-$commit-vendor.tar.xz Source: cosmic-panel-%{commit}-vendor.tar.xz BuildRequires: cargo-rpm-macros >= 25 @@ -83,6 +87,9 @@ just rootdir=%{buildroot} prefix=%{_prefix} install %license cargo-vendor.txt %doc README.md %{_bindir}/cosmic-panel +%dir %{_datadir}/cosmic/com.system76.CosmicPanel.Dock +%dir %{_datadir}/cosmic/com.system76.CosmicPanel.Panel +%dir %{_datadir}/cosmic/com.system76.CosmicPanel %{_datadir}/cosmic/com.system76.CosmicPanel.Dock/* %{_datadir}/cosmic/com.system76.CosmicPanel.Panel/* %{_datadir}/cosmic/com.system76.CosmicPanel/* diff --git a/rpms/cosmic-player/cosmic-player.spec b/rpms/cosmic-player/cosmic-player.spec deleted file mode 100644 index 2c1e836..0000000 --- a/rpms/cosmic-player/cosmic-player.spec +++ /dev/null @@ -1,65 +0,0 @@ -# Generated by rust2rpm 26 -%bcond_without check - -# prevent library files from being installed -%global cargo_install_lib 0 - -%global crate cosmic-player - -Name: cosmic-player -Version: 0.1.0 -Release: %autorelease -Summary: # FIXME - -SourceLicense: None -# FIXME: paste output of %%cargo_license_summary here -License: # FIXME -# LICENSE.dependencies contains a full license breakdown -# FIXME: No license information in crate metadata. - -URL: # FIXME - -# To create these sources: -# * git clone the repository -# * cargo vendor > .vendor/config.toml -# * tar -pcJf $name-$commit-vendor.tar.xz and move -# the tar out of the repo directory -# * tar -pcJf $name-$commit.tar.xz -Source: # FIXME -Source: cosmic-player-0.1.0-vendor.tar.xz - -BuildRequires: cargo-rpm-macros >= 26 - -%global _description %{expand: -%{summary}.} - -%description %{_description} - -%prep -%autosetup -n %{crate}-%{version} -p1 -a1 -%cargo_prep -v vendor - -%build -%cargo_build -%{cargo_license_summary} -%{cargo_license} > LICENSE.dependencies -%{cargo_vendor_manifest} -sed 's/\(.*\) (.*#\(.*\))/\1+git\2/' -i cargo-vendor.txt - -%install -%cargo_install - -%if %{with check} -%check -%cargo_test -%endif - -%files -%license LICENSE -%license LICENSE.dependencies -%license cargo-vendor.txt -%doc README.md -%{_bindir}/cosmic-player - -%changelog -%autochangelog diff --git a/rpms/cosmic-randr/cosmic-randr.spec b/rpms/cosmic-randr/cosmic-randr.spec index 0fa7422..e32c70f 100644 --- a/rpms/cosmic-randr/cosmic-randr.spec +++ b/rpms/cosmic-randr/cosmic-randr.spec @@ -34,6 +34,10 @@ URL: https://github.com/pop-os/cosmic-randr # the tar out of the repo directory # * tar -pcJf $name-$commit.tar.xz Source: cosmic-randr-%{commit}.tar.xz +# To create the vendor tarball: +# * git clone the repository +# * cargo vendor +# * tar -pcJf $name-$commit-vendor.tar.xz Source: cosmic-randr-%{commit}-vendor.tar.xz BuildRequires: cargo-rpm-macros >= 25 diff --git a/rpms/cosmic-screenshot/cosmic-screenshot.spec b/rpms/cosmic-screenshot/cosmic-screenshot.spec index 0f82db2..4cfdb03 100644 --- a/rpms/cosmic-screenshot/cosmic-screenshot.spec +++ b/rpms/cosmic-screenshot/cosmic-screenshot.spec @@ -38,6 +38,10 @@ URL: https://github.com/pop-os/cosmic-screenshot # the tar out of the repo directory # * tar -pcJf $name-$commit.tar.xz Source: cosmic-screenshot-%{commit}.tar.xz +# To create the vendor tarball: +# * git clone the repository +# * cargo vendor +# * tar -pcJf $name-$commit-vendor.tar.xz Source: cosmic-screenshot-%{commit}-vendor.tar.xz BuildRequires: cargo-rpm-macros >= 26 diff --git a/rpms/cosmic-session/cosmic-session.spec b/rpms/cosmic-session/cosmic-session.spec index bd296cc..88d4175 100644 --- a/rpms/cosmic-session/cosmic-session.spec +++ b/rpms/cosmic-session/cosmic-session.spec @@ -42,6 +42,10 @@ URL: https://github.com/pop-os/cosmic-session # the tar out of the repo directory # * tar -pcJf $name-$commit.tar.xz Source: cosmic-session-%{commit}.tar.xz +# To create the vendor tarball: +# * git clone the repository +# * cargo vendor +# * tar -pcJf $name-$commit-vendor.tar.xz Source: cosmic-session-%{commit}-vendor.tar.xz BuildRequires: cargo-rpm-macros >= 26 diff --git a/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec b/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec index 3eaea56..b9d4b74 100644 --- a/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec +++ b/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec @@ -47,6 +47,10 @@ URL: https://github.com/pop-os/cosmic-settings-daemon # the tar out of the repo directory # * tar -pcJf $name-$commit.tar.xz Source: cosmic-settings-daemon-%{commit}.tar.xz +# To create the vendor tarball: +# * git clone the repository +# * cargo vendor +# * tar -pcJf $name-$commit-vendor.tar.xz Source: cosmic-settings-daemon-%{commit}-vendor.tar.xz BuildRequires: cargo-rpm-macros >= 26 diff --git a/rpms/cosmic-settings/cosmic-settings.spec b/rpms/cosmic-settings/cosmic-settings.spec index c20fa52..5889951 100644 --- a/rpms/cosmic-settings/cosmic-settings.spec +++ b/rpms/cosmic-settings/cosmic-settings.spec @@ -48,6 +48,10 @@ URL: https://github.com/pop-os/cosmic-settings # the tar out of the repo directory # * tar -pcJf $name-$commit.tar.xz Source: cosmic-settings-%{commit}.tar.xz +# To create the vendor tarball: +# * git clone the repository +# * cargo vendor +# * tar -pcJf $name-$commit-vendor.tar.xz Source: cosmic-settings-%{commit}-vendor.tar.xz BuildRequires: cargo-rpm-macros >= 25 @@ -93,10 +97,15 @@ just rootdir=%{buildroot} install %{_bindir}/cosmic-settings %{_datadir}/applications/com.system76.CosmicSettings.desktop %{_metainfodir}/com.system76.CosmicSettings.metainfo.xml +%dir %{_datadir}/cosmic/com.system76.CosmicTheme.Dark.Builder %{_datadir}/cosmic/com.system76.CosmicTheme.Dark.Builder/v1/* +%dir %{_datadir}/cosmic/com.system76.CosmicTheme.Dark %{_datadir}/cosmic/com.system76.CosmicTheme.Dark/v1/* +%dir %{_datadir}/cosmic/com.system76.CosmicTheme.Light.Builder %{_datadir}/cosmic/com.system76.CosmicTheme.Light.Builder/v1/* +%dir %{_datadir}/cosmic/com.system76.CosmicTheme.Light %{_datadir}/cosmic/com.system76.CosmicTheme.Light/v1/* +%dir %{_datadir}/cosmic/com.system76.CosmicTheme.Mode %{_datadir}/cosmic/com.system76.CosmicTheme.Mode/v1/* %{_datadir}/icons/hicolor/scalable/status/illustration-appearance-dark-style-round.svg %{_datadir}/icons/hicolor/scalable/status/illustration-appearance-dark-style-slightly-round.svg diff --git a/rpms/cosmic-store/cosmic-store.spec b/rpms/cosmic-store/cosmic-store.spec index c7da7bd..f57ba76 100644 --- a/rpms/cosmic-store/cosmic-store.spec +++ b/rpms/cosmic-store/cosmic-store.spec @@ -46,6 +46,10 @@ URL: https://github.com/pop-os/cosmic-store # the tar out of the repo directory # * tar -pcJf $name-$commit.tar.xz Source: cosmic-store-%{commit}.tar.xz +# To create the vendor tarball: +# * git clone the repository +# * cargo vendor +# * tar -pcJf $name-$commit-vendor.tar.xz Source: cosmic-store-%{commit}-vendor.tar.xz BuildRequires: cargo-rpm-macros >= 25 diff --git a/rpms/cosmic-term/cosmic-term.spec b/rpms/cosmic-term/cosmic-term.spec index beedce7..cfaa46e 100644 --- a/rpms/cosmic-term/cosmic-term.spec +++ b/rpms/cosmic-term/cosmic-term.spec @@ -50,6 +50,10 @@ URL: https://github.com/pop-os/cosmic-term # the tar out of the repo directory # * tar -pcJf $name-$commit.tar.xz Source: cosmic-term-%{commit}.tar.xz +# To create the vendor tarball: +# * git clone the repository +# * cargo vendor +# * tar -pcJf $name-$commit-vendor.tar.xz Source: cosmic-term-%{commit}-vendor.tar.xz BuildRequires: cargo-rpm-macros >= 26 diff --git a/rpms/cosmic-workspaces/cosmic-workspaces.spec b/rpms/cosmic-workspaces/cosmic-workspaces.spec index 772d8e6..535eef6 100644 --- a/rpms/cosmic-workspaces/cosmic-workspaces.spec +++ b/rpms/cosmic-workspaces/cosmic-workspaces.spec @@ -48,6 +48,10 @@ URL: https://github.com/pop-os/cosmic-workspaces-epoch # the tar out of the repo directory # * tar -pcJf $name-$commit.tar.xz Source: cosmic-workspaces-%{commit}.tar.xz +# To create the vendor tarball: +# * git clone the repository +# * cargo vendor +# * tar -pcJf $name-$commit-vendor.tar.xz Source: cosmic-workspaces-%{commit}-vendor.tar.xz BuildRequires: cargo-rpm-macros >= 26 diff --git a/rpms/pop-launcher/pop-launcher.spec b/rpms/pop-launcher/pop-launcher.spec index 504e745..5dd19b2 100644 --- a/rpms/pop-launcher/pop-launcher.spec +++ b/rpms/pop-launcher/pop-launcher.spec @@ -43,6 +43,10 @@ URL: https://github.com/pop-os/launcher # the tar out of the repo directory # * tar -pcJf $name-$commit.tar.xz Source: pop-launcher-%{commit}.tar.xz +# To create the vendor tarball: +# * git clone the repository +# * cargo vendor +# * tar -pcJf $name-$commit-vendor.tar.xz Source: pop-launcher-%{commit}-vendor.tar.xz Patch: symlink.patch @@ -69,7 +73,6 @@ Requires: fd-find cat .vendor/config.toml >> .cargo/config %build -# %%cargo_build just build-release --offline --frozen %{cargo_license_summary} %{cargo_license} > LICENSE.dependencies @@ -88,9 +91,10 @@ just rootdir=%{buildroot} install %license LICENSE %license plugins/COPYING %license LICENSE.dependencies -# %% license cargo-vendor.txt +%license cargo-vendor.txt %doc README.md %{_bindir}/pop-launcher +%dir %{_prefix}/lib/pop-launcher %{_prefix}/lib/pop-launcher/* %changelog diff --git a/rpms/system76-power/system76-power.old.spec b/rpms/system76-power/system76-power.old.spec deleted file mode 100644 index dd21c4c..0000000 --- a/rpms/system76-power/system76-power.old.spec +++ /dev/null @@ -1,95 +0,0 @@ -%define debug_package %{nil} -# Generated by rust2rpm 25 - -# prevent library files from being installed - -%global crate system76-power -%global repo https://github.com/pop-os/system76-power - -Name: system76-power -Version: # TO BE REPLACED AUTOMATICALLY - -Release: %autorelease -Summary: System76 Power Management - -License: GPL-3.0 - -URL: https://github.com/pop-os/system76-power - -Source: %{crate}.tar.gz -Source: vendor.tar - - - -# For now, we require all deps for all of cosmic-epoch -BuildRequires: make -BuildRequires: which -BuildRequires: git-core -BuildRequires: just -BuildRequires: rustc -BuildRequires: lld -BuildRequires: cargo -BuildRequires: glib2-devel -BuildRequires: gtk3-devel -BuildRequires: dbus-devel -BuildRequires: wayland-devel -BuildRequires: clang-devel -BuildRequires: libxkbcommon-devel -BuildRequires: mesa-libgbm-devel -BuildRequires: rust-rav1e+nasm-rs-devel -BuildRequires: libappstream-glib -BuildRequires: pipewire-devel -BuildRequires: libglvnd-devel -BuildRequires: libseat-devel -BuildRequires: libinput-devel -BuildRequires: pam-devel -BuildRequires: flatpak-devel - -BuildRequires: rust-hidapi+linux-shared-libusb-devel -BuildRequires: libusb1-devel -BuildRequires: systemd-rpm-macros - - -# For now, we require all deps for all of cosmic-epoch -Requires: libseat -Requires: pop-icon-theme -Requires: greetd -Requires: greetd-selinux -Requires: cage -Requires: mozilla-fira-mono-fonts -Requires: mozilla-fira-sans-fonts - - -%global _description %{expand: -%{summary}.} - -%description %{_description} - -%prep - -%autosetup -n %{crate} -p1 -mv %{_sourcedir}/vendor.tar vendor.tar -ls -a -mkdir -p .cargo -cp .vendor/config.toml .cargo/config.toml - -tar -pxf vendor.tar - -%build -cargo build --release --offline --frozen - -%install -make install DESTDIR=%{buildroot} prefix=%{_prefix} - -%files - -%{_bindir}/system76-power -%{_unitdir}/com.system76.PowerDaemon.service -%{_datadir}/dbus-1/interfaces/com.system76.PowerDaemon.xml -%{_datadir}/dbus-1/system.d/com.system76.PowerDaemon.conf -%{_datadir}/polkit-1/actions/com.system76.PowerDaemon.policy - - -%changelog -%autochangelog - \ No newline at end of file diff --git a/rpms/system76-power/system76-power.spec b/rpms/system76-power/system76-power.spec deleted file mode 100644 index 20297d0..0000000 --- a/rpms/system76-power/system76-power.spec +++ /dev/null @@ -1,59 +0,0 @@ -# Generated by rust2rpm 26 -%bcond_without check - -# prevent library files from being installed -%global cargo_install_lib 0 - -%global crate system76-power - -Name: system76-power -Version: 1.1.25 -Release: %autorelease -Summary: # FIXME - -SourceLicense: None -# FIXME: paste output of %%cargo_license_summary here -License: # FIXME -# LICENSE.dependencies contains a full license breakdown -# FIXME: No license information in crate metadata. - -URL: # FIXME -Source: # FIXME -Source: system76-power-1.1.25-vendor.tar.xz - -BuildRequires: cargo-rpm-macros >= 26 - -%global _description %{expand: -%{summary}.} - -%description %{_description} - -%prep -%autosetup -n %{crate}-%{version} -p1 -a1 -%cargo_prep -v vendor - -%build -%cargo_build -%{cargo_license_summary} -%{cargo_license} > LICENSE.dependencies -%{cargo_vendor_manifest} -sed 's/\(.*\) (.*#\(.*\))/\1+git\2/' -i cargo-vendor.txt - -%install -%cargo_install - -%if %{with check} -%check -%cargo_test -%endif - -%files -%license LICENSE -%license LICENSE.dependencies -%license cargo-vendor.txt -%doc README.md -%doc TESTING.md -%{_bindir}/system76-power - -%changelog -%autochangelog diff --git a/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec b/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec index c818ba0..f50a3ae 100644 --- a/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec +++ b/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec @@ -48,6 +48,10 @@ URL: https://github.com/pop-os/xdg-desktop-portal-cosmic # the tar out of the repo directory # * tar -pcJf $name-$commit.tar.xz Source: xdg-desktop-portal-cosmic-%{commit}.tar.xz +# To create the vendor tarball: +# * git clone the repository +# * cargo vendor +# * tar -pcJf $name-$commit-vendor.tar.xz Source: xdg-desktop-portal-cosmic-%{commit}-vendor.tar.xz BuildRequires: cargo-rpm-macros >= 26 From 8bbd9e2426f09805b5ec52ae61b2a75d57f87bc4 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Apr 26 2024 18:28:32 +0000 Subject: [PATCH 137/220] stuff --- diff --git a/rpms/cosmic-app-library/cosmic-app-library.spec b/rpms/cosmic-app-library/cosmic-app-library.spec index d30f639..8ea036b 100644 --- a/rpms/cosmic-app-library/cosmic-app-library.spec +++ b/rpms/cosmic-app-library/cosmic-app-library.spec @@ -43,8 +43,7 @@ URL: https://github.com/pop-os/cosmic-applibrary # To create these sources: # * git clone the repository # * cargo vendor > .vendor/config.toml -# * tar -pcJf $name-$commit-vendor.tar.xz and move -# the tar out of the repo directory +# * rm -rf vendor # * tar -pcJf $name-$commit.tar.xz Source: cosmic-app-library-%{commit}.tar.xz # To create the vendor tarball: diff --git a/rpms/cosmic-applets/cosmic-applets.spec b/rpms/cosmic-applets/cosmic-applets.spec index 70fbb4e..46e6058 100644 --- a/rpms/cosmic-applets/cosmic-applets.spec +++ b/rpms/cosmic-applets/cosmic-applets.spec @@ -39,8 +39,7 @@ URL: https://github.com/pop-os/cosmic-applets # To create these sources: # * git clone the repository # * cargo vendor > .vendor/config.toml -# * tar -pcJf $name-$commit-vendor.tar.xz and move -# the tar out of the repo directory +# * rm -rf vendor # * tar -pcJf $name-$commit.tar.xz Source: cosmic-applets-%{commit}.tar.xz # To create the vendor tarball: diff --git a/rpms/cosmic-bg/cosmic-bg.spec b/rpms/cosmic-bg/cosmic-bg.spec index 38075e8..c258102 100644 --- a/rpms/cosmic-bg/cosmic-bg.spec +++ b/rpms/cosmic-bg/cosmic-bg.spec @@ -33,8 +33,7 @@ URL: https://github.com/pop-os/cosmic-bg # To create these sources: # * git clone the repository # * cargo vendor > .vendor/config.toml -# * tar -pcJf $name-$commit-vendor.tar.xz and move -# the tar out of the repo directory +# * rm -rf vendor # * tar -pcJf $name-$commit.tar.xz Source: cosmic-bg-%{commit}.tar.xz # To create the vendor tarball: diff --git a/rpms/cosmic-comp/cosmic-comp.spec b/rpms/cosmic-comp/cosmic-comp.spec index e94a000..b10f3f2 100644 --- a/rpms/cosmic-comp/cosmic-comp.spec +++ b/rpms/cosmic-comp/cosmic-comp.spec @@ -44,8 +44,7 @@ URL: https://github.com/pop-os/cosmic-comp # To create these sources: # * git clone the repository # * cargo vendor > .vendor/config.toml -# * tar -pcJf $name-$commit-vendor.tar.xz and move -# the tar out of the repo directory +# * rm -rf vendor # * tar -pcJf $name-$commit.tar.xz Source: cosmic-comp-%{commit}.tar.xz # To create the vendor tarball: diff --git a/rpms/cosmic-edit/cosmic-edit.spec b/rpms/cosmic-edit/cosmic-edit.spec index dd642e3..babd0d4 100644 --- a/rpms/cosmic-edit/cosmic-edit.spec +++ b/rpms/cosmic-edit/cosmic-edit.spec @@ -47,8 +47,7 @@ URL: https://github.com/pop-os/cosmic-edit # To create these sources: # * git clone the repository # * cargo vendor > .vendor/config.toml -# * tar -pcJf $name-$commit-vendor.tar.xz and move -# the tar out of the repo directory +# * rm -rf vendor # * tar -pcJf $name-$commit.tar.xz Source: cosmic-edit-%{commit}.tar.xz # To create the vendor tarball: diff --git a/rpms/cosmic-files/cosmic-files.spec b/rpms/cosmic-files/cosmic-files.spec index 6304fa3..90d4da9 100644 --- a/rpms/cosmic-files/cosmic-files.spec +++ b/rpms/cosmic-files/cosmic-files.spec @@ -46,8 +46,7 @@ URL: https://github.com/pop-os/cosmic-files # To create these sources: # * git clone the repository # * cargo vendor > .vendor/config.toml -# * tar -pcJf $name-$commit-vendor.tar.xz and move -# the tar out of the repo directory +# * rm -rf vendor # * tar -pcJf $name-$commit.tar.xz Source: cosmic-files-%{commit}.tar.xz # To create the vendor tarball: diff --git a/rpms/cosmic-greeter/cosmic-greeter.spec b/rpms/cosmic-greeter/cosmic-greeter.spec index b00654e..34fe92b 100644 --- a/rpms/cosmic-greeter/cosmic-greeter.spec +++ b/rpms/cosmic-greeter/cosmic-greeter.spec @@ -40,8 +40,7 @@ URL: https://github.com/pop-os/cosmic-greeter # To create these sources: # * git clone the repository # * cargo vendor > .vendor/config.toml -# * tar -pcJf $name-$commit-vendor.tar.xz and move -# the tar out of the repo directory +# * rm -rf vendor # * tar -pcJf $name-$commit.tar.xz Source: cosmic-greeter-%{commit}.tar.xz # To create the vendor tarball: diff --git a/rpms/cosmic-icons/cosmic-icons.spec b/rpms/cosmic-icons/cosmic-icons.spec index 7a5690f..a728461 100644 --- a/rpms/cosmic-icons/cosmic-icons.spec +++ b/rpms/cosmic-icons/cosmic-icons.spec @@ -36,6 +36,7 @@ Requires: pop-icon-theme just rootdir=%{buildroot} install %files +%dir %{_datadir}/icons/Cosmic %{_datadir}/icons/Cosmic/scalable/* %{_datadir}/icons/Cosmic/index.theme diff --git a/rpms/cosmic-launcher/cosmic-launcher.spec b/rpms/cosmic-launcher/cosmic-launcher.spec index 06114cc..28e657d 100644 --- a/rpms/cosmic-launcher/cosmic-launcher.spec +++ b/rpms/cosmic-launcher/cosmic-launcher.spec @@ -46,8 +46,7 @@ URL: https://github.com/pop-os/cosmic-launcher # To create these sources: # * git clone the repository # * cargo vendor > .vendor/config.toml -# * tar -pcJf $name-$commit-vendor.tar.xz and move -# the tar out of the repo directory +# * rm -rf vendor # * tar -pcJf $name-$commit.tar.xz Source: cosmic-launcher-%{commit}.tar.xz # To create the vendor tarball: diff --git a/rpms/cosmic-notifications/cosmic-notifications.spec b/rpms/cosmic-notifications/cosmic-notifications.spec index a1595c0..a8845ca 100644 --- a/rpms/cosmic-notifications/cosmic-notifications.spec +++ b/rpms/cosmic-notifications/cosmic-notifications.spec @@ -41,8 +41,7 @@ URL: https://github.com/pop-os/cosmic-notifications # To create these sources: # * git clone the repository # * cargo vendor > .vendor/config.toml -# * tar -pcJf $name-$commit-vendor.tar.xz and move -# the tar out of the repo directory +# * rm -rf vendor # * tar -pcJf $name-$commit.tar.xz Source: cosmic-notifications-%{commit}.tar.xz # To create the vendor tarball: diff --git a/rpms/cosmic-osd/cosmic-osd.spec b/rpms/cosmic-osd/cosmic-osd.spec index 7b323c9..9e680fa 100644 --- a/rpms/cosmic-osd/cosmic-osd.spec +++ b/rpms/cosmic-osd/cosmic-osd.spec @@ -44,8 +44,7 @@ URL: https://github.com/pop-os/cosmic-osd # To create these sources: # * git clone the repository # * cargo vendor > .vendor/config.toml -# * tar -pcJf $name-$commit-vendor.tar.xz and move -# the tar out of the repo directory +# * rm -rf vendor # * tar -pcJf $name-$commit.tar.xz Source: cosmic-osd-%{commit}.tar.xz # To create the vendor tarball: diff --git a/rpms/cosmic-panel/cosmic-panel.spec b/rpms/cosmic-panel/cosmic-panel.spec index 22085c5..33c7131 100644 --- a/rpms/cosmic-panel/cosmic-panel.spec +++ b/rpms/cosmic-panel/cosmic-panel.spec @@ -38,8 +38,7 @@ URL: https://github.com/pop-os/cosmic-panel # To create these sources: # * git clone the repository # * cargo vendor > .vendor/config.toml -# * tar -pcJf $name-$commit-vendor.tar.xz and move -# the tar out of the repo directory +# * rm -rf vendor # * tar -pcJf $name-$commit.tar.xz Source: cosmic-panel-%{commit}.tar.xz # To create the vendor tarball: diff --git a/rpms/cosmic-randr/cosmic-randr.spec b/rpms/cosmic-randr/cosmic-randr.spec index e32c70f..b9e7100 100644 --- a/rpms/cosmic-randr/cosmic-randr.spec +++ b/rpms/cosmic-randr/cosmic-randr.spec @@ -30,8 +30,7 @@ URL: https://github.com/pop-os/cosmic-randr # To create these sources: # * git clone the repository # * cargo vendor > .vendor/config.toml -# * tar -pcJf $name-$commit-vendor.tar.xz and move -# the tar out of the repo directory +# * rm -rf vendor # * tar -pcJf $name-$commit.tar.xz Source: cosmic-randr-%{commit}.tar.xz # To create the vendor tarball: diff --git a/rpms/cosmic-screenshot/cosmic-screenshot.spec b/rpms/cosmic-screenshot/cosmic-screenshot.spec index 4cfdb03..598272e 100644 --- a/rpms/cosmic-screenshot/cosmic-screenshot.spec +++ b/rpms/cosmic-screenshot/cosmic-screenshot.spec @@ -34,8 +34,7 @@ URL: https://github.com/pop-os/cosmic-screenshot # To create these sources: # * git clone the repository # * cargo vendor > .vendor/config.toml -# * tar -pcJf $name-$commit-vendor.tar.xz and move -# the tar out of the repo directory +# * rm -rf vendor # * tar -pcJf $name-$commit.tar.xz Source: cosmic-screenshot-%{commit}.tar.xz # To create the vendor tarball: diff --git a/rpms/cosmic-session/cosmic-session.spec b/rpms/cosmic-session/cosmic-session.spec index 88d4175..abe5bd0 100644 --- a/rpms/cosmic-session/cosmic-session.spec +++ b/rpms/cosmic-session/cosmic-session.spec @@ -38,8 +38,7 @@ URL: https://github.com/pop-os/cosmic-session # To create these sources: # * git clone the repository # * cargo vendor > .vendor/config.toml -# * tar -pcJf $name-$commit-vendor.tar.xz and move -# the tar out of the repo directory +# * rm -rf vendor # * tar -pcJf $name-$commit.tar.xz Source: cosmic-session-%{commit}.tar.xz # To create the vendor tarball: diff --git a/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec b/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec index b9d4b74..579938b 100644 --- a/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec +++ b/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec @@ -43,8 +43,7 @@ URL: https://github.com/pop-os/cosmic-settings-daemon # To create these sources: # * git clone the repository # * cargo vendor > .vendor/config.toml -# * tar -pcJf $name-$commit-vendor.tar.xz and move -# the tar out of the repo directory +# * rm -rf vendor # * tar -pcJf $name-$commit.tar.xz Source: cosmic-settings-daemon-%{commit}.tar.xz # To create the vendor tarball: diff --git a/rpms/cosmic-settings/cosmic-settings.spec b/rpms/cosmic-settings/cosmic-settings.spec index 5889951..a58c32c 100644 --- a/rpms/cosmic-settings/cosmic-settings.spec +++ b/rpms/cosmic-settings/cosmic-settings.spec @@ -44,8 +44,7 @@ URL: https://github.com/pop-os/cosmic-settings # To create these sources: # * git clone the repository # * cargo vendor > .vendor/config.toml -# * tar -pcJf $name-$commit-vendor.tar.xz and move -# the tar out of the repo directory +# * rm -rf vendor # * tar -pcJf $name-$commit.tar.xz Source: cosmic-settings-%{commit}.tar.xz # To create the vendor tarball: diff --git a/rpms/cosmic-store/cosmic-store.spec b/rpms/cosmic-store/cosmic-store.spec index f57ba76..15c3708 100644 --- a/rpms/cosmic-store/cosmic-store.spec +++ b/rpms/cosmic-store/cosmic-store.spec @@ -42,8 +42,7 @@ URL: https://github.com/pop-os/cosmic-store # To create these sources: # * git clone the repository # * cargo vendor > .vendor/config.toml -# * tar -pcJf $name-$commit-vendor.tar.xz and move -# the tar out of the repo directory +# * rm -rf vendor # * tar -pcJf $name-$commit.tar.xz Source: cosmic-store-%{commit}.tar.xz # To create the vendor tarball: diff --git a/rpms/cosmic-term/cosmic-term.spec b/rpms/cosmic-term/cosmic-term.spec index cfaa46e..64748d9 100644 --- a/rpms/cosmic-term/cosmic-term.spec +++ b/rpms/cosmic-term/cosmic-term.spec @@ -46,8 +46,7 @@ URL: https://github.com/pop-os/cosmic-term # To create these sources: # * git clone the repository # * cargo vendor > .vendor/config.toml -# * tar -pcJf $name-$commit-vendor.tar.xz and move -# the tar out of the repo directory +# * rm -rf vendor # * tar -pcJf $name-$commit.tar.xz Source: cosmic-term-%{commit}.tar.xz # To create the vendor tarball: diff --git a/rpms/cosmic-workspaces/cosmic-workspaces.spec b/rpms/cosmic-workspaces/cosmic-workspaces.spec index 535eef6..25cb23c 100644 --- a/rpms/cosmic-workspaces/cosmic-workspaces.spec +++ b/rpms/cosmic-workspaces/cosmic-workspaces.spec @@ -44,8 +44,7 @@ URL: https://github.com/pop-os/cosmic-workspaces-epoch # To create these sources: # * git clone the repository # * cargo vendor > .vendor/config.toml -# * tar -pcJf $name-$commit-vendor.tar.xz and move -# the tar out of the repo directory +# * rm -rf vendor # * tar -pcJf $name-$commit.tar.xz Source: cosmic-workspaces-%{commit}.tar.xz # To create the vendor tarball: diff --git a/rpms/pop-launcher/pop-launcher.spec b/rpms/pop-launcher/pop-launcher.spec index 5dd19b2..38a3c14 100644 --- a/rpms/pop-launcher/pop-launcher.spec +++ b/rpms/pop-launcher/pop-launcher.spec @@ -39,8 +39,7 @@ URL: https://github.com/pop-os/launcher # To create these sources: # * git clone the repository # * cargo vendor > .vendor/config.toml -# * tar -pcJf $name-$commit-vendor.tar.xz and move -# the tar out of the repo directory +# * rm -rf vendor # * tar -pcJf $name-$commit.tar.xz Source: pop-launcher-%{commit}.tar.xz # To create the vendor tarball: diff --git a/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec b/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec index f50a3ae..fa931cb 100644 --- a/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec +++ b/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec @@ -44,8 +44,7 @@ URL: https://github.com/pop-os/xdg-desktop-portal-cosmic # To create these sources: # * git clone the repository # * cargo vendor > .vendor/config.toml -# * tar -pcJf $name-$commit-vendor.tar.xz and move -# the tar out of the repo directory +# * rm -rf vendor # * tar -pcJf $name-$commit.tar.xz Source: xdg-desktop-portal-cosmic-%{commit}.tar.xz # To create the vendor tarball: From 93406d015368a36cab53a1fd3bbce72d769b4506 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Apr 26 2024 18:29:37 +0000 Subject: [PATCH 138/220] Update cosmic-greeter.spec --- diff --git a/rpms/cosmic-greeter/cosmic-greeter.spec b/rpms/cosmic-greeter/cosmic-greeter.spec index 34fe92b..7236cb8 100644 --- a/rpms/cosmic-greeter/cosmic-greeter.spec +++ b/rpms/cosmic-greeter/cosmic-greeter.spec @@ -80,8 +80,6 @@ Requires: cosmic-comp cat .vendor/config.toml >> .cargo/config %build -# FIXME: cargo_build doesn't compile greeter daemon -# %%cargo_build cargo build --release --all --offline --frozen %{cargo_license_summary} %{cargo_license} > LICENSE.dependencies From 13dbd902595975e9c27443372570a9bf62438aef Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Apr 26 2024 18:33:29 +0000 Subject: [PATCH 139/220] Summary fixes --- diff --git a/rpms/cosmic-app-library/cosmic-app-library.spec b/rpms/cosmic-app-library/cosmic-app-library.spec index 8ea036b..97d4f24 100644 --- a/rpms/cosmic-app-library/cosmic-app-library.spec +++ b/rpms/cosmic-app-library/cosmic-app-library.spec @@ -13,7 +13,7 @@ Name: cosmic-app-library Version: %{ver}~git%{date}.%{sub %{commit} 1 7} Release: %autorelease -Summary: App Library program for the COSMIC Desktop Environment. +Summary: App Library program for the COSMIC Desktop Environment SourceLicense: GPL-3.0 # 0BSD OR MIT OR Apache-2.0 diff --git a/rpms/cosmic-applets/cosmic-applets.spec b/rpms/cosmic-applets/cosmic-applets.spec index 46e6058..ab40afe 100644 --- a/rpms/cosmic-applets/cosmic-applets.spec +++ b/rpms/cosmic-applets/cosmic-applets.spec @@ -8,7 +8,7 @@ Name: cosmic-applets Version: %{ver}~git%{date}.%{sub %{commit} 1 7} Release: %autorelease -Summary: Applets for the COSMIC Desktop Environment. +Summary: Applets for the COSMIC Desktop Environment SourceLicense: GPL-3.0-or-later # 0BSD OR MIT OR Apache-2.0 diff --git a/rpms/cosmic-bg/cosmic-bg.spec b/rpms/cosmic-bg/cosmic-bg.spec index c258102..cf0c587 100644 --- a/rpms/cosmic-bg/cosmic-bg.spec +++ b/rpms/cosmic-bg/cosmic-bg.spec @@ -8,7 +8,7 @@ Name: cosmic-bg Version: %{ver}~git%{date}.%{sub %{commit} 1 7} Release: %autorelease -Summary: Background manager for the COSMIC Desktop Environment. +Summary: Background manager for the COSMIC Desktop Environment SourceLicense: MPL-2.0 # 0BSD OR MIT OR Apache-2.0 diff --git a/rpms/cosmic-comp/cosmic-comp.spec b/rpms/cosmic-comp/cosmic-comp.spec index b10f3f2..1b78f92 100644 --- a/rpms/cosmic-comp/cosmic-comp.spec +++ b/rpms/cosmic-comp/cosmic-comp.spec @@ -8,7 +8,7 @@ Name: cosmic-comp Version: %{ver}~git%{date}.%{sub %{commit} 1 7} Release: %autorelease -Summary: Compositor for the COSMIC Desktop Environment. Can also be used as a standalone compositor. +Summary: Compositor for the COSMIC Desktop Environment SourceLicense: GPL-3.0-only # (Apache-2.0 OR MIT) AND BSD-3-Clause diff --git a/rpms/cosmic-edit/cosmic-edit.spec b/rpms/cosmic-edit/cosmic-edit.spec index babd0d4..9c83705 100644 --- a/rpms/cosmic-edit/cosmic-edit.spec +++ b/rpms/cosmic-edit/cosmic-edit.spec @@ -13,7 +13,7 @@ Name: cosmic-edit Version: %{ver}~git%{date}.%{sub %{commit} 1 7} Release: %autorelease -Summary: Libcosmic text editor. +Summary: Libcosmic text editor SourceLicense: GPL-3.0-only # (Apache-2.0 OR MIT) AND BSD-3-Clause diff --git a/rpms/cosmic-files/cosmic-files.spec b/rpms/cosmic-files/cosmic-files.spec index 90d4da9..ea766e5 100644 --- a/rpms/cosmic-files/cosmic-files.spec +++ b/rpms/cosmic-files/cosmic-files.spec @@ -13,7 +13,7 @@ Name: cosmic-files Version: %{ver}~git%{date}.%{sub %{commit} 1 7} Release: %autorelease -Summary: Libcosmic file manager. +Summary: Libcosmic file manager SourceLicense: GPL-3.0-only # 0BSD OR MIT OR Apache-2.0 diff --git a/rpms/cosmic-greeter/cosmic-greeter.spec b/rpms/cosmic-greeter/cosmic-greeter.spec index 7236cb8..ec30f98 100644 --- a/rpms/cosmic-greeter/cosmic-greeter.spec +++ b/rpms/cosmic-greeter/cosmic-greeter.spec @@ -8,7 +8,7 @@ Name: cosmic-greeter Version: %{ver}~git%{date}.%{sub %{commit} 1 7} Release: %autorelease -Summary: Login and display manager built using GreetD for the COSMIC Desktop Environment. +Summary: Login and display manager for the COSMIC Desktop Environment SourceLicense: GPL-3.0 # 0BSD OR MIT OR Apache-2.0 diff --git a/rpms/cosmic-icons/cosmic-icons.spec b/rpms/cosmic-icons/cosmic-icons.spec index a728461..8f66928 100644 --- a/rpms/cosmic-icons/cosmic-icons.spec +++ b/rpms/cosmic-icons/cosmic-icons.spec @@ -7,7 +7,7 @@ Name: cosmic-icons Version: %{ver}~git%{date}.%{sub %{commit} 1 7} Release: %autorelease -Summary: Icon theme for the COSMIC Desktop Environment. +Summary: Icon theme for the COSMIC Desktop Environment License: CC-BY-SA-4.0 diff --git a/rpms/cosmic-launcher/cosmic-launcher.spec b/rpms/cosmic-launcher/cosmic-launcher.spec index 28e657d..0b48249 100644 --- a/rpms/cosmic-launcher/cosmic-launcher.spec +++ b/rpms/cosmic-launcher/cosmic-launcher.spec @@ -13,7 +13,7 @@ Name: cosmic-launcher Version: %{ver}~git%{date}.%{sub %{commit} 1 7} Release: %autorelease -Summary: Pop launcher frontend for the COSMIC Desktop Environment. +Summary: Pop launcher frontend for the COSMIC Desktop Environment SourceLicense: GPL-3.0 # 0BSD OR MIT OR Apache-2.0 diff --git a/rpms/cosmic-notifications/cosmic-notifications.spec b/rpms/cosmic-notifications/cosmic-notifications.spec index a8845ca..44f87b3 100644 --- a/rpms/cosmic-notifications/cosmic-notifications.spec +++ b/rpms/cosmic-notifications/cosmic-notifications.spec @@ -8,7 +8,7 @@ Name: cosmic-notifications Version: %{ver}~git%{date}.%{sub %{commit} 1 7} Release: %autorelease -Summary: Notifications daemon for the COSMIC Desktop Environment. +Summary: Notifications daemon for the COSMIC Desktop Environment SourceLicense: GPL-3.0 # 0BSD OR MIT OR Apache-2.0 diff --git a/rpms/cosmic-osd/cosmic-osd.spec b/rpms/cosmic-osd/cosmic-osd.spec index 9e680fa..de8e618 100644 --- a/rpms/cosmic-osd/cosmic-osd.spec +++ b/rpms/cosmic-osd/cosmic-osd.spec @@ -13,7 +13,7 @@ Name: cosmic-osd Version: %{ver}~git%{date}.%{sub %{commit} 1 7} Release: %autorelease -Summary: OSDs for the COSMIC Desktop Environment. +Summary: OSDs for the COSMIC Desktop Environment SourceLicense: GPL-3.0-or-later # 0BSD OR MIT OR Apache-2.0 diff --git a/rpms/cosmic-panel/cosmic-panel.spec b/rpms/cosmic-panel/cosmic-panel.spec index 33c7131..6d3ce4e 100644 --- a/rpms/cosmic-panel/cosmic-panel.spec +++ b/rpms/cosmic-panel/cosmic-panel.spec @@ -8,7 +8,7 @@ Name: cosmic-panel Version: %{ver}~git%{date}.%{sub %{commit} 1 7} Release: %autorelease -Summary: Panel for the COSMIC Desktop Environment. +Summary: Panel for the COSMIC Desktop Environment SourceLicense: GPL-3.0 # 0BSD OR MIT OR Apache-2.0 diff --git a/rpms/cosmic-randr/cosmic-randr.spec b/rpms/cosmic-randr/cosmic-randr.spec index b9e7100..6ed0c92 100644 --- a/rpms/cosmic-randr/cosmic-randr.spec +++ b/rpms/cosmic-randr/cosmic-randr.spec @@ -8,7 +8,7 @@ Name: cosmic-randr Version: %{ver}~git%{date}.%{sub %{commit} 1 7} Release: %autorelease -Summary: Cosmic-randr command line interface +Summary: Display configuration command line tool SourceLicense: MPL-2.0 # 0BSD OR MIT OR Apache-2.0 diff --git a/rpms/cosmic-screenshot/cosmic-screenshot.spec b/rpms/cosmic-screenshot/cosmic-screenshot.spec index 598272e..4b8fc59 100644 --- a/rpms/cosmic-screenshot/cosmic-screenshot.spec +++ b/rpms/cosmic-screenshot/cosmic-screenshot.spec @@ -13,7 +13,7 @@ Name: cosmic-screenshot Version: %{ver}~git%{date}.%{sub %{commit} 1 7} Release: %autorelease -Summary: Screenshot utility for the COSMIC Desktop Environment. +Summary: Screenshot utility for the COSMIC Desktop Environment SourceLicense: GPL-3.0 # 0BSD OR MIT OR Apache-2.0 diff --git a/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec b/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec index 579938b..412b157 100644 --- a/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec +++ b/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec @@ -13,7 +13,7 @@ Name: cosmic-settings-daemon Version: %{ver}~git%{date}.%{sub %{commit} 1 7} Release: %autorelease -Summary: Settings daemon for the COSMIC Desktop Environment. +Summary: Settings daemon for the COSMIC Desktop Environment SourceLicense: GPL-3.0-or-later # 0BSD OR MIT OR Apache-2.0 diff --git a/rpms/cosmic-settings/cosmic-settings.spec b/rpms/cosmic-settings/cosmic-settings.spec index a58c32c..de4e2e5 100644 --- a/rpms/cosmic-settings/cosmic-settings.spec +++ b/rpms/cosmic-settings/cosmic-settings.spec @@ -10,7 +10,7 @@ Name: cosmic-settings Version: %{ver}~git%{date}.%{sub %{commit} 1 7} Release: %autorelease -Summary: Settings app for the COSMIC Desktop Environment. +Summary: Settings app for the COSMIC Desktop Environment SourceLicense: GPL-3.0 AND GPL-3.0-only # 0BSD OR MIT OR Apache-2.0 diff --git a/rpms/cosmic-store/cosmic-store.spec b/rpms/cosmic-store/cosmic-store.spec index 15c3708..8599155 100644 --- a/rpms/cosmic-store/cosmic-store.spec +++ b/rpms/cosmic-store/cosmic-store.spec @@ -8,7 +8,7 @@ Name: cosmic-store Version: %{ver}~git%{date}.%{sub %{commit} 1 7} Release: %autorelease -Summary: App store for the COSMIC Desktop Environment. +Summary: App store for the COSMIC Desktop Environment SourceLicense: GPL-3.0 # (Apache-2.0 OR MIT) AND BSD-3-Clause diff --git a/rpms/cosmic-term/cosmic-term.spec b/rpms/cosmic-term/cosmic-term.spec index 64748d9..8068fbd 100644 --- a/rpms/cosmic-term/cosmic-term.spec +++ b/rpms/cosmic-term/cosmic-term.spec @@ -13,7 +13,7 @@ Name: cosmic-term Version: %{ver}~git%{date}.%{sub %{commit} 1 7} Release: %autorelease -Summary: Terminal emulator built with Libcosmic. +Summary: Terminal emulator built with alacritty and Libcosmic SourceLicense: GPL-3.0-only # 0BSD OR MIT OR Apache-2.0 diff --git a/rpms/cosmic-workspaces/cosmic-workspaces.spec b/rpms/cosmic-workspaces/cosmic-workspaces.spec index 25cb23c..d78aba6 100644 --- a/rpms/cosmic-workspaces/cosmic-workspaces.spec +++ b/rpms/cosmic-workspaces/cosmic-workspaces.spec @@ -13,7 +13,7 @@ Name: cosmic-workspaces Version: %{ver}~git%{date}.%{sub %{commit} 1 7} Release: %autorelease -Summary: Workspaces overview for the COSMIC Desktop Environment. +Summary: Workspaces overview for the COSMIC Desktop Environment SourceLicense: GPL-3.0 # 0BSD OR MIT OR Apache-2.0 diff --git a/rpms/pop-launcher/pop-launcher.spec b/rpms/pop-launcher/pop-launcher.spec index 38a3c14..8617708 100644 --- a/rpms/pop-launcher/pop-launcher.spec +++ b/rpms/pop-launcher/pop-launcher.spec @@ -8,7 +8,7 @@ Name: pop-launcher Version: %{ver}~git%{date}.%{sub %{commit} 1 7} Release: %autorelease -Summary: Modular IPC-based desktop launcher service. +Summary: Modular IPC-based desktop launcher service SourceLicense: GPL-3.0-only AND MPL-2.0 # (Apache-2.0 OR MIT) AND BSD-3-Clause diff --git a/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec b/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec index fa931cb..36f3862 100644 --- a/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec +++ b/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec @@ -13,7 +13,7 @@ Name: xdg-desktop-portal-cosmic Version: %{ver}~git%{date}.%{sub %{commit} 1 7} Release: %autorelease -Summary: XDG Desktop Portals implementation for the COSMIC Desktop Environment. +Summary: XDG Desktop Portals for the COSMIC Desktop Environment SourceLicense: GPL-3.0-or-later # 0BSD OR MIT OR Apache-2.0 From d327751d0f7883a0374cf8638e32b668196f31b3 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Apr 27 2024 18:35:50 +0000 Subject: [PATCH 140/220] Update all_deps.txt --- diff --git a/metadata/all_deps.txt b/metadata/all_deps.txt index 3ae97b6..35fa976 100644 --- a/metadata/all_deps.txt +++ b/metadata/all_deps.txt @@ -12,7 +12,7 @@ Requires: cage Requires: mozilla-fira-mono-fonts Requires: mozilla-fira-sans-fonts - +lld cargo wayland-devel libxkbcommon-devel libglvnd-devel libseat-devel libinput-devel mesa-libgbm-devel pixman-devel make dbus-devel just libudev-devel pulseaudio-libs-devel mesa-libEGL-devel rustc lld cargo dbus-devel wayland-devel libinput-devel libudev-devel pulseaudio-libs-devel mesa-libEGL-devel libxkbcommon-devel just From cec66ce44292df8b5db1ef488c746f4f46bf8a90 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Apr 29 2024 06:40:29 +0000 Subject: [PATCH 141/220] fix: cosmic-greeter --- diff --git a/rpms/cosmic-greeter/cosmic-greeter.spec b/rpms/cosmic-greeter/cosmic-greeter.spec index ec30f98..d98b82a 100644 --- a/rpms/cosmic-greeter/cosmic-greeter.spec +++ b/rpms/cosmic-greeter/cosmic-greeter.spec @@ -67,6 +67,8 @@ BuildRequires: systemd-rpm-macros Requires: dbus Requires: greetd Requires: greetd-selinux +Requires: fprintd-pam +Requires: pam Requires: cosmic-comp %global _description %{expand: From 831f11cbde77b5b44d872698169c233c97234366 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Apr 29 2024 06:50:55 +0000 Subject: [PATCH 142/220] Add note about fprintd-pam --- diff --git a/rpms/cosmic-greeter/cosmic-greeter.spec b/rpms/cosmic-greeter/cosmic-greeter.spec index d98b82a..0cefaf0 100644 --- a/rpms/cosmic-greeter/cosmic-greeter.spec +++ b/rpms/cosmic-greeter/cosmic-greeter.spec @@ -67,6 +67,7 @@ BuildRequires: systemd-rpm-macros Requires: dbus Requires: greetd Requires: greetd-selinux +# fprintd-pam is required to start sessions (unclear why) Requires: fprintd-pam Requires: pam Requires: cosmic-comp From 57a2ae6abc7295f50a7318ebe721a0fc27f9162f Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: May 01 2024 18:18:13 +0000 Subject: [PATCH 143/220] Begone, i686 and i386 --- diff --git a/rpms/cosmic-app-library/cosmic-app-library.spec b/rpms/cosmic-app-library/cosmic-app-library.spec index 97d4f24..1981516 100644 --- a/rpms/cosmic-app-library/cosmic-app-library.spec +++ b/rpms/cosmic-app-library/cosmic-app-library.spec @@ -1,3 +1,4 @@ +ExcludeArch: %{ix86} # Generated by rust2rpm 26 %bcond_without check diff --git a/rpms/cosmic-applets/cosmic-applets.spec b/rpms/cosmic-applets/cosmic-applets.spec index ab40afe..c7a04e0 100644 --- a/rpms/cosmic-applets/cosmic-applets.spec +++ b/rpms/cosmic-applets/cosmic-applets.spec @@ -1,3 +1,4 @@ +ExcludeArch: %{ix86} # Generated by rust2rpm 26 %bcond_without check diff --git a/rpms/cosmic-bg/cosmic-bg.spec b/rpms/cosmic-bg/cosmic-bg.spec index cf0c587..8f5f73c 100644 --- a/rpms/cosmic-bg/cosmic-bg.spec +++ b/rpms/cosmic-bg/cosmic-bg.spec @@ -1,3 +1,4 @@ +ExcludeArch: %{ix86} # Generated by rust2rpm 26 %bcond_without check diff --git a/rpms/cosmic-comp/cosmic-comp.spec b/rpms/cosmic-comp/cosmic-comp.spec index 1b78f92..64e9b2f 100644 --- a/rpms/cosmic-comp/cosmic-comp.spec +++ b/rpms/cosmic-comp/cosmic-comp.spec @@ -1,3 +1,4 @@ +ExcludeArch: %{ix86} # Generated by rust2rpm 26 %bcond_without check diff --git a/rpms/cosmic-edit/cosmic-edit.spec b/rpms/cosmic-edit/cosmic-edit.spec index 9c83705..428e386 100644 --- a/rpms/cosmic-edit/cosmic-edit.spec +++ b/rpms/cosmic-edit/cosmic-edit.spec @@ -1,3 +1,4 @@ +ExcludeArch: %{ix86} # Generated by rust2rpm 26 %bcond_without check diff --git a/rpms/cosmic-files/cosmic-files.spec b/rpms/cosmic-files/cosmic-files.spec index ea766e5..042baee 100644 --- a/rpms/cosmic-files/cosmic-files.spec +++ b/rpms/cosmic-files/cosmic-files.spec @@ -1,3 +1,4 @@ +ExcludeArch: %{ix86} # Generated by rust2rpm 26 %bcond_without check diff --git a/rpms/cosmic-greeter/cosmic-greeter.spec b/rpms/cosmic-greeter/cosmic-greeter.spec index 0cefaf0..0112c2c 100644 --- a/rpms/cosmic-greeter/cosmic-greeter.spec +++ b/rpms/cosmic-greeter/cosmic-greeter.spec @@ -1,3 +1,4 @@ +ExcludeArch: %{ix86} # Generated by rust2rpm 26 %bcond_without check diff --git a/rpms/cosmic-launcher/cosmic-launcher.spec b/rpms/cosmic-launcher/cosmic-launcher.spec index 0b48249..3d42fb1 100644 --- a/rpms/cosmic-launcher/cosmic-launcher.spec +++ b/rpms/cosmic-launcher/cosmic-launcher.spec @@ -1,3 +1,4 @@ +ExcludeArch: %{ix86} # Generated by rust2rpm 26 %bcond_without check diff --git a/rpms/cosmic-notifications/cosmic-notifications.spec b/rpms/cosmic-notifications/cosmic-notifications.spec index 44f87b3..0b839c1 100644 --- a/rpms/cosmic-notifications/cosmic-notifications.spec +++ b/rpms/cosmic-notifications/cosmic-notifications.spec @@ -1,3 +1,4 @@ +ExcludeArch: %{ix86} # Generated by rust2rpm 26 %bcond_without check diff --git a/rpms/cosmic-osd/cosmic-osd.spec b/rpms/cosmic-osd/cosmic-osd.spec index de8e618..1164d35 100644 --- a/rpms/cosmic-osd/cosmic-osd.spec +++ b/rpms/cosmic-osd/cosmic-osd.spec @@ -1,3 +1,4 @@ +ExcludeArch: %{ix86} # Generated by rust2rpm 26 %bcond_without check diff --git a/rpms/cosmic-panel/cosmic-panel.spec b/rpms/cosmic-panel/cosmic-panel.spec index 6d3ce4e..3a9c263 100644 --- a/rpms/cosmic-panel/cosmic-panel.spec +++ b/rpms/cosmic-panel/cosmic-panel.spec @@ -1,3 +1,4 @@ +ExcludeArch: %{ix86} # Generated by rust2rpm 26 %bcond_without check diff --git a/rpms/cosmic-randr/cosmic-randr.spec b/rpms/cosmic-randr/cosmic-randr.spec index 6ed0c92..00cf805 100644 --- a/rpms/cosmic-randr/cosmic-randr.spec +++ b/rpms/cosmic-randr/cosmic-randr.spec @@ -1,3 +1,4 @@ +ExcludeArch: %{ix86} # Generated by rust2rpm 26 %bcond_without check diff --git a/rpms/cosmic-screenshot/cosmic-screenshot.spec b/rpms/cosmic-screenshot/cosmic-screenshot.spec index 4b8fc59..b350a65 100644 --- a/rpms/cosmic-screenshot/cosmic-screenshot.spec +++ b/rpms/cosmic-screenshot/cosmic-screenshot.spec @@ -1,3 +1,4 @@ +ExcludeArch: %{ix86} # Generated by rust2rpm 26 %bcond_without check diff --git a/rpms/cosmic-session/cosmic-session.spec b/rpms/cosmic-session/cosmic-session.spec index abe5bd0..a01d9a2 100644 --- a/rpms/cosmic-session/cosmic-session.spec +++ b/rpms/cosmic-session/cosmic-session.spec @@ -1,3 +1,4 @@ +ExcludeArch: %{ix86} # Generated by rust2rpm 26 %bcond_without check diff --git a/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec b/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec index 412b157..69f599b 100644 --- a/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec +++ b/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec @@ -1,3 +1,4 @@ +ExcludeArch: %{ix86} # Generated by rust2rpm 26 %bcond_without check diff --git a/rpms/cosmic-settings/cosmic-settings.spec b/rpms/cosmic-settings/cosmic-settings.spec index de4e2e5..3c3bc04 100644 --- a/rpms/cosmic-settings/cosmic-settings.spec +++ b/rpms/cosmic-settings/cosmic-settings.spec @@ -1,5 +1,6 @@ # FIXME: Debug artifacts get in the way %define debug_package %{nil} +ExcludeArch: %{ix86} # Generated by rust2rpm 26 %bcond_without check diff --git a/rpms/cosmic-store/cosmic-store.spec b/rpms/cosmic-store/cosmic-store.spec index 8599155..87fbe98 100644 --- a/rpms/cosmic-store/cosmic-store.spec +++ b/rpms/cosmic-store/cosmic-store.spec @@ -1,3 +1,4 @@ +ExcludeArch: %{ix86} # Generated by rust2rpm 26 %bcond_without check diff --git a/rpms/cosmic-term/cosmic-term.spec b/rpms/cosmic-term/cosmic-term.spec index 8068fbd..da00c12 100644 --- a/rpms/cosmic-term/cosmic-term.spec +++ b/rpms/cosmic-term/cosmic-term.spec @@ -1,3 +1,4 @@ +ExcludeArch: %{ix86} # Generated by rust2rpm 26 %bcond_without check diff --git a/rpms/cosmic-workspaces/cosmic-workspaces.spec b/rpms/cosmic-workspaces/cosmic-workspaces.spec index d78aba6..5ca10eb 100644 --- a/rpms/cosmic-workspaces/cosmic-workspaces.spec +++ b/rpms/cosmic-workspaces/cosmic-workspaces.spec @@ -1,3 +1,4 @@ +ExcludeArch: %{ix86} # Generated by rust2rpm 26 %bcond_without check diff --git a/rpms/pop-launcher/pop-launcher.spec b/rpms/pop-launcher/pop-launcher.spec index 8617708..feef095 100644 --- a/rpms/pop-launcher/pop-launcher.spec +++ b/rpms/pop-launcher/pop-launcher.spec @@ -1,3 +1,4 @@ +ExcludeArch: %{ix86} # Generated by rust2rpm 26 %bcond_without check diff --git a/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec b/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec index 36f3862..df7ede6 100644 --- a/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec +++ b/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec @@ -1,3 +1,4 @@ +ExcludeArch: %{ix86} # Generated by rust2rpm 26 %bcond_without check From ec2d7a5cae258eabe84ff468f83bb262bb214745 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: May 04 2024 22:53:10 +0000 Subject: [PATCH 144/220] Add cosmic-epoch compat package --- diff --git a/data/build-for-rawhide.md b/data/build-for-rawhide.md new file mode 100644 index 0000000..53fa5cd --- /dev/null +++ b/data/build-for-rawhide.md @@ -0,0 +1,7 @@ +```sh +fedpkg request-repo ... +fedpkg clone && cd +fedpkg import /path/to/package.src.rpm +fedpkg commit -m "Initial import to Fedora (rhbz#XXXXXXXX)" +fedpkg push && fedpkg build +``` diff --git a/rpms/cosmic-epoch/cosmic-epoch.spec b/rpms/cosmic-epoch/cosmic-epoch.spec new file mode 100644 index 0000000..df7dae6 --- /dev/null +++ b/rpms/cosmic-epoch/cosmic-epoch.spec @@ -0,0 +1,30 @@ +%global ver ### +%global commit ### +%global date ### + +Name: cosmic-epoch +Version: %{ver}~git%{date}.%{sub %{commit} 1 7} +Release: %autorelease +Summary: The next generation COSMIC Desktop Environment + +License: GPL-3.0 + +URL: https://github.com/pop-os/cosmic-epoch + +Requires: cosmic-desktop + +%global _description %{expand: +%{summary}.} + +%description %{_description} + +%prep + +%build + +%install + +%files + +%changelog +%autochangelog From b22b0ae095a2b2ec642ce0cf380fcf7b51510ca3 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: May 06 2024 21:30:02 +0000 Subject: [PATCH 145/220] Update cosmic-applets.spec --- diff --git a/rpms/cosmic-applets/cosmic-applets.spec b/rpms/cosmic-applets/cosmic-applets.spec index c7a04e0..95fc087 100644 --- a/rpms/cosmic-applets/cosmic-applets.spec +++ b/rpms/cosmic-applets/cosmic-applets.spec @@ -103,6 +103,7 @@ just rootdir=%{buildroot} prefix=%{_prefix} install %{_bindir}/cosmic-applet-audio %{_bindir}/cosmic-applet-battery %{_bindir}/cosmic-applet-bluetooth +%{_bindir}/cosmic-applet-input-sources %{_bindir}/cosmic-applet-minimize %{_bindir}/cosmic-applet-network %{_bindir}/cosmic-applet-notifications @@ -115,6 +116,7 @@ just rootdir=%{buildroot} prefix=%{_prefix} install %{_datadir}/applications/com.system76.CosmicAppletAudio.desktop %{_datadir}/applications/com.system76.CosmicAppletBattery.desktop %{_datadir}/applications/com.system76.CosmicAppletBluetooth.desktop +%{_datadir}/applications/com.system76.CosmicAppletInputSources.desktop %{_datadir}/applications/com.system76.CosmicAppletMinimize.desktop %{_datadir}/applications/com.system76.CosmicAppletNetwork.desktop %{_datadir}/applications/com.system76.CosmicAppletNotifications.desktop From 0e8dc1fb087e30d67fc5a14348d27e22455163bc Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: May 07 2024 04:30:22 +0000 Subject: [PATCH 146/220] Update better compile.patch --- diff --git a/rpms/cosmic-applets/better_compile.patch b/rpms/cosmic-applets/better_compile.patch index f1fcdf7..83463ce 100644 --- a/rpms/cosmic-applets/better_compile.patch +++ b/rpms/cosmic-applets/better_compile.patch @@ -1,7 +1,7 @@ ---- ./Cargo.toml 2024-03-15 12:13:48.916128075 -0500 -+++ ./Cargo.toml.new 2024-03-15 12:14:58.707131403 -0500 -@@ -50,7 +50,7 @@ - tracing-log = "0.2.0" +--- Cargo.toml 2024-05-06 17:04:31.059469877 -0500 ++++ Cargo.toml.new 2024-05-06 23:27:51.338764184 -0500 +@@ -56,7 +56,7 @@ + serde = { version = "1.0.152", features = ["derive"] } [profile.release] -lto = "fat" From 4444f65dabc0050e3611279c906bded0c52c0bc4 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: May 07 2024 04:52:06 +0000 Subject: [PATCH 147/220] Update better_compile.patch --- diff --git a/rpms/cosmic-applets/better_compile.patch b/rpms/cosmic-applets/better_compile.patch index 83463ce..073eb83 100644 --- a/rpms/cosmic-applets/better_compile.patch +++ b/rpms/cosmic-applets/better_compile.patch @@ -1,5 +1,5 @@ ---- Cargo.toml 2024-05-06 17:04:31.059469877 -0500 -+++ Cargo.toml.new 2024-05-06 23:27:51.338764184 -0500 +--- ./Cargo.toml 2024-05-06 17:04:31.059469877 -0500 ++++ ./Cargo.toml.new 2024-05-06 23:27:51.338764184 -0500 @@ -56,7 +56,7 @@ serde = { version = "1.0.152", features = ["derive"] } From 6f00e1b5eeaf00e5b222d7ed7c9a3ca5fb2ac4ef Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: May 08 2024 20:13:28 +0000 Subject: [PATCH 148/220] Update cosmic-applets.spec --- diff --git a/rpms/cosmic-applets/cosmic-applets.spec b/rpms/cosmic-applets/cosmic-applets.spec index 95fc087..909f9e5 100644 --- a/rpms/cosmic-applets/cosmic-applets.spec +++ b/rpms/cosmic-applets/cosmic-applets.spec @@ -130,7 +130,7 @@ just rootdir=%{buildroot} prefix=%{_prefix} install %dir %{_datadir}/cosmic/com.system76.CosmicAppList %{_datadir}/cosmic/com.system76.CosmicAppList/v1/favorites %{_datadir}/cosmic/com.system76.CosmicAppList/v1/filter_top_levels -%{_datadir}/icons/hicolor/scalable/app/com.system76.CosmicAppletStatusArea.svg +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletStatusArea.svg %{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppList.svg %{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletAudio.svg %{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletBattery.svg From c41a00c658a540c8a436db4b915aace9179ea1d6 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: May 12 2024 06:47:21 +0000 Subject: [PATCH 149/220] fix: cosmic-applets --- diff --git a/rpms/cosmic-applets/cosmic-applets.spec b/rpms/cosmic-applets/cosmic-applets.spec index 909f9e5..6d52a95 100644 --- a/rpms/cosmic-applets/cosmic-applets.spec +++ b/rpms/cosmic-applets/cosmic-applets.spec @@ -132,17 +132,19 @@ just rootdir=%{buildroot} prefix=%{_prefix} install %{_datadir}/cosmic/com.system76.CosmicAppList/v1/filter_top_levels %{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletStatusArea.svg %{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppList.svg -%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletAudio.svg -%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletBattery.svg -%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletBluetooth.svg +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletAudio-symbolic.svg +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletBattery-symbolic.svg +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletBluetooth-symbolic.svg +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletInputSources-symbolic.svg %{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletMinimize.svg -%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletNetwork.svg -%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletNotifications.svg -%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletPower.svg +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletNetwork-symbolic.svg +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletNotifications-symbolic.svg +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletPower-symbolic.svg %{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletTiling.Off.svg %{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletTiling.On.svg -%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletTime.svg -%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletWorkspaces.svg +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletTiling-symbolic.svg +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletTime-symbolic.svg +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletWorkspaces-symbolic.svg %{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicPanelAppButton.svg %{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicPanelWorkspacesButton.svg %{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-display-brightness-high-symbolic.svg From 113b3fbc3dcaf2e5afe40e3946cd4b04bd97e033 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: May 15 2024 18:27:12 +0000 Subject: [PATCH 150/220] s --- diff --git a/data/build-for-rawhide.md b/data/build-for-rawhide.md index 53fa5cd..bd7d544 100644 --- a/data/build-for-rawhide.md +++ b/data/build-for-rawhide.md @@ -5,3 +5,7 @@ fedpkg import /path/to/package.src.rpm fedpkg commit -m "Initial import to Fedora (rhbz#XXXXXXXX)" fedpkg push && fedpkg build ``` + +``` +fkinit +``` \ No newline at end of file diff --git a/rpms/cosmic-greeter/cosmic-greeter.spec b/rpms/cosmic-greeter/cosmic-greeter.spec index 0112c2c..3cbde20 100644 --- a/rpms/cosmic-greeter/cosmic-greeter.spec +++ b/rpms/cosmic-greeter/cosmic-greeter.spec @@ -96,7 +96,7 @@ install -Dm0755 target/release/cosmic-greeter-daemon %{buildroot}/%{_bindir}/cos install -Dm0644 dbus/com.system76.CosmicGreeter.conf %{buildroot}/%{_datadir}/dbus-1/system.d/com.system76.CosmicGreeter.conf install -Dm0644 debian/cosmic-greeter.sysusers %{buildroot}/%{_sysusersdir}/cosmic-greeter.conf install -Dm0644 debian/cosmic-greeter.tmpfiles %{buildroot}/%{_tmpfilesdir}/cosmic-greeter.conf -install -Dm0644 cosmic-greeter.toml %{buildroot}/%{_prefix}/etc/greetd/cosmic-greeter.toml +install -Dm0644 cosmic-greeter.toml %{buildroot}/%{_sysconfdir}/greetd/cosmic-greeter.toml install -Dm0644 debian/cosmic-greeter.service %{buildroot}/%{_unitdir}/cosmic-greeter.service install -Dm0644 debian/cosmic-greeter-daemon.service %{buildroot}/%{_unitdir}/cosmic-greeter-daemon.service @@ -130,7 +130,7 @@ install -Dm0644 debian/cosmic-greeter-daemon.service %{buildroot}/%{_unitdir}/co %{_datadir}/dbus-1/system.d/com.system76.CosmicGreeter.conf %{_sysusersdir}/cosmic-greeter.conf %{_tmpfilesdir}/cosmic-greeter.conf -%{_prefix}/etc/greetd/cosmic-greeter.toml +%{_sysconfdir}/greetd/cosmic-greeter.toml %{_unitdir}/cosmic-greeter.service %{_unitdir}/cosmic-greeter-daemon.service From 1b7c31aae6b0996643eb47c0001e601a875ca8f5 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: May 19 2024 19:56:27 +0000 Subject: [PATCH 151/220] Fix: building for libcosmic apps --- diff --git a/rpms/cosmic-edit/cosmic-edit.spec b/rpms/cosmic-edit/cosmic-edit.spec index 428e386..06ec54f 100644 --- a/rpms/cosmic-edit/cosmic-edit.spec +++ b/rpms/cosmic-edit/cosmic-edit.spec @@ -62,6 +62,7 @@ BuildRequires: rustc BuildRequires: lld BuildRequires: cargo BuildRequires: just +BuildRequires: libxkbcommon-devel BuildRequires: git-core diff --git a/rpms/cosmic-files/cosmic-files.spec b/rpms/cosmic-files/cosmic-files.spec index 042baee..6b39582 100644 --- a/rpms/cosmic-files/cosmic-files.spec +++ b/rpms/cosmic-files/cosmic-files.spec @@ -62,6 +62,7 @@ BuildRequires: lld BuildRequires: cargo BuildRequires: just BuildRequires: glib2-devel +BuildRequires: libxkbcommon-devel BuildRequires: git-core diff --git a/rpms/cosmic-store/cosmic-store.spec b/rpms/cosmic-store/cosmic-store.spec index 87fbe98..19fa766 100644 --- a/rpms/cosmic-store/cosmic-store.spec +++ b/rpms/cosmic-store/cosmic-store.spec @@ -59,6 +59,7 @@ BuildRequires: cargo BuildRequires: flatpak-devel BuildRequires: libappstream-glib BuildRequires: just +BuildRequires: libxkbcommon-devel Requires: PackageKit Requires: flatpak-libs diff --git a/rpms/cosmic-term/cosmic-term.spec b/rpms/cosmic-term/cosmic-term.spec index da00c12..c37291a 100644 --- a/rpms/cosmic-term/cosmic-term.spec +++ b/rpms/cosmic-term/cosmic-term.spec @@ -61,6 +61,7 @@ BuildRequires: rustc BuildRequires: lld BuildRequires: cargo BuildRequires: just +BuildRequires: libxkbcommon-devel BuildRequires: git-core From efd5cb907bc2beacb4ce964ae569f80a30bad2ff Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: May 19 2024 20:12:41 +0000 Subject: [PATCH 152/220] fix: Write vendor config to config.toml NOTE: This currently breaks any other build that's not Fedora Rawhide, as this change coincides with a rust-packaging change: https://pagure.io/fedora-rust/rust-packaging/c/146c0bec7738d7e3302f61391e3ea62522053446?branch=main --- diff --git a/rpms/cosmic-app-library/cosmic-app-library.spec b/rpms/cosmic-app-library/cosmic-app-library.spec index 1981516..85fd6e4 100644 --- a/rpms/cosmic-app-library/cosmic-app-library.spec +++ b/rpms/cosmic-app-library/cosmic-app-library.spec @@ -69,7 +69,7 @@ BuildRequires: just %prep %autosetup -n %{crate}-%{commit} -p1 -a1 %cargo_prep -N -cat .vendor/config.toml >> .cargo/config +cat .vendor/config.toml >> .cargo/config.toml %build %cargo_build diff --git a/rpms/cosmic-applets/cosmic-applets.spec b/rpms/cosmic-applets/cosmic-applets.spec index 6d52a95..6e03918 100644 --- a/rpms/cosmic-applets/cosmic-applets.spec +++ b/rpms/cosmic-applets/cosmic-applets.spec @@ -76,7 +76,7 @@ Requires: cosmic-panel %prep %autosetup -n cosmic-applets-%{commit} -p1 -a1 %cargo_prep -N -cat .vendor/config.toml >> .cargo/config +cat .vendor/config.toml >> .cargo/config.toml %build %cargo_build diff --git a/rpms/cosmic-bg/cosmic-bg.spec b/rpms/cosmic-bg/cosmic-bg.spec index 8f5f73c..2b2ceed 100644 --- a/rpms/cosmic-bg/cosmic-bg.spec +++ b/rpms/cosmic-bg/cosmic-bg.spec @@ -61,7 +61,7 @@ Requires: cosmic-session %prep %autosetup -n cosmic-bg-%{commit} -p1 -a1 %cargo_prep -N -cat .vendor/config.toml >> .cargo/config +cat .vendor/config.toml >> .cargo/config.toml %build %cargo_build diff --git a/rpms/cosmic-comp/cosmic-comp.spec b/rpms/cosmic-comp/cosmic-comp.spec index 64e9b2f..b2b98a4 100644 --- a/rpms/cosmic-comp/cosmic-comp.spec +++ b/rpms/cosmic-comp/cosmic-comp.spec @@ -79,7 +79,7 @@ Recommends: cosmic-session %prep %autosetup -n cosmic-comp-%{commit} -p1 -a1 %cargo_prep -N -cat .vendor/config.toml >> .cargo/config +cat .vendor/config.toml >> .cargo/config.toml %build %cargo_build diff --git a/rpms/cosmic-edit/cosmic-edit.spec b/rpms/cosmic-edit/cosmic-edit.spec index 06ec54f..2c8b531 100644 --- a/rpms/cosmic-edit/cosmic-edit.spec +++ b/rpms/cosmic-edit/cosmic-edit.spec @@ -74,7 +74,7 @@ BuildRequires: git-core %prep %autosetup -n %{crate}-%{commit} -p1 -a1 %cargo_prep -N -cat .vendor/config.toml >> .cargo/config +cat .vendor/config.toml >> .cargo/config.toml %build %cargo_build diff --git a/rpms/cosmic-files/cosmic-files.spec b/rpms/cosmic-files/cosmic-files.spec index 6b39582..d033e69 100644 --- a/rpms/cosmic-files/cosmic-files.spec +++ b/rpms/cosmic-files/cosmic-files.spec @@ -74,7 +74,7 @@ BuildRequires: git-core %prep %autosetup -n %{crate}-%{commit} -p1 -a1 %cargo_prep -N -cat .vendor/config.toml >> .cargo/config +cat .vendor/config.toml >> .cargo/config.toml %build %cargo_build diff --git a/rpms/cosmic-greeter/cosmic-greeter.spec b/rpms/cosmic-greeter/cosmic-greeter.spec index 3cbde20..e06c7fe 100644 --- a/rpms/cosmic-greeter/cosmic-greeter.spec +++ b/rpms/cosmic-greeter/cosmic-greeter.spec @@ -81,7 +81,7 @@ Requires: cosmic-comp %prep %autosetup -n cosmic-greeter-%{commit} -p1 -a1 %cargo_prep -N -cat .vendor/config.toml >> .cargo/config +cat .vendor/config.toml >> .cargo/config.toml %build cargo build --release --all --offline --frozen diff --git a/rpms/cosmic-launcher/cosmic-launcher.spec b/rpms/cosmic-launcher/cosmic-launcher.spec index 3d42fb1..ca57525 100644 --- a/rpms/cosmic-launcher/cosmic-launcher.spec +++ b/rpms/cosmic-launcher/cosmic-launcher.spec @@ -74,7 +74,7 @@ Requires: pop-launcher %prep %autosetup -n %{crate}-%{commit} -p1 -a1 %cargo_prep -N -cat .vendor/config.toml >> .cargo/config +cat .vendor/config.toml >> .cargo/config.toml %build %cargo_build diff --git a/rpms/cosmic-notifications/cosmic-notifications.spec b/rpms/cosmic-notifications/cosmic-notifications.spec index 0b839c1..a50e2ac 100644 --- a/rpms/cosmic-notifications/cosmic-notifications.spec +++ b/rpms/cosmic-notifications/cosmic-notifications.spec @@ -67,7 +67,7 @@ BuildRequires: just %prep %autosetup -n cosmic-notifications-%{commit} -p1 -a1 %cargo_prep -N -cat .vendor/config.toml >> .cargo/config +cat .vendor/config.toml >> .cargo/config.toml %build %cargo_build diff --git a/rpms/cosmic-osd/cosmic-osd.spec b/rpms/cosmic-osd/cosmic-osd.spec index 1164d35..1dd84b3 100644 --- a/rpms/cosmic-osd/cosmic-osd.spec +++ b/rpms/cosmic-osd/cosmic-osd.spec @@ -72,7 +72,7 @@ BuildRequires: make %prep %autosetup -n %{crate}-%{commit} -p1 -a1 %cargo_prep -N -cat .vendor/config.toml >> .cargo/config +cat .vendor/config.toml >> .cargo/config.toml %build make all polkit-agent-helper-1=/usr/lib/polkit-1/polkit-agent-helper-1 diff --git a/rpms/cosmic-panel/cosmic-panel.spec b/rpms/cosmic-panel/cosmic-panel.spec index 3a9c263..5240cd0 100644 --- a/rpms/cosmic-panel/cosmic-panel.spec +++ b/rpms/cosmic-panel/cosmic-panel.spec @@ -64,7 +64,7 @@ BuildRequires: just %prep %autosetup -n cosmic-panel-%{commit} -p1 -a1 %cargo_prep -N -cat .vendor/config.toml >> .cargo/config +cat .vendor/config.toml >> .cargo/config.toml %build %cargo_build diff --git a/rpms/cosmic-randr/cosmic-randr.spec b/rpms/cosmic-randr/cosmic-randr.spec index 00cf805..1591874 100644 --- a/rpms/cosmic-randr/cosmic-randr.spec +++ b/rpms/cosmic-randr/cosmic-randr.spec @@ -55,7 +55,7 @@ Cosmic-randr command line interface.} %prep %autosetup -n cosmic-randr-%{commit} -p1 -a1 %cargo_prep -N -cat .vendor/config.toml >> .cargo/config +cat .vendor/config.toml >> .cargo/config.toml %build %cargo_build diff --git a/rpms/cosmic-screenshot/cosmic-screenshot.spec b/rpms/cosmic-screenshot/cosmic-screenshot.spec index b350a65..391fdfb 100644 --- a/rpms/cosmic-screenshot/cosmic-screenshot.spec +++ b/rpms/cosmic-screenshot/cosmic-screenshot.spec @@ -58,7 +58,7 @@ BuildRequires: just %prep %autosetup -n %{crate}-%{commit} -p1 -a1 %cargo_prep -N -cat .vendor/config.toml >> .cargo/config +cat .vendor/config.toml >> .cargo/config.toml %build %cargo_build diff --git a/rpms/cosmic-session/cosmic-session.spec b/rpms/cosmic-session/cosmic-session.spec index a01d9a2..c2d1e7b 100644 --- a/rpms/cosmic-session/cosmic-session.spec +++ b/rpms/cosmic-session/cosmic-session.spec @@ -84,7 +84,7 @@ The session manager for the COSMIC desktop environment.} %prep %autosetup -n %{crate}-%{commit} -p1 -a1 %cargo_prep -N -cat .vendor/config.toml >> .cargo/config +cat .vendor/config.toml >> .cargo/config.toml %build %cargo_build diff --git a/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec b/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec index 69f599b..09c2bb8 100644 --- a/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec +++ b/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec @@ -71,7 +71,7 @@ Requires: acpid %prep %autosetup -n %{crate}-%{commit} -p1 -a1 %cargo_prep -N -cat .vendor/config.toml >> .cargo/config +cat .vendor/config.toml >> .cargo/config.toml %build %cargo_build diff --git a/rpms/cosmic-settings/cosmic-settings.spec b/rpms/cosmic-settings/cosmic-settings.spec index 3c3bc04..32e7603 100644 --- a/rpms/cosmic-settings/cosmic-settings.spec +++ b/rpms/cosmic-settings/cosmic-settings.spec @@ -72,7 +72,7 @@ BuildRequires: just %prep %autosetup -n cosmic-settings-%{commit} -p1 -a1 %cargo_prep -N -cat .vendor/config.toml >> .cargo/config +cat .vendor/config.toml >> .cargo/config.toml %build %cargo_build diff --git a/rpms/cosmic-store/cosmic-store.spec b/rpms/cosmic-store/cosmic-store.spec index 19fa766..c73357c 100644 --- a/rpms/cosmic-store/cosmic-store.spec +++ b/rpms/cosmic-store/cosmic-store.spec @@ -72,7 +72,7 @@ Requires: flatpak-libs %prep %autosetup -n cosmic-store-%{commit} -p1 -a1 %cargo_prep -N -cat .vendor/config.toml >> .cargo/config +cat .vendor/config.toml >> .cargo/config.toml %build %cargo_build diff --git a/rpms/cosmic-term/cosmic-term.spec b/rpms/cosmic-term/cosmic-term.spec index c37291a..dd19140 100644 --- a/rpms/cosmic-term/cosmic-term.spec +++ b/rpms/cosmic-term/cosmic-term.spec @@ -73,7 +73,7 @@ BuildRequires: git-core %prep %autosetup -n %{crate}-%{commit} -p1 -a1 %cargo_prep -N -cat .vendor/config.toml >> .cargo/config +cat .vendor/config.toml >> .cargo/config.toml %build %cargo_build diff --git a/rpms/cosmic-workspaces/cosmic-workspaces.spec b/rpms/cosmic-workspaces/cosmic-workspaces.spec index 5ca10eb..343d7ca 100644 --- a/rpms/cosmic-workspaces/cosmic-workspaces.spec +++ b/rpms/cosmic-workspaces/cosmic-workspaces.spec @@ -77,7 +77,7 @@ Requires: cosmic-comp %prep %autosetup -n %{crate}-%{commit} -p1 -a1 %cargo_prep -N -cat .vendor/config.toml >> .cargo/config +cat .vendor/config.toml >> .cargo/config.toml %build %cargo_build diff --git a/rpms/pop-launcher/pop-launcher.spec b/rpms/pop-launcher/pop-launcher.spec index feef095..70c63d5 100644 --- a/rpms/pop-launcher/pop-launcher.spec +++ b/rpms/pop-launcher/pop-launcher.spec @@ -70,7 +70,7 @@ Requires: fd-find %prep %autosetup -n pop-launcher-%{commit} -p1 -a1 %cargo_prep -N -cat .vendor/config.toml >> .cargo/config +cat .vendor/config.toml >> .cargo/config.toml %build just build-release --offline --frozen diff --git a/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec b/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec index df7ede6..216c89a 100644 --- a/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec +++ b/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec @@ -76,7 +76,7 @@ BuildRequires: just %prep %autosetup -n %{crate}-%{commit} -p1 -a1 %cargo_prep -N -cat .vendor/config.toml >> .cargo/config +cat .vendor/config.toml >> .cargo/config.toml %build %cargo_build From c23a250354fa7e38d9ff1652e4699859e5f8cfc4 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: May 23 2024 19:06:17 +0000 Subject: [PATCH 153/220] fix: Monkey patch to make 39 and 40 work --- diff --git a/rpms/cosmic-app-library/cosmic-app-library.spec b/rpms/cosmic-app-library/cosmic-app-library.spec index 85fd6e4..ce4a0bd 100644 --- a/rpms/cosmic-app-library/cosmic-app-library.spec +++ b/rpms/cosmic-app-library/cosmic-app-library.spec @@ -69,7 +69,16 @@ BuildRequires: just %prep %autosetup -n %{crate}-%{commit} -p1 -a1 %cargo_prep -N -cat .vendor/config.toml >> .cargo/config.toml +# Check if .cargo/config.toml exists +if [ -f .cargo/config.toml ]; then + # If it exists, append the contents of .vendor/config.toml to .cargo/config.toml + cat .vendor/config.toml >> .cargo/config.toml + echo "Appended .vendor/config.toml to .cargo/config.toml" +else + # If it does not exist, append the contents of .vendor/config.toml to .cargo/config + cat .vendor/config.toml >> .cargo/config + echo "Appended .vendor/config.toml to .cargo/config" +fi %build %cargo_build diff --git a/rpms/cosmic-applets/cosmic-applets.spec b/rpms/cosmic-applets/cosmic-applets.spec index 6e03918..9b5c432 100644 --- a/rpms/cosmic-applets/cosmic-applets.spec +++ b/rpms/cosmic-applets/cosmic-applets.spec @@ -76,7 +76,16 @@ Requires: cosmic-panel %prep %autosetup -n cosmic-applets-%{commit} -p1 -a1 %cargo_prep -N -cat .vendor/config.toml >> .cargo/config.toml +# Check if .cargo/config.toml exists +if [ -f .cargo/config.toml ]; then + # If it exists, append the contents of .vendor/config.toml to .cargo/config.toml + cat .vendor/config.toml >> .cargo/config.toml + echo "Appended .vendor/config.toml to .cargo/config.toml" +else + # If it does not exist, append the contents of .vendor/config.toml to .cargo/config + cat .vendor/config.toml >> .cargo/config + echo "Appended .vendor/config.toml to .cargo/config" +fi %build %cargo_build diff --git a/rpms/cosmic-bg/cosmic-bg.spec b/rpms/cosmic-bg/cosmic-bg.spec index 2b2ceed..d2e7cef 100644 --- a/rpms/cosmic-bg/cosmic-bg.spec +++ b/rpms/cosmic-bg/cosmic-bg.spec @@ -61,7 +61,16 @@ Requires: cosmic-session %prep %autosetup -n cosmic-bg-%{commit} -p1 -a1 %cargo_prep -N -cat .vendor/config.toml >> .cargo/config.toml +# Check if .cargo/config.toml exists +if [ -f .cargo/config.toml ]; then + # If it exists, append the contents of .vendor/config.toml to .cargo/config.toml + cat .vendor/config.toml >> .cargo/config.toml + echo "Appended .vendor/config.toml to .cargo/config.toml" +else + # If it does not exist, append the contents of .vendor/config.toml to .cargo/config + cat .vendor/config.toml >> .cargo/config + echo "Appended .vendor/config.toml to .cargo/config" +fi %build %cargo_build diff --git a/rpms/cosmic-comp/cosmic-comp.spec b/rpms/cosmic-comp/cosmic-comp.spec index b2b98a4..f69e36b 100644 --- a/rpms/cosmic-comp/cosmic-comp.spec +++ b/rpms/cosmic-comp/cosmic-comp.spec @@ -79,7 +79,16 @@ Recommends: cosmic-session %prep %autosetup -n cosmic-comp-%{commit} -p1 -a1 %cargo_prep -N -cat .vendor/config.toml >> .cargo/config.toml +# Check if .cargo/config.toml exists +if [ -f .cargo/config.toml ]; then + # If it exists, append the contents of .vendor/config.toml to .cargo/config.toml + cat .vendor/config.toml >> .cargo/config.toml + echo "Appended .vendor/config.toml to .cargo/config.toml" +else + # If it does not exist, append the contents of .vendor/config.toml to .cargo/config + cat .vendor/config.toml >> .cargo/config + echo "Appended .vendor/config.toml to .cargo/config" +fi %build %cargo_build diff --git a/rpms/cosmic-edit/cosmic-edit.spec b/rpms/cosmic-edit/cosmic-edit.spec index 2c8b531..c815c6a 100644 --- a/rpms/cosmic-edit/cosmic-edit.spec +++ b/rpms/cosmic-edit/cosmic-edit.spec @@ -74,7 +74,16 @@ BuildRequires: git-core %prep %autosetup -n %{crate}-%{commit} -p1 -a1 %cargo_prep -N -cat .vendor/config.toml >> .cargo/config.toml +# Check if .cargo/config.toml exists +if [ -f .cargo/config.toml ]; then + # If it exists, append the contents of .vendor/config.toml to .cargo/config.toml + cat .vendor/config.toml >> .cargo/config.toml + echo "Appended .vendor/config.toml to .cargo/config.toml" +else + # If it does not exist, append the contents of .vendor/config.toml to .cargo/config + cat .vendor/config.toml >> .cargo/config + echo "Appended .vendor/config.toml to .cargo/config" +fi %build %cargo_build diff --git a/rpms/cosmic-files/cosmic-files.spec b/rpms/cosmic-files/cosmic-files.spec index d033e69..3171636 100644 --- a/rpms/cosmic-files/cosmic-files.spec +++ b/rpms/cosmic-files/cosmic-files.spec @@ -74,7 +74,16 @@ BuildRequires: git-core %prep %autosetup -n %{crate}-%{commit} -p1 -a1 %cargo_prep -N -cat .vendor/config.toml >> .cargo/config.toml +# Check if .cargo/config.toml exists +if [ -f .cargo/config.toml ]; then + # If it exists, append the contents of .vendor/config.toml to .cargo/config.toml + cat .vendor/config.toml >> .cargo/config.toml + echo "Appended .vendor/config.toml to .cargo/config.toml" +else + # If it does not exist, append the contents of .vendor/config.toml to .cargo/config + cat .vendor/config.toml >> .cargo/config + echo "Appended .vendor/config.toml to .cargo/config" +fi %build %cargo_build diff --git a/rpms/cosmic-greeter/cosmic-greeter.spec b/rpms/cosmic-greeter/cosmic-greeter.spec index e06c7fe..4719823 100644 --- a/rpms/cosmic-greeter/cosmic-greeter.spec +++ b/rpms/cosmic-greeter/cosmic-greeter.spec @@ -81,7 +81,16 @@ Requires: cosmic-comp %prep %autosetup -n cosmic-greeter-%{commit} -p1 -a1 %cargo_prep -N -cat .vendor/config.toml >> .cargo/config.toml +# Check if .cargo/config.toml exists +if [ -f .cargo/config.toml ]; then + # If it exists, append the contents of .vendor/config.toml to .cargo/config.toml + cat .vendor/config.toml >> .cargo/config.toml + echo "Appended .vendor/config.toml to .cargo/config.toml" +else + # If it does not exist, append the contents of .vendor/config.toml to .cargo/config + cat .vendor/config.toml >> .cargo/config + echo "Appended .vendor/config.toml to .cargo/config" +fi %build cargo build --release --all --offline --frozen diff --git a/rpms/cosmic-launcher/cosmic-launcher.spec b/rpms/cosmic-launcher/cosmic-launcher.spec index ca57525..06d8d39 100644 --- a/rpms/cosmic-launcher/cosmic-launcher.spec +++ b/rpms/cosmic-launcher/cosmic-launcher.spec @@ -74,7 +74,16 @@ Requires: pop-launcher %prep %autosetup -n %{crate}-%{commit} -p1 -a1 %cargo_prep -N -cat .vendor/config.toml >> .cargo/config.toml +# Check if .cargo/config.toml exists +if [ -f .cargo/config.toml ]; then + # If it exists, append the contents of .vendor/config.toml to .cargo/config.toml + cat .vendor/config.toml >> .cargo/config.toml + echo "Appended .vendor/config.toml to .cargo/config.toml" +else + # If it does not exist, append the contents of .vendor/config.toml to .cargo/config + cat .vendor/config.toml >> .cargo/config + echo "Appended .vendor/config.toml to .cargo/config" +fi %build %cargo_build diff --git a/rpms/cosmic-notifications/cosmic-notifications.spec b/rpms/cosmic-notifications/cosmic-notifications.spec index a50e2ac..f09a4b5 100644 --- a/rpms/cosmic-notifications/cosmic-notifications.spec +++ b/rpms/cosmic-notifications/cosmic-notifications.spec @@ -67,7 +67,16 @@ BuildRequires: just %prep %autosetup -n cosmic-notifications-%{commit} -p1 -a1 %cargo_prep -N -cat .vendor/config.toml >> .cargo/config.toml +# Check if .cargo/config.toml exists +if [ -f .cargo/config.toml ]; then + # If it exists, append the contents of .vendor/config.toml to .cargo/config.toml + cat .vendor/config.toml >> .cargo/config.toml + echo "Appended .vendor/config.toml to .cargo/config.toml" +else + # If it does not exist, append the contents of .vendor/config.toml to .cargo/config + cat .vendor/config.toml >> .cargo/config + echo "Appended .vendor/config.toml to .cargo/config" +fi %build %cargo_build diff --git a/rpms/cosmic-osd/cosmic-osd.spec b/rpms/cosmic-osd/cosmic-osd.spec index 1dd84b3..a18f142 100644 --- a/rpms/cosmic-osd/cosmic-osd.spec +++ b/rpms/cosmic-osd/cosmic-osd.spec @@ -72,7 +72,16 @@ BuildRequires: make %prep %autosetup -n %{crate}-%{commit} -p1 -a1 %cargo_prep -N -cat .vendor/config.toml >> .cargo/config.toml +# Check if .cargo/config.toml exists +if [ -f .cargo/config.toml ]; then + # If it exists, append the contents of .vendor/config.toml to .cargo/config.toml + cat .vendor/config.toml >> .cargo/config.toml + echo "Appended .vendor/config.toml to .cargo/config.toml" +else + # If it does not exist, append the contents of .vendor/config.toml to .cargo/config + cat .vendor/config.toml >> .cargo/config + echo "Appended .vendor/config.toml to .cargo/config" +fi %build make all polkit-agent-helper-1=/usr/lib/polkit-1/polkit-agent-helper-1 diff --git a/rpms/cosmic-panel/cosmic-panel.spec b/rpms/cosmic-panel/cosmic-panel.spec index 5240cd0..2777aad 100644 --- a/rpms/cosmic-panel/cosmic-panel.spec +++ b/rpms/cosmic-panel/cosmic-panel.spec @@ -64,7 +64,16 @@ BuildRequires: just %prep %autosetup -n cosmic-panel-%{commit} -p1 -a1 %cargo_prep -N -cat .vendor/config.toml >> .cargo/config.toml +# Check if .cargo/config.toml exists +if [ -f .cargo/config.toml ]; then + # If it exists, append the contents of .vendor/config.toml to .cargo/config.toml + cat .vendor/config.toml >> .cargo/config.toml + echo "Appended .vendor/config.toml to .cargo/config.toml" +else + # If it does not exist, append the contents of .vendor/config.toml to .cargo/config + cat .vendor/config.toml >> .cargo/config + echo "Appended .vendor/config.toml to .cargo/config" +fi %build %cargo_build diff --git a/rpms/cosmic-randr/cosmic-randr.spec b/rpms/cosmic-randr/cosmic-randr.spec index 1591874..cc7be4e 100644 --- a/rpms/cosmic-randr/cosmic-randr.spec +++ b/rpms/cosmic-randr/cosmic-randr.spec @@ -55,7 +55,16 @@ Cosmic-randr command line interface.} %prep %autosetup -n cosmic-randr-%{commit} -p1 -a1 %cargo_prep -N -cat .vendor/config.toml >> .cargo/config.toml +# Check if .cargo/config.toml exists +if [ -f .cargo/config.toml ]; then + # If it exists, append the contents of .vendor/config.toml to .cargo/config.toml + cat .vendor/config.toml >> .cargo/config.toml + echo "Appended .vendor/config.toml to .cargo/config.toml" +else + # If it does not exist, append the contents of .vendor/config.toml to .cargo/config + cat .vendor/config.toml >> .cargo/config + echo "Appended .vendor/config.toml to .cargo/config" +fi %build %cargo_build diff --git a/rpms/cosmic-screenshot/cosmic-screenshot.spec b/rpms/cosmic-screenshot/cosmic-screenshot.spec index 391fdfb..c76aeeb 100644 --- a/rpms/cosmic-screenshot/cosmic-screenshot.spec +++ b/rpms/cosmic-screenshot/cosmic-screenshot.spec @@ -58,7 +58,16 @@ BuildRequires: just %prep %autosetup -n %{crate}-%{commit} -p1 -a1 %cargo_prep -N -cat .vendor/config.toml >> .cargo/config.toml +# Check if .cargo/config.toml exists +if [ -f .cargo/config.toml ]; then + # If it exists, append the contents of .vendor/config.toml to .cargo/config.toml + cat .vendor/config.toml >> .cargo/config.toml + echo "Appended .vendor/config.toml to .cargo/config.toml" +else + # If it does not exist, append the contents of .vendor/config.toml to .cargo/config + cat .vendor/config.toml >> .cargo/config + echo "Appended .vendor/config.toml to .cargo/config" +fi %build %cargo_build diff --git a/rpms/cosmic-session/cosmic-session.spec b/rpms/cosmic-session/cosmic-session.spec index c2d1e7b..0a9a07f 100644 --- a/rpms/cosmic-session/cosmic-session.spec +++ b/rpms/cosmic-session/cosmic-session.spec @@ -84,7 +84,16 @@ The session manager for the COSMIC desktop environment.} %prep %autosetup -n %{crate}-%{commit} -p1 -a1 %cargo_prep -N -cat .vendor/config.toml >> .cargo/config.toml +# Check if .cargo/config.toml exists +if [ -f .cargo/config.toml ]; then + # If it exists, append the contents of .vendor/config.toml to .cargo/config.toml + cat .vendor/config.toml >> .cargo/config.toml + echo "Appended .vendor/config.toml to .cargo/config.toml" +else + # If it does not exist, append the contents of .vendor/config.toml to .cargo/config + cat .vendor/config.toml >> .cargo/config + echo "Appended .vendor/config.toml to .cargo/config" +fi %build %cargo_build diff --git a/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec b/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec index 09c2bb8..89456d2 100644 --- a/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec +++ b/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec @@ -71,7 +71,16 @@ Requires: acpid %prep %autosetup -n %{crate}-%{commit} -p1 -a1 %cargo_prep -N -cat .vendor/config.toml >> .cargo/config.toml +# Check if .cargo/config.toml exists +if [ -f .cargo/config.toml ]; then + # If it exists, append the contents of .vendor/config.toml to .cargo/config.toml + cat .vendor/config.toml >> .cargo/config.toml + echo "Appended .vendor/config.toml to .cargo/config.toml" +else + # If it does not exist, append the contents of .vendor/config.toml to .cargo/config + cat .vendor/config.toml >> .cargo/config + echo "Appended .vendor/config.toml to .cargo/config" +fi %build %cargo_build diff --git a/rpms/cosmic-settings/cosmic-settings.spec b/rpms/cosmic-settings/cosmic-settings.spec index 32e7603..7e02666 100644 --- a/rpms/cosmic-settings/cosmic-settings.spec +++ b/rpms/cosmic-settings/cosmic-settings.spec @@ -72,7 +72,16 @@ BuildRequires: just %prep %autosetup -n cosmic-settings-%{commit} -p1 -a1 %cargo_prep -N -cat .vendor/config.toml >> .cargo/config.toml +# Check if .cargo/config.toml exists +if [ -f .cargo/config.toml ]; then + # If it exists, append the contents of .vendor/config.toml to .cargo/config.toml + cat .vendor/config.toml >> .cargo/config.toml + echo "Appended .vendor/config.toml to .cargo/config.toml" +else + # If it does not exist, append the contents of .vendor/config.toml to .cargo/config + cat .vendor/config.toml >> .cargo/config + echo "Appended .vendor/config.toml to .cargo/config" +fi %build %cargo_build diff --git a/rpms/cosmic-store/cosmic-store.spec b/rpms/cosmic-store/cosmic-store.spec index c73357c..79ebd8a 100644 --- a/rpms/cosmic-store/cosmic-store.spec +++ b/rpms/cosmic-store/cosmic-store.spec @@ -72,7 +72,16 @@ Requires: flatpak-libs %prep %autosetup -n cosmic-store-%{commit} -p1 -a1 %cargo_prep -N -cat .vendor/config.toml >> .cargo/config.toml +# Check if .cargo/config.toml exists +if [ -f .cargo/config.toml ]; then + # If it exists, append the contents of .vendor/config.toml to .cargo/config.toml + cat .vendor/config.toml >> .cargo/config.toml + echo "Appended .vendor/config.toml to .cargo/config.toml" +else + # If it does not exist, append the contents of .vendor/config.toml to .cargo/config + cat .vendor/config.toml >> .cargo/config + echo "Appended .vendor/config.toml to .cargo/config" +fi %build %cargo_build diff --git a/rpms/cosmic-term/cosmic-term.spec b/rpms/cosmic-term/cosmic-term.spec index dd19140..513b173 100644 --- a/rpms/cosmic-term/cosmic-term.spec +++ b/rpms/cosmic-term/cosmic-term.spec @@ -73,7 +73,16 @@ BuildRequires: git-core %prep %autosetup -n %{crate}-%{commit} -p1 -a1 %cargo_prep -N -cat .vendor/config.toml >> .cargo/config.toml +# Check if .cargo/config.toml exists +if [ -f .cargo/config.toml ]; then + # If it exists, append the contents of .vendor/config.toml to .cargo/config.toml + cat .vendor/config.toml >> .cargo/config.toml + echo "Appended .vendor/config.toml to .cargo/config.toml" +else + # If it does not exist, append the contents of .vendor/config.toml to .cargo/config + cat .vendor/config.toml >> .cargo/config + echo "Appended .vendor/config.toml to .cargo/config" +fi %build %cargo_build diff --git a/rpms/cosmic-workspaces/cosmic-workspaces.spec b/rpms/cosmic-workspaces/cosmic-workspaces.spec index 343d7ca..c23318f 100644 --- a/rpms/cosmic-workspaces/cosmic-workspaces.spec +++ b/rpms/cosmic-workspaces/cosmic-workspaces.spec @@ -77,7 +77,16 @@ Requires: cosmic-comp %prep %autosetup -n %{crate}-%{commit} -p1 -a1 %cargo_prep -N -cat .vendor/config.toml >> .cargo/config.toml +# Check if .cargo/config.toml exists +if [ -f .cargo/config.toml ]; then + # If it exists, append the contents of .vendor/config.toml to .cargo/config.toml + cat .vendor/config.toml >> .cargo/config.toml + echo "Appended .vendor/config.toml to .cargo/config.toml" +else + # If it does not exist, append the contents of .vendor/config.toml to .cargo/config + cat .vendor/config.toml >> .cargo/config + echo "Appended .vendor/config.toml to .cargo/config" +fi %build %cargo_build diff --git a/rpms/pop-launcher/pop-launcher.spec b/rpms/pop-launcher/pop-launcher.spec index 70c63d5..ce2efed 100644 --- a/rpms/pop-launcher/pop-launcher.spec +++ b/rpms/pop-launcher/pop-launcher.spec @@ -70,7 +70,16 @@ Requires: fd-find %prep %autosetup -n pop-launcher-%{commit} -p1 -a1 %cargo_prep -N -cat .vendor/config.toml >> .cargo/config.toml +# Check if .cargo/config.toml exists +if [ -f .cargo/config.toml ]; then + # If it exists, append the contents of .vendor/config.toml to .cargo/config.toml + cat .vendor/config.toml >> .cargo/config.toml + echo "Appended .vendor/config.toml to .cargo/config.toml" +else + # If it does not exist, append the contents of .vendor/config.toml to .cargo/config + cat .vendor/config.toml >> .cargo/config + echo "Appended .vendor/config.toml to .cargo/config" +fi %build just build-release --offline --frozen diff --git a/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec b/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec index 216c89a..cb90afd 100644 --- a/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec +++ b/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec @@ -76,7 +76,16 @@ BuildRequires: just %prep %autosetup -n %{crate}-%{commit} -p1 -a1 %cargo_prep -N -cat .vendor/config.toml >> .cargo/config.toml +# Check if .cargo/config.toml exists +if [ -f .cargo/config.toml ]; then + # If it exists, append the contents of .vendor/config.toml to .cargo/config.toml + cat .vendor/config.toml >> .cargo/config.toml + echo "Appended .vendor/config.toml to .cargo/config.toml" +else + # If it does not exist, append the contents of .vendor/config.toml to .cargo/config + cat .vendor/config.toml >> .cargo/config + echo "Appended .vendor/config.toml to .cargo/config" +fi %build %cargo_build From c96a68a9625104a61e029657af82583bde4927ec Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: May 26 2024 17:55:16 +0000 Subject: [PATCH 154/220] fix: cosmic-icon-theme --- diff --git a/rpms/cosmic-desktop/cosmic-desktop.spec b/rpms/cosmic-desktop/cosmic-desktop.spec index 1a464db..d6e23ac 100644 --- a/rpms/cosmic-desktop/cosmic-desktop.spec +++ b/rpms/cosmic-desktop/cosmic-desktop.spec @@ -15,7 +15,7 @@ Requires: cosmic-app-library Requires: cosmic-applets Requires: cosmic-bg Requires: cosmic-comp -Requires: cosmic-icons +Requires: cosmic-icon-theme Requires: cosmic-launcher Requires: cosmic-notifications Requires: cosmic-osd diff --git a/rpms/cosmic-icon-theme/cosmic-icon-theme.spec b/rpms/cosmic-icon-theme/cosmic-icon-theme.spec new file mode 100644 index 0000000..168e348 --- /dev/null +++ b/rpms/cosmic-icon-theme/cosmic-icon-theme.spec @@ -0,0 +1,49 @@ +%define debug_package %{nil} + +%global ver ### +%global commit ### +%global date ### + +Name: cosmic-icon-theme +Version: %{ver}~git%{date}.%{sub %{commit} 1 7} +Release: %autorelease +Summary: Icon theme for the COSMIC Desktop Environment + +License: CC-BY-SA-4.0 + +URL: https://github.com/pop-os/cosmic-icons + +# To create this source: +# * git clone the repository +# * tar -pcJf $name-$commit.tar.xz +Source: cosmic-icons-%{commit}.tar.xz + +BuildRequires: just + +Requires: pop-icon-theme + +Obsoletes: cosmic-icons < 0.1.0~git20240526.04.9aad1ab-2 +Provides: cosmic-icons = %{version}-%{release} + +%global _description %{expand: +%{summary}.} + +%description %{_description} + +%prep +%autosetup -n cosmic-icons-%{commit} + +%build + +%install +just rootdir=%{buildroot} install + +%files +%dir %{_datadir}/icons/Cosmic +%{_datadir}/icons/Cosmic/scalable/* +%{_datadir}/icons/Cosmic/index.theme + + +%changelog +%autochangelog + \ No newline at end of file diff --git a/rpms/cosmic-icons/cosmic-icons.spec b/rpms/cosmic-icons/cosmic-icons.spec deleted file mode 100644 index 8f66928..0000000 --- a/rpms/cosmic-icons/cosmic-icons.spec +++ /dev/null @@ -1,46 +0,0 @@ -%define debug_package %{nil} - -%global ver ### -%global commit ### -%global date ### - -Name: cosmic-icons -Version: %{ver}~git%{date}.%{sub %{commit} 1 7} -Release: %autorelease -Summary: Icon theme for the COSMIC Desktop Environment - -License: CC-BY-SA-4.0 - -URL: https://github.com/pop-os/cosmic-icons - -# To create this source: -# * git clone the repository -# * tar -pcJf $name-$commit.tar.xz -Source: cosmic-icons-%{commit}.tar.xz - -BuildRequires: just - -Requires: pop-icon-theme - -%global _description %{expand: -%{summary}.} - -%description %{_description} - -%prep -%autosetup -n cosmic-icons-%{commit} - -%build - -%install -just rootdir=%{buildroot} install - -%files -%dir %{_datadir}/icons/Cosmic -%{_datadir}/icons/Cosmic/scalable/* -%{_datadir}/icons/Cosmic/index.theme - - -%changelog -%autochangelog - \ No newline at end of file From b1d4f719df2c6a0507183830cd2475f59b1a64c4 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: May 26 2024 18:12:02 +0000 Subject: [PATCH 155/220] Update cosmic-icon-theme.spec --- diff --git a/rpms/cosmic-icon-theme/cosmic-icon-theme.spec b/rpms/cosmic-icon-theme/cosmic-icon-theme.spec index 168e348..d25dfbd 100644 --- a/rpms/cosmic-icon-theme/cosmic-icon-theme.spec +++ b/rpms/cosmic-icon-theme/cosmic-icon-theme.spec @@ -16,7 +16,7 @@ URL: https://github.com/pop-os/cosmic-icons # To create this source: # * git clone the repository # * tar -pcJf $name-$commit.tar.xz -Source: cosmic-icons-%{commit}.tar.xz +Source: cosmic-icon-theme-%{commit}.tar.xz BuildRequires: just From 35e9d1dafe0be6a98473fc04eaf8632f0a8dc2ef Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: May 26 2024 18:15:19 +0000 Subject: [PATCH 156/220] Update cosmic-icon-theme.spec --- diff --git a/rpms/cosmic-icon-theme/cosmic-icon-theme.spec b/rpms/cosmic-icon-theme/cosmic-icon-theme.spec index d25dfbd..0fa6011 100644 --- a/rpms/cosmic-icon-theme/cosmic-icon-theme.spec +++ b/rpms/cosmic-icon-theme/cosmic-icon-theme.spec @@ -31,7 +31,7 @@ Provides: cosmic-icons = %{version}-%{release} %description %{_description} %prep -%autosetup -n cosmic-icons-%{commit} +%autosetup -n cosmic-icon-theme-%{commit} %build From 221a57534178f36b3e0711c6555f1981ed2b5ab5 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: May 27 2024 21:44:09 +0000 Subject: [PATCH 157/220] fix: cosmic-icon-theme --- diff --git a/rpms/cosmic-icon-theme/cosmic-icon-theme.spec b/rpms/cosmic-icon-theme/cosmic-icon-theme.spec index 0fa6011..cb3d635 100644 --- a/rpms/cosmic-icon-theme/cosmic-icon-theme.spec +++ b/rpms/cosmic-icon-theme/cosmic-icon-theme.spec @@ -1,4 +1,4 @@ -%define debug_package %{nil} +BuildArch: noarch %global ver ### %global commit ### @@ -13,10 +13,7 @@ License: CC-BY-SA-4.0 URL: https://github.com/pop-os/cosmic-icons -# To create this source: -# * git clone the repository -# * tar -pcJf $name-$commit.tar.xz -Source: cosmic-icon-theme-%{commit}.tar.xz +Source: https://github.com/pop-os/cosmic-icons/archive/%{commit}.tar.xz BuildRequires: just From 18f0e250123414f50e64f83c70cb837e26067e00 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: May 27 2024 21:45:30 +0000 Subject: [PATCH 158/220] Update cosmic-icon-theme.spec --- diff --git a/rpms/cosmic-icon-theme/cosmic-icon-theme.spec b/rpms/cosmic-icon-theme/cosmic-icon-theme.spec index cb3d635..ef51de5 100644 --- a/rpms/cosmic-icon-theme/cosmic-icon-theme.spec +++ b/rpms/cosmic-icon-theme/cosmic-icon-theme.spec @@ -28,7 +28,7 @@ Provides: cosmic-icons = %{version}-%{release} %description %{_description} %prep -%autosetup -n cosmic-icon-theme-%{commit} +%autosetup -n cosmic-icons-%{commit} %build From 0fa61992ac050e060455846b3abda70711d7d41b Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: May 27 2024 21:47:45 +0000 Subject: [PATCH 159/220] Update cosmic-icon-theme.spec --- diff --git a/rpms/cosmic-icon-theme/cosmic-icon-theme.spec b/rpms/cosmic-icon-theme/cosmic-icon-theme.spec index ef51de5..f922058 100644 --- a/rpms/cosmic-icon-theme/cosmic-icon-theme.spec +++ b/rpms/cosmic-icon-theme/cosmic-icon-theme.spec @@ -13,7 +13,7 @@ License: CC-BY-SA-4.0 URL: https://github.com/pop-os/cosmic-icons -Source: https://github.com/pop-os/cosmic-icons/archive/%{commit}.tar.xz +Source: https://github.com/pop-os/cosmic-icons/archive/%{commit}.tar.gz BuildRequires: just From d96274ae8151c241a9dd5031db9142cc5be18084 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: May 27 2024 22:29:43 +0000 Subject: [PATCH 160/220] Update srpm.sh --- diff --git a/scripts/srpm.sh b/scripts/srpm.sh index cb3f21d..e6aa1d6 100644 --- a/scripts/srpm.sh +++ b/scripts/srpm.sh @@ -34,7 +34,7 @@ tar -pcJf $name-$commit.tar.xz $name-$commit rm -rf $name-$commit # Get specfile -cp $path_to_spec $name.spec 2>/dev/null || : +mv $path_to_spec $name.spec 2>/dev/null || : # Make replacements to specfile sed -i "/^%global ver / s/.*/%global ver $version/" $name.spec From a18d983291333e79745fd5eda63d10789d41b9d7 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: May 27 2024 22:35:47 +0000 Subject: [PATCH 161/220] Update srpm.sh --- diff --git a/scripts/srpm.sh b/scripts/srpm.sh index e6aa1d6..21f5bd2 100644 --- a/scripts/srpm.sh +++ b/scripts/srpm.sh @@ -33,8 +33,8 @@ cd .. tar -pcJf $name-$commit.tar.xz $name-$commit rm -rf $name-$commit -# Get specfile -mv $path_to_spec $name.spec 2>/dev/null || : +# # Get specfile +# mv $path_to_spec $name.spec 2>/dev/null || : # Make replacements to specfile sed -i "/^%global ver / s/.*/%global ver $version/" $name.spec From 53ea7247bd3f14290cf8bbb4f52de881395ad757 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: May 27 2024 22:45:27 +0000 Subject: [PATCH 162/220] Update srpm.sh --- diff --git a/scripts/srpm.sh b/scripts/srpm.sh index 21f5bd2..e6aa1d6 100644 --- a/scripts/srpm.sh +++ b/scripts/srpm.sh @@ -33,8 +33,8 @@ cd .. tar -pcJf $name-$commit.tar.xz $name-$commit rm -rf $name-$commit -# # Get specfile -# mv $path_to_spec $name.spec 2>/dev/null || : +# Get specfile +mv $path_to_spec $name.spec 2>/dev/null || : # Make replacements to specfile sed -i "/^%global ver / s/.*/%global ver $version/" $name.spec From 02e60a9bac46ea4a65bf20eb244f15abec3de790 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: May 27 2024 23:08:37 +0000 Subject: [PATCH 163/220] fix: source from the repo --- diff --git a/rpms/cosmic-app-library/cosmic-app-library.spec b/rpms/cosmic-app-library/cosmic-app-library.spec index ce4a0bd..bd9a486 100644 --- a/rpms/cosmic-app-library/cosmic-app-library.spec +++ b/rpms/cosmic-app-library/cosmic-app-library.spec @@ -41,17 +41,14 @@ License: 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 AND Apache-2.0 OR MIT A URL: https://github.com/pop-os/cosmic-applibrary -# To create these sources: -# * git clone the repository -# * cargo vendor > .vendor/config.toml -# * rm -rf vendor -# * tar -pcJf $name-$commit.tar.xz -Source: cosmic-app-library-%{commit}.tar.xz -# To create the vendor tarball: -# * git clone the repository -# * cargo vendor -# * tar -pcJf $name-$commit-vendor.tar.xz -Source: cosmic-app-library-%{commit}-vendor.tar.xz +Source: https://github.com/pop-os/cosmic-applibrary/archive/%{commit}.tar.gz +# To create the below sources: +# * git clone https://github.com/pop-os/cosmic-applibrary at the specified commit +# * cargo vendor > vendor-config.toml +# * tar -pczf vendor.tar.gz vendor +Source: vendor.tar.gz +# * mv vendor-config.toml .. +Source: vendor-config.toml BuildRequires: cargo-rpm-macros >= 26 BuildRequires: rustc diff --git a/rpms/cosmic-applets/cosmic-applets.spec b/rpms/cosmic-applets/cosmic-applets.spec index 9b5c432..b7b326b 100644 --- a/rpms/cosmic-applets/cosmic-applets.spec +++ b/rpms/cosmic-applets/cosmic-applets.spec @@ -37,17 +37,14 @@ License: 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 AND Apache-2.0 OR MIT A URL: https://github.com/pop-os/cosmic-applets -# To create these sources: -# * git clone the repository -# * cargo vendor > .vendor/config.toml -# * rm -rf vendor -# * tar -pcJf $name-$commit.tar.xz -Source: cosmic-applets-%{commit}.tar.xz -# To create the vendor tarball: -# * git clone the repository -# * cargo vendor -# * tar -pcJf $name-$commit-vendor.tar.xz -Source: cosmic-applets-%{commit}-vendor.tar.xz +Source: https://github.com/pop-os/cosmic-applets/archive/%{commit}.tar.gz +# To create the below sources: +# * git clone https://github.com/pop-os/cosmic-applets at the specified commit +# * cargo vendor > vendor-config.toml +# * tar -pczf vendor.tar.gz vendor +Source: vendor.tar.gz +# * mv vendor-config.toml .. +Source: vendor-config.toml Patch: better_compile.patch Patch: symlink.patch diff --git a/rpms/cosmic-bg/cosmic-bg.spec b/rpms/cosmic-bg/cosmic-bg.spec index d2e7cef..d58e5ed 100644 --- a/rpms/cosmic-bg/cosmic-bg.spec +++ b/rpms/cosmic-bg/cosmic-bg.spec @@ -31,17 +31,14 @@ License: 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 OR MIT AND Apache-2.0 W URL: https://github.com/pop-os/cosmic-bg -# To create these sources: -# * git clone the repository -# * cargo vendor > .vendor/config.toml -# * rm -rf vendor -# * tar -pcJf $name-$commit.tar.xz -Source: cosmic-bg-%{commit}.tar.xz -# To create the vendor tarball: -# * git clone the repository -# * cargo vendor -# * tar -pcJf $name-$commit-vendor.tar.xz -Source: cosmic-bg-%{commit}-vendor.tar.xz +Source: https://github.com/pop-os/cosmic-bg/archive/%{commit}.tar.gz +# To create the below sources: +# * git clone https://github.com/pop-os/cosmic-bg at the specified commit +# * cargo vendor > vendor-config.toml +# * tar -pczf vendor.tar.gz vendor +Source: vendor.tar.gz +# * mv vendor-config.toml .. +Source: vendor-config.toml BuildRequires: cargo-rpm-macros >= 25 BuildRequires: rustc diff --git a/rpms/cosmic-comp/cosmic-comp.spec b/rpms/cosmic-comp/cosmic-comp.spec index f69e36b..6fe218b 100644 --- a/rpms/cosmic-comp/cosmic-comp.spec +++ b/rpms/cosmic-comp/cosmic-comp.spec @@ -42,17 +42,14 @@ License: GPL-3.0 AND (Apache-2.0 OR MIT) AND BSD-3-Clause AND 0BSD OR MIT URL: https://github.com/pop-os/cosmic-comp -# To create these sources: -# * git clone the repository -# * cargo vendor > .vendor/config.toml -# * rm -rf vendor -# * tar -pcJf $name-$commit.tar.xz -Source: cosmic-comp-%{commit}.tar.xz -# To create the vendor tarball: -# * git clone the repository -# * cargo vendor -# * tar -pcJf $name-$commit-vendor.tar.xz -Source: cosmic-comp-%{commit}-vendor.tar.xz +Source: https://github.com/pop-os/cosmic-comp/archive/%{commit}.tar.gz +# To create the below sources: +# * git clone https://github.com/pop-os/cosmic-comp at the specified commit +# * cargo vendor > vendor-config.toml +# * tar -pczf vendor.tar.gz vendor +Source: vendor.tar.gz +# * mv vendor-config.toml .. +Source: vendor-config.toml BuildRequires: cargo-rpm-macros >= 25 BuildRequires: rustc diff --git a/rpms/cosmic-edit/cosmic-edit.spec b/rpms/cosmic-edit/cosmic-edit.spec index c815c6a..a1565ab 100644 --- a/rpms/cosmic-edit/cosmic-edit.spec +++ b/rpms/cosmic-edit/cosmic-edit.spec @@ -45,17 +45,14 @@ License: (Apache-2.0 OR MIT) AND BSD-3-Clause AND 0BSD OR MIT OR Apache-2 URL: https://github.com/pop-os/cosmic-edit -# To create these sources: -# * git clone the repository -# * cargo vendor > .vendor/config.toml -# * rm -rf vendor -# * tar -pcJf $name-$commit.tar.xz -Source: cosmic-edit-%{commit}.tar.xz -# To create the vendor tarball: -# * git clone the repository -# * cargo vendor -# * tar -pcJf $name-$commit-vendor.tar.xz -Source: cosmic-edit-%{commit}-vendor.tar.xz +Source: https://github.com/pop-os/cosmic-edit/archive/%{commit}.tar.gz +# To create the below sources: +# * git clone https://github.com/pop-os/cosmic-edit at the specified commit +# * cargo vendor > vendor-config.toml +# * tar -pczf vendor.tar.gz vendor +Source: vendor.tar.gz +# * mv vendor-config.toml .. +Source: vendor-config.toml BuildRequires: cargo-rpm-macros >= 26 BuildRequires: rustc diff --git a/rpms/cosmic-files/cosmic-files.spec b/rpms/cosmic-files/cosmic-files.spec index 3171636..b596ef7 100644 --- a/rpms/cosmic-files/cosmic-files.spec +++ b/rpms/cosmic-files/cosmic-files.spec @@ -44,17 +44,14 @@ License: 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 AND Apache-2.0 OR BSL-1 URL: https://github.com/pop-os/cosmic-files -# To create these sources: -# * git clone the repository -# * cargo vendor > .vendor/config.toml -# * rm -rf vendor -# * tar -pcJf $name-$commit.tar.xz -Source: cosmic-files-%{commit}.tar.xz -# To create the vendor tarball: -# * git clone the repository -# * cargo vendor -# * tar -pcJf $name-$commit-vendor.tar.xz -Source: cosmic-files-%{commit}-vendor.tar.xz +Source: https://github.com/pop-os/cosmic-files/archive/%{commit}.tar.gz +# To create the below sources: +# * git clone https://github.com/pop-os/cosmic-files at the specified commit +# * cargo vendor > vendor-config.toml +# * tar -pczf vendor.tar.gz vendor +Source: vendor.tar.gz +# * mv vendor-config.toml .. +Source: vendor-config.toml BuildRequires: cargo-rpm-macros >= 26 BuildRequires: rustc diff --git a/rpms/cosmic-greeter/cosmic-greeter.spec b/rpms/cosmic-greeter/cosmic-greeter.spec index 4719823..6b95235 100644 --- a/rpms/cosmic-greeter/cosmic-greeter.spec +++ b/rpms/cosmic-greeter/cosmic-greeter.spec @@ -38,17 +38,14 @@ License: 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 AND Apache-2.0 OR BSL-1 URL: https://github.com/pop-os/cosmic-greeter -# To create these sources: -# * git clone the repository -# * cargo vendor > .vendor/config.toml -# * rm -rf vendor -# * tar -pcJf $name-$commit.tar.xz -Source: cosmic-greeter-%{commit}.tar.xz -# To create the vendor tarball: -# * git clone the repository -# * cargo vendor -# * tar -pcJf $name-$commit-vendor.tar.xz -Source: cosmic-greeter-%{commit}-vendor.tar.xz +Source: https://github.com/pop-os/cosmic-greeter/archive/%{commit}.tar.gz +# To create the below sources: +# * git clone https://github.com/pop-os/cosmic-greeter at the specified commit +# * cargo vendor > vendor-config.toml +# * tar -pczf vendor.tar.gz vendor +Source: vendor.tar.gz +# * mv vendor-config.toml .. +Source: vendor-config.toml Patch: service.patch diff --git a/rpms/cosmic-launcher/cosmic-launcher.spec b/rpms/cosmic-launcher/cosmic-launcher.spec index 06d8d39..80a2352 100644 --- a/rpms/cosmic-launcher/cosmic-launcher.spec +++ b/rpms/cosmic-launcher/cosmic-launcher.spec @@ -44,17 +44,14 @@ License: 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 AND Apache-2.0 OR BSL-1 URL: https://github.com/pop-os/cosmic-launcher -# To create these sources: -# * git clone the repository -# * cargo vendor > .vendor/config.toml -# * rm -rf vendor -# * tar -pcJf $name-$commit.tar.xz -Source: cosmic-launcher-%{commit}.tar.xz -# To create the vendor tarball: -# * git clone the repository -# * cargo vendor -# * tar -pcJf $name-$commit-vendor.tar.xz -Source: cosmic-launcher-%{commit}-vendor.tar.xz +Source: https://github.com/pop-os/cosmic-launcher/archive/%{commit}.tar.gz +# To create the below sources: +# * git clone https://github.com/pop-os/cosmic-launcher at the specified commit +# * cargo vendor > vendor-config.toml +# * tar -pczf vendor.tar.gz vendor +Source: vendor.tar.gz +# * mv vendor-config.toml .. +Source: vendor-config.toml BuildRequires: cargo-rpm-macros >= 26 BuildRequires: rustc diff --git a/rpms/cosmic-notifications/cosmic-notifications.spec b/rpms/cosmic-notifications/cosmic-notifications.spec index f09a4b5..e1111d9 100644 --- a/rpms/cosmic-notifications/cosmic-notifications.spec +++ b/rpms/cosmic-notifications/cosmic-notifications.spec @@ -39,17 +39,14 @@ License: 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 AND Apache-2.0 OR BSD-3 URL: https://github.com/pop-os/cosmic-notifications -# To create these sources: -# * git clone the repository -# * cargo vendor > .vendor/config.toml -# * rm -rf vendor -# * tar -pcJf $name-$commit.tar.xz -Source: cosmic-notifications-%{commit}.tar.xz -# To create the vendor tarball: -# * git clone the repository -# * cargo vendor -# * tar -pcJf $name-$commit-vendor.tar.xz -Source: cosmic-notifications-%{commit}-vendor.tar.xz +Source: https://github.com/pop-os/cosmic-notifications/archive/%{commit}.tar.gz +# To create the below sources: +# * git clone https://github.com/pop-os/cosmic-notifications at the specified commit +# * cargo vendor > vendor-config.toml +# * tar -pczf vendor.tar.gz vendor +Source: vendor.tar.gz +# * mv vendor-config.toml .. +Source: vendor-config.toml BuildRequires: cargo-rpm-macros >= 25 BuildRequires: rustc diff --git a/rpms/cosmic-osd/cosmic-osd.spec b/rpms/cosmic-osd/cosmic-osd.spec index a18f142..bfb4a96 100644 --- a/rpms/cosmic-osd/cosmic-osd.spec +++ b/rpms/cosmic-osd/cosmic-osd.spec @@ -42,17 +42,14 @@ License: 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 AND Apache-2.0 OR MIT A URL: https://github.com/pop-os/cosmic-osd -# To create these sources: -# * git clone the repository -# * cargo vendor > .vendor/config.toml -# * rm -rf vendor -# * tar -pcJf $name-$commit.tar.xz -Source: cosmic-osd-%{commit}.tar.xz -# To create the vendor tarball: -# * git clone the repository -# * cargo vendor -# * tar -pcJf $name-$commit-vendor.tar.xz -Source: cosmic-osd-%{commit}-vendor.tar.xz +Source: https://github.com/pop-os/cosmic-osd/archive/%{commit}.tar.gz +# To create the below sources: +# * git clone https://github.com/pop-os/cosmic-osd at the specified commit +# * cargo vendor > vendor-config.toml +# * tar -pczf vendor.tar.gz vendor +Source: vendor.tar.gz +# * mv vendor-config.toml .. +Source: vendor-config.toml BuildRequires: cargo-rpm-macros >= 26 BuildRequires: rustc diff --git a/rpms/cosmic-panel/cosmic-panel.spec b/rpms/cosmic-panel/cosmic-panel.spec index 2777aad..031fe59 100644 --- a/rpms/cosmic-panel/cosmic-panel.spec +++ b/rpms/cosmic-panel/cosmic-panel.spec @@ -36,17 +36,14 @@ License: 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 AND Apache-2.0 OR BSD-3 URL: https://github.com/pop-os/cosmic-panel -# To create these sources: -# * git clone the repository -# * cargo vendor > .vendor/config.toml -# * rm -rf vendor -# * tar -pcJf $name-$commit.tar.xz -Source: cosmic-panel-%{commit}.tar.xz -# To create the vendor tarball: -# * git clone the repository -# * cargo vendor -# * tar -pcJf $name-$commit-vendor.tar.xz -Source: cosmic-panel-%{commit}-vendor.tar.xz +Source: https://github.com/pop-os/cosmic-panel/archive/%{commit}.tar.gz +# To create the below sources: +# * git clone https://github.com/pop-os/cosmic-panel at the specified commit +# * cargo vendor > vendor-config.toml +# * tar -pczf vendor.tar.gz vendor +Source: vendor.tar.gz +# * mv vendor-config.toml .. +Source: vendor-config.toml BuildRequires: cargo-rpm-macros >= 25 BuildRequires: rustc diff --git a/rpms/cosmic-randr/cosmic-randr.spec b/rpms/cosmic-randr/cosmic-randr.spec index cc7be4e..ff213bd 100644 --- a/rpms/cosmic-randr/cosmic-randr.spec +++ b/rpms/cosmic-randr/cosmic-randr.spec @@ -28,17 +28,14 @@ License: 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 AND Apache-2.0 OR MIT A URL: https://github.com/pop-os/cosmic-randr -# To create these sources: -# * git clone the repository -# * cargo vendor > .vendor/config.toml -# * rm -rf vendor -# * tar -pcJf $name-$commit.tar.xz -Source: cosmic-randr-%{commit}.tar.xz -# To create the vendor tarball: -# * git clone the repository -# * cargo vendor -# * tar -pcJf $name-$commit-vendor.tar.xz -Source: cosmic-randr-%{commit}-vendor.tar.xz +Source: https://github.com/pop-os/cosmic-randr/archive/%{commit}.tar.gz +# To create the below sources: +# * git clone https://github.com/pop-os/cosmic-randr at the specified commit +# * cargo vendor > vendor-config.toml +# * tar -pczf vendor.tar.gz vendor +Source: vendor.tar.gz +# * mv vendor-config.toml .. +Source: vendor-config.toml BuildRequires: cargo-rpm-macros >= 25 BuildRequires: rustc diff --git a/rpms/cosmic-screenshot/cosmic-screenshot.spec b/rpms/cosmic-screenshot/cosmic-screenshot.spec index c76aeeb..c85b9db 100644 --- a/rpms/cosmic-screenshot/cosmic-screenshot.spec +++ b/rpms/cosmic-screenshot/cosmic-screenshot.spec @@ -32,17 +32,14 @@ License: 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 OR MIT AND Apache-2.0 W URL: https://github.com/pop-os/cosmic-screenshot -# To create these sources: -# * git clone the repository -# * cargo vendor > .vendor/config.toml -# * rm -rf vendor -# * tar -pcJf $name-$commit.tar.xz -Source: cosmic-screenshot-%{commit}.tar.xz -# To create the vendor tarball: -# * git clone the repository -# * cargo vendor -# * tar -pcJf $name-$commit-vendor.tar.xz -Source: cosmic-screenshot-%{commit}-vendor.tar.xz +Source: https://github.com/pop-os/cosmic-screenshot/archive/%{commit}.tar.gz +# To create the below sources: +# * git clone https://github.com/pop-os/cosmic-screenshot at the specified commit +# * cargo vendor > vendor-config.toml +# * tar -pczf vendor.tar.gz vendor +Source: vendor.tar.gz +# * mv vendor-config.toml .. +Source: vendor-config.toml BuildRequires: cargo-rpm-macros >= 26 BuildRequires: rustc diff --git a/rpms/cosmic-session/cosmic-session.spec b/rpms/cosmic-session/cosmic-session.spec index 0a9a07f..3ea39fd 100644 --- a/rpms/cosmic-session/cosmic-session.spec +++ b/rpms/cosmic-session/cosmic-session.spec @@ -36,17 +36,14 @@ License: 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 OR BSD-3-Clause AND Apa URL: https://github.com/pop-os/cosmic-session -# To create these sources: -# * git clone the repository -# * cargo vendor > .vendor/config.toml -# * rm -rf vendor -# * tar -pcJf $name-$commit.tar.xz -Source: cosmic-session-%{commit}.tar.xz -# To create the vendor tarball: -# * git clone the repository -# * cargo vendor -# * tar -pcJf $name-$commit-vendor.tar.xz -Source: cosmic-session-%{commit}-vendor.tar.xz +Source: https://github.com/pop-os/cosmic-session/archive/%{commit}.tar.gz +# To create the below sources: +# * git clone https://github.com/pop-os/cosmic-session at the specified commit +# * cargo vendor > vendor-config.toml +# * tar -pczf vendor.tar.gz vendor +Source: vendor.tar.gz +# * mv vendor-config.toml .. +Source: vendor-config.toml BuildRequires: cargo-rpm-macros >= 26 BuildRequires: rustc diff --git a/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec b/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec index 89456d2..f9ca209 100644 --- a/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec +++ b/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec @@ -41,17 +41,14 @@ License: 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 AND Apache-2.0 OR MIT A URL: https://github.com/pop-os/cosmic-settings-daemon -# To create these sources: -# * git clone the repository -# * cargo vendor > .vendor/config.toml -# * rm -rf vendor -# * tar -pcJf $name-$commit.tar.xz -Source: cosmic-settings-daemon-%{commit}.tar.xz -# To create the vendor tarball: -# * git clone the repository -# * cargo vendor -# * tar -pcJf $name-$commit-vendor.tar.xz -Source: cosmic-settings-daemon-%{commit}-vendor.tar.xz +Source: https://github.com/pop-os/cosmic-settings-daemon/archive/%{commit}.tar.gz +# To create the below sources: +# * git clone https://github.com/pop-os/cosmic-settings-daemon at the specified commit +# * cargo vendor > vendor-config.toml +# * tar -pczf vendor.tar.gz vendor +Source: vendor.tar.gz +# * mv vendor-config.toml .. +Source: vendor-config.toml BuildRequires: cargo-rpm-macros >= 26 BuildRequires: rustc diff --git a/rpms/cosmic-settings/cosmic-settings.spec b/rpms/cosmic-settings/cosmic-settings.spec index 7e02666..970084c 100644 --- a/rpms/cosmic-settings/cosmic-settings.spec +++ b/rpms/cosmic-settings/cosmic-settings.spec @@ -42,17 +42,14 @@ License: 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 AND Apache-2.0 OR MIT A URL: https://github.com/pop-os/cosmic-settings -# To create these sources: -# * git clone the repository -# * cargo vendor > .vendor/config.toml -# * rm -rf vendor -# * tar -pcJf $name-$commit.tar.xz -Source: cosmic-settings-%{commit}.tar.xz -# To create the vendor tarball: -# * git clone the repository -# * cargo vendor -# * tar -pcJf $name-$commit-vendor.tar.xz -Source: cosmic-settings-%{commit}-vendor.tar.xz +Source: https://github.com/pop-os/cosmic-settings/archive/%{commit}.tar.gz +# To create the below sources: +# * git clone https://github.com/pop-os/cosmic-settings at the specified commit +# * cargo vendor > vendor-config.toml +# * tar -pczf vendor.tar.gz vendor +Source: vendor.tar.gz +# * mv vendor-config.toml .. +Source: vendor-config.toml BuildRequires: cargo-rpm-macros >= 25 BuildRequires: rustc diff --git a/rpms/cosmic-store/cosmic-store.spec b/rpms/cosmic-store/cosmic-store.spec index 79ebd8a..8e8ed39 100644 --- a/rpms/cosmic-store/cosmic-store.spec +++ b/rpms/cosmic-store/cosmic-store.spec @@ -40,17 +40,14 @@ License: (Apache-2.0 OR MIT) AND BSD-3-Clause AND 0BSD OR MIT OR Apache-2 URL: https://github.com/pop-os/cosmic-store -# To create these sources: -# * git clone the repository -# * cargo vendor > .vendor/config.toml -# * rm -rf vendor -# * tar -pcJf $name-$commit.tar.xz -Source: cosmic-store-%{commit}.tar.xz -# To create the vendor tarball: -# * git clone the repository -# * cargo vendor -# * tar -pcJf $name-$commit-vendor.tar.xz -Source: cosmic-store-%{commit}-vendor.tar.xz +Source: https://github.com/pop-os/cosmic-store/archive/%{commit}.tar.gz +# To create the below sources: +# * git clone https://github.com/pop-os/cosmic-store at the specified commit +# * cargo vendor > vendor-config.toml +# * tar -pczf vendor.tar.gz vendor +Source: vendor.tar.gz +# * mv vendor-config.toml .. +Source: vendor-config.toml BuildRequires: cargo-rpm-macros >= 25 BuildRequires: rustc diff --git a/rpms/cosmic-term/cosmic-term.spec b/rpms/cosmic-term/cosmic-term.spec index 513b173..70981ab 100644 --- a/rpms/cosmic-term/cosmic-term.spec +++ b/rpms/cosmic-term/cosmic-term.spec @@ -44,17 +44,14 @@ License: 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 AND Apache-2.0 OR BSL-1 URL: https://github.com/pop-os/cosmic-term -# To create these sources: -# * git clone the repository -# * cargo vendor > .vendor/config.toml -# * rm -rf vendor -# * tar -pcJf $name-$commit.tar.xz -Source: cosmic-term-%{commit}.tar.xz -# To create the vendor tarball: -# * git clone the repository -# * cargo vendor -# * tar -pcJf $name-$commit-vendor.tar.xz -Source: cosmic-term-%{commit}-vendor.tar.xz +Source: https://github.com/pop-os/cosmic-term/archive/%{commit}.tar.gz +# To create the below sources: +# * git clone https://github.com/pop-os/cosmic-term at the specified commit +# * cargo vendor > vendor-config.toml +# * tar -pczf vendor.tar.gz vendor +Source: vendor.tar.gz +# * mv vendor-config.toml .. +Source: vendor-config.toml BuildRequires: cargo-rpm-macros >= 26 BuildRequires: rustc diff --git a/rpms/cosmic-workspaces/cosmic-workspaces.spec b/rpms/cosmic-workspaces/cosmic-workspaces.spec index c23318f..41c3de1 100644 --- a/rpms/cosmic-workspaces/cosmic-workspaces.spec +++ b/rpms/cosmic-workspaces/cosmic-workspaces.spec @@ -42,17 +42,14 @@ License: 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 AND Apache-2.0 OR MIT A URL: https://github.com/pop-os/cosmic-workspaces-epoch -# To create these sources: -# * git clone the repository -# * cargo vendor > .vendor/config.toml -# * rm -rf vendor -# * tar -pcJf $name-$commit.tar.xz -Source: cosmic-workspaces-%{commit}.tar.xz -# To create the vendor tarball: -# * git clone the repository -# * cargo vendor -# * tar -pcJf $name-$commit-vendor.tar.xz -Source: cosmic-workspaces-%{commit}-vendor.tar.xz +Source: https://github.com/pop-os/cosmic-workspaces-epoch/archive/%{commit}.tar.gz +# To create the below sources: +# * git clone https://github.com/pop-os/cosmic-workspaces-epoch at the specified commit +# * cargo vendor > vendor-config.toml +# * tar -pczf vendor.tar.gz vendor +Source: vendor.tar.gz +# * mv vendor-config.toml .. +Source: vendor-config.toml BuildRequires: cargo-rpm-macros >= 26 BuildRequires: rustc diff --git a/rpms/pop-launcher/pop-launcher.spec b/rpms/pop-launcher/pop-launcher.spec index ce2efed..6db13e6 100644 --- a/rpms/pop-launcher/pop-launcher.spec +++ b/rpms/pop-launcher/pop-launcher.spec @@ -37,17 +37,14 @@ License: (Apache-2.0 OR MIT) AND BSD-3-Clause AND Apache-2.0 AND Apache-2 URL: https://github.com/pop-os/launcher -# To create these sources: -# * git clone the repository -# * cargo vendor > .vendor/config.toml -# * rm -rf vendor -# * tar -pcJf $name-$commit.tar.xz -Source: pop-launcher-%{commit}.tar.xz -# To create the vendor tarball: -# * git clone the repository -# * cargo vendor -# * tar -pcJf $name-$commit-vendor.tar.xz -Source: pop-launcher-%{commit}-vendor.tar.xz +Source: https://github.com/pop-os/launcher/archive/%{commit}.tar.gz +# To create the below sources: +# * git clone https://github.com/pop-os/launcher at the specified commit +# * cargo vendor > vendor-config.toml +# * tar -pczf vendor.tar.gz vendor +Source: vendor.tar.gz +# * mv vendor-config.toml .. +Source: vendor-config.toml Patch: symlink.patch diff --git a/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec b/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec index cb90afd..9bc8ed2 100644 --- a/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec +++ b/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec @@ -42,17 +42,14 @@ License: 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 AND Apache-2.0 OR MIT A URL: https://github.com/pop-os/xdg-desktop-portal-cosmic -# To create these sources: -# * git clone the repository -# * cargo vendor > .vendor/config.toml -# * rm -rf vendor -# * tar -pcJf $name-$commit.tar.xz -Source: xdg-desktop-portal-cosmic-%{commit}.tar.xz -# To create the vendor tarball: -# * git clone the repository -# * cargo vendor -# * tar -pcJf $name-$commit-vendor.tar.xz -Source: xdg-desktop-portal-cosmic-%{commit}-vendor.tar.xz +Source: https://github.com/pop-os/xdg-desktop-portal-cosmic/archive/%{commit}.tar.gz +# To create the below sources: +# * git clone https://github.com/pop-os/xdg-desktop-portal-cosmic at the specified commit +# * cargo vendor > vendor-config.toml +# * tar -pczf vendor.tar.gz vendor +Source: vendor.tar.gz +# * mv vendor-config.toml .. +Source: vendor-config.toml BuildRequires: cargo-rpm-macros >= 26 BuildRequires: rustc From e1af9dff4fb694aefc3d355c05d41e2752361815 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: May 28 2024 02:19:11 +0000 Subject: [PATCH 164/220] Time to test --- diff --git a/rpms/cosmic-app-library/cosmic-app-library.spec b/rpms/cosmic-app-library/cosmic-app-library.spec index bd9a486..e229787 100644 --- a/rpms/cosmic-app-library/cosmic-app-library.spec +++ b/rpms/cosmic-app-library/cosmic-app-library.spec @@ -64,7 +64,7 @@ BuildRequires: just %description %{_description} %prep -%autosetup -n %{crate}-%{commit} -p1 -a1 +%autosetup -n cosmic-applibrary-%{commit} -p1 -a1 -a2 %cargo_prep -N # Check if .cargo/config.toml exists if [ -f .cargo/config.toml ]; then diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 831a01c..0fec750 100644 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -1,11 +1,25 @@ #!/bin/bash -x -PACKAGE= +VENDOR=1 +# Names (Source name can sometimes be the same as name) +NAME= +SOURCE_NAME= +# Version and commit (latest if using master) VERSION=0.1.0 -COMMIT=latest -REPO=https://github.com/pop-os/$PACKAGE +COMMIT=LATEST +# Repos +REPO=https://github.com/pop-os/$SOURCE_NAME +RPM_REPO=https://pagure.io/forks/ryanabx/fedora-cosmic/cosmic-packaging.git +# Paths to files +RPM_FILES=cosmic-packaging/rpms/$SOURCE_NAME/* +SCRIPT_FILE=srpm.sh +SCRIPT_DIR=cosmic-packaging/scripts/$SCRIPT_FILE -git clone --recurse-submodules https://pagure.io/forks/ryanabx/fedora-cosmic/cosmic-packaging.git -cp cosmic-packaging/rpms/$PACKAGE/* . -cp cosmic-packaging/scripts/vendor-srpm.sh . -. vendor-srpm.sh $PACKAGE $VERSION $COMMIT $PACKAGE.spec $REPO \ No newline at end of file +# Clone the RPM repo +git clone --recurse-submodules $RPM_REPO +# Get extra RPM files +cp $RPM_FILES . +# Get script file +cp $SCRIPT_FILE . +# Run script file +. $SCRIPT_FILE $PACKAGE $VERSION $COMMIT $REPO $VENDOR \ No newline at end of file diff --git a/scripts/cargo_license_vendor.txt b/scripts/cargo_license_vendor.txt deleted file mode 100644 index 5683edb..0000000 --- a/scripts/cargo_license_vendor.txt +++ /dev/null @@ -1,3 +0,0 @@ -cargo tree --offline --workspace --edges normal,build,dev --no-dedupe --target all --all-features --prefix none --format "{p}" | grep -v "$(pwd)" | sed -e "s: (proc-macro)::" | sort -u > cargo-vendor.txt - -sed 's/\(.*\) (.*#\(.*\))/\1+git\2/' -i cargo-vendor.txt \ No newline at end of file diff --git a/scripts/srpm.sh b/scripts/srpm.sh index e6aa1d6..032d6a8 100644 --- a/scripts/srpm.sh +++ b/scripts/srpm.sh @@ -1,49 +1,55 @@ #!/bin/bash -x -# name of the crate/package -name=$1 -# version of the crate/package -version=$2 -# commit to target (latest == master) -commit=$3 -# path to the spec file on the pc -path_to_spec=$4 -# repo link -repo=$5 - -LATEST="latest" - -# Clone repo and cd into it -mkdir $name-$commit && cd $name-$commit && git clone --recurse-submodules $repo . - -# Get latest commit hash if commit is set to latest -if [[ "$commit" == "$LATEST" ]] +# NAME of the crate/package +NAME=$1 +SOURCE-NAME=$2 +# VERSION of the crate/package +VERSION=$3 +# COMMIT to target (latest == master) +COMMIT=$4 +# REPO link +REPO=$5 +# VENDOR? +VENDOR=$6 + +LATEST="LATEST" + +# Clone REPO and cd into it +mkdir $NAME-$COMMIT && cd $NAME-$COMMIT && git clone --recurse-submodules $REPO . + +# Get latest COMMIT hash if COMMIT is set to latest +if [[ "$COMMIT" == "$LATEST" ]] then - commit=$(git rev-parse HEAD) - cd .. && mv $name-latest $name-$commit && cd $name-$commit + COMMIT=$(git rev-parse HEAD) + cd .. && mv $NAME-latest $NAME-$COMMIT && cd $NAME-$COMMIT fi -# Reset to specified commit -git reset --hard $commit - -# Go back to parent directory -cd .. - -# Zip source -tar -pcJf $name-$commit.tar.xz $name-$commit -rm -rf $name-$commit +# Reset to specified COMMIT +git reset --hard $COMMIT + +if [ "$VENDOR" -eq 1 ]; then + echo "VENDOR=1" + # Vendor dependencies and zip vendor + cargo vendor > ../vendor-config.toml + tar -pczf $NAME-$COMMIT-vendor.tar.gz vendor && mv $NAME-$COMMIT-vendor.tar.gz ../$NAME-$COMMIT-vendor.tar.gz + # Back into parent directory + rm -rf vendor + cd .. +else + cd .. +fi -# Get specfile -mv $path_to_spec $name.spec 2>/dev/null || : +# Zip SOURCE +tar -pczf $NAME-$COMMIT.tar.xz $NAME-$COMMIT +rm -rf $NAME-$COMMIT # Make replacements to specfile -sed -i "/^%global ver / s/.*/%global ver $version/" $name.spec -sed -i "/^%global commit / s/.*/%global commit $commit/" $name.spec +sed -i "/^%global ver / s/.*/%global ver $VERSION/" $NAME.spec +sed -i "/^%global commit / s/.*/%global commit $COMMIT/" $NAME.spec current_date=$(date +'%Y%m%d.%H') -sed -i "/^%global date / s/.*/%global date $current_date/" $name.spec - - -ls -a -pwd +sed -i "/^%global date / s/.*/%global date $current_date/" $NAME.spec -echo Done! $1 $2 $3 $4 $5 \ No newline at end of file +# Should have these sources +# NAME-COMMIT.tar.gz +# vendor.tar.gz +# vendor-config.toml \ No newline at end of file diff --git a/scripts/vendor-srpm.sh b/scripts/vendor-srpm.sh deleted file mode 100644 index 8cc2988..0000000 --- a/scripts/vendor-srpm.sh +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/bash -x - -# name of the crate/package -name=$1 -# version of the crate/package -version=$2 -# commit to target (latest == master) -commit=$3 -# path to the spec file on the pc -path_to_spec=$4 -# repo link -repo=$5 - -LATEST="latest" - -# Clone repo and cd into it -mkdir $name-$commit && cd $name-$commit && git clone --recurse-submodules $repo . - -# Get latest commit hash if commit is set to latest -if [[ "$commit" == "$LATEST" ]] -then - commit=$(git rev-parse HEAD) - cd .. && mv $name-latest $name-$commit && cd $name-$commit -fi - -# Reset to specified commit -git reset --hard $commit - -# Vendor dependencies and zip vendor -mkdir .vendor -cargo vendor > .vendor/config.toml -tar -pcJf $name-$commit-vendor.tar.xz vendor && mv $name-$commit-vendor.tar.xz ../$name-$commit-vendor.tar.xz -# Back into parent directory -rm -rf vendor && cd .. - -# Zip source -tar -pcJf $name-$commit.tar.xz $name-$commit -rm -rf $name-$commit - -# Get specfile -cp $path_to_spec $name.spec 2>/dev/null || : - -# Make replacements to specfile -sed -i "/^%global ver / s/.*/%global ver $version/" $name.spec -sed -i "/^%global commit / s/.*/%global commit $commit/" $name.spec -current_date=$(date +'%Y%m%d.%H') -sed -i "/^%global date / s/.*/%global date $current_date/" $name.spec - - -ls -a -pwd - -echo Done! $1 $2 $3 $4 $5 \ No newline at end of file From bbab54328292a605ad0e98a18f342d3f2cc07954 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: May 28 2024 02:20:01 +0000 Subject: [PATCH 165/220] Update bootstrap.sh --- diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 0fec750..8f859ad 100644 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -22,4 +22,4 @@ cp $RPM_FILES . # Get script file cp $SCRIPT_FILE . # Run script file -. $SCRIPT_FILE $PACKAGE $VERSION $COMMIT $REPO $VENDOR \ No newline at end of file +. $SCRIPT_FILE $NAME $SOURCE_NAME $VERSION $COMMIT $REPO $VENDOR \ No newline at end of file From 2b37df81b07dd7f024638baa2a7debb186ced2f2 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: May 28 2024 02:46:13 +0000 Subject: [PATCH 166/220] Update bootstrap.sh --- diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 8f859ad..820b516 100644 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -11,7 +11,7 @@ COMMIT=LATEST REPO=https://github.com/pop-os/$SOURCE_NAME RPM_REPO=https://pagure.io/forks/ryanabx/fedora-cosmic/cosmic-packaging.git # Paths to files -RPM_FILES=cosmic-packaging/rpms/$SOURCE_NAME/* +RPM_FILES=cosmic-packaging/rpms/$NAME/* SCRIPT_FILE=srpm.sh SCRIPT_DIR=cosmic-packaging/scripts/$SCRIPT_FILE From 0ac8a78b7fb7c67d423f79e3d425f29d4bb5036b Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: May 28 2024 02:53:53 +0000 Subject: [PATCH 167/220] Update bootstrap.sh --- diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 820b516..a7bc5f4 100644 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -20,6 +20,6 @@ git clone --recurse-submodules $RPM_REPO # Get extra RPM files cp $RPM_FILES . # Get script file -cp $SCRIPT_FILE . +cp $SCRIPT_DIR . # Run script file . $SCRIPT_FILE $NAME $SOURCE_NAME $VERSION $COMMIT $REPO $VENDOR \ No newline at end of file From 48d8e1c9dbd030a5a7bee3a004256b5e6f62c37c Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: May 28 2024 03:00:15 +0000 Subject: [PATCH 168/220] Update srpm.sh --- diff --git a/scripts/srpm.sh b/scripts/srpm.sh index 032d6a8..a3b02b0 100644 --- a/scripts/srpm.sh +++ b/scripts/srpm.sh @@ -2,7 +2,7 @@ # NAME of the crate/package NAME=$1 -SOURCE-NAME=$2 +SOURCE_NAME=$2 # VERSION of the crate/package VERSION=$3 # COMMIT to target (latest == master) @@ -15,13 +15,13 @@ VENDOR=$6 LATEST="LATEST" # Clone REPO and cd into it -mkdir $NAME-$COMMIT && cd $NAME-$COMMIT && git clone --recurse-submodules $REPO . +mkdir $SOURCE_NAME-$COMMIT && cd $SOURCE_NAME-$COMMIT && git clone --recurse-submodules $REPO . # Get latest COMMIT hash if COMMIT is set to latest if [[ "$COMMIT" == "$LATEST" ]] then COMMIT=$(git rev-parse HEAD) - cd .. && mv $NAME-latest $NAME-$COMMIT && cd $NAME-$COMMIT + cd .. && mv $SOURCE_NAME-latest $SOURCE_NAME-$COMMIT && cd $SOURCE_NAME-$COMMIT fi # Reset to specified COMMIT @@ -31,7 +31,7 @@ if [ "$VENDOR" -eq 1 ]; then echo "VENDOR=1" # Vendor dependencies and zip vendor cargo vendor > ../vendor-config.toml - tar -pczf $NAME-$COMMIT-vendor.tar.gz vendor && mv $NAME-$COMMIT-vendor.tar.gz ../$NAME-$COMMIT-vendor.tar.gz + tar -pczf vendor.tar.gz vendor && mv vendor.tar.gz ../vendor.tar.gz # Back into parent directory rm -rf vendor cd .. @@ -40,8 +40,8 @@ else fi # Zip SOURCE -tar -pczf $NAME-$COMMIT.tar.xz $NAME-$COMMIT -rm -rf $NAME-$COMMIT +tar -pczf $SOURCE_NAME-$COMMIT.tar.xz $SOURCE_NAME-$COMMIT +rm -rf $SOURCE_NAME-$COMMIT # Make replacements to specfile sed -i "/^%global ver / s/.*/%global ver $VERSION/" $NAME.spec @@ -50,6 +50,6 @@ current_date=$(date +'%Y%m%d.%H') sed -i "/^%global date / s/.*/%global date $current_date/" $NAME.spec # Should have these sources -# NAME-COMMIT.tar.gz +# SOURCE_NAME-COMMIT.tar.gz # vendor.tar.gz # vendor-config.toml \ No newline at end of file From b6423b960a7cb7cbb3ff193283e0b231393949f6 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: May 28 2024 03:06:53 +0000 Subject: [PATCH 169/220] Update srpm.sh --- diff --git a/scripts/srpm.sh b/scripts/srpm.sh index a3b02b0..f82f23a 100644 --- a/scripts/srpm.sh +++ b/scripts/srpm.sh @@ -40,7 +40,7 @@ else fi # Zip SOURCE -tar -pczf $SOURCE_NAME-$COMMIT.tar.xz $SOURCE_NAME-$COMMIT +tar -pczf $SOURCE_NAME-$COMMIT.tar.gz $SOURCE_NAME-$COMMIT rm -rf $SOURCE_NAME-$COMMIT # Make replacements to specfile From 7882a8f6b9b0d806b8115aa4c1e5443903f44bee Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: May 28 2024 03:10:48 +0000 Subject: [PATCH 170/220] Update srpm.sh --- diff --git a/scripts/srpm.sh b/scripts/srpm.sh index f82f23a..f76f43b 100644 --- a/scripts/srpm.sh +++ b/scripts/srpm.sh @@ -21,7 +21,7 @@ mkdir $SOURCE_NAME-$COMMIT && cd $SOURCE_NAME-$COMMIT && git clone --recurse-sub if [[ "$COMMIT" == "$LATEST" ]] then COMMIT=$(git rev-parse HEAD) - cd .. && mv $SOURCE_NAME-latest $SOURCE_NAME-$COMMIT && cd $SOURCE_NAME-$COMMIT + cd .. && mv $SOURCE_NAME-LATEST $SOURCE_NAME-$COMMIT && cd $SOURCE_NAME-$COMMIT fi # Reset to specified COMMIT From 37ca644f1f9e9f3ef90450b390f930201ce123a0 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: May 28 2024 03:25:08 +0000 Subject: [PATCH 171/220] Update cosmic-app-library.spec --- diff --git a/rpms/cosmic-app-library/cosmic-app-library.spec b/rpms/cosmic-app-library/cosmic-app-library.spec index e229787..49703a0 100644 --- a/rpms/cosmic-app-library/cosmic-app-library.spec +++ b/rpms/cosmic-app-library/cosmic-app-library.spec @@ -48,7 +48,7 @@ Source: https://github.com/pop-os/cosmic-applibrary/archive/%{commit}.ta # * tar -pczf vendor.tar.gz vendor Source: vendor.tar.gz # * mv vendor-config.toml .. -Source: vendor-config.toml +Source2: vendor-config.toml BuildRequires: cargo-rpm-macros >= 26 BuildRequires: rustc @@ -64,7 +64,8 @@ BuildRequires: just %description %{_description} %prep -%autosetup -n cosmic-applibrary-%{commit} -p1 -a1 -a2 +%autosetup -n cosmic-applibrary-%{commit} -p1 -a1 +cp %{SOURCE2} . %cargo_prep -N # Check if .cargo/config.toml exists if [ -f .cargo/config.toml ]; then From 42f5a3a1c8ad51f1bf16878547ae8bc77d6e5b05 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: May 28 2024 03:34:04 +0000 Subject: [PATCH 172/220] s --- diff --git a/rpms/cosmic-app-library/cosmic-app-library.spec b/rpms/cosmic-app-library/cosmic-app-library.spec index 49703a0..4d5025c 100644 --- a/rpms/cosmic-app-library/cosmic-app-library.spec +++ b/rpms/cosmic-app-library/cosmic-app-library.spec @@ -65,17 +65,16 @@ BuildRequires: just %prep %autosetup -n cosmic-applibrary-%{commit} -p1 -a1 -cp %{SOURCE2} . %cargo_prep -N # Check if .cargo/config.toml exists if [ -f .cargo/config.toml ]; then - # If it exists, append the contents of .vendor/config.toml to .cargo/config.toml - cat .vendor/config.toml >> .cargo/config.toml - echo "Appended .vendor/config.toml to .cargo/config.toml" + # If it exists, append the contents of ../vendor-config.toml to .cargo/config.toml + cat ../vendor-config.toml >> .cargo/config.toml + echo "Appended ../vendor-config.toml to .cargo/config.toml" else - # If it does not exist, append the contents of .vendor/config.toml to .cargo/config - cat .vendor/config.toml >> .cargo/config - echo "Appended .vendor/config.toml to .cargo/config" + # If it does not exist, append the contents of ../vendor-config.toml to .cargo/config + cat ../vendor-config.toml >> .cargo/config + echo "Appended ../vendor-config.toml to .cargo/config" fi %build diff --git a/rpms/cosmic-applets/cosmic-applets.spec b/rpms/cosmic-applets/cosmic-applets.spec index b7b326b..6769fbe 100644 --- a/rpms/cosmic-applets/cosmic-applets.spec +++ b/rpms/cosmic-applets/cosmic-applets.spec @@ -75,13 +75,13 @@ Requires: cosmic-panel %cargo_prep -N # Check if .cargo/config.toml exists if [ -f .cargo/config.toml ]; then - # If it exists, append the contents of .vendor/config.toml to .cargo/config.toml - cat .vendor/config.toml >> .cargo/config.toml - echo "Appended .vendor/config.toml to .cargo/config.toml" + # If it exists, append the contents of ../vendor-config.toml to .cargo/config.toml + cat ../vendor-config.toml >> .cargo/config.toml + echo "Appended ../vendor-config.toml to .cargo/config.toml" else - # If it does not exist, append the contents of .vendor/config.toml to .cargo/config - cat .vendor/config.toml >> .cargo/config - echo "Appended .vendor/config.toml to .cargo/config" + # If it does not exist, append the contents of ../vendor-config.toml to .cargo/config + cat ../vendor-config.toml >> .cargo/config + echo "Appended ../vendor-config.toml to .cargo/config" fi %build diff --git a/rpms/cosmic-bg/cosmic-bg.spec b/rpms/cosmic-bg/cosmic-bg.spec index d58e5ed..4ea9fa7 100644 --- a/rpms/cosmic-bg/cosmic-bg.spec +++ b/rpms/cosmic-bg/cosmic-bg.spec @@ -60,13 +60,13 @@ Requires: cosmic-session %cargo_prep -N # Check if .cargo/config.toml exists if [ -f .cargo/config.toml ]; then - # If it exists, append the contents of .vendor/config.toml to .cargo/config.toml - cat .vendor/config.toml >> .cargo/config.toml - echo "Appended .vendor/config.toml to .cargo/config.toml" + # If it exists, append the contents of ../vendor-config.toml to .cargo/config.toml + cat ../vendor-config.toml >> .cargo/config.toml + echo "Appended ../vendor-config.toml to .cargo/config.toml" else - # If it does not exist, append the contents of .vendor/config.toml to .cargo/config - cat .vendor/config.toml >> .cargo/config - echo "Appended .vendor/config.toml to .cargo/config" + # If it does not exist, append the contents of ../vendor-config.toml to .cargo/config + cat ../vendor-config.toml >> .cargo/config + echo "Appended ../vendor-config.toml to .cargo/config" fi %build diff --git a/rpms/cosmic-comp/cosmic-comp.spec b/rpms/cosmic-comp/cosmic-comp.spec index 6fe218b..da22c6d 100644 --- a/rpms/cosmic-comp/cosmic-comp.spec +++ b/rpms/cosmic-comp/cosmic-comp.spec @@ -78,13 +78,13 @@ Recommends: cosmic-session %cargo_prep -N # Check if .cargo/config.toml exists if [ -f .cargo/config.toml ]; then - # If it exists, append the contents of .vendor/config.toml to .cargo/config.toml - cat .vendor/config.toml >> .cargo/config.toml - echo "Appended .vendor/config.toml to .cargo/config.toml" + # If it exists, append the contents of ../vendor-config.toml to .cargo/config.toml + cat ../vendor-config.toml >> .cargo/config.toml + echo "Appended ../vendor-config.toml to .cargo/config.toml" else - # If it does not exist, append the contents of .vendor/config.toml to .cargo/config - cat .vendor/config.toml >> .cargo/config - echo "Appended .vendor/config.toml to .cargo/config" + # If it does not exist, append the contents of ../vendor-config.toml to .cargo/config + cat ../vendor-config.toml >> .cargo/config + echo "Appended ../vendor-config.toml to .cargo/config" fi %build diff --git a/rpms/cosmic-edit/cosmic-edit.spec b/rpms/cosmic-edit/cosmic-edit.spec index a1565ab..9a4949b 100644 --- a/rpms/cosmic-edit/cosmic-edit.spec +++ b/rpms/cosmic-edit/cosmic-edit.spec @@ -73,13 +73,13 @@ BuildRequires: git-core %cargo_prep -N # Check if .cargo/config.toml exists if [ -f .cargo/config.toml ]; then - # If it exists, append the contents of .vendor/config.toml to .cargo/config.toml - cat .vendor/config.toml >> .cargo/config.toml - echo "Appended .vendor/config.toml to .cargo/config.toml" + # If it exists, append the contents of ../vendor-config.toml to .cargo/config.toml + cat ../vendor-config.toml >> .cargo/config.toml + echo "Appended ../vendor-config.toml to .cargo/config.toml" else - # If it does not exist, append the contents of .vendor/config.toml to .cargo/config - cat .vendor/config.toml >> .cargo/config - echo "Appended .vendor/config.toml to .cargo/config" + # If it does not exist, append the contents of ../vendor-config.toml to .cargo/config + cat ../vendor-config.toml >> .cargo/config + echo "Appended ../vendor-config.toml to .cargo/config" fi %build diff --git a/rpms/cosmic-files/cosmic-files.spec b/rpms/cosmic-files/cosmic-files.spec index b596ef7..f8e2c4d 100644 --- a/rpms/cosmic-files/cosmic-files.spec +++ b/rpms/cosmic-files/cosmic-files.spec @@ -73,13 +73,13 @@ BuildRequires: git-core %cargo_prep -N # Check if .cargo/config.toml exists if [ -f .cargo/config.toml ]; then - # If it exists, append the contents of .vendor/config.toml to .cargo/config.toml - cat .vendor/config.toml >> .cargo/config.toml - echo "Appended .vendor/config.toml to .cargo/config.toml" + # If it exists, append the contents of ../vendor-config.toml to .cargo/config.toml + cat ../vendor-config.toml >> .cargo/config.toml + echo "Appended ../vendor-config.toml to .cargo/config.toml" else - # If it does not exist, append the contents of .vendor/config.toml to .cargo/config - cat .vendor/config.toml >> .cargo/config - echo "Appended .vendor/config.toml to .cargo/config" + # If it does not exist, append the contents of ../vendor-config.toml to .cargo/config + cat ../vendor-config.toml >> .cargo/config + echo "Appended ../vendor-config.toml to .cargo/config" fi %build diff --git a/rpms/cosmic-greeter/cosmic-greeter.spec b/rpms/cosmic-greeter/cosmic-greeter.spec index 6b95235..4b67d81 100644 --- a/rpms/cosmic-greeter/cosmic-greeter.spec +++ b/rpms/cosmic-greeter/cosmic-greeter.spec @@ -80,13 +80,13 @@ Requires: cosmic-comp %cargo_prep -N # Check if .cargo/config.toml exists if [ -f .cargo/config.toml ]; then - # If it exists, append the contents of .vendor/config.toml to .cargo/config.toml - cat .vendor/config.toml >> .cargo/config.toml - echo "Appended .vendor/config.toml to .cargo/config.toml" + # If it exists, append the contents of ../vendor-config.toml to .cargo/config.toml + cat ../vendor-config.toml >> .cargo/config.toml + echo "Appended ../vendor-config.toml to .cargo/config.toml" else - # If it does not exist, append the contents of .vendor/config.toml to .cargo/config - cat .vendor/config.toml >> .cargo/config - echo "Appended .vendor/config.toml to .cargo/config" + # If it does not exist, append the contents of ../vendor-config.toml to .cargo/config + cat ../vendor-config.toml >> .cargo/config + echo "Appended ../vendor-config.toml to .cargo/config" fi %build diff --git a/rpms/cosmic-launcher/cosmic-launcher.spec b/rpms/cosmic-launcher/cosmic-launcher.spec index 80a2352..af907a4 100644 --- a/rpms/cosmic-launcher/cosmic-launcher.spec +++ b/rpms/cosmic-launcher/cosmic-launcher.spec @@ -73,13 +73,13 @@ Requires: pop-launcher %cargo_prep -N # Check if .cargo/config.toml exists if [ -f .cargo/config.toml ]; then - # If it exists, append the contents of .vendor/config.toml to .cargo/config.toml - cat .vendor/config.toml >> .cargo/config.toml - echo "Appended .vendor/config.toml to .cargo/config.toml" + # If it exists, append the contents of ../vendor-config.toml to .cargo/config.toml + cat ../vendor-config.toml >> .cargo/config.toml + echo "Appended ../vendor-config.toml to .cargo/config.toml" else - # If it does not exist, append the contents of .vendor/config.toml to .cargo/config - cat .vendor/config.toml >> .cargo/config - echo "Appended .vendor/config.toml to .cargo/config" + # If it does not exist, append the contents of ../vendor-config.toml to .cargo/config + cat ../vendor-config.toml >> .cargo/config + echo "Appended ../vendor-config.toml to .cargo/config" fi %build diff --git a/rpms/cosmic-notifications/cosmic-notifications.spec b/rpms/cosmic-notifications/cosmic-notifications.spec index e1111d9..f283b80 100644 --- a/rpms/cosmic-notifications/cosmic-notifications.spec +++ b/rpms/cosmic-notifications/cosmic-notifications.spec @@ -66,13 +66,13 @@ BuildRequires: just %cargo_prep -N # Check if .cargo/config.toml exists if [ -f .cargo/config.toml ]; then - # If it exists, append the contents of .vendor/config.toml to .cargo/config.toml - cat .vendor/config.toml >> .cargo/config.toml - echo "Appended .vendor/config.toml to .cargo/config.toml" + # If it exists, append the contents of ../vendor-config.toml to .cargo/config.toml + cat ../vendor-config.toml >> .cargo/config.toml + echo "Appended ../vendor-config.toml to .cargo/config.toml" else - # If it does not exist, append the contents of .vendor/config.toml to .cargo/config - cat .vendor/config.toml >> .cargo/config - echo "Appended .vendor/config.toml to .cargo/config" + # If it does not exist, append the contents of ../vendor-config.toml to .cargo/config + cat ../vendor-config.toml >> .cargo/config + echo "Appended ../vendor-config.toml to .cargo/config" fi %build diff --git a/rpms/cosmic-osd/cosmic-osd.spec b/rpms/cosmic-osd/cosmic-osd.spec index bfb4a96..f2e5f7f 100644 --- a/rpms/cosmic-osd/cosmic-osd.spec +++ b/rpms/cosmic-osd/cosmic-osd.spec @@ -71,13 +71,13 @@ BuildRequires: make %cargo_prep -N # Check if .cargo/config.toml exists if [ -f .cargo/config.toml ]; then - # If it exists, append the contents of .vendor/config.toml to .cargo/config.toml - cat .vendor/config.toml >> .cargo/config.toml - echo "Appended .vendor/config.toml to .cargo/config.toml" + # If it exists, append the contents of ../vendor-config.toml to .cargo/config.toml + cat ../vendor-config.toml >> .cargo/config.toml + echo "Appended ../vendor-config.toml to .cargo/config.toml" else - # If it does not exist, append the contents of .vendor/config.toml to .cargo/config - cat .vendor/config.toml >> .cargo/config - echo "Appended .vendor/config.toml to .cargo/config" + # If it does not exist, append the contents of ../vendor-config.toml to .cargo/config + cat ../vendor-config.toml >> .cargo/config + echo "Appended ../vendor-config.toml to .cargo/config" fi %build diff --git a/rpms/cosmic-panel/cosmic-panel.spec b/rpms/cosmic-panel/cosmic-panel.spec index 031fe59..56276cb 100644 --- a/rpms/cosmic-panel/cosmic-panel.spec +++ b/rpms/cosmic-panel/cosmic-panel.spec @@ -63,13 +63,13 @@ BuildRequires: just %cargo_prep -N # Check if .cargo/config.toml exists if [ -f .cargo/config.toml ]; then - # If it exists, append the contents of .vendor/config.toml to .cargo/config.toml - cat .vendor/config.toml >> .cargo/config.toml - echo "Appended .vendor/config.toml to .cargo/config.toml" + # If it exists, append the contents of ../vendor-config.toml to .cargo/config.toml + cat ../vendor-config.toml >> .cargo/config.toml + echo "Appended ../vendor-config.toml to .cargo/config.toml" else - # If it does not exist, append the contents of .vendor/config.toml to .cargo/config - cat .vendor/config.toml >> .cargo/config - echo "Appended .vendor/config.toml to .cargo/config" + # If it does not exist, append the contents of ../vendor-config.toml to .cargo/config + cat ../vendor-config.toml >> .cargo/config + echo "Appended ../vendor-config.toml to .cargo/config" fi %build diff --git a/rpms/cosmic-randr/cosmic-randr.spec b/rpms/cosmic-randr/cosmic-randr.spec index ff213bd..80e19ea 100644 --- a/rpms/cosmic-randr/cosmic-randr.spec +++ b/rpms/cosmic-randr/cosmic-randr.spec @@ -54,13 +54,13 @@ Cosmic-randr command line interface.} %cargo_prep -N # Check if .cargo/config.toml exists if [ -f .cargo/config.toml ]; then - # If it exists, append the contents of .vendor/config.toml to .cargo/config.toml - cat .vendor/config.toml >> .cargo/config.toml - echo "Appended .vendor/config.toml to .cargo/config.toml" + # If it exists, append the contents of ../vendor-config.toml to .cargo/config.toml + cat ../vendor-config.toml >> .cargo/config.toml + echo "Appended ../vendor-config.toml to .cargo/config.toml" else - # If it does not exist, append the contents of .vendor/config.toml to .cargo/config - cat .vendor/config.toml >> .cargo/config - echo "Appended .vendor/config.toml to .cargo/config" + # If it does not exist, append the contents of ../vendor-config.toml to .cargo/config + cat ../vendor-config.toml >> .cargo/config + echo "Appended ../vendor-config.toml to .cargo/config" fi %build diff --git a/rpms/cosmic-screenshot/cosmic-screenshot.spec b/rpms/cosmic-screenshot/cosmic-screenshot.spec index c85b9db..329a408 100644 --- a/rpms/cosmic-screenshot/cosmic-screenshot.spec +++ b/rpms/cosmic-screenshot/cosmic-screenshot.spec @@ -57,13 +57,13 @@ BuildRequires: just %cargo_prep -N # Check if .cargo/config.toml exists if [ -f .cargo/config.toml ]; then - # If it exists, append the contents of .vendor/config.toml to .cargo/config.toml - cat .vendor/config.toml >> .cargo/config.toml - echo "Appended .vendor/config.toml to .cargo/config.toml" + # If it exists, append the contents of ../vendor-config.toml to .cargo/config.toml + cat ../vendor-config.toml >> .cargo/config.toml + echo "Appended ../vendor-config.toml to .cargo/config.toml" else - # If it does not exist, append the contents of .vendor/config.toml to .cargo/config - cat .vendor/config.toml >> .cargo/config - echo "Appended .vendor/config.toml to .cargo/config" + # If it does not exist, append the contents of ../vendor-config.toml to .cargo/config + cat ../vendor-config.toml >> .cargo/config + echo "Appended ../vendor-config.toml to .cargo/config" fi %build diff --git a/rpms/cosmic-session/cosmic-session.spec b/rpms/cosmic-session/cosmic-session.spec index 3ea39fd..eaf6995 100644 --- a/rpms/cosmic-session/cosmic-session.spec +++ b/rpms/cosmic-session/cosmic-session.spec @@ -83,13 +83,13 @@ The session manager for the COSMIC desktop environment.} %cargo_prep -N # Check if .cargo/config.toml exists if [ -f .cargo/config.toml ]; then - # If it exists, append the contents of .vendor/config.toml to .cargo/config.toml - cat .vendor/config.toml >> .cargo/config.toml - echo "Appended .vendor/config.toml to .cargo/config.toml" + # If it exists, append the contents of ../vendor-config.toml to .cargo/config.toml + cat ../vendor-config.toml >> .cargo/config.toml + echo "Appended ../vendor-config.toml to .cargo/config.toml" else - # If it does not exist, append the contents of .vendor/config.toml to .cargo/config - cat .vendor/config.toml >> .cargo/config - echo "Appended .vendor/config.toml to .cargo/config" + # If it does not exist, append the contents of ../vendor-config.toml to .cargo/config + cat ../vendor-config.toml >> .cargo/config + echo "Appended ../vendor-config.toml to .cargo/config" fi %build diff --git a/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec b/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec index f9ca209..363c8e7 100644 --- a/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec +++ b/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec @@ -70,13 +70,13 @@ Requires: acpid %cargo_prep -N # Check if .cargo/config.toml exists if [ -f .cargo/config.toml ]; then - # If it exists, append the contents of .vendor/config.toml to .cargo/config.toml - cat .vendor/config.toml >> .cargo/config.toml - echo "Appended .vendor/config.toml to .cargo/config.toml" + # If it exists, append the contents of ../vendor-config.toml to .cargo/config.toml + cat ../vendor-config.toml >> .cargo/config.toml + echo "Appended ../vendor-config.toml to .cargo/config.toml" else - # If it does not exist, append the contents of .vendor/config.toml to .cargo/config - cat .vendor/config.toml >> .cargo/config - echo "Appended .vendor/config.toml to .cargo/config" + # If it does not exist, append the contents of ../vendor-config.toml to .cargo/config + cat ../vendor-config.toml >> .cargo/config + echo "Appended ../vendor-config.toml to .cargo/config" fi %build diff --git a/rpms/cosmic-settings/cosmic-settings.spec b/rpms/cosmic-settings/cosmic-settings.spec index 970084c..306d0ed 100644 --- a/rpms/cosmic-settings/cosmic-settings.spec +++ b/rpms/cosmic-settings/cosmic-settings.spec @@ -71,13 +71,13 @@ BuildRequires: just %cargo_prep -N # Check if .cargo/config.toml exists if [ -f .cargo/config.toml ]; then - # If it exists, append the contents of .vendor/config.toml to .cargo/config.toml - cat .vendor/config.toml >> .cargo/config.toml - echo "Appended .vendor/config.toml to .cargo/config.toml" + # If it exists, append the contents of ../vendor-config.toml to .cargo/config.toml + cat ../vendor-config.toml >> .cargo/config.toml + echo "Appended ../vendor-config.toml to .cargo/config.toml" else - # If it does not exist, append the contents of .vendor/config.toml to .cargo/config - cat .vendor/config.toml >> .cargo/config - echo "Appended .vendor/config.toml to .cargo/config" + # If it does not exist, append the contents of ../vendor-config.toml to .cargo/config + cat ../vendor-config.toml >> .cargo/config + echo "Appended ../vendor-config.toml to .cargo/config" fi %build diff --git a/rpms/cosmic-store/cosmic-store.spec b/rpms/cosmic-store/cosmic-store.spec index 8e8ed39..6223071 100644 --- a/rpms/cosmic-store/cosmic-store.spec +++ b/rpms/cosmic-store/cosmic-store.spec @@ -71,13 +71,13 @@ Requires: flatpak-libs %cargo_prep -N # Check if .cargo/config.toml exists if [ -f .cargo/config.toml ]; then - # If it exists, append the contents of .vendor/config.toml to .cargo/config.toml - cat .vendor/config.toml >> .cargo/config.toml - echo "Appended .vendor/config.toml to .cargo/config.toml" + # If it exists, append the contents of ../vendor-config.toml to .cargo/config.toml + cat ../vendor-config.toml >> .cargo/config.toml + echo "Appended ../vendor-config.toml to .cargo/config.toml" else - # If it does not exist, append the contents of .vendor/config.toml to .cargo/config - cat .vendor/config.toml >> .cargo/config - echo "Appended .vendor/config.toml to .cargo/config" + # If it does not exist, append the contents of ../vendor-config.toml to .cargo/config + cat ../vendor-config.toml >> .cargo/config + echo "Appended ../vendor-config.toml to .cargo/config" fi %build diff --git a/rpms/cosmic-term/cosmic-term.spec b/rpms/cosmic-term/cosmic-term.spec index 70981ab..0a61d25 100644 --- a/rpms/cosmic-term/cosmic-term.spec +++ b/rpms/cosmic-term/cosmic-term.spec @@ -72,13 +72,13 @@ BuildRequires: git-core %cargo_prep -N # Check if .cargo/config.toml exists if [ -f .cargo/config.toml ]; then - # If it exists, append the contents of .vendor/config.toml to .cargo/config.toml - cat .vendor/config.toml >> .cargo/config.toml - echo "Appended .vendor/config.toml to .cargo/config.toml" + # If it exists, append the contents of ../vendor-config.toml to .cargo/config.toml + cat ../vendor-config.toml >> .cargo/config.toml + echo "Appended ../vendor-config.toml to .cargo/config.toml" else - # If it does not exist, append the contents of .vendor/config.toml to .cargo/config - cat .vendor/config.toml >> .cargo/config - echo "Appended .vendor/config.toml to .cargo/config" + # If it does not exist, append the contents of ../vendor-config.toml to .cargo/config + cat ../vendor-config.toml >> .cargo/config + echo "Appended ../vendor-config.toml to .cargo/config" fi %build diff --git a/rpms/cosmic-workspaces/cosmic-workspaces.spec b/rpms/cosmic-workspaces/cosmic-workspaces.spec index 41c3de1..40c7a24 100644 --- a/rpms/cosmic-workspaces/cosmic-workspaces.spec +++ b/rpms/cosmic-workspaces/cosmic-workspaces.spec @@ -76,13 +76,13 @@ Requires: cosmic-comp %cargo_prep -N # Check if .cargo/config.toml exists if [ -f .cargo/config.toml ]; then - # If it exists, append the contents of .vendor/config.toml to .cargo/config.toml - cat .vendor/config.toml >> .cargo/config.toml - echo "Appended .vendor/config.toml to .cargo/config.toml" + # If it exists, append the contents of ../vendor-config.toml to .cargo/config.toml + cat ../vendor-config.toml >> .cargo/config.toml + echo "Appended ../vendor-config.toml to .cargo/config.toml" else - # If it does not exist, append the contents of .vendor/config.toml to .cargo/config - cat .vendor/config.toml >> .cargo/config - echo "Appended .vendor/config.toml to .cargo/config" + # If it does not exist, append the contents of ../vendor-config.toml to .cargo/config + cat ../vendor-config.toml >> .cargo/config + echo "Appended ../vendor-config.toml to .cargo/config" fi %build diff --git a/rpms/pop-launcher/pop-launcher.spec b/rpms/pop-launcher/pop-launcher.spec index 6db13e6..75d95f0 100644 --- a/rpms/pop-launcher/pop-launcher.spec +++ b/rpms/pop-launcher/pop-launcher.spec @@ -69,13 +69,13 @@ Requires: fd-find %cargo_prep -N # Check if .cargo/config.toml exists if [ -f .cargo/config.toml ]; then - # If it exists, append the contents of .vendor/config.toml to .cargo/config.toml - cat .vendor/config.toml >> .cargo/config.toml - echo "Appended .vendor/config.toml to .cargo/config.toml" + # If it exists, append the contents of ../vendor-config.toml to .cargo/config.toml + cat ../vendor-config.toml >> .cargo/config.toml + echo "Appended ../vendor-config.toml to .cargo/config.toml" else - # If it does not exist, append the contents of .vendor/config.toml to .cargo/config - cat .vendor/config.toml >> .cargo/config - echo "Appended .vendor/config.toml to .cargo/config" + # If it does not exist, append the contents of ../vendor-config.toml to .cargo/config + cat ../vendor-config.toml >> .cargo/config + echo "Appended ../vendor-config.toml to .cargo/config" fi %build diff --git a/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec b/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec index 9bc8ed2..8f49e28 100644 --- a/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec +++ b/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec @@ -75,13 +75,13 @@ BuildRequires: just %cargo_prep -N # Check if .cargo/config.toml exists if [ -f .cargo/config.toml ]; then - # If it exists, append the contents of .vendor/config.toml to .cargo/config.toml - cat .vendor/config.toml >> .cargo/config.toml - echo "Appended .vendor/config.toml to .cargo/config.toml" + # If it exists, append the contents of ../vendor-config.toml to .cargo/config.toml + cat ../vendor-config.toml >> .cargo/config.toml + echo "Appended ../vendor-config.toml to .cargo/config.toml" else - # If it does not exist, append the contents of .vendor/config.toml to .cargo/config - cat .vendor/config.toml >> .cargo/config - echo "Appended .vendor/config.toml to .cargo/config" + # If it does not exist, append the contents of ../vendor-config.toml to .cargo/config + cat ../vendor-config.toml >> .cargo/config + echo "Appended ../vendor-config.toml to .cargo/config" fi %build From 85af21f30c92b7225355ef3347c2cd78ae9fc810 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: May 28 2024 03:46:01 +0000 Subject: [PATCH 173/220] s --- diff --git a/rpms/cosmic-app-library/cosmic-app-library.spec b/rpms/cosmic-app-library/cosmic-app-library.spec index 4d5025c..62f0678 100644 --- a/rpms/cosmic-app-library/cosmic-app-library.spec +++ b/rpms/cosmic-app-library/cosmic-app-library.spec @@ -68,13 +68,13 @@ BuildRequires: just %cargo_prep -N # Check if .cargo/config.toml exists if [ -f .cargo/config.toml ]; then - # If it exists, append the contents of ../vendor-config.toml to .cargo/config.toml - cat ../vendor-config.toml >> .cargo/config.toml - echo "Appended ../vendor-config.toml to .cargo/config.toml" + # If it exists, append the contents of %{SOURCE2} to .cargo/config.toml + cat %{SOURCE2} >> .cargo/config.toml + echo "Appended %{SOURCE2} to .cargo/config.toml" else - # If it does not exist, append the contents of ../vendor-config.toml to .cargo/config - cat ../vendor-config.toml >> .cargo/config - echo "Appended ../vendor-config.toml to .cargo/config" + # If it does not exist, append the contents of %{SOURCE2} to .cargo/config + cat %{SOURCE2} >> .cargo/config + echo "Appended %{SOURCE2} to .cargo/config" fi %build diff --git a/rpms/cosmic-applets/cosmic-applets.spec b/rpms/cosmic-applets/cosmic-applets.spec index 6769fbe..733a6ca 100644 --- a/rpms/cosmic-applets/cosmic-applets.spec +++ b/rpms/cosmic-applets/cosmic-applets.spec @@ -75,13 +75,13 @@ Requires: cosmic-panel %cargo_prep -N # Check if .cargo/config.toml exists if [ -f .cargo/config.toml ]; then - # If it exists, append the contents of ../vendor-config.toml to .cargo/config.toml - cat ../vendor-config.toml >> .cargo/config.toml - echo "Appended ../vendor-config.toml to .cargo/config.toml" + # If it exists, append the contents of %{SOURCE2} to .cargo/config.toml + cat %{SOURCE2} >> .cargo/config.toml + echo "Appended %{SOURCE2} to .cargo/config.toml" else - # If it does not exist, append the contents of ../vendor-config.toml to .cargo/config - cat ../vendor-config.toml >> .cargo/config - echo "Appended ../vendor-config.toml to .cargo/config" + # If it does not exist, append the contents of %{SOURCE2} to .cargo/config + cat %{SOURCE2} >> .cargo/config + echo "Appended %{SOURCE2} to .cargo/config" fi %build diff --git a/rpms/cosmic-bg/cosmic-bg.spec b/rpms/cosmic-bg/cosmic-bg.spec index 4ea9fa7..950a082 100644 --- a/rpms/cosmic-bg/cosmic-bg.spec +++ b/rpms/cosmic-bg/cosmic-bg.spec @@ -60,13 +60,13 @@ Requires: cosmic-session %cargo_prep -N # Check if .cargo/config.toml exists if [ -f .cargo/config.toml ]; then - # If it exists, append the contents of ../vendor-config.toml to .cargo/config.toml - cat ../vendor-config.toml >> .cargo/config.toml - echo "Appended ../vendor-config.toml to .cargo/config.toml" + # If it exists, append the contents of %{SOURCE2} to .cargo/config.toml + cat %{SOURCE2} >> .cargo/config.toml + echo "Appended %{SOURCE2} to .cargo/config.toml" else - # If it does not exist, append the contents of ../vendor-config.toml to .cargo/config - cat ../vendor-config.toml >> .cargo/config - echo "Appended ../vendor-config.toml to .cargo/config" + # If it does not exist, append the contents of %{SOURCE2} to .cargo/config + cat %{SOURCE2} >> .cargo/config + echo "Appended %{SOURCE2} to .cargo/config" fi %build diff --git a/rpms/cosmic-comp/cosmic-comp.spec b/rpms/cosmic-comp/cosmic-comp.spec index da22c6d..2dc2df0 100644 --- a/rpms/cosmic-comp/cosmic-comp.spec +++ b/rpms/cosmic-comp/cosmic-comp.spec @@ -78,13 +78,13 @@ Recommends: cosmic-session %cargo_prep -N # Check if .cargo/config.toml exists if [ -f .cargo/config.toml ]; then - # If it exists, append the contents of ../vendor-config.toml to .cargo/config.toml - cat ../vendor-config.toml >> .cargo/config.toml - echo "Appended ../vendor-config.toml to .cargo/config.toml" + # If it exists, append the contents of %{SOURCE2} to .cargo/config.toml + cat %{SOURCE2} >> .cargo/config.toml + echo "Appended %{SOURCE2} to .cargo/config.toml" else - # If it does not exist, append the contents of ../vendor-config.toml to .cargo/config - cat ../vendor-config.toml >> .cargo/config - echo "Appended ../vendor-config.toml to .cargo/config" + # If it does not exist, append the contents of %{SOURCE2} to .cargo/config + cat %{SOURCE2} >> .cargo/config + echo "Appended %{SOURCE2} to .cargo/config" fi %build diff --git a/rpms/cosmic-edit/cosmic-edit.spec b/rpms/cosmic-edit/cosmic-edit.spec index 9a4949b..3531f77 100644 --- a/rpms/cosmic-edit/cosmic-edit.spec +++ b/rpms/cosmic-edit/cosmic-edit.spec @@ -73,13 +73,13 @@ BuildRequires: git-core %cargo_prep -N # Check if .cargo/config.toml exists if [ -f .cargo/config.toml ]; then - # If it exists, append the contents of ../vendor-config.toml to .cargo/config.toml - cat ../vendor-config.toml >> .cargo/config.toml - echo "Appended ../vendor-config.toml to .cargo/config.toml" + # If it exists, append the contents of %{SOURCE2} to .cargo/config.toml + cat %{SOURCE2} >> .cargo/config.toml + echo "Appended %{SOURCE2} to .cargo/config.toml" else - # If it does not exist, append the contents of ../vendor-config.toml to .cargo/config - cat ../vendor-config.toml >> .cargo/config - echo "Appended ../vendor-config.toml to .cargo/config" + # If it does not exist, append the contents of %{SOURCE2} to .cargo/config + cat %{SOURCE2} >> .cargo/config + echo "Appended %{SOURCE2} to .cargo/config" fi %build diff --git a/rpms/cosmic-files/cosmic-files.spec b/rpms/cosmic-files/cosmic-files.spec index f8e2c4d..f8bc46d 100644 --- a/rpms/cosmic-files/cosmic-files.spec +++ b/rpms/cosmic-files/cosmic-files.spec @@ -73,13 +73,13 @@ BuildRequires: git-core %cargo_prep -N # Check if .cargo/config.toml exists if [ -f .cargo/config.toml ]; then - # If it exists, append the contents of ../vendor-config.toml to .cargo/config.toml - cat ../vendor-config.toml >> .cargo/config.toml - echo "Appended ../vendor-config.toml to .cargo/config.toml" + # If it exists, append the contents of %{SOURCE2} to .cargo/config.toml + cat %{SOURCE2} >> .cargo/config.toml + echo "Appended %{SOURCE2} to .cargo/config.toml" else - # If it does not exist, append the contents of ../vendor-config.toml to .cargo/config - cat ../vendor-config.toml >> .cargo/config - echo "Appended ../vendor-config.toml to .cargo/config" + # If it does not exist, append the contents of %{SOURCE2} to .cargo/config + cat %{SOURCE2} >> .cargo/config + echo "Appended %{SOURCE2} to .cargo/config" fi %build diff --git a/rpms/cosmic-greeter/cosmic-greeter.spec b/rpms/cosmic-greeter/cosmic-greeter.spec index 4b67d81..35f5e0e 100644 --- a/rpms/cosmic-greeter/cosmic-greeter.spec +++ b/rpms/cosmic-greeter/cosmic-greeter.spec @@ -80,13 +80,13 @@ Requires: cosmic-comp %cargo_prep -N # Check if .cargo/config.toml exists if [ -f .cargo/config.toml ]; then - # If it exists, append the contents of ../vendor-config.toml to .cargo/config.toml - cat ../vendor-config.toml >> .cargo/config.toml - echo "Appended ../vendor-config.toml to .cargo/config.toml" + # If it exists, append the contents of %{SOURCE2} to .cargo/config.toml + cat %{SOURCE2} >> .cargo/config.toml + echo "Appended %{SOURCE2} to .cargo/config.toml" else - # If it does not exist, append the contents of ../vendor-config.toml to .cargo/config - cat ../vendor-config.toml >> .cargo/config - echo "Appended ../vendor-config.toml to .cargo/config" + # If it does not exist, append the contents of %{SOURCE2} to .cargo/config + cat %{SOURCE2} >> .cargo/config + echo "Appended %{SOURCE2} to .cargo/config" fi %build diff --git a/rpms/cosmic-launcher/cosmic-launcher.spec b/rpms/cosmic-launcher/cosmic-launcher.spec index af907a4..65ee0a1 100644 --- a/rpms/cosmic-launcher/cosmic-launcher.spec +++ b/rpms/cosmic-launcher/cosmic-launcher.spec @@ -73,13 +73,13 @@ Requires: pop-launcher %cargo_prep -N # Check if .cargo/config.toml exists if [ -f .cargo/config.toml ]; then - # If it exists, append the contents of ../vendor-config.toml to .cargo/config.toml - cat ../vendor-config.toml >> .cargo/config.toml - echo "Appended ../vendor-config.toml to .cargo/config.toml" + # If it exists, append the contents of %{SOURCE2} to .cargo/config.toml + cat %{SOURCE2} >> .cargo/config.toml + echo "Appended %{SOURCE2} to .cargo/config.toml" else - # If it does not exist, append the contents of ../vendor-config.toml to .cargo/config - cat ../vendor-config.toml >> .cargo/config - echo "Appended ../vendor-config.toml to .cargo/config" + # If it does not exist, append the contents of %{SOURCE2} to .cargo/config + cat %{SOURCE2} >> .cargo/config + echo "Appended %{SOURCE2} to .cargo/config" fi %build diff --git a/rpms/cosmic-notifications/cosmic-notifications.spec b/rpms/cosmic-notifications/cosmic-notifications.spec index f283b80..7a5f2b5 100644 --- a/rpms/cosmic-notifications/cosmic-notifications.spec +++ b/rpms/cosmic-notifications/cosmic-notifications.spec @@ -66,13 +66,13 @@ BuildRequires: just %cargo_prep -N # Check if .cargo/config.toml exists if [ -f .cargo/config.toml ]; then - # If it exists, append the contents of ../vendor-config.toml to .cargo/config.toml - cat ../vendor-config.toml >> .cargo/config.toml - echo "Appended ../vendor-config.toml to .cargo/config.toml" + # If it exists, append the contents of %{SOURCE2} to .cargo/config.toml + cat %{SOURCE2} >> .cargo/config.toml + echo "Appended %{SOURCE2} to .cargo/config.toml" else - # If it does not exist, append the contents of ../vendor-config.toml to .cargo/config - cat ../vendor-config.toml >> .cargo/config - echo "Appended ../vendor-config.toml to .cargo/config" + # If it does not exist, append the contents of %{SOURCE2} to .cargo/config + cat %{SOURCE2} >> .cargo/config + echo "Appended %{SOURCE2} to .cargo/config" fi %build diff --git a/rpms/cosmic-osd/cosmic-osd.spec b/rpms/cosmic-osd/cosmic-osd.spec index f2e5f7f..30377ac 100644 --- a/rpms/cosmic-osd/cosmic-osd.spec +++ b/rpms/cosmic-osd/cosmic-osd.spec @@ -71,13 +71,13 @@ BuildRequires: make %cargo_prep -N # Check if .cargo/config.toml exists if [ -f .cargo/config.toml ]; then - # If it exists, append the contents of ../vendor-config.toml to .cargo/config.toml - cat ../vendor-config.toml >> .cargo/config.toml - echo "Appended ../vendor-config.toml to .cargo/config.toml" + # If it exists, append the contents of %{SOURCE2} to .cargo/config.toml + cat %{SOURCE2} >> .cargo/config.toml + echo "Appended %{SOURCE2} to .cargo/config.toml" else - # If it does not exist, append the contents of ../vendor-config.toml to .cargo/config - cat ../vendor-config.toml >> .cargo/config - echo "Appended ../vendor-config.toml to .cargo/config" + # If it does not exist, append the contents of %{SOURCE2} to .cargo/config + cat %{SOURCE2} >> .cargo/config + echo "Appended %{SOURCE2} to .cargo/config" fi %build diff --git a/rpms/cosmic-panel/cosmic-panel.spec b/rpms/cosmic-panel/cosmic-panel.spec index 56276cb..ca92dc4 100644 --- a/rpms/cosmic-panel/cosmic-panel.spec +++ b/rpms/cosmic-panel/cosmic-panel.spec @@ -63,13 +63,13 @@ BuildRequires: just %cargo_prep -N # Check if .cargo/config.toml exists if [ -f .cargo/config.toml ]; then - # If it exists, append the contents of ../vendor-config.toml to .cargo/config.toml - cat ../vendor-config.toml >> .cargo/config.toml - echo "Appended ../vendor-config.toml to .cargo/config.toml" + # If it exists, append the contents of %{SOURCE2} to .cargo/config.toml + cat %{SOURCE2} >> .cargo/config.toml + echo "Appended %{SOURCE2} to .cargo/config.toml" else - # If it does not exist, append the contents of ../vendor-config.toml to .cargo/config - cat ../vendor-config.toml >> .cargo/config - echo "Appended ../vendor-config.toml to .cargo/config" + # If it does not exist, append the contents of %{SOURCE2} to .cargo/config + cat %{SOURCE2} >> .cargo/config + echo "Appended %{SOURCE2} to .cargo/config" fi %build diff --git a/rpms/cosmic-randr/cosmic-randr.spec b/rpms/cosmic-randr/cosmic-randr.spec index 80e19ea..91dc0ec 100644 --- a/rpms/cosmic-randr/cosmic-randr.spec +++ b/rpms/cosmic-randr/cosmic-randr.spec @@ -54,13 +54,13 @@ Cosmic-randr command line interface.} %cargo_prep -N # Check if .cargo/config.toml exists if [ -f .cargo/config.toml ]; then - # If it exists, append the contents of ../vendor-config.toml to .cargo/config.toml - cat ../vendor-config.toml >> .cargo/config.toml - echo "Appended ../vendor-config.toml to .cargo/config.toml" + # If it exists, append the contents of %{SOURCE2} to .cargo/config.toml + cat %{SOURCE2} >> .cargo/config.toml + echo "Appended %{SOURCE2} to .cargo/config.toml" else - # If it does not exist, append the contents of ../vendor-config.toml to .cargo/config - cat ../vendor-config.toml >> .cargo/config - echo "Appended ../vendor-config.toml to .cargo/config" + # If it does not exist, append the contents of %{SOURCE2} to .cargo/config + cat %{SOURCE2} >> .cargo/config + echo "Appended %{SOURCE2} to .cargo/config" fi %build diff --git a/rpms/cosmic-screenshot/cosmic-screenshot.spec b/rpms/cosmic-screenshot/cosmic-screenshot.spec index 329a408..abf8a32 100644 --- a/rpms/cosmic-screenshot/cosmic-screenshot.spec +++ b/rpms/cosmic-screenshot/cosmic-screenshot.spec @@ -57,13 +57,13 @@ BuildRequires: just %cargo_prep -N # Check if .cargo/config.toml exists if [ -f .cargo/config.toml ]; then - # If it exists, append the contents of ../vendor-config.toml to .cargo/config.toml - cat ../vendor-config.toml >> .cargo/config.toml - echo "Appended ../vendor-config.toml to .cargo/config.toml" + # If it exists, append the contents of %{SOURCE2} to .cargo/config.toml + cat %{SOURCE2} >> .cargo/config.toml + echo "Appended %{SOURCE2} to .cargo/config.toml" else - # If it does not exist, append the contents of ../vendor-config.toml to .cargo/config - cat ../vendor-config.toml >> .cargo/config - echo "Appended ../vendor-config.toml to .cargo/config" + # If it does not exist, append the contents of %{SOURCE2} to .cargo/config + cat %{SOURCE2} >> .cargo/config + echo "Appended %{SOURCE2} to .cargo/config" fi %build diff --git a/rpms/cosmic-session/cosmic-session.spec b/rpms/cosmic-session/cosmic-session.spec index eaf6995..9d54d3f 100644 --- a/rpms/cosmic-session/cosmic-session.spec +++ b/rpms/cosmic-session/cosmic-session.spec @@ -83,13 +83,13 @@ The session manager for the COSMIC desktop environment.} %cargo_prep -N # Check if .cargo/config.toml exists if [ -f .cargo/config.toml ]; then - # If it exists, append the contents of ../vendor-config.toml to .cargo/config.toml - cat ../vendor-config.toml >> .cargo/config.toml - echo "Appended ../vendor-config.toml to .cargo/config.toml" + # If it exists, append the contents of %{SOURCE2} to .cargo/config.toml + cat %{SOURCE2} >> .cargo/config.toml + echo "Appended %{SOURCE2} to .cargo/config.toml" else - # If it does not exist, append the contents of ../vendor-config.toml to .cargo/config - cat ../vendor-config.toml >> .cargo/config - echo "Appended ../vendor-config.toml to .cargo/config" + # If it does not exist, append the contents of %{SOURCE2} to .cargo/config + cat %{SOURCE2} >> .cargo/config + echo "Appended %{SOURCE2} to .cargo/config" fi %build diff --git a/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec b/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec index 363c8e7..904e75b 100644 --- a/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec +++ b/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec @@ -70,13 +70,13 @@ Requires: acpid %cargo_prep -N # Check if .cargo/config.toml exists if [ -f .cargo/config.toml ]; then - # If it exists, append the contents of ../vendor-config.toml to .cargo/config.toml - cat ../vendor-config.toml >> .cargo/config.toml - echo "Appended ../vendor-config.toml to .cargo/config.toml" + # If it exists, append the contents of %{SOURCE2} to .cargo/config.toml + cat %{SOURCE2} >> .cargo/config.toml + echo "Appended %{SOURCE2} to .cargo/config.toml" else - # If it does not exist, append the contents of ../vendor-config.toml to .cargo/config - cat ../vendor-config.toml >> .cargo/config - echo "Appended ../vendor-config.toml to .cargo/config" + # If it does not exist, append the contents of %{SOURCE2} to .cargo/config + cat %{SOURCE2} >> .cargo/config + echo "Appended %{SOURCE2} to .cargo/config" fi %build diff --git a/rpms/cosmic-settings/cosmic-settings.spec b/rpms/cosmic-settings/cosmic-settings.spec index 306d0ed..f391d74 100644 --- a/rpms/cosmic-settings/cosmic-settings.spec +++ b/rpms/cosmic-settings/cosmic-settings.spec @@ -71,13 +71,13 @@ BuildRequires: just %cargo_prep -N # Check if .cargo/config.toml exists if [ -f .cargo/config.toml ]; then - # If it exists, append the contents of ../vendor-config.toml to .cargo/config.toml - cat ../vendor-config.toml >> .cargo/config.toml - echo "Appended ../vendor-config.toml to .cargo/config.toml" + # If it exists, append the contents of %{SOURCE2} to .cargo/config.toml + cat %{SOURCE2} >> .cargo/config.toml + echo "Appended %{SOURCE2} to .cargo/config.toml" else - # If it does not exist, append the contents of ../vendor-config.toml to .cargo/config - cat ../vendor-config.toml >> .cargo/config - echo "Appended ../vendor-config.toml to .cargo/config" + # If it does not exist, append the contents of %{SOURCE2} to .cargo/config + cat %{SOURCE2} >> .cargo/config + echo "Appended %{SOURCE2} to .cargo/config" fi %build diff --git a/rpms/cosmic-store/cosmic-store.spec b/rpms/cosmic-store/cosmic-store.spec index 6223071..bea323b 100644 --- a/rpms/cosmic-store/cosmic-store.spec +++ b/rpms/cosmic-store/cosmic-store.spec @@ -71,13 +71,13 @@ Requires: flatpak-libs %cargo_prep -N # Check if .cargo/config.toml exists if [ -f .cargo/config.toml ]; then - # If it exists, append the contents of ../vendor-config.toml to .cargo/config.toml - cat ../vendor-config.toml >> .cargo/config.toml - echo "Appended ../vendor-config.toml to .cargo/config.toml" + # If it exists, append the contents of %{SOURCE2} to .cargo/config.toml + cat %{SOURCE2} >> .cargo/config.toml + echo "Appended %{SOURCE2} to .cargo/config.toml" else - # If it does not exist, append the contents of ../vendor-config.toml to .cargo/config - cat ../vendor-config.toml >> .cargo/config - echo "Appended ../vendor-config.toml to .cargo/config" + # If it does not exist, append the contents of %{SOURCE2} to .cargo/config + cat %{SOURCE2} >> .cargo/config + echo "Appended %{SOURCE2} to .cargo/config" fi %build diff --git a/rpms/cosmic-term/cosmic-term.spec b/rpms/cosmic-term/cosmic-term.spec index 0a61d25..0e4b664 100644 --- a/rpms/cosmic-term/cosmic-term.spec +++ b/rpms/cosmic-term/cosmic-term.spec @@ -72,13 +72,13 @@ BuildRequires: git-core %cargo_prep -N # Check if .cargo/config.toml exists if [ -f .cargo/config.toml ]; then - # If it exists, append the contents of ../vendor-config.toml to .cargo/config.toml - cat ../vendor-config.toml >> .cargo/config.toml - echo "Appended ../vendor-config.toml to .cargo/config.toml" + # If it exists, append the contents of %{SOURCE2} to .cargo/config.toml + cat %{SOURCE2} >> .cargo/config.toml + echo "Appended %{SOURCE2} to .cargo/config.toml" else - # If it does not exist, append the contents of ../vendor-config.toml to .cargo/config - cat ../vendor-config.toml >> .cargo/config - echo "Appended ../vendor-config.toml to .cargo/config" + # If it does not exist, append the contents of %{SOURCE2} to .cargo/config + cat %{SOURCE2} >> .cargo/config + echo "Appended %{SOURCE2} to .cargo/config" fi %build diff --git a/rpms/cosmic-workspaces/cosmic-workspaces.spec b/rpms/cosmic-workspaces/cosmic-workspaces.spec index 40c7a24..492896d 100644 --- a/rpms/cosmic-workspaces/cosmic-workspaces.spec +++ b/rpms/cosmic-workspaces/cosmic-workspaces.spec @@ -76,13 +76,13 @@ Requires: cosmic-comp %cargo_prep -N # Check if .cargo/config.toml exists if [ -f .cargo/config.toml ]; then - # If it exists, append the contents of ../vendor-config.toml to .cargo/config.toml - cat ../vendor-config.toml >> .cargo/config.toml - echo "Appended ../vendor-config.toml to .cargo/config.toml" + # If it exists, append the contents of %{SOURCE2} to .cargo/config.toml + cat %{SOURCE2} >> .cargo/config.toml + echo "Appended %{SOURCE2} to .cargo/config.toml" else - # If it does not exist, append the contents of ../vendor-config.toml to .cargo/config - cat ../vendor-config.toml >> .cargo/config - echo "Appended ../vendor-config.toml to .cargo/config" + # If it does not exist, append the contents of %{SOURCE2} to .cargo/config + cat %{SOURCE2} >> .cargo/config + echo "Appended %{SOURCE2} to .cargo/config" fi %build diff --git a/rpms/pop-launcher/pop-launcher.spec b/rpms/pop-launcher/pop-launcher.spec index 75d95f0..c7e7fb1 100644 --- a/rpms/pop-launcher/pop-launcher.spec +++ b/rpms/pop-launcher/pop-launcher.spec @@ -69,13 +69,13 @@ Requires: fd-find %cargo_prep -N # Check if .cargo/config.toml exists if [ -f .cargo/config.toml ]; then - # If it exists, append the contents of ../vendor-config.toml to .cargo/config.toml - cat ../vendor-config.toml >> .cargo/config.toml - echo "Appended ../vendor-config.toml to .cargo/config.toml" + # If it exists, append the contents of %{SOURCE2} to .cargo/config.toml + cat %{SOURCE2} >> .cargo/config.toml + echo "Appended %{SOURCE2} to .cargo/config.toml" else - # If it does not exist, append the contents of ../vendor-config.toml to .cargo/config - cat ../vendor-config.toml >> .cargo/config - echo "Appended ../vendor-config.toml to .cargo/config" + # If it does not exist, append the contents of %{SOURCE2} to .cargo/config + cat %{SOURCE2} >> .cargo/config + echo "Appended %{SOURCE2} to .cargo/config" fi %build diff --git a/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec b/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec index 8f49e28..3404652 100644 --- a/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec +++ b/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec @@ -75,13 +75,13 @@ BuildRequires: just %cargo_prep -N # Check if .cargo/config.toml exists if [ -f .cargo/config.toml ]; then - # If it exists, append the contents of ../vendor-config.toml to .cargo/config.toml - cat ../vendor-config.toml >> .cargo/config.toml - echo "Appended ../vendor-config.toml to .cargo/config.toml" + # If it exists, append the contents of %{SOURCE2} to .cargo/config.toml + cat %{SOURCE2} >> .cargo/config.toml + echo "Appended %{SOURCE2} to .cargo/config.toml" else - # If it does not exist, append the contents of ../vendor-config.toml to .cargo/config - cat ../vendor-config.toml >> .cargo/config - echo "Appended ../vendor-config.toml to .cargo/config" + # If it does not exist, append the contents of %{SOURCE2} to .cargo/config + cat %{SOURCE2} >> .cargo/config + echo "Appended %{SOURCE2} to .cargo/config" fi %build diff --git a/scripts/srpm.sh b/scripts/srpm.sh index f76f43b..9c96c5d 100644 --- a/scripts/srpm.sh +++ b/scripts/srpm.sh @@ -30,7 +30,7 @@ git reset --hard $COMMIT if [ "$VENDOR" -eq 1 ]; then echo "VENDOR=1" # Vendor dependencies and zip vendor - cargo vendor > ../vendor-config.toml + cargo vendor > %{SOURCE2} tar -pczf vendor.tar.gz vendor && mv vendor.tar.gz ../vendor.tar.gz # Back into parent directory rm -rf vendor From 6ac9849011c8b2b45494023f3989e9b9deeea71a Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: May 28 2024 04:15:25 +0000 Subject: [PATCH 174/220] Update srpm.sh --- diff --git a/scripts/srpm.sh b/scripts/srpm.sh index 9c96c5d..f76f43b 100644 --- a/scripts/srpm.sh +++ b/scripts/srpm.sh @@ -30,7 +30,7 @@ git reset --hard $COMMIT if [ "$VENDOR" -eq 1 ]; then echo "VENDOR=1" # Vendor dependencies and zip vendor - cargo vendor > %{SOURCE2} + cargo vendor > ../vendor-config.toml tar -pczf vendor.tar.gz vendor && mv vendor.tar.gz ../vendor.tar.gz # Back into parent directory rm -rf vendor From 9fb5ef046a119871a8e1c2e8db4a1e308a16690d Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: May 28 2024 04:30:12 +0000 Subject: [PATCH 175/220] s --- diff --git a/rpms/cosmic-applets/cosmic-applets.spec b/rpms/cosmic-applets/cosmic-applets.spec index 733a6ca..cf77b9a 100644 --- a/rpms/cosmic-applets/cosmic-applets.spec +++ b/rpms/cosmic-applets/cosmic-applets.spec @@ -44,7 +44,7 @@ Source: https://github.com/pop-os/cosmic-applets/archive/%{commit}.tar.g # * tar -pczf vendor.tar.gz vendor Source: vendor.tar.gz # * mv vendor-config.toml .. -Source: vendor-config.toml +Source2: vendor-config.toml Patch: better_compile.patch Patch: symlink.patch diff --git a/rpms/cosmic-bg/cosmic-bg.spec b/rpms/cosmic-bg/cosmic-bg.spec index 950a082..121b978 100644 --- a/rpms/cosmic-bg/cosmic-bg.spec +++ b/rpms/cosmic-bg/cosmic-bg.spec @@ -38,7 +38,7 @@ Source: https://github.com/pop-os/cosmic-bg/archive/%{commit}.tar.gz # * tar -pczf vendor.tar.gz vendor Source: vendor.tar.gz # * mv vendor-config.toml .. -Source: vendor-config.toml +Source2: vendor-config.toml BuildRequires: cargo-rpm-macros >= 25 BuildRequires: rustc diff --git a/rpms/cosmic-comp/cosmic-comp.spec b/rpms/cosmic-comp/cosmic-comp.spec index 2dc2df0..0aa5e48 100644 --- a/rpms/cosmic-comp/cosmic-comp.spec +++ b/rpms/cosmic-comp/cosmic-comp.spec @@ -49,7 +49,7 @@ Source: https://github.com/pop-os/cosmic-comp/archive/%{commit}.tar.gz # * tar -pczf vendor.tar.gz vendor Source: vendor.tar.gz # * mv vendor-config.toml .. -Source: vendor-config.toml +Source2: vendor-config.toml BuildRequires: cargo-rpm-macros >= 25 BuildRequires: rustc diff --git a/rpms/cosmic-edit/cosmic-edit.spec b/rpms/cosmic-edit/cosmic-edit.spec index 3531f77..2db3137 100644 --- a/rpms/cosmic-edit/cosmic-edit.spec +++ b/rpms/cosmic-edit/cosmic-edit.spec @@ -52,7 +52,7 @@ Source: https://github.com/pop-os/cosmic-edit/archive/%{commit}.tar.gz # * tar -pczf vendor.tar.gz vendor Source: vendor.tar.gz # * mv vendor-config.toml .. -Source: vendor-config.toml +Source2: vendor-config.toml BuildRequires: cargo-rpm-macros >= 26 BuildRequires: rustc diff --git a/rpms/cosmic-files/cosmic-files.spec b/rpms/cosmic-files/cosmic-files.spec index f8bc46d..b2cc2ed 100644 --- a/rpms/cosmic-files/cosmic-files.spec +++ b/rpms/cosmic-files/cosmic-files.spec @@ -51,7 +51,7 @@ Source: https://github.com/pop-os/cosmic-files/archive/%{commit}.tar.gz # * tar -pczf vendor.tar.gz vendor Source: vendor.tar.gz # * mv vendor-config.toml .. -Source: vendor-config.toml +Source2: vendor-config.toml BuildRequires: cargo-rpm-macros >= 26 BuildRequires: rustc diff --git a/rpms/cosmic-greeter/cosmic-greeter.spec b/rpms/cosmic-greeter/cosmic-greeter.spec index 35f5e0e..e38a3bf 100644 --- a/rpms/cosmic-greeter/cosmic-greeter.spec +++ b/rpms/cosmic-greeter/cosmic-greeter.spec @@ -45,7 +45,7 @@ Source: https://github.com/pop-os/cosmic-greeter/archive/%{commit}.tar.g # * tar -pczf vendor.tar.gz vendor Source: vendor.tar.gz # * mv vendor-config.toml .. -Source: vendor-config.toml +Source2: vendor-config.toml Patch: service.patch diff --git a/rpms/cosmic-launcher/cosmic-launcher.spec b/rpms/cosmic-launcher/cosmic-launcher.spec index 65ee0a1..0c06852 100644 --- a/rpms/cosmic-launcher/cosmic-launcher.spec +++ b/rpms/cosmic-launcher/cosmic-launcher.spec @@ -51,7 +51,7 @@ Source: https://github.com/pop-os/cosmic-launcher/archive/%{commit}.tar. # * tar -pczf vendor.tar.gz vendor Source: vendor.tar.gz # * mv vendor-config.toml .. -Source: vendor-config.toml +Source2: vendor-config.toml BuildRequires: cargo-rpm-macros >= 26 BuildRequires: rustc diff --git a/rpms/cosmic-notifications/cosmic-notifications.spec b/rpms/cosmic-notifications/cosmic-notifications.spec index 7a5f2b5..eb42f0c 100644 --- a/rpms/cosmic-notifications/cosmic-notifications.spec +++ b/rpms/cosmic-notifications/cosmic-notifications.spec @@ -46,7 +46,7 @@ Source: https://github.com/pop-os/cosmic-notifications/archive/%{commit} # * tar -pczf vendor.tar.gz vendor Source: vendor.tar.gz # * mv vendor-config.toml .. -Source: vendor-config.toml +Source2: vendor-config.toml BuildRequires: cargo-rpm-macros >= 25 BuildRequires: rustc diff --git a/rpms/cosmic-osd/cosmic-osd.spec b/rpms/cosmic-osd/cosmic-osd.spec index 30377ac..00bf078 100644 --- a/rpms/cosmic-osd/cosmic-osd.spec +++ b/rpms/cosmic-osd/cosmic-osd.spec @@ -49,7 +49,7 @@ Source: https://github.com/pop-os/cosmic-osd/archive/%{commit}.tar.gz # * tar -pczf vendor.tar.gz vendor Source: vendor.tar.gz # * mv vendor-config.toml .. -Source: vendor-config.toml +Source2: vendor-config.toml BuildRequires: cargo-rpm-macros >= 26 BuildRequires: rustc diff --git a/rpms/cosmic-panel/cosmic-panel.spec b/rpms/cosmic-panel/cosmic-panel.spec index ca92dc4..62fedb4 100644 --- a/rpms/cosmic-panel/cosmic-panel.spec +++ b/rpms/cosmic-panel/cosmic-panel.spec @@ -43,7 +43,7 @@ Source: https://github.com/pop-os/cosmic-panel/archive/%{commit}.tar.gz # * tar -pczf vendor.tar.gz vendor Source: vendor.tar.gz # * mv vendor-config.toml .. -Source: vendor-config.toml +Source2: vendor-config.toml BuildRequires: cargo-rpm-macros >= 25 BuildRequires: rustc diff --git a/rpms/cosmic-randr/cosmic-randr.spec b/rpms/cosmic-randr/cosmic-randr.spec index 91dc0ec..60f20ff 100644 --- a/rpms/cosmic-randr/cosmic-randr.spec +++ b/rpms/cosmic-randr/cosmic-randr.spec @@ -35,7 +35,7 @@ Source: https://github.com/pop-os/cosmic-randr/archive/%{commit}.tar.gz # * tar -pczf vendor.tar.gz vendor Source: vendor.tar.gz # * mv vendor-config.toml .. -Source: vendor-config.toml +Source2: vendor-config.toml BuildRequires: cargo-rpm-macros >= 25 BuildRequires: rustc diff --git a/rpms/cosmic-screenshot/cosmic-screenshot.spec b/rpms/cosmic-screenshot/cosmic-screenshot.spec index abf8a32..1bcbed1 100644 --- a/rpms/cosmic-screenshot/cosmic-screenshot.spec +++ b/rpms/cosmic-screenshot/cosmic-screenshot.spec @@ -39,7 +39,7 @@ Source: https://github.com/pop-os/cosmic-screenshot/archive/%{commit}.ta # * tar -pczf vendor.tar.gz vendor Source: vendor.tar.gz # * mv vendor-config.toml .. -Source: vendor-config.toml +Source2: vendor-config.toml BuildRequires: cargo-rpm-macros >= 26 BuildRequires: rustc diff --git a/rpms/cosmic-session/cosmic-session.spec b/rpms/cosmic-session/cosmic-session.spec index 9d54d3f..7d864f0 100644 --- a/rpms/cosmic-session/cosmic-session.spec +++ b/rpms/cosmic-session/cosmic-session.spec @@ -43,7 +43,7 @@ Source: https://github.com/pop-os/cosmic-session/archive/%{commit}.tar.g # * tar -pczf vendor.tar.gz vendor Source: vendor.tar.gz # * mv vendor-config.toml .. -Source: vendor-config.toml +Source2: vendor-config.toml BuildRequires: cargo-rpm-macros >= 26 BuildRequires: rustc diff --git a/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec b/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec index 904e75b..3a3c384 100644 --- a/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec +++ b/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec @@ -48,7 +48,7 @@ Source: https://github.com/pop-os/cosmic-settings-daemon/archive/%{commi # * tar -pczf vendor.tar.gz vendor Source: vendor.tar.gz # * mv vendor-config.toml .. -Source: vendor-config.toml +Source2: vendor-config.toml BuildRequires: cargo-rpm-macros >= 26 BuildRequires: rustc diff --git a/rpms/cosmic-settings/cosmic-settings.spec b/rpms/cosmic-settings/cosmic-settings.spec index f391d74..db53221 100644 --- a/rpms/cosmic-settings/cosmic-settings.spec +++ b/rpms/cosmic-settings/cosmic-settings.spec @@ -49,7 +49,7 @@ Source: https://github.com/pop-os/cosmic-settings/archive/%{commit}.tar. # * tar -pczf vendor.tar.gz vendor Source: vendor.tar.gz # * mv vendor-config.toml .. -Source: vendor-config.toml +Source2: vendor-config.toml BuildRequires: cargo-rpm-macros >= 25 BuildRequires: rustc diff --git a/rpms/cosmic-store/cosmic-store.spec b/rpms/cosmic-store/cosmic-store.spec index bea323b..07d9a36 100644 --- a/rpms/cosmic-store/cosmic-store.spec +++ b/rpms/cosmic-store/cosmic-store.spec @@ -47,7 +47,7 @@ Source: https://github.com/pop-os/cosmic-store/archive/%{commit}.tar.gz # * tar -pczf vendor.tar.gz vendor Source: vendor.tar.gz # * mv vendor-config.toml .. -Source: vendor-config.toml +Source2: vendor-config.toml BuildRequires: cargo-rpm-macros >= 25 BuildRequires: rustc diff --git a/rpms/cosmic-term/cosmic-term.spec b/rpms/cosmic-term/cosmic-term.spec index 0e4b664..35b2927 100644 --- a/rpms/cosmic-term/cosmic-term.spec +++ b/rpms/cosmic-term/cosmic-term.spec @@ -51,7 +51,7 @@ Source: https://github.com/pop-os/cosmic-term/archive/%{commit}.tar.gz # * tar -pczf vendor.tar.gz vendor Source: vendor.tar.gz # * mv vendor-config.toml .. -Source: vendor-config.toml +Source2: vendor-config.toml BuildRequires: cargo-rpm-macros >= 26 BuildRequires: rustc diff --git a/rpms/cosmic-workspaces/cosmic-workspaces.spec b/rpms/cosmic-workspaces/cosmic-workspaces.spec index 492896d..b893a49 100644 --- a/rpms/cosmic-workspaces/cosmic-workspaces.spec +++ b/rpms/cosmic-workspaces/cosmic-workspaces.spec @@ -49,7 +49,7 @@ Source: https://github.com/pop-os/cosmic-workspaces-epoch/archive/%{comm # * tar -pczf vendor.tar.gz vendor Source: vendor.tar.gz # * mv vendor-config.toml .. -Source: vendor-config.toml +Source2: vendor-config.toml BuildRequires: cargo-rpm-macros >= 26 BuildRequires: rustc diff --git a/rpms/pop-launcher/pop-launcher.spec b/rpms/pop-launcher/pop-launcher.spec index c7e7fb1..402d8e1 100644 --- a/rpms/pop-launcher/pop-launcher.spec +++ b/rpms/pop-launcher/pop-launcher.spec @@ -44,7 +44,7 @@ Source: https://github.com/pop-os/launcher/archive/%{commit}.tar.gz # * tar -pczf vendor.tar.gz vendor Source: vendor.tar.gz # * mv vendor-config.toml .. -Source: vendor-config.toml +Source2: vendor-config.toml Patch: symlink.patch diff --git a/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec b/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec index 3404652..5b970a6 100644 --- a/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec +++ b/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec @@ -49,7 +49,7 @@ Source: https://github.com/pop-os/xdg-desktop-portal-cosmic/archive/%{co # * tar -pczf vendor.tar.gz vendor Source: vendor.tar.gz # * mv vendor-config.toml .. -Source: vendor-config.toml +Source2: vendor-config.toml BuildRequires: cargo-rpm-macros >= 26 BuildRequires: rustc From 2c712311eafd0d4fb5d65a71aad751aba0a23281 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: May 28 2024 16:01:56 +0000 Subject: [PATCH 176/220] Update cosmic-workspaces.spec --- diff --git a/rpms/cosmic-workspaces/cosmic-workspaces.spec b/rpms/cosmic-workspaces/cosmic-workspaces.spec index b893a49..34172c9 100644 --- a/rpms/cosmic-workspaces/cosmic-workspaces.spec +++ b/rpms/cosmic-workspaces/cosmic-workspaces.spec @@ -72,7 +72,7 @@ Requires: cosmic-comp %description %{_description} %prep -%autosetup -n %{crate}-%{commit} -p1 -a1 +%autosetup -n cosmic-workspaces-epoch-%{commit} -p1 -a1 %cargo_prep -N # Check if .cargo/config.toml exists if [ -f .cargo/config.toml ]; then From f089b40a196581881ff61592e681735902392d44 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: May 28 2024 16:02:21 +0000 Subject: [PATCH 177/220] Update pop-launcher.spec --- diff --git a/rpms/pop-launcher/pop-launcher.spec b/rpms/pop-launcher/pop-launcher.spec index 402d8e1..98c7218 100644 --- a/rpms/pop-launcher/pop-launcher.spec +++ b/rpms/pop-launcher/pop-launcher.spec @@ -65,7 +65,7 @@ Requires: fd-find %description %{_description} %prep -%autosetup -n pop-launcher-%{commit} -p1 -a1 +%autosetup -n launcher-%{commit} -p1 -a1 %cargo_prep -N # Check if .cargo/config.toml exists if [ -f .cargo/config.toml ]; then From 544fe49c68a7fe5d96c3ddfa795e6e0fd2343f0a Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: May 28 2024 19:25:22 +0000 Subject: [PATCH 178/220] Update cosmic-icon-theme.spec --- diff --git a/rpms/cosmic-icon-theme/cosmic-icon-theme.spec b/rpms/cosmic-icon-theme/cosmic-icon-theme.spec index f922058..45522e2 100644 --- a/rpms/cosmic-icon-theme/cosmic-icon-theme.spec +++ b/rpms/cosmic-icon-theme/cosmic-icon-theme.spec @@ -1,5 +1,3 @@ -BuildArch: noarch - %global ver ### %global commit ### %global date ### @@ -15,8 +13,11 @@ URL: https://github.com/pop-os/cosmic-icons Source: https://github.com/pop-os/cosmic-icons/archive/%{commit}.tar.gz +BuildArch: noarch + BuildRequires: just + Requires: pop-icon-theme Obsoletes: cosmic-icons < 0.1.0~git20240526.04.9aad1ab-2 @@ -37,9 +38,7 @@ just rootdir=%{buildroot} install %files %dir %{_datadir}/icons/Cosmic -%{_datadir}/icons/Cosmic/scalable/* -%{_datadir}/icons/Cosmic/index.theme - +%{_datadir}/icons/Cosmic/* %changelog %autochangelog From fb023263d43b207cb9031227c43e3194d97744f3 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: May 28 2024 20:38:04 +0000 Subject: [PATCH 179/220] Update cosmic-files.spec --- diff --git a/rpms/cosmic-files/cosmic-files.spec b/rpms/cosmic-files/cosmic-files.spec index b2cc2ed..c9ba5bb 100644 --- a/rpms/cosmic-files/cosmic-files.spec +++ b/rpms/cosmic-files/cosmic-files.spec @@ -61,7 +61,8 @@ BuildRequires: just BuildRequires: glib2-devel BuildRequires: libxkbcommon-devel -BuildRequires: git-core +# BuildRequires: git-core +BuildRequires: git %global _description %{expand: %{summary}.} From 04b887b65cc1298a78c642bdab9f6ef0d83cce12 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: May 30 2024 00:02:02 +0000 Subject: [PATCH 180/220] Update cosmic-files.spec --- diff --git a/rpms/cosmic-files/cosmic-files.spec b/rpms/cosmic-files/cosmic-files.spec index c9ba5bb..d878689 100644 --- a/rpms/cosmic-files/cosmic-files.spec +++ b/rpms/cosmic-files/cosmic-files.spec @@ -61,8 +61,7 @@ BuildRequires: just BuildRequires: glib2-devel BuildRequires: libxkbcommon-devel -# BuildRequires: git-core -BuildRequires: git +BuildRequires: git-core %global _description %{expand: %{summary}.} @@ -84,6 +83,8 @@ else fi %build +export VERGEN_GIT_COMMIT_DATE= +export VERGEN_GIT_SHA= %cargo_build %{cargo_license_summary} %{cargo_license} > LICENSE.dependencies From 10fcd274c212ab7a2a56b7f537f134f2f6fdf029 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: May 30 2024 00:19:39 +0000 Subject: [PATCH 181/220] Update cosmic-files.spec --- diff --git a/rpms/cosmic-files/cosmic-files.spec b/rpms/cosmic-files/cosmic-files.spec index d878689..90e28de 100644 --- a/rpms/cosmic-files/cosmic-files.spec +++ b/rpms/cosmic-files/cosmic-files.spec @@ -83,8 +83,8 @@ else fi %build -export VERGEN_GIT_COMMIT_DATE= -export VERGEN_GIT_SHA= +export VERGEN_GIT_COMMIT_DATE=%{date} +export VERGEN_GIT_SHA=%{commit} %cargo_build %{cargo_license_summary} %{cargo_license} > LICENSE.dependencies From f7ba9aec92513a1df9999d2c1b3236c085dc14fa Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: May 30 2024 00:40:02 +0000 Subject: [PATCH 182/220] Update cosmic-files.spec --- diff --git a/rpms/cosmic-files/cosmic-files.spec b/rpms/cosmic-files/cosmic-files.spec index 90e28de..f3426ca 100644 --- a/rpms/cosmic-files/cosmic-files.spec +++ b/rpms/cosmic-files/cosmic-files.spec @@ -83,8 +83,8 @@ else fi %build -export VERGEN_GIT_COMMIT_DATE=%{date} -export VERGEN_GIT_SHA=%{commit} +export VERGEN_GIT_COMMIT_DATE="date --utc '%{date}'" +export VERGEN_GIT_SHA="%{commit}" %cargo_build %{cargo_license_summary} %{cargo_license} > LICENSE.dependencies From 76ee7e9871d62d01f1e8872bfb46be8dbb604efe Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: May 30 2024 01:17:33 +0000 Subject: [PATCH 183/220] commitdate instead of rpm date --- diff --git a/rpms/cosmic-app-library/cosmic-app-library.spec b/rpms/cosmic-app-library/cosmic-app-library.spec index 62f0678..4326bf6 100644 --- a/rpms/cosmic-app-library/cosmic-app-library.spec +++ b/rpms/cosmic-app-library/cosmic-app-library.spec @@ -7,12 +7,13 @@ ExcludeArch: %{ix86} %global ver ### %global commit ### -%global date ### +%global commitdatestring ### +%global commitdate ### %global crate cosmic-app-library Name: cosmic-app-library -Version: %{ver}~git%{date}.%{sub %{commit} 1 7} +Version: %{ver}~git%{commitdate}.%{sub %{commit} 1 7} Release: %autorelease Summary: App Library program for the COSMIC Desktop Environment diff --git a/rpms/cosmic-applets/cosmic-applets.spec b/rpms/cosmic-applets/cosmic-applets.spec index cf77b9a..0df88f2 100644 --- a/rpms/cosmic-applets/cosmic-applets.spec +++ b/rpms/cosmic-applets/cosmic-applets.spec @@ -4,10 +4,11 @@ ExcludeArch: %{ix86} %global ver ### %global commit ### -%global date ### +%global commitdatestring ### +%global commitdate ### Name: cosmic-applets -Version: %{ver}~git%{date}.%{sub %{commit} 1 7} +Version: %{ver}~git%{commitdate}.%{sub %{commit} 1 7} Release: %autorelease Summary: Applets for the COSMIC Desktop Environment diff --git a/rpms/cosmic-bg/cosmic-bg.spec b/rpms/cosmic-bg/cosmic-bg.spec index 121b978..1ccc549 100644 --- a/rpms/cosmic-bg/cosmic-bg.spec +++ b/rpms/cosmic-bg/cosmic-bg.spec @@ -4,10 +4,11 @@ ExcludeArch: %{ix86} %global ver ### %global commit ### -%global date ### +%global commitdatestring ### +%global commitdate ### Name: cosmic-bg -Version: %{ver}~git%{date}.%{sub %{commit} 1 7} +Version: %{ver}~git%{commitdate}.%{sub %{commit} 1 7} Release: %autorelease Summary: Background manager for the COSMIC Desktop Environment diff --git a/rpms/cosmic-comp/cosmic-comp.spec b/rpms/cosmic-comp/cosmic-comp.spec index 0aa5e48..09e8e08 100644 --- a/rpms/cosmic-comp/cosmic-comp.spec +++ b/rpms/cosmic-comp/cosmic-comp.spec @@ -4,10 +4,11 @@ ExcludeArch: %{ix86} %global ver ### %global commit ### -%global date ### +%global commitdatestring ### +%global commitdate ### Name: cosmic-comp -Version: %{ver}~git%{date}.%{sub %{commit} 1 7} +Version: %{ver}~git%{commitdate}.%{sub %{commit} 1 7} Release: %autorelease Summary: Compositor for the COSMIC Desktop Environment diff --git a/rpms/cosmic-desktop/cosmic-desktop.spec b/rpms/cosmic-desktop/cosmic-desktop.spec index d6e23ac..2f00e68 100644 --- a/rpms/cosmic-desktop/cosmic-desktop.spec +++ b/rpms/cosmic-desktop/cosmic-desktop.spec @@ -1,9 +1,10 @@ %global ver ### %global commit ### -%global date ### +%global commitdatestring ### +%global commitdate ### Name: cosmic-desktop -Version: %{ver}~git%{date}.%{sub %{commit} 1 7} +Version: %{ver}~git%{commitdate}.%{sub %{commit} 1 7} Release: %autorelease Summary: The next generation COSMIC Desktop Environment diff --git a/rpms/cosmic-edit/cosmic-edit.spec b/rpms/cosmic-edit/cosmic-edit.spec index 2db3137..d7053ed 100644 --- a/rpms/cosmic-edit/cosmic-edit.spec +++ b/rpms/cosmic-edit/cosmic-edit.spec @@ -9,10 +9,11 @@ ExcludeArch: %{ix86} %global ver ### %global commit ### -%global date ### +%global commitdatestring ### +%global commitdate ### Name: cosmic-edit -Version: %{ver}~git%{date}.%{sub %{commit} 1 7} +Version: %{ver}~git%{commitdate}.%{sub %{commit} 1 7} Release: %autorelease Summary: Libcosmic text editor diff --git a/rpms/cosmic-epoch/cosmic-epoch.spec b/rpms/cosmic-epoch/cosmic-epoch.spec index df7dae6..e38359a 100644 --- a/rpms/cosmic-epoch/cosmic-epoch.spec +++ b/rpms/cosmic-epoch/cosmic-epoch.spec @@ -1,9 +1,10 @@ %global ver ### %global commit ### -%global date ### +%global commitdatestring ### +%global commitdate ### Name: cosmic-epoch -Version: %{ver}~git%{date}.%{sub %{commit} 1 7} +Version: %{ver}~git%{commitdate}.%{sub %{commit} 1 7} Release: %autorelease Summary: The next generation COSMIC Desktop Environment diff --git a/rpms/cosmic-files/cosmic-files.spec b/rpms/cosmic-files/cosmic-files.spec index f3426ca..e131394 100644 --- a/rpms/cosmic-files/cosmic-files.spec +++ b/rpms/cosmic-files/cosmic-files.spec @@ -9,10 +9,11 @@ ExcludeArch: %{ix86} %global ver ### %global commit ### -%global date ### +%global commitdatestring ### +%global commitdate ### Name: cosmic-files -Version: %{ver}~git%{date}.%{sub %{commit} 1 7} +Version: %{ver}~git%{commitdate}.%{sub %{commit} 1 7} Release: %autorelease Summary: Libcosmic file manager @@ -83,7 +84,7 @@ else fi %build -export VERGEN_GIT_COMMIT_DATE="date --utc '%{date}'" +export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" export VERGEN_GIT_SHA="%{commit}" %cargo_build %{cargo_license_summary} diff --git a/rpms/cosmic-greeter/cosmic-greeter.spec b/rpms/cosmic-greeter/cosmic-greeter.spec index e38a3bf..7c4a218 100644 --- a/rpms/cosmic-greeter/cosmic-greeter.spec +++ b/rpms/cosmic-greeter/cosmic-greeter.spec @@ -4,10 +4,11 @@ ExcludeArch: %{ix86} %global ver ### %global commit ### -%global date ### +%global commitdatestring ### +%global commitdate ### Name: cosmic-greeter -Version: %{ver}~git%{date}.%{sub %{commit} 1 7} +Version: %{ver}~git%{commitdate}.%{sub %{commit} 1 7} Release: %autorelease Summary: Login and display manager for the COSMIC Desktop Environment diff --git a/rpms/cosmic-icon-theme/cosmic-icon-theme.spec b/rpms/cosmic-icon-theme/cosmic-icon-theme.spec index 45522e2..7d5898c 100644 --- a/rpms/cosmic-icon-theme/cosmic-icon-theme.spec +++ b/rpms/cosmic-icon-theme/cosmic-icon-theme.spec @@ -1,9 +1,10 @@ %global ver ### %global commit ### -%global date ### +%global commitdatestring ### +%global commitdate ### Name: cosmic-icon-theme -Version: %{ver}~git%{date}.%{sub %{commit} 1 7} +Version: %{ver}~git%{commitdate}.%{sub %{commit} 1 7} Release: %autorelease Summary: Icon theme for the COSMIC Desktop Environment diff --git a/rpms/cosmic-launcher/cosmic-launcher.spec b/rpms/cosmic-launcher/cosmic-launcher.spec index 0c06852..a7e4281 100644 --- a/rpms/cosmic-launcher/cosmic-launcher.spec +++ b/rpms/cosmic-launcher/cosmic-launcher.spec @@ -9,10 +9,11 @@ ExcludeArch: %{ix86} %global ver ### %global commit ### -%global date ### +%global commitdatestring ### +%global commitdate ### Name: cosmic-launcher -Version: %{ver}~git%{date}.%{sub %{commit} 1 7} +Version: %{ver}~git%{commitdate}.%{sub %{commit} 1 7} Release: %autorelease Summary: Pop launcher frontend for the COSMIC Desktop Environment diff --git a/rpms/cosmic-notifications/cosmic-notifications.spec b/rpms/cosmic-notifications/cosmic-notifications.spec index eb42f0c..3ced682 100644 --- a/rpms/cosmic-notifications/cosmic-notifications.spec +++ b/rpms/cosmic-notifications/cosmic-notifications.spec @@ -4,10 +4,11 @@ ExcludeArch: %{ix86} %global ver ### %global commit ### -%global date ### +%global commitdatestring ### +%global commitdate ### Name: cosmic-notifications -Version: %{ver}~git%{date}.%{sub %{commit} 1 7} +Version: %{ver}~git%{commitdate}.%{sub %{commit} 1 7} Release: %autorelease Summary: Notifications daemon for the COSMIC Desktop Environment diff --git a/rpms/cosmic-osd/cosmic-osd.spec b/rpms/cosmic-osd/cosmic-osd.spec index 00bf078..0e52876 100644 --- a/rpms/cosmic-osd/cosmic-osd.spec +++ b/rpms/cosmic-osd/cosmic-osd.spec @@ -9,10 +9,11 @@ ExcludeArch: %{ix86} %global ver ### %global commit ### -%global date ### +%global commitdatestring ### +%global commitdate ### Name: cosmic-osd -Version: %{ver}~git%{date}.%{sub %{commit} 1 7} +Version: %{ver}~git%{commitdate}.%{sub %{commit} 1 7} Release: %autorelease Summary: OSDs for the COSMIC Desktop Environment diff --git a/rpms/cosmic-panel/cosmic-panel.spec b/rpms/cosmic-panel/cosmic-panel.spec index 62fedb4..1d1149e 100644 --- a/rpms/cosmic-panel/cosmic-panel.spec +++ b/rpms/cosmic-panel/cosmic-panel.spec @@ -4,10 +4,11 @@ ExcludeArch: %{ix86} %global ver ### %global commit ### -%global date ### +%global commitdatestring ### +%global commitdate ### Name: cosmic-panel -Version: %{ver}~git%{date}.%{sub %{commit} 1 7} +Version: %{ver}~git%{commitdate}.%{sub %{commit} 1 7} Release: %autorelease Summary: Panel for the COSMIC Desktop Environment diff --git a/rpms/cosmic-randr/cosmic-randr.spec b/rpms/cosmic-randr/cosmic-randr.spec index 60f20ff..593df41 100644 --- a/rpms/cosmic-randr/cosmic-randr.spec +++ b/rpms/cosmic-randr/cosmic-randr.spec @@ -4,10 +4,11 @@ ExcludeArch: %{ix86} %global ver ### %global commit ### -%global date ### +%global commitdatestring ### +%global commitdate ### Name: cosmic-randr -Version: %{ver}~git%{date}.%{sub %{commit} 1 7} +Version: %{ver}~git%{commitdate}.%{sub %{commit} 1 7} Release: %autorelease Summary: Display configuration command line tool diff --git a/rpms/cosmic-screenshot/cosmic-screenshot.spec b/rpms/cosmic-screenshot/cosmic-screenshot.spec index 1bcbed1..e9588f8 100644 --- a/rpms/cosmic-screenshot/cosmic-screenshot.spec +++ b/rpms/cosmic-screenshot/cosmic-screenshot.spec @@ -9,10 +9,11 @@ ExcludeArch: %{ix86} %global ver ### %global commit ### -%global date ### +%global commitdatestring ### +%global commitdate ### Name: cosmic-screenshot -Version: %{ver}~git%{date}.%{sub %{commit} 1 7} +Version: %{ver}~git%{commitdate}.%{sub %{commit} 1 7} Release: %autorelease Summary: Screenshot utility for the COSMIC Desktop Environment diff --git a/rpms/cosmic-session/cosmic-session.spec b/rpms/cosmic-session/cosmic-session.spec index 7d864f0..4bacb14 100644 --- a/rpms/cosmic-session/cosmic-session.spec +++ b/rpms/cosmic-session/cosmic-session.spec @@ -9,10 +9,11 @@ ExcludeArch: %{ix86} %global ver ### %global commit ### -%global date ### +%global commitdatestring ### +%global commitdate ### Name: cosmic-session -Version: %{ver}~git%{date}.%{sub %{commit} 1 7} +Version: %{ver}~git%{commitdate}.%{sub %{commit} 1 7} Release: %autorelease Summary: Session manager for the COSMIC desktop environment diff --git a/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec b/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec index 3a3c384..0f8aeb7 100644 --- a/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec +++ b/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec @@ -9,10 +9,11 @@ ExcludeArch: %{ix86} %global ver ### %global commit ### -%global date ### +%global commitdatestring ### +%global commitdate ### Name: cosmic-settings-daemon -Version: %{ver}~git%{date}.%{sub %{commit} 1 7} +Version: %{ver}~git%{commitdate}.%{sub %{commit} 1 7} Release: %autorelease Summary: Settings daemon for the COSMIC Desktop Environment diff --git a/rpms/cosmic-settings/cosmic-settings.spec b/rpms/cosmic-settings/cosmic-settings.spec index db53221..3715525 100644 --- a/rpms/cosmic-settings/cosmic-settings.spec +++ b/rpms/cosmic-settings/cosmic-settings.spec @@ -6,10 +6,11 @@ ExcludeArch: %{ix86} %global ver ### %global commit ### -%global date ### +%global commitdatestring ### +%global commitdate ### Name: cosmic-settings -Version: %{ver}~git%{date}.%{sub %{commit} 1 7} +Version: %{ver}~git%{commitdate}.%{sub %{commit} 1 7} Release: %autorelease Summary: Settings app for the COSMIC Desktop Environment diff --git a/rpms/cosmic-store/cosmic-store.spec b/rpms/cosmic-store/cosmic-store.spec index 07d9a36..091f335 100644 --- a/rpms/cosmic-store/cosmic-store.spec +++ b/rpms/cosmic-store/cosmic-store.spec @@ -4,10 +4,11 @@ ExcludeArch: %{ix86} %global ver ### %global commit ### -%global date ### +%global commitdatestring ### +%global commitdate ### Name: cosmic-store -Version: %{ver}~git%{date}.%{sub %{commit} 1 7} +Version: %{ver}~git%{commitdate}.%{sub %{commit} 1 7} Release: %autorelease Summary: App store for the COSMIC Desktop Environment diff --git a/rpms/cosmic-term/cosmic-term.spec b/rpms/cosmic-term/cosmic-term.spec index 35b2927..4db0edd 100644 --- a/rpms/cosmic-term/cosmic-term.spec +++ b/rpms/cosmic-term/cosmic-term.spec @@ -9,10 +9,11 @@ ExcludeArch: %{ix86} %global ver ### %global commit ### -%global date ### +%global commitdatestring ### +%global commitdate ### Name: cosmic-term -Version: %{ver}~git%{date}.%{sub %{commit} 1 7} +Version: %{ver}~git%{commitdate}.%{sub %{commit} 1 7} Release: %autorelease Summary: Terminal emulator built with alacritty and Libcosmic diff --git a/rpms/cosmic-workspaces/cosmic-workspaces.spec b/rpms/cosmic-workspaces/cosmic-workspaces.spec index 34172c9..9342b74 100644 --- a/rpms/cosmic-workspaces/cosmic-workspaces.spec +++ b/rpms/cosmic-workspaces/cosmic-workspaces.spec @@ -9,10 +9,11 @@ ExcludeArch: %{ix86} %global ver ### %global commit ### -%global date ### +%global commitdatestring ### +%global commitdate ### Name: cosmic-workspaces -Version: %{ver}~git%{date}.%{sub %{commit} 1 7} +Version: %{ver}~git%{commitdate}.%{sub %{commit} 1 7} Release: %autorelease Summary: Workspaces overview for the COSMIC Desktop Environment diff --git a/rpms/pop-launcher/pop-launcher.spec b/rpms/pop-launcher/pop-launcher.spec index 98c7218..61e889f 100644 --- a/rpms/pop-launcher/pop-launcher.spec +++ b/rpms/pop-launcher/pop-launcher.spec @@ -4,10 +4,11 @@ ExcludeArch: %{ix86} %global ver ### %global commit ### -%global date ### +%global commitdatestring ### +%global commitdate ### Name: pop-launcher -Version: %{ver}~git%{date}.%{sub %{commit} 1 7} +Version: %{ver}~git%{commitdate}.%{sub %{commit} 1 7} Release: %autorelease Summary: Modular IPC-based desktop launcher service diff --git a/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec b/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec index 5b970a6..7be1a9b 100644 --- a/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec +++ b/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec @@ -9,10 +9,11 @@ ExcludeArch: %{ix86} %global ver ### %global commit ### -%global date ### +%global commitdatestring ### +%global commitdate ### Name: xdg-desktop-portal-cosmic -Version: %{ver}~git%{date}.%{sub %{commit} 1 7} +Version: %{ver}~git%{commitdate}.%{sub %{commit} 1 7} Release: %autorelease Summary: XDG Desktop Portals for the COSMIC Desktop Environment diff --git a/scripts/srpm.sh b/scripts/srpm.sh index f76f43b..74bd92c 100644 --- a/scripts/srpm.sh +++ b/scripts/srpm.sh @@ -27,6 +27,9 @@ fi # Reset to specified COMMIT git reset --hard $COMMIT +COMMITDATE=$(git log -1 --format=%cd --date=format:%Y%m%d.%H%M%S) +COMMITDATESTRING=$(git log -1 --format=%cd --date=iso) + if [ "$VENDOR" -eq 1 ]; then echo "VENDOR=1" # Vendor dependencies and zip vendor @@ -46,8 +49,9 @@ rm -rf $SOURCE_NAME-$COMMIT # Make replacements to specfile sed -i "/^%global ver / s/.*/%global ver $VERSION/" $NAME.spec sed -i "/^%global commit / s/.*/%global commit $COMMIT/" $NAME.spec -current_date=$(date +'%Y%m%d.%H') -sed -i "/^%global date / s/.*/%global date $current_date/" $NAME.spec + +sed -i "/^%global commitdate / s/.*/%global commitdate $COMMITDATE/" $NAME.spec +sed -i "/^%global commitdatestring / s/.*/%global commitdatestring $COMMITDATESTRING/" $NAME.spec # Should have these sources # SOURCE_NAME-COMMIT.tar.gz From b32a68f3bd81964a5b30684aa31083941a9a5dda Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: May 30 2024 01:19:09 +0000 Subject: [PATCH 184/220] Update cosmic-files.spec --- diff --git a/rpms/cosmic-files/cosmic-files.spec b/rpms/cosmic-files/cosmic-files.spec index e131394..9078b64 100644 --- a/rpms/cosmic-files/cosmic-files.spec +++ b/rpms/cosmic-files/cosmic-files.spec @@ -93,6 +93,8 @@ export VERGEN_GIT_SHA="%{commit}" sed 's/\(.*\) (.*#\(.*\))/\1+git\2/' -i cargo-vendor.txt %install +export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" +export VERGEN_GIT_SHA="%{commit}" just rootdir=%{buildroot} prefix=%{_prefix} install %if %{with check} From 9ae4458c3bf4c95eb1e1c560c8f7d5d6f5556478 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: May 30 2024 01:54:07 +0000 Subject: [PATCH 185/220] Set vergen environment variables --- diff --git a/rpms/cosmic-app-library/cosmic-app-library.spec b/rpms/cosmic-app-library/cosmic-app-library.spec index 4326bf6..f7fce75 100644 --- a/rpms/cosmic-app-library/cosmic-app-library.spec +++ b/rpms/cosmic-app-library/cosmic-app-library.spec @@ -79,6 +79,9 @@ else fi %build +# Set vergen environment variables +export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" +export VERGEN_GIT_SHA="%{commit}" %cargo_build %{cargo_license_summary} %{cargo_license} > LICENSE.dependencies @@ -86,6 +89,9 @@ fi sed 's/\(.*\) (.*#\(.*\))/\1+git\2/' -i cargo-vendor.txt %install +# Set vergen environment variables +export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" +export VERGEN_GIT_SHA="%{commit}" just rootdir=%{buildroot} prefix=%{_prefix} install %if %{with check} diff --git a/rpms/cosmic-applets/cosmic-applets.spec b/rpms/cosmic-applets/cosmic-applets.spec index 0df88f2..d8a0fb4 100644 --- a/rpms/cosmic-applets/cosmic-applets.spec +++ b/rpms/cosmic-applets/cosmic-applets.spec @@ -86,6 +86,9 @@ else fi %build +# Set vergen environment variables +export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" +export VERGEN_GIT_SHA="%{commit}" %cargo_build %{cargo_license_summary} %{cargo_license} > LICENSE.dependencies @@ -93,6 +96,9 @@ fi sed 's/\(.*\) (.*#\(.*\))/\1+git\2/' -i cargo-vendor.txt %install +# Set vergen environment variables +export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" +export VERGEN_GIT_SHA="%{commit}" just rootdir=%{buildroot} prefix=%{_prefix} install %if %{with check} diff --git a/rpms/cosmic-bg/cosmic-bg.spec b/rpms/cosmic-bg/cosmic-bg.spec index 1ccc549..940d2ee 100644 --- a/rpms/cosmic-bg/cosmic-bg.spec +++ b/rpms/cosmic-bg/cosmic-bg.spec @@ -71,6 +71,9 @@ else fi %build +# Set vergen environment variables +export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" +export VERGEN_GIT_SHA="%{commit}" %cargo_build %{cargo_license_summary} %{cargo_license} > LICENSE.dependencies @@ -78,6 +81,9 @@ fi sed 's/\(.*\) (.*#\(.*\))/\1+git\2/' -i cargo-vendor.txt %install +# Set vergen environment variables +export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" +export VERGEN_GIT_SHA="%{commit}" just rootdir=%{buildroot} prefix=%{_prefix} install %if %{with check} diff --git a/rpms/cosmic-comp/cosmic-comp.spec b/rpms/cosmic-comp/cosmic-comp.spec index 09e8e08..53c9294 100644 --- a/rpms/cosmic-comp/cosmic-comp.spec +++ b/rpms/cosmic-comp/cosmic-comp.spec @@ -89,6 +89,9 @@ else fi %build +# Set vergen environment variables +export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" +export VERGEN_GIT_SHA="%{commit}" %cargo_build %{cargo_license_summary} %{cargo_license} > LICENSE.dependencies @@ -96,6 +99,9 @@ fi sed 's/\(.*\) (.*#\(.*\))/\1+git\2/' -i cargo-vendor.txt %install +# Set vergen environment variables +export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" +export VERGEN_GIT_SHA="%{commit}" make install DESTDIR=%{buildroot} prefix=%{_prefix} install -Dm0644 config.ron %{buildroot}/%{_sysconfdir}/cosmic-comp/config.ron diff --git a/rpms/cosmic-edit/cosmic-edit.spec b/rpms/cosmic-edit/cosmic-edit.spec index d7053ed..7760929 100644 --- a/rpms/cosmic-edit/cosmic-edit.spec +++ b/rpms/cosmic-edit/cosmic-edit.spec @@ -84,6 +84,9 @@ else fi %build +# Set vergen environment variables +export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" +export VERGEN_GIT_SHA="%{commit}" %cargo_build %{cargo_license_summary} %{cargo_license} > LICENSE.dependencies @@ -91,6 +94,9 @@ fi sed 's/\(.*\) (.*#\(.*\))/\1+git\2/' -i cargo-vendor.txt %install +# Set vergen environment variables +export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" +export VERGEN_GIT_SHA="%{commit}" just rootdir=%{buildroot} prefix=%{_prefix} install %if %{with check} diff --git a/rpms/cosmic-files/cosmic-files.spec b/rpms/cosmic-files/cosmic-files.spec index 9078b64..af4994e 100644 --- a/rpms/cosmic-files/cosmic-files.spec +++ b/rpms/cosmic-files/cosmic-files.spec @@ -84,6 +84,7 @@ else fi %build +# Set vergen environment variables export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" export VERGEN_GIT_SHA="%{commit}" %cargo_build @@ -93,6 +94,7 @@ export VERGEN_GIT_SHA="%{commit}" sed 's/\(.*\) (.*#\(.*\))/\1+git\2/' -i cargo-vendor.txt %install +# Set vergen environment variables export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" export VERGEN_GIT_SHA="%{commit}" just rootdir=%{buildroot} prefix=%{_prefix} install diff --git a/rpms/cosmic-greeter/cosmic-greeter.spec b/rpms/cosmic-greeter/cosmic-greeter.spec index 7c4a218..148bbc4 100644 --- a/rpms/cosmic-greeter/cosmic-greeter.spec +++ b/rpms/cosmic-greeter/cosmic-greeter.spec @@ -91,6 +91,9 @@ else fi %build +# Set vergen environment variables +export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" +export VERGEN_GIT_SHA="%{commit}" cargo build --release --all --offline --frozen %{cargo_license_summary} %{cargo_license} > LICENSE.dependencies @@ -98,6 +101,9 @@ cargo build --release --all --offline --frozen sed 's/\(.*\) (.*#\(.*\))/\1+git\2/' -i cargo-vendor.txt %install +# Set vergen environment variables +export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" +export VERGEN_GIT_SHA="%{commit}" install -Dm0755 target/release/cosmic-greeter %{buildroot}/%{_bindir}/cosmic-greeter install -Dm0755 target/release/cosmic-greeter-daemon %{buildroot}/%{_bindir}/cosmic-greeter-daemon install -Dm0644 dbus/com.system76.CosmicGreeter.conf %{buildroot}/%{_datadir}/dbus-1/system.d/com.system76.CosmicGreeter.conf diff --git a/rpms/cosmic-icon-theme/cosmic-icon-theme.spec b/rpms/cosmic-icon-theme/cosmic-icon-theme.spec index 7d5898c..c2563bb 100644 --- a/rpms/cosmic-icon-theme/cosmic-icon-theme.spec +++ b/rpms/cosmic-icon-theme/cosmic-icon-theme.spec @@ -35,6 +35,9 @@ Provides: cosmic-icons = %{version}-%{release} %build %install +# Set vergen environment variables +export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" +export VERGEN_GIT_SHA="%{commit}" just rootdir=%{buildroot} install %files diff --git a/rpms/cosmic-launcher/cosmic-launcher.spec b/rpms/cosmic-launcher/cosmic-launcher.spec index a7e4281..a633e3e 100644 --- a/rpms/cosmic-launcher/cosmic-launcher.spec +++ b/rpms/cosmic-launcher/cosmic-launcher.spec @@ -84,6 +84,9 @@ else fi %build +# Set vergen environment variables +export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" +export VERGEN_GIT_SHA="%{commit}" %cargo_build %{cargo_license_summary} %{cargo_license} > LICENSE.dependencies @@ -91,6 +94,9 @@ fi sed 's/\(.*\) (.*#\(.*\))/\1+git\2/' -i cargo-vendor.txt %install +# Set vergen environment variables +export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" +export VERGEN_GIT_SHA="%{commit}" just rootdir=%{buildroot} prefix=%{_prefix} install %if %{with check} diff --git a/rpms/cosmic-notifications/cosmic-notifications.spec b/rpms/cosmic-notifications/cosmic-notifications.spec index 3ced682..ad420f9 100644 --- a/rpms/cosmic-notifications/cosmic-notifications.spec +++ b/rpms/cosmic-notifications/cosmic-notifications.spec @@ -77,6 +77,9 @@ else fi %build +# Set vergen environment variables +export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" +export VERGEN_GIT_SHA="%{commit}" %cargo_build %{cargo_license_summary} %{cargo_license} > LICENSE.dependencies @@ -84,6 +87,9 @@ fi sed 's/\(.*\) (.*#\(.*\))/\1+git\2/' -i cargo-vendor.txt %install +# Set vergen environment variables +export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" +export VERGEN_GIT_SHA="%{commit}" just rootdir=%{buildroot} prefix=%{_prefix} install %if %{with check} diff --git a/rpms/cosmic-osd/cosmic-osd.spec b/rpms/cosmic-osd/cosmic-osd.spec index 0e52876..b23486a 100644 --- a/rpms/cosmic-osd/cosmic-osd.spec +++ b/rpms/cosmic-osd/cosmic-osd.spec @@ -82,14 +82,19 @@ else fi %build +# Set vergen environment variables +export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" +export VERGEN_GIT_SHA="%{commit}" make all polkit-agent-helper-1=/usr/lib/polkit-1/polkit-agent-helper-1 -# %%cargo_build %{cargo_license_summary} %{cargo_license} > LICENSE.dependencies %{cargo_vendor_manifest} sed 's/\(.*\) (.*#\(.*\))/\1+git\2/' -i cargo-vendor.txt %install +# Set vergen environment variables +export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" +export VERGEN_GIT_SHA="%{commit}" make install DESTDIR=%{buildroot} prefix=%{_prefix} %if %{with check} diff --git a/rpms/cosmic-panel/cosmic-panel.spec b/rpms/cosmic-panel/cosmic-panel.spec index 1d1149e..7c3879d 100644 --- a/rpms/cosmic-panel/cosmic-panel.spec +++ b/rpms/cosmic-panel/cosmic-panel.spec @@ -74,6 +74,9 @@ else fi %build +# Set vergen environment variables +export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" +export VERGEN_GIT_SHA="%{commit}" %cargo_build %{cargo_license_summary} %{cargo_license} > LICENSE.dependencies @@ -81,6 +84,9 @@ fi sed 's/\(.*\) (.*#\(.*\))/\1+git\2/' -i cargo-vendor.txt %install +# Set vergen environment variables +export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" +export VERGEN_GIT_SHA="%{commit}" just rootdir=%{buildroot} prefix=%{_prefix} install %if %{with check} diff --git a/rpms/cosmic-randr/cosmic-randr.spec b/rpms/cosmic-randr/cosmic-randr.spec index 593df41..f4f3a3a 100644 --- a/rpms/cosmic-randr/cosmic-randr.spec +++ b/rpms/cosmic-randr/cosmic-randr.spec @@ -65,6 +65,9 @@ else fi %build +# Set vergen environment variables +export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" +export VERGEN_GIT_SHA="%{commit}" %cargo_build %{cargo_license_summary} %{cargo_license} > LICENSE.dependencies @@ -72,6 +75,9 @@ fi sed 's/\(.*\) (.*#\(.*\))/\1+git\2/' -i cargo-vendor.txt %install +# Set vergen environment variables +export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" +export VERGEN_GIT_SHA="%{commit}" just rootdir=%{buildroot} prefix=%{_prefix} install %if %{with check} diff --git a/rpms/cosmic-screenshot/cosmic-screenshot.spec b/rpms/cosmic-screenshot/cosmic-screenshot.spec index e9588f8..52b2926 100644 --- a/rpms/cosmic-screenshot/cosmic-screenshot.spec +++ b/rpms/cosmic-screenshot/cosmic-screenshot.spec @@ -68,6 +68,9 @@ else fi %build +# Set vergen environment variables +export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" +export VERGEN_GIT_SHA="%{commit}" %cargo_build %{cargo_license_summary} %{cargo_license} > LICENSE.dependencies @@ -75,6 +78,9 @@ fi sed 's/\(.*\) (.*#\(.*\))/\1+git\2/' -i cargo-vendor.txt %install +# Set vergen environment variables +export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" +export VERGEN_GIT_SHA="%{commit}" just rootdir=%{buildroot} prefix=%{_prefix} install %if %{with check} diff --git a/rpms/cosmic-session/cosmic-session.spec b/rpms/cosmic-session/cosmic-session.spec index 4bacb14..f332e46 100644 --- a/rpms/cosmic-session/cosmic-session.spec +++ b/rpms/cosmic-session/cosmic-session.spec @@ -94,6 +94,9 @@ else fi %build +# Set vergen environment variables +export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" +export VERGEN_GIT_SHA="%{commit}" %cargo_build %{cargo_license_summary} %{cargo_license} > LICENSE.dependencies @@ -101,6 +104,9 @@ fi sed 's/\(.*\) (.*#\(.*\))/\1+git\2/' -i cargo-vendor.txt %install +# Set vergen environment variables +export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" +export VERGEN_GIT_SHA="%{commit}" just rootdir=%{buildroot} install %if %{with check} diff --git a/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec b/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec index 0f8aeb7..3cc9165 100644 --- a/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec +++ b/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec @@ -81,6 +81,9 @@ else fi %build +# Set vergen environment variables +export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" +export VERGEN_GIT_SHA="%{commit}" %cargo_build %{cargo_license_summary} %{cargo_license} > LICENSE.dependencies @@ -88,6 +91,9 @@ fi sed 's/\(.*\) (.*#\(.*\))/\1+git\2/' -i cargo-vendor.txt %install +# Set vergen environment variables +export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" +export VERGEN_GIT_SHA="%{commit}" make install DESTDIR=%{buildroot} prefix=%{_prefix} %if %{with check} diff --git a/rpms/cosmic-settings/cosmic-settings.spec b/rpms/cosmic-settings/cosmic-settings.spec index 3715525..00f7a05 100644 --- a/rpms/cosmic-settings/cosmic-settings.spec +++ b/rpms/cosmic-settings/cosmic-settings.spec @@ -82,6 +82,9 @@ else fi %build +# Set vergen environment variables +export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" +export VERGEN_GIT_SHA="%{commit}" %cargo_build %{cargo_license_summary} %{cargo_license} > LICENSE.dependencies @@ -89,6 +92,9 @@ fi sed 's/\(.*\) (.*#\(.*\))/\1+git\2/' -i cargo-vendor.txt %install +# Set vergen environment variables +export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" +export VERGEN_GIT_SHA="%{commit}" just rootdir=%{buildroot} install %if %{with check} diff --git a/rpms/cosmic-store/cosmic-store.spec b/rpms/cosmic-store/cosmic-store.spec index 091f335..dd94ece 100644 --- a/rpms/cosmic-store/cosmic-store.spec +++ b/rpms/cosmic-store/cosmic-store.spec @@ -82,6 +82,9 @@ else fi %build +# Set vergen environment variables +export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" +export VERGEN_GIT_SHA="%{commit}" %cargo_build %{cargo_license_summary} %{cargo_license} > LICENSE.dependencies @@ -89,6 +92,9 @@ fi sed 's/\(.*\) (.*#\(.*\))/\1+git\2/' -i cargo-vendor.txt %install +# Set vergen environment variables +export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" +export VERGEN_GIT_SHA="%{commit}" just rootdir=%{buildroot} prefix=%{_prefix} install %if %{with check} diff --git a/rpms/cosmic-term/cosmic-term.spec b/rpms/cosmic-term/cosmic-term.spec index 4db0edd..4baadd7 100644 --- a/rpms/cosmic-term/cosmic-term.spec +++ b/rpms/cosmic-term/cosmic-term.spec @@ -83,6 +83,9 @@ else fi %build +# Set vergen environment variables +export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" +export VERGEN_GIT_SHA="%{commit}" %cargo_build %{cargo_license_summary} %{cargo_license} > LICENSE.dependencies @@ -90,6 +93,9 @@ fi sed 's/\(.*\) (.*#\(.*\))/\1+git\2/' -i cargo-vendor.txt %install +# Set vergen environment variables +export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" +export VERGEN_GIT_SHA="%{commit}" just rootdir=%{buildroot} prefix=%{_prefix} install %if %{with check} diff --git a/rpms/cosmic-workspaces/cosmic-workspaces.spec b/rpms/cosmic-workspaces/cosmic-workspaces.spec index 9342b74..7773d42 100644 --- a/rpms/cosmic-workspaces/cosmic-workspaces.spec +++ b/rpms/cosmic-workspaces/cosmic-workspaces.spec @@ -87,6 +87,9 @@ else fi %build +# Set vergen environment variables +export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" +export VERGEN_GIT_SHA="%{commit}" %cargo_build %{cargo_license_summary} %{cargo_license} > LICENSE.dependencies @@ -94,6 +97,9 @@ fi sed 's/\(.*\) (.*#\(.*\))/\1+git\2/' -i cargo-vendor.txt %install +# Set vergen environment variables +export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" +export VERGEN_GIT_SHA="%{commit}" make install DESTDIR=%{buildroot} prefix=%{_prefix} %if %{with check} diff --git a/rpms/pop-launcher/pop-launcher.spec b/rpms/pop-launcher/pop-launcher.spec index 61e889f..b077644 100644 --- a/rpms/pop-launcher/pop-launcher.spec +++ b/rpms/pop-launcher/pop-launcher.spec @@ -80,6 +80,9 @@ else fi %build +# Set vergen environment variables +export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" +export VERGEN_GIT_SHA="%{commit}" just build-release --offline --frozen %{cargo_license_summary} %{cargo_license} > LICENSE.dependencies @@ -87,6 +90,9 @@ just build-release --offline --frozen sed 's/\(.*\) (.*#\(.*\))/\1+git\2/' -i cargo-vendor.txt %install +# Set vergen environment variables +export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" +export VERGEN_GIT_SHA="%{commit}" just rootdir=%{buildroot} install %if %{with check} diff --git a/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec b/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec index 7be1a9b..81668d5 100644 --- a/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec +++ b/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec @@ -86,6 +86,9 @@ else fi %build +# Set vergen environment variables +export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" +export VERGEN_GIT_SHA="%{commit}" %cargo_build %{cargo_license_summary} %{cargo_license} > LICENSE.dependencies @@ -93,6 +96,9 @@ fi sed 's/\(.*\) (.*#\(.*\))/\1+git\2/' -i cargo-vendor.txt %install +# Set vergen environment variables +export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" +export VERGEN_GIT_SHA="%{commit}" make install DESTDIR=%{buildroot} prefix=%{_prefix} %if %{with check} From 415e8514e90d28e797ae70b32ad9db5a2c482a52 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: May 30 2024 02:00:06 +0000 Subject: [PATCH 186/220] Update no-sources-srpm.sh --- diff --git a/scripts/no-sources-srpm.sh b/scripts/no-sources-srpm.sh index f00c38a..a45ffee 100644 --- a/scripts/no-sources-srpm.sh +++ b/scripts/no-sources-srpm.sh @@ -18,7 +18,8 @@ cp $path_to_spec $name.spec 2>/dev/null || : sed -i "/^%global ver / s/.*/%global ver $version/" $name.spec sed -i "/^%global commit / s/.*/%global commit none/" $name.spec current_date=$(date +'%Y%m%d.%H') -sed -i "/^%global date / s/.*/%global date $current_date/" $name.spec +sed -i "/^%global date / s/.*/%global commitdate $current_date/" $name.spec +sed -i "/^%global date / s/.*/%global commitdatestring $current_date/" $name.spec ls -a From a4e70aa523a9a0345588ab8fdc4beb45ca3d08f3 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: May 30 2024 02:18:52 +0000 Subject: [PATCH 187/220] Update no-sources-srpm.sh --- diff --git a/scripts/no-sources-srpm.sh b/scripts/no-sources-srpm.sh index a45ffee..bb90ae3 100644 --- a/scripts/no-sources-srpm.sh +++ b/scripts/no-sources-srpm.sh @@ -18,8 +18,8 @@ cp $path_to_spec $name.spec 2>/dev/null || : sed -i "/^%global ver / s/.*/%global ver $version/" $name.spec sed -i "/^%global commit / s/.*/%global commit none/" $name.spec current_date=$(date +'%Y%m%d.%H') -sed -i "/^%global date / s/.*/%global commitdate $current_date/" $name.spec -sed -i "/^%global date / s/.*/%global commitdatestring $current_date/" $name.spec +sed -i "/^%global commitdate / s/.*/%global commitdate $current_date/" $name.spec +sed -i "/^%global commitdatestring / s/.*/%global commitdatestring $current_date/" $name.spec ls -a From 70a3342403c6a3b0451672cc5f67d0f12c191ccc Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: May 30 2024 06:04:17 +0000 Subject: [PATCH 188/220] s --- diff --git a/rpms/cosmic-app-library/cosmic-app-library.spec b/rpms/cosmic-app-library/cosmic-app-library.spec index f7fce75..fae20a1 100644 --- a/rpms/cosmic-app-library/cosmic-app-library.spec +++ b/rpms/cosmic-app-library/cosmic-app-library.spec @@ -96,6 +96,9 @@ just rootdir=%{buildroot} prefix=%{_prefix} install %if %{with check} %check +# Set vergen environment variables +export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" +export VERGEN_GIT_SHA="%{commit}" %cargo_test %endif diff --git a/rpms/cosmic-applets/cosmic-applets.spec b/rpms/cosmic-applets/cosmic-applets.spec index d8a0fb4..f023f6f 100644 --- a/rpms/cosmic-applets/cosmic-applets.spec +++ b/rpms/cosmic-applets/cosmic-applets.spec @@ -103,6 +103,9 @@ just rootdir=%{buildroot} prefix=%{_prefix} install %if %{with check} %check +# Set vergen environment variables +export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" +export VERGEN_GIT_SHA="%{commit}" %cargo_test %endif diff --git a/rpms/cosmic-bg/cosmic-bg.spec b/rpms/cosmic-bg/cosmic-bg.spec index 940d2ee..517e8ba 100644 --- a/rpms/cosmic-bg/cosmic-bg.spec +++ b/rpms/cosmic-bg/cosmic-bg.spec @@ -88,6 +88,9 @@ just rootdir=%{buildroot} prefix=%{_prefix} install %if %{with check} %check +# Set vergen environment variables +export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" +export VERGEN_GIT_SHA="%{commit}" %cargo_test %endif diff --git a/rpms/cosmic-comp/cosmic-comp.spec b/rpms/cosmic-comp/cosmic-comp.spec index 53c9294..91f6e3f 100644 --- a/rpms/cosmic-comp/cosmic-comp.spec +++ b/rpms/cosmic-comp/cosmic-comp.spec @@ -107,6 +107,9 @@ install -Dm0644 config.ron %{buildroot}/%{_sysconfdir}/cosmic-comp/config.ron %if %{with check} %check +# Set vergen environment variables +export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" +export VERGEN_GIT_SHA="%{commit}" %cargo_test %endif diff --git a/rpms/cosmic-edit/cosmic-edit.spec b/rpms/cosmic-edit/cosmic-edit.spec index 7760929..6643f3f 100644 --- a/rpms/cosmic-edit/cosmic-edit.spec +++ b/rpms/cosmic-edit/cosmic-edit.spec @@ -101,6 +101,9 @@ just rootdir=%{buildroot} prefix=%{_prefix} install %if %{with check} %check +# Set vergen environment variables +export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" +export VERGEN_GIT_SHA="%{commit}" %cargo_test %endif diff --git a/rpms/cosmic-greeter/cosmic-greeter.spec b/rpms/cosmic-greeter/cosmic-greeter.spec index 148bbc4..babe6e0 100644 --- a/rpms/cosmic-greeter/cosmic-greeter.spec +++ b/rpms/cosmic-greeter/cosmic-greeter.spec @@ -115,6 +115,9 @@ install -Dm0644 debian/cosmic-greeter-daemon.service %{buildroot}/%{_unitdir}/co %if %{with check} %check +# Set vergen environment variables +export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" +export VERGEN_GIT_SHA="%{commit}" %cargo_test %endif diff --git a/rpms/cosmic-launcher/cosmic-launcher.spec b/rpms/cosmic-launcher/cosmic-launcher.spec index a633e3e..3e7fc09 100644 --- a/rpms/cosmic-launcher/cosmic-launcher.spec +++ b/rpms/cosmic-launcher/cosmic-launcher.spec @@ -101,6 +101,9 @@ just rootdir=%{buildroot} prefix=%{_prefix} install %if %{with check} %check +# Set vergen environment variables +export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" +export VERGEN_GIT_SHA="%{commit}" %cargo_test %endif diff --git a/rpms/cosmic-notifications/cosmic-notifications.spec b/rpms/cosmic-notifications/cosmic-notifications.spec index ad420f9..55a3cc0 100644 --- a/rpms/cosmic-notifications/cosmic-notifications.spec +++ b/rpms/cosmic-notifications/cosmic-notifications.spec @@ -94,6 +94,9 @@ just rootdir=%{buildroot} prefix=%{_prefix} install %if %{with check} %check +# Set vergen environment variables +export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" +export VERGEN_GIT_SHA="%{commit}" %cargo_test %endif diff --git a/rpms/cosmic-osd/cosmic-osd.spec b/rpms/cosmic-osd/cosmic-osd.spec index b23486a..72aa906 100644 --- a/rpms/cosmic-osd/cosmic-osd.spec +++ b/rpms/cosmic-osd/cosmic-osd.spec @@ -99,6 +99,9 @@ make install DESTDIR=%{buildroot} prefix=%{_prefix} %if %{with check} %check +# Set vergen environment variables +export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" +export VERGEN_GIT_SHA="%{commit}" %cargo_test %endif diff --git a/rpms/cosmic-panel/cosmic-panel.spec b/rpms/cosmic-panel/cosmic-panel.spec index 7c3879d..f005104 100644 --- a/rpms/cosmic-panel/cosmic-panel.spec +++ b/rpms/cosmic-panel/cosmic-panel.spec @@ -91,6 +91,9 @@ just rootdir=%{buildroot} prefix=%{_prefix} install %if %{with check} %check +# Set vergen environment variables +export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" +export VERGEN_GIT_SHA="%{commit}" %cargo_test %endif diff --git a/rpms/cosmic-randr/cosmic-randr.spec b/rpms/cosmic-randr/cosmic-randr.spec index f4f3a3a..01b4fd6 100644 --- a/rpms/cosmic-randr/cosmic-randr.spec +++ b/rpms/cosmic-randr/cosmic-randr.spec @@ -82,6 +82,9 @@ just rootdir=%{buildroot} prefix=%{_prefix} install %if %{with check} %check +# Set vergen environment variables +export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" +export VERGEN_GIT_SHA="%{commit}" %cargo_test %endif diff --git a/rpms/cosmic-screenshot/cosmic-screenshot.spec b/rpms/cosmic-screenshot/cosmic-screenshot.spec index 52b2926..170f68a 100644 --- a/rpms/cosmic-screenshot/cosmic-screenshot.spec +++ b/rpms/cosmic-screenshot/cosmic-screenshot.spec @@ -85,6 +85,9 @@ just rootdir=%{buildroot} prefix=%{_prefix} install %if %{with check} %check +# Set vergen environment variables +export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" +export VERGEN_GIT_SHA="%{commit}" %cargo_test %endif diff --git a/rpms/cosmic-session/cosmic-session.spec b/rpms/cosmic-session/cosmic-session.spec index f332e46..bb919cc 100644 --- a/rpms/cosmic-session/cosmic-session.spec +++ b/rpms/cosmic-session/cosmic-session.spec @@ -111,6 +111,9 @@ just rootdir=%{buildroot} install %if %{with check} %check +# Set vergen environment variables +export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" +export VERGEN_GIT_SHA="%{commit}" %cargo_test %endif diff --git a/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec b/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec index 3cc9165..4bbcb87 100644 --- a/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec +++ b/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec @@ -98,6 +98,9 @@ make install DESTDIR=%{buildroot} prefix=%{_prefix} %if %{with check} %check +# Set vergen environment variables +export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" +export VERGEN_GIT_SHA="%{commit}" %cargo_test %endif diff --git a/rpms/cosmic-settings/cosmic-settings.spec b/rpms/cosmic-settings/cosmic-settings.spec index 00f7a05..43bb54f 100644 --- a/rpms/cosmic-settings/cosmic-settings.spec +++ b/rpms/cosmic-settings/cosmic-settings.spec @@ -99,6 +99,9 @@ just rootdir=%{buildroot} install %if %{with check} %check +# Set vergen environment variables +export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" +export VERGEN_GIT_SHA="%{commit}" %cargo_test %endif diff --git a/rpms/cosmic-store/cosmic-store.spec b/rpms/cosmic-store/cosmic-store.spec index dd94ece..b36eae2 100644 --- a/rpms/cosmic-store/cosmic-store.spec +++ b/rpms/cosmic-store/cosmic-store.spec @@ -99,6 +99,9 @@ just rootdir=%{buildroot} prefix=%{_prefix} install %if %{with check} %check +# Set vergen environment variables +export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" +export VERGEN_GIT_SHA="%{commit}" %cargo_test %endif diff --git a/rpms/cosmic-term/cosmic-term.spec b/rpms/cosmic-term/cosmic-term.spec index 4baadd7..584a1f4 100644 --- a/rpms/cosmic-term/cosmic-term.spec +++ b/rpms/cosmic-term/cosmic-term.spec @@ -100,6 +100,9 @@ just rootdir=%{buildroot} prefix=%{_prefix} install %if %{with check} %check +# Set vergen environment variables +export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" +export VERGEN_GIT_SHA="%{commit}" %cargo_test %endif diff --git a/rpms/cosmic-workspaces/cosmic-workspaces.spec b/rpms/cosmic-workspaces/cosmic-workspaces.spec index 7773d42..7027a44 100644 --- a/rpms/cosmic-workspaces/cosmic-workspaces.spec +++ b/rpms/cosmic-workspaces/cosmic-workspaces.spec @@ -104,6 +104,9 @@ make install DESTDIR=%{buildroot} prefix=%{_prefix} %if %{with check} %check +# Set vergen environment variables +export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" +export VERGEN_GIT_SHA="%{commit}" %cargo_test %endif diff --git a/rpms/pop-launcher/pop-launcher.spec b/rpms/pop-launcher/pop-launcher.spec index b077644..5949336 100644 --- a/rpms/pop-launcher/pop-launcher.spec +++ b/rpms/pop-launcher/pop-launcher.spec @@ -97,6 +97,9 @@ just rootdir=%{buildroot} install %if %{with check} %check +# Set vergen environment variables +export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" +export VERGEN_GIT_SHA="%{commit}" %cargo_test %endif diff --git a/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec b/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec index 81668d5..ee89215 100644 --- a/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec +++ b/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec @@ -103,6 +103,9 @@ make install DESTDIR=%{buildroot} prefix=%{_prefix} %if %{with check} %check +# Set vergen environment variables +export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" +export VERGEN_GIT_SHA="%{commit}" %cargo_test %endif From ec9ed59723f3c414f433ff58eb52bbd4bcd582a9 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: May 31 2024 00:36:20 +0000 Subject: [PATCH 189/220] maybe? --- diff --git a/rpms/cosmic-desktop/cosmic-desktop.spec b/rpms/cosmic-desktop/cosmic-desktop.spec index 2f00e68..70e4443 100644 --- a/rpms/cosmic-desktop/cosmic-desktop.spec +++ b/rpms/cosmic-desktop/cosmic-desktop.spec @@ -12,6 +12,8 @@ License: GPL-3.0 URL: https://github.com/pop-os/cosmic-epoch +BuildArch: noarch + Requires: cosmic-app-library Requires: cosmic-applets Requires: cosmic-bg diff --git a/rpms/cosmic-epoch/cosmic-epoch.spec b/rpms/cosmic-epoch/cosmic-epoch.spec index e38359a..37207e4 100644 --- a/rpms/cosmic-epoch/cosmic-epoch.spec +++ b/rpms/cosmic-epoch/cosmic-epoch.spec @@ -12,6 +12,8 @@ License: GPL-3.0 URL: https://github.com/pop-os/cosmic-epoch +BuildArch: noarch + Requires: cosmic-desktop %global _description %{expand: From ca1db0c113112676bc7e641fb9920f286e83eed3 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: May 31 2024 18:26:26 +0000 Subject: [PATCH 190/220] Update cosmic-files.spec --- diff --git a/rpms/cosmic-files/cosmic-files.spec b/rpms/cosmic-files/cosmic-files.spec index af4994e..829d2a7 100644 --- a/rpms/cosmic-files/cosmic-files.spec +++ b/rpms/cosmic-files/cosmic-files.spec @@ -64,6 +64,8 @@ BuildRequires: libxkbcommon-devel BuildRequires: git-core +Requires: gvfs + %global _description %{expand: %{summary}.} From e21cd0d26e470c0b9b1a96d07d4c82103d42df84 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: May 31 2024 18:48:08 +0000 Subject: [PATCH 191/220] Update cosmic-files.spec --- diff --git a/rpms/cosmic-files/cosmic-files.spec b/rpms/cosmic-files/cosmic-files.spec index 829d2a7..73102c7 100644 --- a/rpms/cosmic-files/cosmic-files.spec +++ b/rpms/cosmic-files/cosmic-files.spec @@ -65,6 +65,7 @@ BuildRequires: libxkbcommon-devel BuildRequires: git-core Requires: gvfs +Requires: xdg-utils %global _description %{expand: %{summary}.} From 004385a639baeb9378a976529340234fbdd2849b Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Jun 06 2024 01:31:04 +0000 Subject: [PATCH 192/220] Add libudev to cosmic-greeter Signed-off-by: Ryan Brue --- diff --git a/rpms/cosmic-greeter/cosmic-greeter.spec b/rpms/cosmic-greeter/cosmic-greeter.spec index babe6e0..ac6d9fe 100644 --- a/rpms/cosmic-greeter/cosmic-greeter.spec +++ b/rpms/cosmic-greeter/cosmic-greeter.spec @@ -59,6 +59,7 @@ BuildRequires: clang-devel BuildRequires: libxkbcommon-devel BuildRequires: pam-devel BuildRequires: just +BuildRequires: libudev-devel BuildRequires: systemd-rpm-macros %{?sysusers_requires_compat} From 888266aec848dd51e20ac5fa80a9c8e0d0a687f1 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Jun 07 2024 23:00:58 +0000 Subject: [PATCH 193/220] Fix cosmic-settings-daemon.spec Signed-off-by: Ryan Brue --- diff --git a/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec b/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec index 4bbcb87..adbdf7c 100644 --- a/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec +++ b/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec @@ -60,6 +60,7 @@ BuildRequires: libudev-devel BuildRequires: just Requires: acpid +Requires: adw-gtk3-theme %global _description %{expand: %{summary}.} From a15aca33ab08941dbcf96882b2bb8696ade95025 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Jun 07 2024 23:06:55 +0000 Subject: [PATCH 194/220] Fix cosmic-greeter (hopefully) Signed-off-by: Ryan Brue --- diff --git a/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec b/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec index adbdf7c..53f43f6 100644 --- a/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec +++ b/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec @@ -57,6 +57,11 @@ BuildRequires: lld BuildRequires: cargo BuildRequires: systemd-devel BuildRequires: libudev-devel +BuildRequires: libinput-devel +BuildRequires: wayland-devel +BuildRequires: clang-devel +BuildRequires: libxkbcommon-devel +BuildRequires: pam-devel BuildRequires: just Requires: acpid From 80079e96a44d6ba7372f1514c941ce4a362a5b0b Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Jun 11 2024 02:01:19 +0000 Subject: [PATCH 195/220] Fix a better compile patch Signed-off-by: Ryan Brue --- diff --git a/rpms/cosmic-applets/better_compile.patch b/rpms/cosmic-applets/better_compile.patch index 073eb83..0dc8b81 100644 --- a/rpms/cosmic-applets/better_compile.patch +++ b/rpms/cosmic-applets/better_compile.patch @@ -1,7 +1,7 @@ ---- ./Cargo.toml 2024-05-06 17:04:31.059469877 -0500 -+++ ./Cargo.toml.new 2024-05-06 23:27:51.338764184 -0500 -@@ -56,7 +56,7 @@ - serde = { version = "1.0.152", features = ["derive"] } +--- ./Cargo.toml 2024-06-10 20:56:56.957205204 -0500 ++++ ./Cargo.toml.new 2024-06-10 20:57:57.163582345 -0500 +@@ -57,7 +57,7 @@ + freedesktop-desktop-entry = "0.6.1" [profile.release] -lto = "fat" From 908df53533ca38fcfe714fe0ccb8af09d88a9849 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Jun 11 2024 02:04:31 +0000 Subject: [PATCH 196/220] Fix cosmic-greeter building Signed-off-by: Ryan Brue --- diff --git a/rpms/cosmic-greeter/cosmic-greeter.spec b/rpms/cosmic-greeter/cosmic-greeter.spec index ac6d9fe..bb0727e 100644 --- a/rpms/cosmic-greeter/cosmic-greeter.spec +++ b/rpms/cosmic-greeter/cosmic-greeter.spec @@ -60,6 +60,7 @@ BuildRequires: libxkbcommon-devel BuildRequires: pam-devel BuildRequires: just BuildRequires: libudev-devel +BuildRequires: libinput-devel BuildRequires: systemd-rpm-macros %{?sysusers_requires_compat} From 358c5339bcedb5f299f19418dde9ac26e8834849 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Jun 26 2024 00:37:30 +0000 Subject: [PATCH 197/220] Remove ver macro. Only used once per spec Signed-off-by: Ryan Brue --- diff --git a/rpms/cosmic-app-library/cosmic-app-library.spec b/rpms/cosmic-app-library/cosmic-app-library.spec index fae20a1..fc5ced0 100644 --- a/rpms/cosmic-app-library/cosmic-app-library.spec +++ b/rpms/cosmic-app-library/cosmic-app-library.spec @@ -5,7 +5,7 @@ ExcludeArch: %{ix86} # prevent library files from being installed %global cargo_install_lib 0 -%global ver ### + %global commit ### %global commitdatestring ### %global commitdate ### @@ -13,7 +13,7 @@ ExcludeArch: %{ix86} %global crate cosmic-app-library Name: cosmic-app-library -Version: %{ver}~git%{commitdate}.%{sub %{commit} 1 7} +Version: ### Release: %autorelease Summary: App Library program for the COSMIC Desktop Environment diff --git a/rpms/cosmic-applets/cosmic-applets.spec b/rpms/cosmic-applets/cosmic-applets.spec index f023f6f..1082fe3 100644 --- a/rpms/cosmic-applets/cosmic-applets.spec +++ b/rpms/cosmic-applets/cosmic-applets.spec @@ -2,13 +2,13 @@ ExcludeArch: %{ix86} # Generated by rust2rpm 26 %bcond_without check -%global ver ### + %global commit ### %global commitdatestring ### %global commitdate ### Name: cosmic-applets -Version: %{ver}~git%{commitdate}.%{sub %{commit} 1 7} +Version: ### Release: %autorelease Summary: Applets for the COSMIC Desktop Environment diff --git a/rpms/cosmic-bg/cosmic-bg.spec b/rpms/cosmic-bg/cosmic-bg.spec index 517e8ba..ce8de1a 100644 --- a/rpms/cosmic-bg/cosmic-bg.spec +++ b/rpms/cosmic-bg/cosmic-bg.spec @@ -2,13 +2,13 @@ ExcludeArch: %{ix86} # Generated by rust2rpm 26 %bcond_without check -%global ver ### + %global commit ### %global commitdatestring ### %global commitdate ### Name: cosmic-bg -Version: %{ver}~git%{commitdate}.%{sub %{commit} 1 7} +Version: ### Release: %autorelease Summary: Background manager for the COSMIC Desktop Environment diff --git a/rpms/cosmic-comp/cosmic-comp.spec b/rpms/cosmic-comp/cosmic-comp.spec index 91f6e3f..3c67b14 100644 --- a/rpms/cosmic-comp/cosmic-comp.spec +++ b/rpms/cosmic-comp/cosmic-comp.spec @@ -2,13 +2,13 @@ ExcludeArch: %{ix86} # Generated by rust2rpm 26 %bcond_without check -%global ver ### + %global commit ### %global commitdatestring ### %global commitdate ### Name: cosmic-comp -Version: %{ver}~git%{commitdate}.%{sub %{commit} 1 7} +Version: ### Release: %autorelease Summary: Compositor for the COSMIC Desktop Environment diff --git a/rpms/cosmic-desktop/cosmic-desktop.spec b/rpms/cosmic-desktop/cosmic-desktop.spec index 70e4443..cc49134 100644 --- a/rpms/cosmic-desktop/cosmic-desktop.spec +++ b/rpms/cosmic-desktop/cosmic-desktop.spec @@ -1,10 +1,10 @@ -%global ver ### + %global commit ### %global commitdatestring ### %global commitdate ### Name: cosmic-desktop -Version: %{ver}~git%{commitdate}.%{sub %{commit} 1 7} +Version: ### Release: %autorelease Summary: The next generation COSMIC Desktop Environment diff --git a/rpms/cosmic-edit/cosmic-edit.spec b/rpms/cosmic-edit/cosmic-edit.spec index 6643f3f..e47e5a0 100644 --- a/rpms/cosmic-edit/cosmic-edit.spec +++ b/rpms/cosmic-edit/cosmic-edit.spec @@ -7,13 +7,13 @@ ExcludeArch: %{ix86} %global crate cosmic-edit -%global ver ### + %global commit ### %global commitdatestring ### %global commitdate ### Name: cosmic-edit -Version: %{ver}~git%{commitdate}.%{sub %{commit} 1 7} +Version: ### Release: %autorelease Summary: Libcosmic text editor diff --git a/rpms/cosmic-epoch/cosmic-epoch.spec b/rpms/cosmic-epoch/cosmic-epoch.spec index 37207e4..4a585e6 100644 --- a/rpms/cosmic-epoch/cosmic-epoch.spec +++ b/rpms/cosmic-epoch/cosmic-epoch.spec @@ -1,10 +1,10 @@ -%global ver ### + %global commit ### %global commitdatestring ### %global commitdate ### Name: cosmic-epoch -Version: %{ver}~git%{commitdate}.%{sub %{commit} 1 7} +Version: ### Release: %autorelease Summary: The next generation COSMIC Desktop Environment diff --git a/rpms/cosmic-files/cosmic-files.spec b/rpms/cosmic-files/cosmic-files.spec index 73102c7..599f562 100644 --- a/rpms/cosmic-files/cosmic-files.spec +++ b/rpms/cosmic-files/cosmic-files.spec @@ -7,13 +7,13 @@ ExcludeArch: %{ix86} %global crate cosmic-files -%global ver ### + %global commit ### %global commitdatestring ### %global commitdate ### Name: cosmic-files -Version: %{ver}~git%{commitdate}.%{sub %{commit} 1 7} +Version: ### Release: %autorelease Summary: Libcosmic file manager diff --git a/rpms/cosmic-greeter/cosmic-greeter.spec b/rpms/cosmic-greeter/cosmic-greeter.spec index bb0727e..9f5e83b 100644 --- a/rpms/cosmic-greeter/cosmic-greeter.spec +++ b/rpms/cosmic-greeter/cosmic-greeter.spec @@ -2,13 +2,13 @@ ExcludeArch: %{ix86} # Generated by rust2rpm 26 %bcond_without check -%global ver ### + %global commit ### %global commitdatestring ### %global commitdate ### Name: cosmic-greeter -Version: %{ver}~git%{commitdate}.%{sub %{commit} 1 7} +Version: ### Release: %autorelease Summary: Login and display manager for the COSMIC Desktop Environment diff --git a/rpms/cosmic-icon-theme/cosmic-icon-theme.spec b/rpms/cosmic-icon-theme/cosmic-icon-theme.spec index c2563bb..be45aa3 100644 --- a/rpms/cosmic-icon-theme/cosmic-icon-theme.spec +++ b/rpms/cosmic-icon-theme/cosmic-icon-theme.spec @@ -1,10 +1,10 @@ -%global ver ### + %global commit ### %global commitdatestring ### %global commitdate ### Name: cosmic-icon-theme -Version: %{ver}~git%{commitdate}.%{sub %{commit} 1 7} +Version: ### Release: %autorelease Summary: Icon theme for the COSMIC Desktop Environment diff --git a/rpms/cosmic-launcher/cosmic-launcher.spec b/rpms/cosmic-launcher/cosmic-launcher.spec index 3e7fc09..0956630 100644 --- a/rpms/cosmic-launcher/cosmic-launcher.spec +++ b/rpms/cosmic-launcher/cosmic-launcher.spec @@ -7,13 +7,13 @@ ExcludeArch: %{ix86} %global crate cosmic-launcher -%global ver ### + %global commit ### %global commitdatestring ### %global commitdate ### Name: cosmic-launcher -Version: %{ver}~git%{commitdate}.%{sub %{commit} 1 7} +Version: ### Release: %autorelease Summary: Pop launcher frontend for the COSMIC Desktop Environment diff --git a/rpms/cosmic-notifications/cosmic-notifications.spec b/rpms/cosmic-notifications/cosmic-notifications.spec index 55a3cc0..0cf044a 100644 --- a/rpms/cosmic-notifications/cosmic-notifications.spec +++ b/rpms/cosmic-notifications/cosmic-notifications.spec @@ -2,13 +2,13 @@ ExcludeArch: %{ix86} # Generated by rust2rpm 26 %bcond_without check -%global ver ### + %global commit ### %global commitdatestring ### %global commitdate ### Name: cosmic-notifications -Version: %{ver}~git%{commitdate}.%{sub %{commit} 1 7} +Version: ### Release: %autorelease Summary: Notifications daemon for the COSMIC Desktop Environment diff --git a/rpms/cosmic-osd/cosmic-osd.spec b/rpms/cosmic-osd/cosmic-osd.spec index 72aa906..393bd4b 100644 --- a/rpms/cosmic-osd/cosmic-osd.spec +++ b/rpms/cosmic-osd/cosmic-osd.spec @@ -7,13 +7,13 @@ ExcludeArch: %{ix86} %global crate cosmic-osd -%global ver ### + %global commit ### %global commitdatestring ### %global commitdate ### Name: cosmic-osd -Version: %{ver}~git%{commitdate}.%{sub %{commit} 1 7} +Version: ### Release: %autorelease Summary: OSDs for the COSMIC Desktop Environment diff --git a/rpms/cosmic-panel/cosmic-panel.spec b/rpms/cosmic-panel/cosmic-panel.spec index f005104..559bda8 100644 --- a/rpms/cosmic-panel/cosmic-panel.spec +++ b/rpms/cosmic-panel/cosmic-panel.spec @@ -2,13 +2,13 @@ ExcludeArch: %{ix86} # Generated by rust2rpm 26 %bcond_without check -%global ver ### + %global commit ### %global commitdatestring ### %global commitdate ### Name: cosmic-panel -Version: %{ver}~git%{commitdate}.%{sub %{commit} 1 7} +Version: ### Release: %autorelease Summary: Panel for the COSMIC Desktop Environment diff --git a/rpms/cosmic-randr/cosmic-randr.spec b/rpms/cosmic-randr/cosmic-randr.spec index 01b4fd6..2cbb6ee 100644 --- a/rpms/cosmic-randr/cosmic-randr.spec +++ b/rpms/cosmic-randr/cosmic-randr.spec @@ -2,13 +2,13 @@ ExcludeArch: %{ix86} # Generated by rust2rpm 26 %bcond_without check -%global ver ### + %global commit ### %global commitdatestring ### %global commitdate ### Name: cosmic-randr -Version: %{ver}~git%{commitdate}.%{sub %{commit} 1 7} +Version: ### Release: %autorelease Summary: Display configuration command line tool diff --git a/rpms/cosmic-screenshot/cosmic-screenshot.spec b/rpms/cosmic-screenshot/cosmic-screenshot.spec index 170f68a..216b7f4 100644 --- a/rpms/cosmic-screenshot/cosmic-screenshot.spec +++ b/rpms/cosmic-screenshot/cosmic-screenshot.spec @@ -7,13 +7,13 @@ ExcludeArch: %{ix86} %global crate cosmic-screenshot -%global ver ### + %global commit ### %global commitdatestring ### %global commitdate ### Name: cosmic-screenshot -Version: %{ver}~git%{commitdate}.%{sub %{commit} 1 7} +Version: ### Release: %autorelease Summary: Screenshot utility for the COSMIC Desktop Environment diff --git a/rpms/cosmic-session/cosmic-session.spec b/rpms/cosmic-session/cosmic-session.spec index bb919cc..c0e8b10 100644 --- a/rpms/cosmic-session/cosmic-session.spec +++ b/rpms/cosmic-session/cosmic-session.spec @@ -7,13 +7,13 @@ ExcludeArch: %{ix86} %global crate cosmic-session -%global ver ### + %global commit ### %global commitdatestring ### %global commitdate ### Name: cosmic-session -Version: %{ver}~git%{commitdate}.%{sub %{commit} 1 7} +Version: ### Release: %autorelease Summary: Session manager for the COSMIC desktop environment diff --git a/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec b/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec index 53f43f6..f1dff95 100644 --- a/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec +++ b/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec @@ -7,13 +7,13 @@ ExcludeArch: %{ix86} %global crate cosmic-settings-daemon -%global ver ### + %global commit ### %global commitdatestring ### %global commitdate ### Name: cosmic-settings-daemon -Version: %{ver}~git%{commitdate}.%{sub %{commit} 1 7} +Version: ### Release: %autorelease Summary: Settings daemon for the COSMIC Desktop Environment diff --git a/rpms/cosmic-settings/cosmic-settings.spec b/rpms/cosmic-settings/cosmic-settings.spec index 43bb54f..bdeceaa 100644 --- a/rpms/cosmic-settings/cosmic-settings.spec +++ b/rpms/cosmic-settings/cosmic-settings.spec @@ -4,13 +4,13 @@ ExcludeArch: %{ix86} # Generated by rust2rpm 26 %bcond_without check -%global ver ### + %global commit ### %global commitdatestring ### %global commitdate ### Name: cosmic-settings -Version: %{ver}~git%{commitdate}.%{sub %{commit} 1 7} +Version: ### Release: %autorelease Summary: Settings app for the COSMIC Desktop Environment diff --git a/rpms/cosmic-store/cosmic-store.spec b/rpms/cosmic-store/cosmic-store.spec index b36eae2..be04aef 100644 --- a/rpms/cosmic-store/cosmic-store.spec +++ b/rpms/cosmic-store/cosmic-store.spec @@ -2,13 +2,13 @@ ExcludeArch: %{ix86} # Generated by rust2rpm 26 %bcond_without check -%global ver ### + %global commit ### %global commitdatestring ### %global commitdate ### Name: cosmic-store -Version: %{ver}~git%{commitdate}.%{sub %{commit} 1 7} +Version: ### Release: %autorelease Summary: App store for the COSMIC Desktop Environment diff --git a/rpms/cosmic-term/cosmic-term.spec b/rpms/cosmic-term/cosmic-term.spec index 584a1f4..5520199 100644 --- a/rpms/cosmic-term/cosmic-term.spec +++ b/rpms/cosmic-term/cosmic-term.spec @@ -7,13 +7,13 @@ ExcludeArch: %{ix86} %global crate cosmic-term -%global ver ### + %global commit ### %global commitdatestring ### %global commitdate ### Name: cosmic-term -Version: %{ver}~git%{commitdate}.%{sub %{commit} 1 7} +Version: ### Release: %autorelease Summary: Terminal emulator built with alacritty and Libcosmic diff --git a/rpms/cosmic-workspaces/cosmic-workspaces.spec b/rpms/cosmic-workspaces/cosmic-workspaces.spec index 7027a44..d881c5b 100644 --- a/rpms/cosmic-workspaces/cosmic-workspaces.spec +++ b/rpms/cosmic-workspaces/cosmic-workspaces.spec @@ -7,13 +7,13 @@ ExcludeArch: %{ix86} %global crate cosmic-workspaces -%global ver ### + %global commit ### %global commitdatestring ### %global commitdate ### Name: cosmic-workspaces -Version: %{ver}~git%{commitdate}.%{sub %{commit} 1 7} +Version: ### Release: %autorelease Summary: Workspaces overview for the COSMIC Desktop Environment diff --git a/rpms/pop-launcher/pop-launcher.spec b/rpms/pop-launcher/pop-launcher.spec index 5949336..fd194d9 100644 --- a/rpms/pop-launcher/pop-launcher.spec +++ b/rpms/pop-launcher/pop-launcher.spec @@ -2,13 +2,13 @@ ExcludeArch: %{ix86} # Generated by rust2rpm 26 %bcond_without check -%global ver ### + %global commit ### %global commitdatestring ### %global commitdate ### Name: pop-launcher -Version: %{ver}~git%{commitdate}.%{sub %{commit} 1 7} +Version: ### Release: %autorelease Summary: Modular IPC-based desktop launcher service diff --git a/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec b/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec index ee89215..9bc4b28 100644 --- a/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec +++ b/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec @@ -7,13 +7,13 @@ ExcludeArch: %{ix86} %global crate xdg-desktop-portal-cosmic -%global ver ### + %global commit ### %global commitdatestring ### %global commitdate ### Name: xdg-desktop-portal-cosmic -Version: %{ver}~git%{commitdate}.%{sub %{commit} 1 7} +Version: ### Release: %autorelease Summary: XDG Desktop Portals for the COSMIC Desktop Environment diff --git a/scripts/no-sources-srpm.sh b/scripts/no-sources-srpm.sh index bb90ae3..af37aea 100644 --- a/scripts/no-sources-srpm.sh +++ b/scripts/no-sources-srpm.sh @@ -15,7 +15,7 @@ repo=$5 cp $path_to_spec $name.spec 2>/dev/null || : # Make replacements to specfile -sed -i "/^%global ver / s/.*/%global ver $version/" $name.spec +sed -i "/^Version: ### / s/.*/Version: $version~^%{commitdate}git%{sub %{commit} 1 7}/" $name.spec sed -i "/^%global commit / s/.*/%global commit none/" $name.spec current_date=$(date +'%Y%m%d.%H') sed -i "/^%global commitdate / s/.*/%global commitdate $current_date/" $name.spec diff --git a/scripts/srpm.sh b/scripts/srpm.sh index 74bd92c..b971b96 100644 --- a/scripts/srpm.sh +++ b/scripts/srpm.sh @@ -47,7 +47,7 @@ tar -pczf $SOURCE_NAME-$COMMIT.tar.gz $SOURCE_NAME-$COMMIT rm -rf $SOURCE_NAME-$COMMIT # Make replacements to specfile -sed -i "/^%global ver / s/.*/%global ver $VERSION/" $NAME.spec +sed -i "/^Version: ### / s/.*/Version: $VERSION~^%{commitdate}git%{sub %{commit} 1 7}/" $NAME.spec sed -i "/^%global commit / s/.*/%global commit $COMMIT/" $NAME.spec sed -i "/^%global commitdate / s/.*/%global commitdate $COMMITDATE/" $NAME.spec From 4cd4a2587569debc9a54fbb1209e41ae60c1ef2f Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Jun 26 2024 00:48:07 +0000 Subject: [PATCH 198/220] Add desktop file validation to all packages that have .desktop files Signed-off-by: Ryan Brue --- diff --git a/rpms/cosmic-app-library/cosmic-app-library.spec b/rpms/cosmic-app-library/cosmic-app-library.spec index fc5ced0..4fd9298 100644 --- a/rpms/cosmic-app-library/cosmic-app-library.spec +++ b/rpms/cosmic-app-library/cosmic-app-library.spec @@ -100,6 +100,7 @@ just rootdir=%{buildroot} prefix=%{_prefix} install export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" export VERGEN_GIT_SHA="%{commit}" %cargo_test +desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicAppLibrary.desktop %endif %files diff --git a/rpms/cosmic-applets/cosmic-applets.spec b/rpms/cosmic-applets/cosmic-applets.spec index 1082fe3..e27bbe5 100644 --- a/rpms/cosmic-applets/cosmic-applets.spec +++ b/rpms/cosmic-applets/cosmic-applets.spec @@ -107,6 +107,22 @@ just rootdir=%{buildroot} prefix=%{_prefix} install export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" export VERGEN_GIT_SHA="%{commit}" %cargo_test +desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicAppList.desktop +desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicAppletAudio.desktop +desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicAppletBattery.desktop +desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicAppletBluetooth.desktop +desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicAppletInputSources.desktop +desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicAppletMinimize.desktop +desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicAppletNetwork.desktop +desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicAppletNotifications.desktop +desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicAppletPower.desktop +desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicAppletStatusArea.desktop +desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicAppletTiling.desktop +desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicAppletTime.desktop +desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicAppletWorkspaces.desktop +desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicPanelAppButton.desktop +desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicPanelWorkspacesButton.desktop +desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicPanelLauncherButton.desktop %endif %files @@ -143,6 +159,7 @@ export VERGEN_GIT_SHA="%{commit}" %{_datadir}/applications/com.system76.CosmicAppletWorkspaces.desktop %{_datadir}/applications/com.system76.CosmicPanelAppButton.desktop %{_datadir}/applications/com.system76.CosmicPanelWorkspacesButton.desktop +%{_datadir}/applications/com.system76.CosmicPanelLauncherButton.desktop %dir %{_datadir}/cosmic/com.system76.CosmicAppList %{_datadir}/cosmic/com.system76.CosmicAppList/v1/favorites %{_datadir}/cosmic/com.system76.CosmicAppList/v1/filter_top_levels @@ -208,7 +225,6 @@ export VERGEN_GIT_SHA="%{commit}" %{_datadir}/icons/hicolor/scalable/status/cosmic-applet-notification-disabled-symbolic.svg %{_datadir}/icons/hicolor/scalable/status/cosmic-applet-notification-new-symbolic.svg %{_datadir}/icons/hicolor/scalable/status/cosmic-applet-notification-symbolic.svg -%{_datadir}/applications/com.system76.CosmicPanelLauncherButton.desktop %{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicPanelLauncherButton.svg %changelog diff --git a/rpms/cosmic-bg/cosmic-bg.spec b/rpms/cosmic-bg/cosmic-bg.spec index ce8de1a..ee91933 100644 --- a/rpms/cosmic-bg/cosmic-bg.spec +++ b/rpms/cosmic-bg/cosmic-bg.spec @@ -92,6 +92,7 @@ just rootdir=%{buildroot} prefix=%{_prefix} install export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" export VERGEN_GIT_SHA="%{commit}" %cargo_test +desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicBackground.desktop %endif %files diff --git a/rpms/cosmic-edit/cosmic-edit.spec b/rpms/cosmic-edit/cosmic-edit.spec index e47e5a0..4a496ef 100644 --- a/rpms/cosmic-edit/cosmic-edit.spec +++ b/rpms/cosmic-edit/cosmic-edit.spec @@ -105,6 +105,7 @@ just rootdir=%{buildroot} prefix=%{_prefix} install export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" export VERGEN_GIT_SHA="%{commit}" %cargo_test +desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicEdit.desktop %endif %files diff --git a/rpms/cosmic-files/cosmic-files.spec b/rpms/cosmic-files/cosmic-files.spec index 599f562..4312622 100644 --- a/rpms/cosmic-files/cosmic-files.spec +++ b/rpms/cosmic-files/cosmic-files.spec @@ -103,7 +103,11 @@ export VERGEN_GIT_SHA="%{commit}" just rootdir=%{buildroot} prefix=%{_prefix} install %if %{with check} +%check +export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" +export VERGEN_GIT_SHA="%{commit}" %cargo_test +desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicFiles.desktop %endif %files diff --git a/rpms/cosmic-launcher/cosmic-launcher.spec b/rpms/cosmic-launcher/cosmic-launcher.spec index 0956630..8caa0f4 100644 --- a/rpms/cosmic-launcher/cosmic-launcher.spec +++ b/rpms/cosmic-launcher/cosmic-launcher.spec @@ -105,6 +105,7 @@ just rootdir=%{buildroot} prefix=%{_prefix} install export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" export VERGEN_GIT_SHA="%{commit}" %cargo_test +desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicLauncher.desktop %endif %files diff --git a/rpms/cosmic-screenshot/cosmic-screenshot.spec b/rpms/cosmic-screenshot/cosmic-screenshot.spec index 216b7f4..22a21a5 100644 --- a/rpms/cosmic-screenshot/cosmic-screenshot.spec +++ b/rpms/cosmic-screenshot/cosmic-screenshot.spec @@ -89,6 +89,7 @@ just rootdir=%{buildroot} prefix=%{_prefix} install export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" export VERGEN_GIT_SHA="%{commit}" %cargo_test +desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicScreenshot.desktop %endif %files diff --git a/rpms/cosmic-session/cosmic-session.spec b/rpms/cosmic-session/cosmic-session.spec index c0e8b10..1ab47e6 100644 --- a/rpms/cosmic-session/cosmic-session.spec +++ b/rpms/cosmic-session/cosmic-session.spec @@ -115,6 +115,7 @@ just rootdir=%{buildroot} install export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" export VERGEN_GIT_SHA="%{commit}" %cargo_test +desktop-file-validate %{buildroot}%{_datadir}/wayland-sessions/cosmic.desktop %endif %files diff --git a/rpms/cosmic-settings/cosmic-settings.spec b/rpms/cosmic-settings/cosmic-settings.spec index bdeceaa..3d1c5bf 100644 --- a/rpms/cosmic-settings/cosmic-settings.spec +++ b/rpms/cosmic-settings/cosmic-settings.spec @@ -103,6 +103,7 @@ just rootdir=%{buildroot} install export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" export VERGEN_GIT_SHA="%{commit}" %cargo_test +desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicSettings.desktop %endif %files diff --git a/rpms/cosmic-store/cosmic-store.spec b/rpms/cosmic-store/cosmic-store.spec index be04aef..e534366 100644 --- a/rpms/cosmic-store/cosmic-store.spec +++ b/rpms/cosmic-store/cosmic-store.spec @@ -103,6 +103,7 @@ just rootdir=%{buildroot} prefix=%{_prefix} install export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" export VERGEN_GIT_SHA="%{commit}" %cargo_test +desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicStore.desktop %endif %files diff --git a/rpms/cosmic-term/cosmic-term.spec b/rpms/cosmic-term/cosmic-term.spec index 5520199..45245f2 100644 --- a/rpms/cosmic-term/cosmic-term.spec +++ b/rpms/cosmic-term/cosmic-term.spec @@ -104,6 +104,7 @@ just rootdir=%{buildroot} prefix=%{_prefix} install export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" export VERGEN_GIT_SHA="%{commit}" %cargo_test +desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicTerm.desktop %endif %files diff --git a/rpms/cosmic-workspaces/cosmic-workspaces.spec b/rpms/cosmic-workspaces/cosmic-workspaces.spec index d881c5b..d54d767 100644 --- a/rpms/cosmic-workspaces/cosmic-workspaces.spec +++ b/rpms/cosmic-workspaces/cosmic-workspaces.spec @@ -108,6 +108,7 @@ make install DESTDIR=%{buildroot} prefix=%{_prefix} export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" export VERGEN_GIT_SHA="%{commit}" %cargo_test +desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicWorkspaces.desktop %endif %files From 82b80684fb9741554384711b1d878f795b1c7aec Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Jun 26 2024 00:58:25 +0000 Subject: [PATCH 199/220] Use wildcards for redundant icon includes This allows us to shorten the specs a little bit :p Signed-off-by: Ryan Brue --- diff --git a/rpms/cosmic-edit/cosmic-edit.spec b/rpms/cosmic-edit/cosmic-edit.spec index 4a496ef..71bd965 100644 --- a/rpms/cosmic-edit/cosmic-edit.spec +++ b/rpms/cosmic-edit/cosmic-edit.spec @@ -116,13 +116,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicEd %{_bindir}/cosmic-edit %{_datadir}/applications/com.system76.CosmicEdit.desktop %{_metainfodir}/com.system76.CosmicEdit.metainfo.xml -%{_datadir}/icons/hicolor/128x128/apps/com.system76.CosmicEdit.svg -%{_datadir}/icons/hicolor/16x16/apps/com.system76.CosmicEdit.svg -%{_datadir}/icons/hicolor/24x24/apps/com.system76.CosmicEdit.svg -%{_datadir}/icons/hicolor/256x256/apps/com.system76.CosmicEdit.svg -%{_datadir}/icons/hicolor/32x32/apps/com.system76.CosmicEdit.svg -%{_datadir}/icons/hicolor/48x48/apps/com.system76.CosmicEdit.svg -%{_datadir}/icons/hicolor/64x64/apps/com.system76.CosmicEdit.svg +%{_datadir}/icons/hicolor/*/apps/com.system76.CosmicEdit.svg %changelog %autochangelog diff --git a/rpms/cosmic-files/cosmic-files.spec b/rpms/cosmic-files/cosmic-files.spec index 4312622..86ae2a2 100644 --- a/rpms/cosmic-files/cosmic-files.spec +++ b/rpms/cosmic-files/cosmic-files.spec @@ -118,13 +118,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicFi %{_bindir}/cosmic-files %{_datadir}/applications/com.system76.CosmicFiles.desktop %{_metainfodir}/com.system76.CosmicFiles.metainfo.xml -%{_datadir}/icons/hicolor/128x128/apps/com.system76.CosmicFiles.svg -%{_datadir}/icons/hicolor/16x16/apps/com.system76.CosmicFiles.svg -%{_datadir}/icons/hicolor/24x24/apps/com.system76.CosmicFiles.svg -%{_datadir}/icons/hicolor/256x256/apps/com.system76.CosmicFiles.svg -%{_datadir}/icons/hicolor/32x32/apps/com.system76.CosmicFiles.svg -%{_datadir}/icons/hicolor/48x48/apps/com.system76.CosmicFiles.svg -%{_datadir}/icons/hicolor/64x64/apps/com.system76.CosmicFiles.svg +%{_datadir}/icons/hicolor/*/apps/com.system76.CosmicFiles.svg %changelog %autochangelog diff --git a/rpms/cosmic-store/cosmic-store.spec b/rpms/cosmic-store/cosmic-store.spec index e534366..1446697 100644 --- a/rpms/cosmic-store/cosmic-store.spec +++ b/rpms/cosmic-store/cosmic-store.spec @@ -114,13 +114,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicSt %{_bindir}/cosmic-store %{_datadir}/applications/com.system76.CosmicStore.desktop %{_metainfodir}/com.system76.CosmicStore.metainfo.xml -%{_datadir}/icons/hicolor/128x128/apps/com.system76.CosmicStore.svg -%{_datadir}/icons/hicolor/16x16/apps/com.system76.CosmicStore.svg -%{_datadir}/icons/hicolor/24x24/apps/com.system76.CosmicStore.svg -%{_datadir}/icons/hicolor/256x256/apps/com.system76.CosmicStore.svg -%{_datadir}/icons/hicolor/32x32/apps/com.system76.CosmicStore.svg -%{_datadir}/icons/hicolor/48x48/apps/com.system76.CosmicStore.svg -%{_datadir}/icons/hicolor/64x64/apps/com.system76.CosmicStore.svg +%{_datadir}/icons/hicolor/*/apps/com.system76.CosmicStore.svg %changelog %autochangelog diff --git a/rpms/cosmic-term/cosmic-term.spec b/rpms/cosmic-term/cosmic-term.spec index 45245f2..bd092bd 100644 --- a/rpms/cosmic-term/cosmic-term.spec +++ b/rpms/cosmic-term/cosmic-term.spec @@ -115,13 +115,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicTe %{_bindir}/cosmic-term %{_datadir}/applications/com.system76.CosmicTerm.desktop %{_metainfodir}/com.system76.CosmicTerm.metainfo.xml -%{_datadir}/icons/hicolor/128x128/apps/com.system76.CosmicTerm.svg -%{_datadir}/icons/hicolor/16x16/apps/com.system76.CosmicTerm.svg -%{_datadir}/icons/hicolor/24x24/apps/com.system76.CosmicTerm.svg -%{_datadir}/icons/hicolor/256x256/apps/com.system76.CosmicTerm.svg -%{_datadir}/icons/hicolor/32x32/apps/com.system76.CosmicTerm.svg -%{_datadir}/icons/hicolor/48x48/apps/com.system76.CosmicTerm.svg -%{_datadir}/icons/hicolor/64x64/apps/com.system76.CosmicTerm.svg +%{_datadir}/icons/hicolor/*/apps/com.system76.CosmicTerm.svg %changelog %autochangelog From 3b10acf50850aef8870bc8dd0aba89952ff87a86 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Jun 26 2024 01:04:54 +0000 Subject: [PATCH 200/220] Remove git-core dep, add hicolor-icon-theme dep Also use wildcard for cosmic-settings icons too Signed-off-by: Ryan Brue --- diff --git a/rpms/cosmic-app-library/cosmic-app-library.spec b/rpms/cosmic-app-library/cosmic-app-library.spec index 4fd9298..abf0b1f 100644 --- a/rpms/cosmic-app-library/cosmic-app-library.spec +++ b/rpms/cosmic-app-library/cosmic-app-library.spec @@ -59,6 +59,8 @@ BuildRequires: wayland-devel BuildRequires: libxkbcommon-devel BuildRequires: just +Requires: hicolor-icon-theme + %global _description %{expand: %{summary}.} diff --git a/rpms/cosmic-applets/cosmic-applets.spec b/rpms/cosmic-applets/cosmic-applets.spec index e27bbe5..ffba568 100644 --- a/rpms/cosmic-applets/cosmic-applets.spec +++ b/rpms/cosmic-applets/cosmic-applets.spec @@ -65,6 +65,7 @@ BuildRequires: just Requires: cosmic-icons Requires: cosmic-panel +Requires: hicolor-icon-theme %global _description %{expand: %{summary}.} diff --git a/rpms/cosmic-bg/cosmic-bg.spec b/rpms/cosmic-bg/cosmic-bg.spec index ee91933..2994065 100644 --- a/rpms/cosmic-bg/cosmic-bg.spec +++ b/rpms/cosmic-bg/cosmic-bg.spec @@ -50,6 +50,7 @@ BuildRequires: libxkbcommon-devel BuildRequires: just Requires: cosmic-session +Requires: hicolor-icon-theme %global _description %{expand: %{summary}.} diff --git a/rpms/cosmic-edit/cosmic-edit.spec b/rpms/cosmic-edit/cosmic-edit.spec index 71bd965..0541b7b 100644 --- a/rpms/cosmic-edit/cosmic-edit.spec +++ b/rpms/cosmic-edit/cosmic-edit.spec @@ -62,7 +62,7 @@ BuildRequires: cargo BuildRequires: just BuildRequires: libxkbcommon-devel -BuildRequires: git-core +Requires: hicolor-icon-theme %global _description %{expand: %{summary}.} diff --git a/rpms/cosmic-files/cosmic-files.spec b/rpms/cosmic-files/cosmic-files.spec index 86ae2a2..4ec237f 100644 --- a/rpms/cosmic-files/cosmic-files.spec +++ b/rpms/cosmic-files/cosmic-files.spec @@ -62,10 +62,9 @@ BuildRequires: just BuildRequires: glib2-devel BuildRequires: libxkbcommon-devel -BuildRequires: git-core - Requires: gvfs Requires: xdg-utils +Requires: hicolor-icon-theme %global _description %{expand: %{summary}.} diff --git a/rpms/cosmic-launcher/cosmic-launcher.spec b/rpms/cosmic-launcher/cosmic-launcher.spec index 8caa0f4..8bbf4c2 100644 --- a/rpms/cosmic-launcher/cosmic-launcher.spec +++ b/rpms/cosmic-launcher/cosmic-launcher.spec @@ -63,6 +63,7 @@ BuildRequires: libxkbcommon-devel BuildRequires: just Requires: pop-launcher +Requires: hicolor-icon-theme %global _description %{expand: %{summary}.} diff --git a/rpms/cosmic-notifications/cosmic-notifications.spec b/rpms/cosmic-notifications/cosmic-notifications.spec index 0cf044a..f7ef813 100644 --- a/rpms/cosmic-notifications/cosmic-notifications.spec +++ b/rpms/cosmic-notifications/cosmic-notifications.spec @@ -57,6 +57,8 @@ BuildRequires: wayland-devel BuildRequires: libxkbcommon-devel BuildRequires: just +Requires: hicolor-icon-theme + %global _description %{expand: %{summary}.} diff --git a/rpms/cosmic-settings/cosmic-settings.spec b/rpms/cosmic-settings/cosmic-settings.spec index 3d1c5bf..b29c480 100644 --- a/rpms/cosmic-settings/cosmic-settings.spec +++ b/rpms/cosmic-settings/cosmic-settings.spec @@ -62,6 +62,8 @@ BuildRequires: libxkbcommon-devel BuildRequires: systemd-devel BuildRequires: just +Requires: hicolor-icon-theme + %global _description %{expand: %{summary}.} @@ -132,13 +134,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicSe %{_datadir}/icons/hicolor/scalable/status/illustration-appearance-light-style-square.svg %{_datadir}/icons/hicolor/scalable/status/illustration-appearance-mode-dark.svg %{_datadir}/icons/hicolor/scalable/status/illustration-appearance-mode-light.svg -%{_datadir}/icons/hicolor/128x128/apps/com.system76.CosmicSettings.svg -%{_datadir}/icons/hicolor/16x16/apps/com.system76.CosmicSettings.svg -%{_datadir}/icons/hicolor/24x24/apps/com.system76.CosmicSettings.svg -%{_datadir}/icons/hicolor/256x256/apps/com.system76.CosmicSettings.svg -%{_datadir}/icons/hicolor/32x32/apps/com.system76.CosmicSettings.svg -%{_datadir}/icons/hicolor/48x48/apps/com.system76.CosmicSettings.svg -%{_datadir}/icons/hicolor/64x64/apps/com.system76.CosmicSettings.svg +%{_datadir}/icons/hicolor/*/apps/com.system76.CosmicSettings.svg %{_datadir}/applications/com.system76.CosmicSettings.About.desktop %{_datadir}/applications/com.system76.CosmicSettings.Appearance.desktop %{_datadir}/applications/com.system76.CosmicSettings.DateTime.desktop diff --git a/rpms/cosmic-store/cosmic-store.spec b/rpms/cosmic-store/cosmic-store.spec index 1446697..6d642a7 100644 --- a/rpms/cosmic-store/cosmic-store.spec +++ b/rpms/cosmic-store/cosmic-store.spec @@ -61,6 +61,7 @@ BuildRequires: libxkbcommon-devel Requires: PackageKit Requires: flatpak-libs +Requires: hicolor-icon-theme %global _description %{expand: %{summary}.} diff --git a/rpms/cosmic-term/cosmic-term.spec b/rpms/cosmic-term/cosmic-term.spec index bd092bd..0fdcd63 100644 --- a/rpms/cosmic-term/cosmic-term.spec +++ b/rpms/cosmic-term/cosmic-term.spec @@ -61,7 +61,7 @@ BuildRequires: cargo BuildRequires: just BuildRequires: libxkbcommon-devel -BuildRequires: git-core +Requires: hicolor-icon-theme %global _description %{expand: %{summary}.} diff --git a/rpms/cosmic-workspaces/cosmic-workspaces.spec b/rpms/cosmic-workspaces/cosmic-workspaces.spec index d54d767..d0ee73f 100644 --- a/rpms/cosmic-workspaces/cosmic-workspaces.spec +++ b/rpms/cosmic-workspaces/cosmic-workspaces.spec @@ -66,6 +66,7 @@ BuildRequires: mesa-libgbm-devel BuildRequires: make Requires: cosmic-comp +Requires: hicolor-icon-theme %global _description %{expand: %{summary}.} diff --git a/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec b/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec index 9bc4b28..cc8c576 100644 --- a/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec +++ b/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec @@ -66,6 +66,8 @@ BuildRequires: gstreamer1-devel BuildRequires: glib2-devel BuildRequires: just +Requires: hicolor-icon-theme + %global _description %{expand: %{summary}.} From 4c9e7edb8fb6f5dded1968a81de856dc5d804d48 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Jun 26 2024 01:07:26 +0000 Subject: [PATCH 201/220] fix: macro in comment Signed-off-by: Ryan Brue --- diff --git a/rpms/cosmic-app-library/cosmic-app-library.spec b/rpms/cosmic-app-library/cosmic-app-library.spec index abf0b1f..cb7c2f6 100644 --- a/rpms/cosmic-app-library/cosmic-app-library.spec +++ b/rpms/cosmic-app-library/cosmic-app-library.spec @@ -71,11 +71,11 @@ Requires: hicolor-icon-theme %cargo_prep -N # Check if .cargo/config.toml exists if [ -f .cargo/config.toml ]; then - # If it exists, append the contents of %{SOURCE2} to .cargo/config.toml + # If it exists, append the contents of %%{SOURCE2} to .cargo/config.toml cat %{SOURCE2} >> .cargo/config.toml echo "Appended %{SOURCE2} to .cargo/config.toml" else - # If it does not exist, append the contents of %{SOURCE2} to .cargo/config + # If it does not exist, append the contents of %%{SOURCE2} to .cargo/config cat %{SOURCE2} >> .cargo/config echo "Appended %{SOURCE2} to .cargo/config" fi diff --git a/rpms/cosmic-applets/cosmic-applets.spec b/rpms/cosmic-applets/cosmic-applets.spec index ffba568..6af5bcf 100644 --- a/rpms/cosmic-applets/cosmic-applets.spec +++ b/rpms/cosmic-applets/cosmic-applets.spec @@ -77,11 +77,11 @@ Requires: hicolor-icon-theme %cargo_prep -N # Check if .cargo/config.toml exists if [ -f .cargo/config.toml ]; then - # If it exists, append the contents of %{SOURCE2} to .cargo/config.toml + # If it exists, append the contents of %%{SOURCE2} to .cargo/config.toml cat %{SOURCE2} >> .cargo/config.toml echo "Appended %{SOURCE2} to .cargo/config.toml" else - # If it does not exist, append the contents of %{SOURCE2} to .cargo/config + # If it does not exist, append the contents of %%{SOURCE2} to .cargo/config cat %{SOURCE2} >> .cargo/config echo "Appended %{SOURCE2} to .cargo/config" fi diff --git a/rpms/cosmic-bg/cosmic-bg.spec b/rpms/cosmic-bg/cosmic-bg.spec index 2994065..325be8d 100644 --- a/rpms/cosmic-bg/cosmic-bg.spec +++ b/rpms/cosmic-bg/cosmic-bg.spec @@ -62,11 +62,11 @@ Requires: hicolor-icon-theme %cargo_prep -N # Check if .cargo/config.toml exists if [ -f .cargo/config.toml ]; then - # If it exists, append the contents of %{SOURCE2} to .cargo/config.toml + # If it exists, append the contents of %%{SOURCE2} to .cargo/config.toml cat %{SOURCE2} >> .cargo/config.toml echo "Appended %{SOURCE2} to .cargo/config.toml" else - # If it does not exist, append the contents of %{SOURCE2} to .cargo/config + # If it does not exist, append the contents of %%{SOURCE2} to .cargo/config cat %{SOURCE2} >> .cargo/config echo "Appended %{SOURCE2} to .cargo/config" fi diff --git a/rpms/cosmic-comp/cosmic-comp.spec b/rpms/cosmic-comp/cosmic-comp.spec index 3c67b14..fa5868d 100644 --- a/rpms/cosmic-comp/cosmic-comp.spec +++ b/rpms/cosmic-comp/cosmic-comp.spec @@ -79,11 +79,11 @@ Recommends: cosmic-session %cargo_prep -N # Check if .cargo/config.toml exists if [ -f .cargo/config.toml ]; then - # If it exists, append the contents of %{SOURCE2} to .cargo/config.toml + # If it exists, append the contents of %%{SOURCE2} to .cargo/config.toml cat %{SOURCE2} >> .cargo/config.toml echo "Appended %{SOURCE2} to .cargo/config.toml" else - # If it does not exist, append the contents of %{SOURCE2} to .cargo/config + # If it does not exist, append the contents of %%{SOURCE2} to .cargo/config cat %{SOURCE2} >> .cargo/config echo "Appended %{SOURCE2} to .cargo/config" fi diff --git a/rpms/cosmic-edit/cosmic-edit.spec b/rpms/cosmic-edit/cosmic-edit.spec index 0541b7b..8a92d69 100644 --- a/rpms/cosmic-edit/cosmic-edit.spec +++ b/rpms/cosmic-edit/cosmic-edit.spec @@ -74,11 +74,11 @@ Requires: hicolor-icon-theme %cargo_prep -N # Check if .cargo/config.toml exists if [ -f .cargo/config.toml ]; then - # If it exists, append the contents of %{SOURCE2} to .cargo/config.toml + # If it exists, append the contents of %%{SOURCE2} to .cargo/config.toml cat %{SOURCE2} >> .cargo/config.toml echo "Appended %{SOURCE2} to .cargo/config.toml" else - # If it does not exist, append the contents of %{SOURCE2} to .cargo/config + # If it does not exist, append the contents of %%{SOURCE2} to .cargo/config cat %{SOURCE2} >> .cargo/config echo "Appended %{SOURCE2} to .cargo/config" fi diff --git a/rpms/cosmic-files/cosmic-files.spec b/rpms/cosmic-files/cosmic-files.spec index 4ec237f..af20823 100644 --- a/rpms/cosmic-files/cosmic-files.spec +++ b/rpms/cosmic-files/cosmic-files.spec @@ -76,11 +76,11 @@ Requires: hicolor-icon-theme %cargo_prep -N # Check if .cargo/config.toml exists if [ -f .cargo/config.toml ]; then - # If it exists, append the contents of %{SOURCE2} to .cargo/config.toml + # If it exists, append the contents of %%{SOURCE2} to .cargo/config.toml cat %{SOURCE2} >> .cargo/config.toml echo "Appended %{SOURCE2} to .cargo/config.toml" else - # If it does not exist, append the contents of %{SOURCE2} to .cargo/config + # If it does not exist, append the contents of %%{SOURCE2} to .cargo/config cat %{SOURCE2} >> .cargo/config echo "Appended %{SOURCE2} to .cargo/config" fi diff --git a/rpms/cosmic-greeter/cosmic-greeter.spec b/rpms/cosmic-greeter/cosmic-greeter.spec index 9f5e83b..d370053 100644 --- a/rpms/cosmic-greeter/cosmic-greeter.spec +++ b/rpms/cosmic-greeter/cosmic-greeter.spec @@ -83,11 +83,11 @@ Requires: cosmic-comp %cargo_prep -N # Check if .cargo/config.toml exists if [ -f .cargo/config.toml ]; then - # If it exists, append the contents of %{SOURCE2} to .cargo/config.toml + # If it exists, append the contents of %%{SOURCE2} to .cargo/config.toml cat %{SOURCE2} >> .cargo/config.toml echo "Appended %{SOURCE2} to .cargo/config.toml" else - # If it does not exist, append the contents of %{SOURCE2} to .cargo/config + # If it does not exist, append the contents of %%{SOURCE2} to .cargo/config cat %{SOURCE2} >> .cargo/config echo "Appended %{SOURCE2} to .cargo/config" fi diff --git a/rpms/cosmic-launcher/cosmic-launcher.spec b/rpms/cosmic-launcher/cosmic-launcher.spec index 8bbf4c2..b80a075 100644 --- a/rpms/cosmic-launcher/cosmic-launcher.spec +++ b/rpms/cosmic-launcher/cosmic-launcher.spec @@ -75,11 +75,11 @@ Requires: hicolor-icon-theme %cargo_prep -N # Check if .cargo/config.toml exists if [ -f .cargo/config.toml ]; then - # If it exists, append the contents of %{SOURCE2} to .cargo/config.toml + # If it exists, append the contents of %%{SOURCE2} to .cargo/config.toml cat %{SOURCE2} >> .cargo/config.toml echo "Appended %{SOURCE2} to .cargo/config.toml" else - # If it does not exist, append the contents of %{SOURCE2} to .cargo/config + # If it does not exist, append the contents of %%{SOURCE2} to .cargo/config cat %{SOURCE2} >> .cargo/config echo "Appended %{SOURCE2} to .cargo/config" fi diff --git a/rpms/cosmic-notifications/cosmic-notifications.spec b/rpms/cosmic-notifications/cosmic-notifications.spec index f7ef813..1fc9f6a 100644 --- a/rpms/cosmic-notifications/cosmic-notifications.spec +++ b/rpms/cosmic-notifications/cosmic-notifications.spec @@ -69,11 +69,11 @@ Requires: hicolor-icon-theme %cargo_prep -N # Check if .cargo/config.toml exists if [ -f .cargo/config.toml ]; then - # If it exists, append the contents of %{SOURCE2} to .cargo/config.toml + # If it exists, append the contents of %%{SOURCE2} to .cargo/config.toml cat %{SOURCE2} >> .cargo/config.toml echo "Appended %{SOURCE2} to .cargo/config.toml" else - # If it does not exist, append the contents of %{SOURCE2} to .cargo/config + # If it does not exist, append the contents of %%{SOURCE2} to .cargo/config cat %{SOURCE2} >> .cargo/config echo "Appended %{SOURCE2} to .cargo/config" fi diff --git a/rpms/cosmic-osd/cosmic-osd.spec b/rpms/cosmic-osd/cosmic-osd.spec index 393bd4b..fbce8b5 100644 --- a/rpms/cosmic-osd/cosmic-osd.spec +++ b/rpms/cosmic-osd/cosmic-osd.spec @@ -72,11 +72,11 @@ BuildRequires: make %cargo_prep -N # Check if .cargo/config.toml exists if [ -f .cargo/config.toml ]; then - # If it exists, append the contents of %{SOURCE2} to .cargo/config.toml + # If it exists, append the contents of %%{SOURCE2} to .cargo/config.toml cat %{SOURCE2} >> .cargo/config.toml echo "Appended %{SOURCE2} to .cargo/config.toml" else - # If it does not exist, append the contents of %{SOURCE2} to .cargo/config + # If it does not exist, append the contents of %%{SOURCE2} to .cargo/config cat %{SOURCE2} >> .cargo/config echo "Appended %{SOURCE2} to .cargo/config" fi diff --git a/rpms/cosmic-panel/cosmic-panel.spec b/rpms/cosmic-panel/cosmic-panel.spec index 559bda8..28507fb 100644 --- a/rpms/cosmic-panel/cosmic-panel.spec +++ b/rpms/cosmic-panel/cosmic-panel.spec @@ -64,11 +64,11 @@ BuildRequires: just %cargo_prep -N # Check if .cargo/config.toml exists if [ -f .cargo/config.toml ]; then - # If it exists, append the contents of %{SOURCE2} to .cargo/config.toml + # If it exists, append the contents of %%{SOURCE2} to .cargo/config.toml cat %{SOURCE2} >> .cargo/config.toml echo "Appended %{SOURCE2} to .cargo/config.toml" else - # If it does not exist, append the contents of %{SOURCE2} to .cargo/config + # If it does not exist, append the contents of %%{SOURCE2} to .cargo/config cat %{SOURCE2} >> .cargo/config echo "Appended %{SOURCE2} to .cargo/config" fi diff --git a/rpms/cosmic-randr/cosmic-randr.spec b/rpms/cosmic-randr/cosmic-randr.spec index 2cbb6ee..d6c389c 100644 --- a/rpms/cosmic-randr/cosmic-randr.spec +++ b/rpms/cosmic-randr/cosmic-randr.spec @@ -55,11 +55,11 @@ Cosmic-randr command line interface.} %cargo_prep -N # Check if .cargo/config.toml exists if [ -f .cargo/config.toml ]; then - # If it exists, append the contents of %{SOURCE2} to .cargo/config.toml + # If it exists, append the contents of %%{SOURCE2} to .cargo/config.toml cat %{SOURCE2} >> .cargo/config.toml echo "Appended %{SOURCE2} to .cargo/config.toml" else - # If it does not exist, append the contents of %{SOURCE2} to .cargo/config + # If it does not exist, append the contents of %%{SOURCE2} to .cargo/config cat %{SOURCE2} >> .cargo/config echo "Appended %{SOURCE2} to .cargo/config" fi diff --git a/rpms/cosmic-screenshot/cosmic-screenshot.spec b/rpms/cosmic-screenshot/cosmic-screenshot.spec index 22a21a5..ffcd154 100644 --- a/rpms/cosmic-screenshot/cosmic-screenshot.spec +++ b/rpms/cosmic-screenshot/cosmic-screenshot.spec @@ -58,11 +58,11 @@ BuildRequires: just %cargo_prep -N # Check if .cargo/config.toml exists if [ -f .cargo/config.toml ]; then - # If it exists, append the contents of %{SOURCE2} to .cargo/config.toml + # If it exists, append the contents of %%{SOURCE2} to .cargo/config.toml cat %{SOURCE2} >> .cargo/config.toml echo "Appended %{SOURCE2} to .cargo/config.toml" else - # If it does not exist, append the contents of %{SOURCE2} to .cargo/config + # If it does not exist, append the contents of %%{SOURCE2} to .cargo/config cat %{SOURCE2} >> .cargo/config echo "Appended %{SOURCE2} to .cargo/config" fi diff --git a/rpms/cosmic-session/cosmic-session.spec b/rpms/cosmic-session/cosmic-session.spec index 1ab47e6..d364b39 100644 --- a/rpms/cosmic-session/cosmic-session.spec +++ b/rpms/cosmic-session/cosmic-session.spec @@ -84,11 +84,11 @@ The session manager for the COSMIC desktop environment.} %cargo_prep -N # Check if .cargo/config.toml exists if [ -f .cargo/config.toml ]; then - # If it exists, append the contents of %{SOURCE2} to .cargo/config.toml + # If it exists, append the contents of %%{SOURCE2} to .cargo/config.toml cat %{SOURCE2} >> .cargo/config.toml echo "Appended %{SOURCE2} to .cargo/config.toml" else - # If it does not exist, append the contents of %{SOURCE2} to .cargo/config + # If it does not exist, append the contents of %%{SOURCE2} to .cargo/config cat %{SOURCE2} >> .cargo/config echo "Appended %{SOURCE2} to .cargo/config" fi diff --git a/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec b/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec index f1dff95..0850b8a 100644 --- a/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec +++ b/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec @@ -77,11 +77,11 @@ Requires: adw-gtk3-theme %cargo_prep -N # Check if .cargo/config.toml exists if [ -f .cargo/config.toml ]; then - # If it exists, append the contents of %{SOURCE2} to .cargo/config.toml + # If it exists, append the contents of %%{SOURCE2} to .cargo/config.toml cat %{SOURCE2} >> .cargo/config.toml echo "Appended %{SOURCE2} to .cargo/config.toml" else - # If it does not exist, append the contents of %{SOURCE2} to .cargo/config + # If it does not exist, append the contents of %%{SOURCE2} to .cargo/config cat %{SOURCE2} >> .cargo/config echo "Appended %{SOURCE2} to .cargo/config" fi diff --git a/rpms/cosmic-settings/cosmic-settings.spec b/rpms/cosmic-settings/cosmic-settings.spec index b29c480..131452a 100644 --- a/rpms/cosmic-settings/cosmic-settings.spec +++ b/rpms/cosmic-settings/cosmic-settings.spec @@ -74,11 +74,11 @@ Requires: hicolor-icon-theme %cargo_prep -N # Check if .cargo/config.toml exists if [ -f .cargo/config.toml ]; then - # If it exists, append the contents of %{SOURCE2} to .cargo/config.toml + # If it exists, append the contents of %%{SOURCE2} to .cargo/config.toml cat %{SOURCE2} >> .cargo/config.toml echo "Appended %{SOURCE2} to .cargo/config.toml" else - # If it does not exist, append the contents of %{SOURCE2} to .cargo/config + # If it does not exist, append the contents of %%{SOURCE2} to .cargo/config cat %{SOURCE2} >> .cargo/config echo "Appended %{SOURCE2} to .cargo/config" fi diff --git a/rpms/cosmic-store/cosmic-store.spec b/rpms/cosmic-store/cosmic-store.spec index 6d642a7..fddeeb0 100644 --- a/rpms/cosmic-store/cosmic-store.spec +++ b/rpms/cosmic-store/cosmic-store.spec @@ -73,11 +73,11 @@ Requires: hicolor-icon-theme %cargo_prep -N # Check if .cargo/config.toml exists if [ -f .cargo/config.toml ]; then - # If it exists, append the contents of %{SOURCE2} to .cargo/config.toml + # If it exists, append the contents of %%{SOURCE2} to .cargo/config.toml cat %{SOURCE2} >> .cargo/config.toml echo "Appended %{SOURCE2} to .cargo/config.toml" else - # If it does not exist, append the contents of %{SOURCE2} to .cargo/config + # If it does not exist, append the contents of %%{SOURCE2} to .cargo/config cat %{SOURCE2} >> .cargo/config echo "Appended %{SOURCE2} to .cargo/config" fi diff --git a/rpms/cosmic-term/cosmic-term.spec b/rpms/cosmic-term/cosmic-term.spec index 0fdcd63..5c21628 100644 --- a/rpms/cosmic-term/cosmic-term.spec +++ b/rpms/cosmic-term/cosmic-term.spec @@ -73,11 +73,11 @@ Requires: hicolor-icon-theme %cargo_prep -N # Check if .cargo/config.toml exists if [ -f .cargo/config.toml ]; then - # If it exists, append the contents of %{SOURCE2} to .cargo/config.toml + # If it exists, append the contents of %%{SOURCE2} to .cargo/config.toml cat %{SOURCE2} >> .cargo/config.toml echo "Appended %{SOURCE2} to .cargo/config.toml" else - # If it does not exist, append the contents of %{SOURCE2} to .cargo/config + # If it does not exist, append the contents of %%{SOURCE2} to .cargo/config cat %{SOURCE2} >> .cargo/config echo "Appended %{SOURCE2} to .cargo/config" fi diff --git a/rpms/cosmic-workspaces/cosmic-workspaces.spec b/rpms/cosmic-workspaces/cosmic-workspaces.spec index d0ee73f..5dcf3ff 100644 --- a/rpms/cosmic-workspaces/cosmic-workspaces.spec +++ b/rpms/cosmic-workspaces/cosmic-workspaces.spec @@ -78,11 +78,11 @@ Requires: hicolor-icon-theme %cargo_prep -N # Check if .cargo/config.toml exists if [ -f .cargo/config.toml ]; then - # If it exists, append the contents of %{SOURCE2} to .cargo/config.toml + # If it exists, append the contents of %%{SOURCE2} to .cargo/config.toml cat %{SOURCE2} >> .cargo/config.toml echo "Appended %{SOURCE2} to .cargo/config.toml" else - # If it does not exist, append the contents of %{SOURCE2} to .cargo/config + # If it does not exist, append the contents of %%{SOURCE2} to .cargo/config cat %{SOURCE2} >> .cargo/config echo "Appended %{SOURCE2} to .cargo/config" fi diff --git a/rpms/pop-launcher/pop-launcher.spec b/rpms/pop-launcher/pop-launcher.spec index fd194d9..526909a 100644 --- a/rpms/pop-launcher/pop-launcher.spec +++ b/rpms/pop-launcher/pop-launcher.spec @@ -70,11 +70,11 @@ Requires: fd-find %cargo_prep -N # Check if .cargo/config.toml exists if [ -f .cargo/config.toml ]; then - # If it exists, append the contents of %{SOURCE2} to .cargo/config.toml + # If it exists, append the contents of %%{SOURCE2} to .cargo/config.toml cat %{SOURCE2} >> .cargo/config.toml echo "Appended %{SOURCE2} to .cargo/config.toml" else - # If it does not exist, append the contents of %{SOURCE2} to .cargo/config + # If it does not exist, append the contents of %%{SOURCE2} to .cargo/config cat %{SOURCE2} >> .cargo/config echo "Appended %{SOURCE2} to .cargo/config" fi diff --git a/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec b/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec index cc8c576..e3ac099 100644 --- a/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec +++ b/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec @@ -78,11 +78,11 @@ Requires: hicolor-icon-theme %cargo_prep -N # Check if .cargo/config.toml exists if [ -f .cargo/config.toml ]; then - # If it exists, append the contents of %{SOURCE2} to .cargo/config.toml + # If it exists, append the contents of %%{SOURCE2} to .cargo/config.toml cat %{SOURCE2} >> .cargo/config.toml echo "Appended %{SOURCE2} to .cargo/config.toml" else - # If it does not exist, append the contents of %{SOURCE2} to .cargo/config + # If it does not exist, append the contents of %%{SOURCE2} to .cargo/config cat %{SOURCE2} >> .cargo/config echo "Appended %{SOURCE2} to .cargo/config" fi From 58ade8b245a923d6e4510d9697e5df3c97afa65e Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Jun 26 2024 01:31:05 +0000 Subject: [PATCH 202/220] fix: also validate cosmicnotifications.desktop Signed-off-by: Ryan Brue --- diff --git a/rpms/cosmic-notifications/cosmic-notifications.spec b/rpms/cosmic-notifications/cosmic-notifications.spec index 1fc9f6a..c7fc430 100644 --- a/rpms/cosmic-notifications/cosmic-notifications.spec +++ b/rpms/cosmic-notifications/cosmic-notifications.spec @@ -100,6 +100,7 @@ just rootdir=%{buildroot} prefix=%{_prefix} install export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" export VERGEN_GIT_SHA="%{commit}" %cargo_test +desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicNotifications.desktop %endif %files From b7a119d61d9961cd454795bb760b049d144cada1 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Jun 26 2024 01:41:02 +0000 Subject: [PATCH 203/220] Remove cargo_install_lib Signed-off-by: Ryan Brue --- diff --git a/rpms/cosmic-app-library/cosmic-app-library.spec b/rpms/cosmic-app-library/cosmic-app-library.spec index cb7c2f6..5482d48 100644 --- a/rpms/cosmic-app-library/cosmic-app-library.spec +++ b/rpms/cosmic-app-library/cosmic-app-library.spec @@ -2,9 +2,6 @@ ExcludeArch: %{ix86} # Generated by rust2rpm 26 %bcond_without check -# prevent library files from being installed -%global cargo_install_lib 0 - %global commit ### %global commitdatestring ### diff --git a/rpms/cosmic-edit/cosmic-edit.spec b/rpms/cosmic-edit/cosmic-edit.spec index 8a92d69..2e10ca9 100644 --- a/rpms/cosmic-edit/cosmic-edit.spec +++ b/rpms/cosmic-edit/cosmic-edit.spec @@ -2,9 +2,6 @@ ExcludeArch: %{ix86} # Generated by rust2rpm 26 %bcond_without check -# prevent library files from being installed -%global cargo_install_lib 0 - %global crate cosmic-edit diff --git a/rpms/cosmic-files/cosmic-files.spec b/rpms/cosmic-files/cosmic-files.spec index af20823..05001fc 100644 --- a/rpms/cosmic-files/cosmic-files.spec +++ b/rpms/cosmic-files/cosmic-files.spec @@ -2,8 +2,6 @@ ExcludeArch: %{ix86} # Generated by rust2rpm 26 %bcond_without check -# prevent library files from being installed -%global cargo_install_lib 0 %global crate cosmic-files diff --git a/rpms/cosmic-launcher/cosmic-launcher.spec b/rpms/cosmic-launcher/cosmic-launcher.spec index b80a075..c24a9ca 100644 --- a/rpms/cosmic-launcher/cosmic-launcher.spec +++ b/rpms/cosmic-launcher/cosmic-launcher.spec @@ -2,8 +2,6 @@ ExcludeArch: %{ix86} # Generated by rust2rpm 26 %bcond_without check -# prevent library files from being installed -%global cargo_install_lib 0 %global crate cosmic-launcher diff --git a/rpms/cosmic-osd/cosmic-osd.spec b/rpms/cosmic-osd/cosmic-osd.spec index fbce8b5..d0a75f9 100644 --- a/rpms/cosmic-osd/cosmic-osd.spec +++ b/rpms/cosmic-osd/cosmic-osd.spec @@ -2,8 +2,6 @@ ExcludeArch: %{ix86} # Generated by rust2rpm 26 %bcond_without check -# prevent library files from being installed -%global cargo_install_lib 0 %global crate cosmic-osd diff --git a/rpms/cosmic-screenshot/cosmic-screenshot.spec b/rpms/cosmic-screenshot/cosmic-screenshot.spec index ffcd154..f3d1f00 100644 --- a/rpms/cosmic-screenshot/cosmic-screenshot.spec +++ b/rpms/cosmic-screenshot/cosmic-screenshot.spec @@ -2,8 +2,6 @@ ExcludeArch: %{ix86} # Generated by rust2rpm 26 %bcond_without check -# prevent library files from being installed -%global cargo_install_lib 0 %global crate cosmic-screenshot diff --git a/rpms/cosmic-session/cosmic-session.spec b/rpms/cosmic-session/cosmic-session.spec index d364b39..9584e03 100644 --- a/rpms/cosmic-session/cosmic-session.spec +++ b/rpms/cosmic-session/cosmic-session.spec @@ -2,8 +2,6 @@ ExcludeArch: %{ix86} # Generated by rust2rpm 26 %bcond_without check -# prevent library files from being installed -%global cargo_install_lib 0 %global crate cosmic-session diff --git a/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec b/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec index 0850b8a..4dd61c5 100644 --- a/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec +++ b/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec @@ -2,8 +2,6 @@ ExcludeArch: %{ix86} # Generated by rust2rpm 26 %bcond_without check -# prevent library files from being installed -%global cargo_install_lib 0 %global crate cosmic-settings-daemon diff --git a/rpms/cosmic-term/cosmic-term.spec b/rpms/cosmic-term/cosmic-term.spec index 5c21628..523567a 100644 --- a/rpms/cosmic-term/cosmic-term.spec +++ b/rpms/cosmic-term/cosmic-term.spec @@ -2,9 +2,6 @@ ExcludeArch: %{ix86} # Generated by rust2rpm 26 %bcond_without check -# prevent library files from being installed -%global cargo_install_lib 0 - %global crate cosmic-term diff --git a/rpms/cosmic-workspaces/cosmic-workspaces.spec b/rpms/cosmic-workspaces/cosmic-workspaces.spec index 5dcf3ff..cea241f 100644 --- a/rpms/cosmic-workspaces/cosmic-workspaces.spec +++ b/rpms/cosmic-workspaces/cosmic-workspaces.spec @@ -2,8 +2,6 @@ ExcludeArch: %{ix86} # Generated by rust2rpm 26 %bcond_without check -# prevent library files from being installed -%global cargo_install_lib 0 %global crate cosmic-workspaces diff --git a/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec b/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec index e3ac099..5c23d33 100644 --- a/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec +++ b/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec @@ -2,8 +2,6 @@ ExcludeArch: %{ix86} # Generated by rust2rpm 26 %bcond_without check -# prevent library files from being installed -%global cargo_install_lib 0 %global crate xdg-desktop-portal-cosmic From 0ea5e37bb3ce5c585b9ff9e9d5fa201a0046ab38 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Jun 26 2024 01:43:04 +0000 Subject: [PATCH 204/220] Remove SourceLicense This is not needed because the packages are vendored re: Carl George Signed-off-by: Ryan Brue --- diff --git a/rpms/cosmic-app-library/cosmic-app-library.spec b/rpms/cosmic-app-library/cosmic-app-library.spec index 5482d48..5d42e3d 100644 --- a/rpms/cosmic-app-library/cosmic-app-library.spec +++ b/rpms/cosmic-app-library/cosmic-app-library.spec @@ -14,7 +14,6 @@ Version: ### Release: %autorelease Summary: App Library program for the COSMIC Desktop Environment -SourceLicense: GPL-3.0 # 0BSD OR MIT OR Apache-2.0 # Apache-2.0 # Apache-2.0 OR MIT diff --git a/rpms/cosmic-applets/cosmic-applets.spec b/rpms/cosmic-applets/cosmic-applets.spec index 6af5bcf..6e2525a 100644 --- a/rpms/cosmic-applets/cosmic-applets.spec +++ b/rpms/cosmic-applets/cosmic-applets.spec @@ -12,7 +12,6 @@ Version: ### Release: %autorelease Summary: Applets for the COSMIC Desktop Environment -SourceLicense: GPL-3.0-or-later # 0BSD OR MIT OR Apache-2.0 # Apache-2.0 # Apache-2.0 OR MIT diff --git a/rpms/cosmic-bg/cosmic-bg.spec b/rpms/cosmic-bg/cosmic-bg.spec index 325be8d..a3f4648 100644 --- a/rpms/cosmic-bg/cosmic-bg.spec +++ b/rpms/cosmic-bg/cosmic-bg.spec @@ -12,7 +12,6 @@ Version: ### Release: %autorelease Summary: Background manager for the COSMIC Desktop Environment -SourceLicense: MPL-2.0 # 0BSD OR MIT OR Apache-2.0 # Apache-2.0 OR MIT # Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT diff --git a/rpms/cosmic-comp/cosmic-comp.spec b/rpms/cosmic-comp/cosmic-comp.spec index fa5868d..1d7659e 100644 --- a/rpms/cosmic-comp/cosmic-comp.spec +++ b/rpms/cosmic-comp/cosmic-comp.spec @@ -12,7 +12,6 @@ Version: ### Release: %autorelease Summary: Compositor for the COSMIC Desktop Environment -SourceLicense: GPL-3.0-only # (Apache-2.0 OR MIT) AND BSD-3-Clause # 0BSD OR MIT OR Apache-2.0 # Apache-2.0 diff --git a/rpms/cosmic-edit/cosmic-edit.spec b/rpms/cosmic-edit/cosmic-edit.spec index 2e10ca9..dcf2222 100644 --- a/rpms/cosmic-edit/cosmic-edit.spec +++ b/rpms/cosmic-edit/cosmic-edit.spec @@ -14,7 +14,6 @@ Version: ### Release: %autorelease Summary: Libcosmic text editor -SourceLicense: GPL-3.0-only # (Apache-2.0 OR MIT) AND BSD-3-Clause # 0BSD OR MIT OR Apache-2.0 # Apache-2.0 diff --git a/rpms/cosmic-files/cosmic-files.spec b/rpms/cosmic-files/cosmic-files.spec index 05001fc..7935c5f 100644 --- a/rpms/cosmic-files/cosmic-files.spec +++ b/rpms/cosmic-files/cosmic-files.spec @@ -15,7 +15,6 @@ Version: ### Release: %autorelease Summary: Libcosmic file manager -SourceLicense: GPL-3.0-only # 0BSD OR MIT OR Apache-2.0 # Apache-2.0 # Apache-2.0 OR BSL-1.0 diff --git a/rpms/cosmic-greeter/cosmic-greeter.spec b/rpms/cosmic-greeter/cosmic-greeter.spec index d370053..5fdca51 100644 --- a/rpms/cosmic-greeter/cosmic-greeter.spec +++ b/rpms/cosmic-greeter/cosmic-greeter.spec @@ -12,7 +12,6 @@ Version: ### Release: %autorelease Summary: Login and display manager for the COSMIC Desktop Environment -SourceLicense: GPL-3.0 # 0BSD OR MIT OR Apache-2.0 # Apache-2.0 # Apache-2.0 OR BSL-1.0 diff --git a/rpms/cosmic-launcher/cosmic-launcher.spec b/rpms/cosmic-launcher/cosmic-launcher.spec index c24a9ca..e09e342 100644 --- a/rpms/cosmic-launcher/cosmic-launcher.spec +++ b/rpms/cosmic-launcher/cosmic-launcher.spec @@ -15,7 +15,6 @@ Version: ### Release: %autorelease Summary: Pop launcher frontend for the COSMIC Desktop Environment -SourceLicense: GPL-3.0 # 0BSD OR MIT OR Apache-2.0 # Apache-2.0 # Apache-2.0 OR BSL-1.0 diff --git a/rpms/cosmic-notifications/cosmic-notifications.spec b/rpms/cosmic-notifications/cosmic-notifications.spec index c7fc430..c359240 100644 --- a/rpms/cosmic-notifications/cosmic-notifications.spec +++ b/rpms/cosmic-notifications/cosmic-notifications.spec @@ -12,7 +12,6 @@ Version: ### Release: %autorelease Summary: Notifications daemon for the COSMIC Desktop Environment -SourceLicense: GPL-3.0 # 0BSD OR MIT OR Apache-2.0 # Apache-2.0 # Apache-2.0 OR BSD-3-Clause diff --git a/rpms/cosmic-osd/cosmic-osd.spec b/rpms/cosmic-osd/cosmic-osd.spec index d0a75f9..5dfc8d3 100644 --- a/rpms/cosmic-osd/cosmic-osd.spec +++ b/rpms/cosmic-osd/cosmic-osd.spec @@ -15,7 +15,6 @@ Version: ### Release: %autorelease Summary: OSDs for the COSMIC Desktop Environment -SourceLicense: GPL-3.0-or-later # 0BSD OR MIT OR Apache-2.0 # Apache-2.0 # Apache-2.0 OR MIT diff --git a/rpms/cosmic-panel/cosmic-panel.spec b/rpms/cosmic-panel/cosmic-panel.spec index 28507fb..983e094 100644 --- a/rpms/cosmic-panel/cosmic-panel.spec +++ b/rpms/cosmic-panel/cosmic-panel.spec @@ -12,7 +12,6 @@ Version: ### Release: %autorelease Summary: Panel for the COSMIC Desktop Environment -SourceLicense: GPL-3.0 # 0BSD OR MIT OR Apache-2.0 # Apache-2.0 # Apache-2.0 OR BSD-3-Clause diff --git a/rpms/cosmic-randr/cosmic-randr.spec b/rpms/cosmic-randr/cosmic-randr.spec index d6c389c..e601c00 100644 --- a/rpms/cosmic-randr/cosmic-randr.spec +++ b/rpms/cosmic-randr/cosmic-randr.spec @@ -12,7 +12,6 @@ Version: ### Release: %autorelease Summary: Display configuration command line tool -SourceLicense: MPL-2.0 # 0BSD OR MIT OR Apache-2.0 # Apache-2.0 # Apache-2.0 OR MIT diff --git a/rpms/cosmic-screenshot/cosmic-screenshot.spec b/rpms/cosmic-screenshot/cosmic-screenshot.spec index f3d1f00..2535c89 100644 --- a/rpms/cosmic-screenshot/cosmic-screenshot.spec +++ b/rpms/cosmic-screenshot/cosmic-screenshot.spec @@ -15,7 +15,6 @@ Version: ### Release: %autorelease Summary: Screenshot utility for the COSMIC Desktop Environment -SourceLicense: GPL-3.0 # 0BSD OR MIT OR Apache-2.0 # Apache-2.0 OR MIT # Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT diff --git a/rpms/cosmic-session/cosmic-session.spec b/rpms/cosmic-session/cosmic-session.spec index 9584e03..2272a68 100644 --- a/rpms/cosmic-session/cosmic-session.spec +++ b/rpms/cosmic-session/cosmic-session.spec @@ -15,7 +15,6 @@ Version: ### Release: %autorelease Summary: Session manager for the COSMIC desktop environment -SourceLicense: GPL-3.0-only # 0BSD OR MIT OR Apache-2.0 # Apache-2.0 OR BSD-3-Clause # Apache-2.0 OR BSL-1.0 diff --git a/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec b/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec index 4dd61c5..92734ba 100644 --- a/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec +++ b/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec @@ -15,7 +15,6 @@ Version: ### Release: %autorelease Summary: Settings daemon for the COSMIC Desktop Environment -SourceLicense: GPL-3.0-or-later # 0BSD OR MIT OR Apache-2.0 # Apache-2.0 # Apache-2.0 OR MIT diff --git a/rpms/cosmic-settings/cosmic-settings.spec b/rpms/cosmic-settings/cosmic-settings.spec index 131452a..b6921dd 100644 --- a/rpms/cosmic-settings/cosmic-settings.spec +++ b/rpms/cosmic-settings/cosmic-settings.spec @@ -14,7 +14,6 @@ Version: ### Release: %autorelease Summary: Settings app for the COSMIC Desktop Environment -SourceLicense: GPL-3.0 AND GPL-3.0-only # 0BSD OR MIT OR Apache-2.0 # Apache-2.0 # Apache-2.0 OR MIT diff --git a/rpms/cosmic-store/cosmic-store.spec b/rpms/cosmic-store/cosmic-store.spec index fddeeb0..40d59b9 100644 --- a/rpms/cosmic-store/cosmic-store.spec +++ b/rpms/cosmic-store/cosmic-store.spec @@ -12,7 +12,6 @@ Version: ### Release: %autorelease Summary: App store for the COSMIC Desktop Environment -SourceLicense: GPL-3.0 # (Apache-2.0 OR MIT) AND BSD-3-Clause # 0BSD OR MIT OR Apache-2.0 # Apache-2.0 diff --git a/rpms/cosmic-term/cosmic-term.spec b/rpms/cosmic-term/cosmic-term.spec index 523567a..9a3ddf8 100644 --- a/rpms/cosmic-term/cosmic-term.spec +++ b/rpms/cosmic-term/cosmic-term.spec @@ -14,7 +14,6 @@ Version: ### Release: %autorelease Summary: Terminal emulator built with alacritty and Libcosmic -SourceLicense: GPL-3.0-only # 0BSD OR MIT OR Apache-2.0 # Apache-2.0 # Apache-2.0 OR BSL-1.0 diff --git a/rpms/cosmic-workspaces/cosmic-workspaces.spec b/rpms/cosmic-workspaces/cosmic-workspaces.spec index cea241f..7b72a3f 100644 --- a/rpms/cosmic-workspaces/cosmic-workspaces.spec +++ b/rpms/cosmic-workspaces/cosmic-workspaces.spec @@ -15,7 +15,6 @@ Version: ### Release: %autorelease Summary: Workspaces overview for the COSMIC Desktop Environment -SourceLicense: GPL-3.0 # 0BSD OR MIT OR Apache-2.0 # Apache-2.0 # Apache-2.0 OR MIT diff --git a/rpms/pop-launcher/pop-launcher.spec b/rpms/pop-launcher/pop-launcher.spec index 526909a..4b9c09d 100644 --- a/rpms/pop-launcher/pop-launcher.spec +++ b/rpms/pop-launcher/pop-launcher.spec @@ -12,7 +12,6 @@ Version: ### Release: %autorelease Summary: Modular IPC-based desktop launcher service -SourceLicense: GPL-3.0-only AND MPL-2.0 # (Apache-2.0 OR MIT) AND BSD-3-Clause # Apache-2.0 # Apache-2.0 OR BSL-1.0 diff --git a/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec b/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec index 5c23d33..2b6b05b 100644 --- a/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec +++ b/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec @@ -15,7 +15,6 @@ Version: ### Release: %autorelease Summary: XDG Desktop Portals for the COSMIC Desktop Environment -SourceLicense: GPL-3.0-or-later # 0BSD OR MIT OR Apache-2.0 # Apache-2.0 # Apache-2.0 OR MIT From 64d1d837e854fcbe5c1de76a395318f4ec0e4553 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Jun 26 2024 01:55:49 +0000 Subject: [PATCH 205/220] fix: *srpm script Signed-off-by: Ryan Brue --- diff --git a/scripts/no-sources-srpm.sh b/scripts/no-sources-srpm.sh index af37aea..fa0711b 100644 --- a/scripts/no-sources-srpm.sh +++ b/scripts/no-sources-srpm.sh @@ -15,7 +15,7 @@ repo=$5 cp $path_to_spec $name.spec 2>/dev/null || : # Make replacements to specfile -sed -i "/^Version: ### / s/.*/Version: $version~^%{commitdate}git%{sub %{commit} 1 7}/" $name.spec +sed -i "/^Version: / s/.*/Version: $version~^%{commitdate}git%{sub %{commit} 1 7}/" $name.spec sed -i "/^%global commit / s/.*/%global commit none/" $name.spec current_date=$(date +'%Y%m%d.%H') sed -i "/^%global commitdate / s/.*/%global commitdate $current_date/" $name.spec diff --git a/scripts/srpm.sh b/scripts/srpm.sh index b971b96..b119901 100644 --- a/scripts/srpm.sh +++ b/scripts/srpm.sh @@ -47,7 +47,7 @@ tar -pczf $SOURCE_NAME-$COMMIT.tar.gz $SOURCE_NAME-$COMMIT rm -rf $SOURCE_NAME-$COMMIT # Make replacements to specfile -sed -i "/^Version: ### / s/.*/Version: $VERSION~^%{commitdate}git%{sub %{commit} 1 7}/" $NAME.spec +sed -i "/^Version: / s/.*/Version: $VERSION~^%{commitdate}git%{sub %{commit} 1 7}/" $NAME.spec sed -i "/^%global commit / s/.*/%global commit $COMMIT/" $NAME.spec sed -i "/^%global commitdate / s/.*/%global commitdate $COMMITDATE/" $NAME.spec From e08a7abe83bc601d9318f6f843786a6cdfc61e8b Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Jun 27 2024 01:59:07 +0000 Subject: [PATCH 206/220] Numbered sources Signed-off-by: Ryan Brue --- diff --git a/rpms/cosmic-app-library/cosmic-app-library.spec b/rpms/cosmic-app-library/cosmic-app-library.spec index 5d42e3d..6a632aa 100644 --- a/rpms/cosmic-app-library/cosmic-app-library.spec +++ b/rpms/cosmic-app-library/cosmic-app-library.spec @@ -38,14 +38,14 @@ License: 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 AND Apache-2.0 OR MIT A URL: https://github.com/pop-os/cosmic-applibrary -Source: https://github.com/pop-os/cosmic-applibrary/archive/%{commit}.tar.gz +Source0: https://github.com/pop-os/cosmic-applibrary/archive/%{commit}.tar.gz # To create the below sources: # * git clone https://github.com/pop-os/cosmic-applibrary at the specified commit # * cargo vendor > vendor-config.toml # * tar -pczf vendor.tar.gz vendor -Source: vendor.tar.gz +Source1: vendor.tar.gz # * mv vendor-config.toml .. -Source2: vendor-config.toml +Source2: vendor-config.toml BuildRequires: cargo-rpm-macros >= 26 BuildRequires: rustc diff --git a/rpms/cosmic-applets/cosmic-applets.spec b/rpms/cosmic-applets/cosmic-applets.spec index 6e2525a..4d33b7a 100644 --- a/rpms/cosmic-applets/cosmic-applets.spec +++ b/rpms/cosmic-applets/cosmic-applets.spec @@ -37,14 +37,14 @@ License: 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 AND Apache-2.0 OR MIT A URL: https://github.com/pop-os/cosmic-applets -Source: https://github.com/pop-os/cosmic-applets/archive/%{commit}.tar.gz +Source0: https://github.com/pop-os/cosmic-applets/archive/%{commit}.tar.gz # To create the below sources: # * git clone https://github.com/pop-os/cosmic-applets at the specified commit # * cargo vendor > vendor-config.toml # * tar -pczf vendor.tar.gz vendor -Source: vendor.tar.gz +Source1: vendor.tar.gz # * mv vendor-config.toml .. -Source2: vendor-config.toml +Source2: vendor-config.toml Patch: better_compile.patch Patch: symlink.patch diff --git a/rpms/cosmic-bg/cosmic-bg.spec b/rpms/cosmic-bg/cosmic-bg.spec index a3f4648..1bd9750 100644 --- a/rpms/cosmic-bg/cosmic-bg.spec +++ b/rpms/cosmic-bg/cosmic-bg.spec @@ -31,14 +31,14 @@ License: 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 OR MIT AND Apache-2.0 W URL: https://github.com/pop-os/cosmic-bg -Source: https://github.com/pop-os/cosmic-bg/archive/%{commit}.tar.gz +Source0: https://github.com/pop-os/cosmic-bg/archive/%{commit}.tar.gz # To create the below sources: # * git clone https://github.com/pop-os/cosmic-bg at the specified commit # * cargo vendor > vendor-config.toml # * tar -pczf vendor.tar.gz vendor -Source: vendor.tar.gz +Source1: vendor.tar.gz # * mv vendor-config.toml .. -Source2: vendor-config.toml +Source2: vendor-config.toml BuildRequires: cargo-rpm-macros >= 25 BuildRequires: rustc diff --git a/rpms/cosmic-comp/cosmic-comp.spec b/rpms/cosmic-comp/cosmic-comp.spec index 1d7659e..a08a8e4 100644 --- a/rpms/cosmic-comp/cosmic-comp.spec +++ b/rpms/cosmic-comp/cosmic-comp.spec @@ -42,14 +42,14 @@ License: GPL-3.0 AND (Apache-2.0 OR MIT) AND BSD-3-Clause AND 0BSD OR MIT URL: https://github.com/pop-os/cosmic-comp -Source: https://github.com/pop-os/cosmic-comp/archive/%{commit}.tar.gz +Source0: https://github.com/pop-os/cosmic-comp/archive/%{commit}.tar.gz # To create the below sources: # * git clone https://github.com/pop-os/cosmic-comp at the specified commit # * cargo vendor > vendor-config.toml # * tar -pczf vendor.tar.gz vendor -Source: vendor.tar.gz +Source1: vendor.tar.gz # * mv vendor-config.toml .. -Source2: vendor-config.toml +Source2: vendor-config.toml BuildRequires: cargo-rpm-macros >= 25 BuildRequires: rustc diff --git a/rpms/cosmic-edit/cosmic-edit.spec b/rpms/cosmic-edit/cosmic-edit.spec index dcf2222..60a6eef 100644 --- a/rpms/cosmic-edit/cosmic-edit.spec +++ b/rpms/cosmic-edit/cosmic-edit.spec @@ -42,14 +42,14 @@ License: (Apache-2.0 OR MIT) AND BSD-3-Clause AND 0BSD OR MIT OR Apache-2 URL: https://github.com/pop-os/cosmic-edit -Source: https://github.com/pop-os/cosmic-edit/archive/%{commit}.tar.gz +Source0: https://github.com/pop-os/cosmic-edit/archive/%{commit}.tar.gz # To create the below sources: # * git clone https://github.com/pop-os/cosmic-edit at the specified commit # * cargo vendor > vendor-config.toml # * tar -pczf vendor.tar.gz vendor -Source: vendor.tar.gz +Source1: vendor.tar.gz # * mv vendor-config.toml .. -Source2: vendor-config.toml +Source2: vendor-config.toml BuildRequires: cargo-rpm-macros >= 26 BuildRequires: rustc diff --git a/rpms/cosmic-files/cosmic-files.spec b/rpms/cosmic-files/cosmic-files.spec index 7935c5f..8f18e82 100644 --- a/rpms/cosmic-files/cosmic-files.spec +++ b/rpms/cosmic-files/cosmic-files.spec @@ -42,14 +42,14 @@ License: 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 AND Apache-2.0 OR BSL-1 URL: https://github.com/pop-os/cosmic-files -Source: https://github.com/pop-os/cosmic-files/archive/%{commit}.tar.gz +Source0: https://github.com/pop-os/cosmic-files/archive/%{commit}.tar.gz # To create the below sources: # * git clone https://github.com/pop-os/cosmic-files at the specified commit # * cargo vendor > vendor-config.toml # * tar -pczf vendor.tar.gz vendor -Source: vendor.tar.gz +Source1: vendor.tar.gz # * mv vendor-config.toml .. -Source2: vendor-config.toml +Source2: vendor-config.toml BuildRequires: cargo-rpm-macros >= 26 BuildRequires: rustc diff --git a/rpms/cosmic-greeter/cosmic-greeter.spec b/rpms/cosmic-greeter/cosmic-greeter.spec index 5fdca51..350622c 100644 --- a/rpms/cosmic-greeter/cosmic-greeter.spec +++ b/rpms/cosmic-greeter/cosmic-greeter.spec @@ -38,14 +38,14 @@ License: 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 AND Apache-2.0 OR BSL-1 URL: https://github.com/pop-os/cosmic-greeter -Source: https://github.com/pop-os/cosmic-greeter/archive/%{commit}.tar.gz +Source0: https://github.com/pop-os/cosmic-greeter/archive/%{commit}.tar.gz # To create the below sources: # * git clone https://github.com/pop-os/cosmic-greeter at the specified commit # * cargo vendor > vendor-config.toml # * tar -pczf vendor.tar.gz vendor -Source: vendor.tar.gz +Source1: vendor.tar.gz # * mv vendor-config.toml .. -Source2: vendor-config.toml +Source2: vendor-config.toml Patch: service.patch diff --git a/rpms/cosmic-icon-theme/cosmic-icon-theme.spec b/rpms/cosmic-icon-theme/cosmic-icon-theme.spec index be45aa3..ebc2306 100644 --- a/rpms/cosmic-icon-theme/cosmic-icon-theme.spec +++ b/rpms/cosmic-icon-theme/cosmic-icon-theme.spec @@ -12,7 +12,7 @@ License: CC-BY-SA-4.0 URL: https://github.com/pop-os/cosmic-icons -Source: https://github.com/pop-os/cosmic-icons/archive/%{commit}.tar.gz +Source0: https://github.com/pop-os/cosmic-icons/archive/%{commit}.tar.gz BuildArch: noarch diff --git a/rpms/cosmic-launcher/cosmic-launcher.spec b/rpms/cosmic-launcher/cosmic-launcher.spec index e09e342..5f7d49b 100644 --- a/rpms/cosmic-launcher/cosmic-launcher.spec +++ b/rpms/cosmic-launcher/cosmic-launcher.spec @@ -42,14 +42,14 @@ License: 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 AND Apache-2.0 OR BSL-1 URL: https://github.com/pop-os/cosmic-launcher -Source: https://github.com/pop-os/cosmic-launcher/archive/%{commit}.tar.gz +Source0: https://github.com/pop-os/cosmic-launcher/archive/%{commit}.tar.gz # To create the below sources: # * git clone https://github.com/pop-os/cosmic-launcher at the specified commit # * cargo vendor > vendor-config.toml # * tar -pczf vendor.tar.gz vendor -Source: vendor.tar.gz +Source1: vendor.tar.gz # * mv vendor-config.toml .. -Source2: vendor-config.toml +Source2: vendor-config.toml BuildRequires: cargo-rpm-macros >= 26 BuildRequires: rustc diff --git a/rpms/cosmic-notifications/cosmic-notifications.spec b/rpms/cosmic-notifications/cosmic-notifications.spec index c359240..fab3e50 100644 --- a/rpms/cosmic-notifications/cosmic-notifications.spec +++ b/rpms/cosmic-notifications/cosmic-notifications.spec @@ -39,14 +39,14 @@ License: 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 AND Apache-2.0 OR BSD-3 URL: https://github.com/pop-os/cosmic-notifications -Source: https://github.com/pop-os/cosmic-notifications/archive/%{commit}.tar.gz +Source0: https://github.com/pop-os/cosmic-notifications/archive/%{commit}.tar.gz # To create the below sources: # * git clone https://github.com/pop-os/cosmic-notifications at the specified commit # * cargo vendor > vendor-config.toml # * tar -pczf vendor.tar.gz vendor -Source: vendor.tar.gz +Source1: vendor.tar.gz # * mv vendor-config.toml .. -Source2: vendor-config.toml +Source2: vendor-config.toml BuildRequires: cargo-rpm-macros >= 25 BuildRequires: rustc diff --git a/rpms/cosmic-osd/cosmic-osd.spec b/rpms/cosmic-osd/cosmic-osd.spec index 5dfc8d3..1015ae4 100644 --- a/rpms/cosmic-osd/cosmic-osd.spec +++ b/rpms/cosmic-osd/cosmic-osd.spec @@ -40,14 +40,14 @@ License: 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 AND Apache-2.0 OR MIT A URL: https://github.com/pop-os/cosmic-osd -Source: https://github.com/pop-os/cosmic-osd/archive/%{commit}.tar.gz +Source0: https://github.com/pop-os/cosmic-osd/archive/%{commit}.tar.gz # To create the below sources: # * git clone https://github.com/pop-os/cosmic-osd at the specified commit # * cargo vendor > vendor-config.toml # * tar -pczf vendor.tar.gz vendor -Source: vendor.tar.gz +Source1: vendor.tar.gz # * mv vendor-config.toml .. -Source2: vendor-config.toml +Source2: vendor-config.toml BuildRequires: cargo-rpm-macros >= 26 BuildRequires: rustc diff --git a/rpms/cosmic-panel/cosmic-panel.spec b/rpms/cosmic-panel/cosmic-panel.spec index 983e094..4da28a8 100644 --- a/rpms/cosmic-panel/cosmic-panel.spec +++ b/rpms/cosmic-panel/cosmic-panel.spec @@ -36,14 +36,14 @@ License: 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 AND Apache-2.0 OR BSD-3 URL: https://github.com/pop-os/cosmic-panel -Source: https://github.com/pop-os/cosmic-panel/archive/%{commit}.tar.gz +Source0: https://github.com/pop-os/cosmic-panel/archive/%{commit}.tar.gz # To create the below sources: # * git clone https://github.com/pop-os/cosmic-panel at the specified commit # * cargo vendor > vendor-config.toml # * tar -pczf vendor.tar.gz vendor -Source: vendor.tar.gz +Source1: vendor.tar.gz # * mv vendor-config.toml .. -Source2: vendor-config.toml +Source2: vendor-config.toml BuildRequires: cargo-rpm-macros >= 25 BuildRequires: rustc diff --git a/rpms/cosmic-randr/cosmic-randr.spec b/rpms/cosmic-randr/cosmic-randr.spec index e601c00..441de4f 100644 --- a/rpms/cosmic-randr/cosmic-randr.spec +++ b/rpms/cosmic-randr/cosmic-randr.spec @@ -28,14 +28,14 @@ License: 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 AND Apache-2.0 OR MIT A URL: https://github.com/pop-os/cosmic-randr -Source: https://github.com/pop-os/cosmic-randr/archive/%{commit}.tar.gz +Source0: https://github.com/pop-os/cosmic-randr/archive/%{commit}.tar.gz # To create the below sources: # * git clone https://github.com/pop-os/cosmic-randr at the specified commit # * cargo vendor > vendor-config.toml # * tar -pczf vendor.tar.gz vendor -Source: vendor.tar.gz +Source1: vendor.tar.gz # * mv vendor-config.toml .. -Source2: vendor-config.toml +Source2: vendor-config.toml BuildRequires: cargo-rpm-macros >= 25 BuildRequires: rustc diff --git a/rpms/cosmic-screenshot/cosmic-screenshot.spec b/rpms/cosmic-screenshot/cosmic-screenshot.spec index 2535c89..fb41547 100644 --- a/rpms/cosmic-screenshot/cosmic-screenshot.spec +++ b/rpms/cosmic-screenshot/cosmic-screenshot.spec @@ -30,14 +30,14 @@ License: 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 OR MIT AND Apache-2.0 W URL: https://github.com/pop-os/cosmic-screenshot -Source: https://github.com/pop-os/cosmic-screenshot/archive/%{commit}.tar.gz +Source0: https://github.com/pop-os/cosmic-screenshot/archive/%{commit}.tar.gz # To create the below sources: # * git clone https://github.com/pop-os/cosmic-screenshot at the specified commit # * cargo vendor > vendor-config.toml # * tar -pczf vendor.tar.gz vendor -Source: vendor.tar.gz +Source1: vendor.tar.gz # * mv vendor-config.toml .. -Source2: vendor-config.toml +Source2: vendor-config.toml BuildRequires: cargo-rpm-macros >= 26 BuildRequires: rustc diff --git a/rpms/cosmic-session/cosmic-session.spec b/rpms/cosmic-session/cosmic-session.spec index 2272a68..329e3b8 100644 --- a/rpms/cosmic-session/cosmic-session.spec +++ b/rpms/cosmic-session/cosmic-session.spec @@ -34,14 +34,14 @@ License: 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 OR BSD-3-Clause AND Apa URL: https://github.com/pop-os/cosmic-session -Source: https://github.com/pop-os/cosmic-session/archive/%{commit}.tar.gz +Source0: https://github.com/pop-os/cosmic-session/archive/%{commit}.tar.gz # To create the below sources: # * git clone https://github.com/pop-os/cosmic-session at the specified commit # * cargo vendor > vendor-config.toml # * tar -pczf vendor.tar.gz vendor -Source: vendor.tar.gz +Source1: vendor.tar.gz # * mv vendor-config.toml .. -Source2: vendor-config.toml +Source2: vendor-config.toml BuildRequires: cargo-rpm-macros >= 26 BuildRequires: rustc diff --git a/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec b/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec index 92734ba..e7f610f 100644 --- a/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec +++ b/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec @@ -39,14 +39,14 @@ License: 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 AND Apache-2.0 OR MIT A URL: https://github.com/pop-os/cosmic-settings-daemon -Source: https://github.com/pop-os/cosmic-settings-daemon/archive/%{commit}.tar.gz +Source0: https://github.com/pop-os/cosmic-settings-daemon/archive/%{commit}.tar.gz # To create the below sources: # * git clone https://github.com/pop-os/cosmic-settings-daemon at the specified commit # * cargo vendor > vendor-config.toml # * tar -pczf vendor.tar.gz vendor -Source: vendor.tar.gz +Source1: vendor.tar.gz # * mv vendor-config.toml .. -Source2: vendor-config.toml +Source2: vendor-config.toml BuildRequires: cargo-rpm-macros >= 26 BuildRequires: rustc diff --git a/rpms/cosmic-settings/cosmic-settings.spec b/rpms/cosmic-settings/cosmic-settings.spec index b6921dd..e0a9b15 100644 --- a/rpms/cosmic-settings/cosmic-settings.spec +++ b/rpms/cosmic-settings/cosmic-settings.spec @@ -42,14 +42,14 @@ License: 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 AND Apache-2.0 OR MIT A URL: https://github.com/pop-os/cosmic-settings -Source: https://github.com/pop-os/cosmic-settings/archive/%{commit}.tar.gz +Source0: https://github.com/pop-os/cosmic-settings/archive/%{commit}.tar.gz # To create the below sources: # * git clone https://github.com/pop-os/cosmic-settings at the specified commit # * cargo vendor > vendor-config.toml # * tar -pczf vendor.tar.gz vendor -Source: vendor.tar.gz +Source1: vendor.tar.gz # * mv vendor-config.toml .. -Source2: vendor-config.toml +Source2: vendor-config.toml BuildRequires: cargo-rpm-macros >= 25 BuildRequires: rustc diff --git a/rpms/cosmic-store/cosmic-store.spec b/rpms/cosmic-store/cosmic-store.spec index 40d59b9..d9eedc5 100644 --- a/rpms/cosmic-store/cosmic-store.spec +++ b/rpms/cosmic-store/cosmic-store.spec @@ -40,14 +40,14 @@ License: (Apache-2.0 OR MIT) AND BSD-3-Clause AND 0BSD OR MIT OR Apache-2 URL: https://github.com/pop-os/cosmic-store -Source: https://github.com/pop-os/cosmic-store/archive/%{commit}.tar.gz +Source0: https://github.com/pop-os/cosmic-store/archive/%{commit}.tar.gz # To create the below sources: # * git clone https://github.com/pop-os/cosmic-store at the specified commit # * cargo vendor > vendor-config.toml # * tar -pczf vendor.tar.gz vendor -Source: vendor.tar.gz +Source1: vendor.tar.gz # * mv vendor-config.toml .. -Source2: vendor-config.toml +Source2: vendor-config.toml BuildRequires: cargo-rpm-macros >= 25 BuildRequires: rustc diff --git a/rpms/cosmic-term/cosmic-term.spec b/rpms/cosmic-term/cosmic-term.spec index 9a3ddf8..bf08725 100644 --- a/rpms/cosmic-term/cosmic-term.spec +++ b/rpms/cosmic-term/cosmic-term.spec @@ -41,14 +41,14 @@ License: 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 AND Apache-2.0 OR BSL-1 URL: https://github.com/pop-os/cosmic-term -Source: https://github.com/pop-os/cosmic-term/archive/%{commit}.tar.gz +Source0: https://github.com/pop-os/cosmic-term/archive/%{commit}.tar.gz # To create the below sources: # * git clone https://github.com/pop-os/cosmic-term at the specified commit # * cargo vendor > vendor-config.toml # * tar -pczf vendor.tar.gz vendor -Source: vendor.tar.gz +Source1: vendor.tar.gz # * mv vendor-config.toml .. -Source2: vendor-config.toml +Source2: vendor-config.toml BuildRequires: cargo-rpm-macros >= 26 BuildRequires: rustc diff --git a/rpms/cosmic-workspaces/cosmic-workspaces.spec b/rpms/cosmic-workspaces/cosmic-workspaces.spec index 7b72a3f..b752043 100644 --- a/rpms/cosmic-workspaces/cosmic-workspaces.spec +++ b/rpms/cosmic-workspaces/cosmic-workspaces.spec @@ -40,14 +40,14 @@ License: 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 AND Apache-2.0 OR MIT A URL: https://github.com/pop-os/cosmic-workspaces-epoch -Source: https://github.com/pop-os/cosmic-workspaces-epoch/archive/%{commit}.tar.gz +Source0: https://github.com/pop-os/cosmic-workspaces-epoch/archive/%{commit}.tar.gz # To create the below sources: # * git clone https://github.com/pop-os/cosmic-workspaces-epoch at the specified commit # * cargo vendor > vendor-config.toml # * tar -pczf vendor.tar.gz vendor -Source: vendor.tar.gz +Source1: vendor.tar.gz # * mv vendor-config.toml .. -Source2: vendor-config.toml +Source2: vendor-config.toml BuildRequires: cargo-rpm-macros >= 26 BuildRequires: rustc diff --git a/rpms/pop-launcher/pop-launcher.spec b/rpms/pop-launcher/pop-launcher.spec index 4b9c09d..578abc3 100644 --- a/rpms/pop-launcher/pop-launcher.spec +++ b/rpms/pop-launcher/pop-launcher.spec @@ -37,14 +37,14 @@ License: (Apache-2.0 OR MIT) AND BSD-3-Clause AND Apache-2.0 AND Apache-2 URL: https://github.com/pop-os/launcher -Source: https://github.com/pop-os/launcher/archive/%{commit}.tar.gz +Source0: https://github.com/pop-os/launcher/archive/%{commit}.tar.gz # To create the below sources: # * git clone https://github.com/pop-os/launcher at the specified commit # * cargo vendor > vendor-config.toml # * tar -pczf vendor.tar.gz vendor -Source: vendor.tar.gz +Source1: vendor.tar.gz # * mv vendor-config.toml .. -Source2: vendor-config.toml +Source2: vendor-config.toml Patch: symlink.patch diff --git a/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec b/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec index 2b6b05b..300e008 100644 --- a/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec +++ b/rpms/xdg-desktop-portal-cosmic/xdg-desktop-portal-cosmic.spec @@ -40,14 +40,14 @@ License: 0BSD OR MIT OR Apache-2.0 AND Apache-2.0 AND Apache-2.0 OR MIT A URL: https://github.com/pop-os/xdg-desktop-portal-cosmic -Source: https://github.com/pop-os/xdg-desktop-portal-cosmic/archive/%{commit}.tar.gz +Source0: https://github.com/pop-os/xdg-desktop-portal-cosmic/archive/%{commit}.tar.gz # To create the below sources: # * git clone https://github.com/pop-os/xdg-desktop-portal-cosmic at the specified commit # * cargo vendor > vendor-config.toml # * tar -pczf vendor.tar.gz vendor -Source: vendor.tar.gz +Source1: vendor.tar.gz # * mv vendor-config.toml .. -Source2: vendor-config.toml +Source2: vendor-config.toml BuildRequires: cargo-rpm-macros >= 26 BuildRequires: rustc From a1119503d085e7fe2402e9cfbf710f9ef0b4a78f Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Jun 28 2024 01:56:33 +0000 Subject: [PATCH 207/220] patch: X-COSMIC, not COSMIC Signed-off-by: Ryan Brue --- diff --git a/rpms/cosmic-app-library/cosmic-app-library.spec b/rpms/cosmic-app-library/cosmic-app-library.spec index 6a632aa..9ea9bab 100644 --- a/rpms/cosmic-app-library/cosmic-app-library.spec +++ b/rpms/cosmic-app-library/cosmic-app-library.spec @@ -47,6 +47,8 @@ Source1: vendor.tar.gz # * mv vendor-config.toml .. Source2: vendor-config.toml +Patch0: https://github.com/pop-os/cosmic-applibrary/pull/130.patch + BuildRequires: cargo-rpm-macros >= 26 BuildRequires: rustc BuildRequires: lld diff --git a/rpms/cosmic-applets/cosmic-applets.spec b/rpms/cosmic-applets/cosmic-applets.spec index 4d33b7a..6902f9b 100644 --- a/rpms/cosmic-applets/cosmic-applets.spec +++ b/rpms/cosmic-applets/cosmic-applets.spec @@ -46,6 +46,8 @@ Source1: vendor.tar.gz # * mv vendor-config.toml .. Source2: vendor-config.toml +Patch0: https://github.com/pop-os/cosmic-applets/pull/507.patch + Patch: better_compile.patch Patch: symlink.patch diff --git a/rpms/cosmic-edit/cosmic-edit.spec b/rpms/cosmic-edit/cosmic-edit.spec index 60a6eef..b2cfd23 100644 --- a/rpms/cosmic-edit/cosmic-edit.spec +++ b/rpms/cosmic-edit/cosmic-edit.spec @@ -51,6 +51,8 @@ Source1: vendor.tar.gz # * mv vendor-config.toml .. Source2: vendor-config.toml +Patch0: https://github.com/pop-os/cosmic-edit/pull/207.patch + BuildRequires: cargo-rpm-macros >= 26 BuildRequires: rustc BuildRequires: lld diff --git a/rpms/cosmic-files/cosmic-files.spec b/rpms/cosmic-files/cosmic-files.spec index 8f18e82..06e5a8f 100644 --- a/rpms/cosmic-files/cosmic-files.spec +++ b/rpms/cosmic-files/cosmic-files.spec @@ -51,6 +51,8 @@ Source1: vendor.tar.gz # * mv vendor-config.toml .. Source2: vendor-config.toml +Patch0: https://github.com/pop-os/cosmic-files/pull/263.patch + BuildRequires: cargo-rpm-macros >= 26 BuildRequires: rustc BuildRequires: lld diff --git a/rpms/cosmic-launcher/cosmic-launcher.spec b/rpms/cosmic-launcher/cosmic-launcher.spec index 5f7d49b..4b86246 100644 --- a/rpms/cosmic-launcher/cosmic-launcher.spec +++ b/rpms/cosmic-launcher/cosmic-launcher.spec @@ -51,6 +51,8 @@ Source1: vendor.tar.gz # * mv vendor-config.toml .. Source2: vendor-config.toml +Patch0: https://github.com/pop-os/cosmic-launcher/pull/149.patch + BuildRequires: cargo-rpm-macros >= 26 BuildRequires: rustc BuildRequires: lld diff --git a/rpms/cosmic-screenshot/cosmic-screenshot.spec b/rpms/cosmic-screenshot/cosmic-screenshot.spec index fb41547..4088cbb 100644 --- a/rpms/cosmic-screenshot/cosmic-screenshot.spec +++ b/rpms/cosmic-screenshot/cosmic-screenshot.spec @@ -39,6 +39,8 @@ Source1: vendor.tar.gz # * mv vendor-config.toml .. Source2: vendor-config.toml +Patch0: https://github.com/pop-os/cosmic-screenshot/pull/32.patch + BuildRequires: cargo-rpm-macros >= 26 BuildRequires: rustc BuildRequires: lld diff --git a/rpms/cosmic-settings/cosmic-settings.spec b/rpms/cosmic-settings/cosmic-settings.spec index e0a9b15..f17ba19 100644 --- a/rpms/cosmic-settings/cosmic-settings.spec +++ b/rpms/cosmic-settings/cosmic-settings.spec @@ -51,6 +51,8 @@ Source1: vendor.tar.gz # * mv vendor-config.toml .. Source2: vendor-config.toml +Patch0: https://github.com/pop-os/cosmic-settings/pull/385.patch + BuildRequires: cargo-rpm-macros >= 25 BuildRequires: rustc BuildRequires: lld diff --git a/rpms/cosmic-store/cosmic-store.spec b/rpms/cosmic-store/cosmic-store.spec index d9eedc5..cf4925d 100644 --- a/rpms/cosmic-store/cosmic-store.spec +++ b/rpms/cosmic-store/cosmic-store.spec @@ -49,6 +49,8 @@ Source1: vendor.tar.gz # * mv vendor-config.toml .. Source2: vendor-config.toml +Patch0: https://github.com/pop-os/cosmic-store/pull/103.patch + BuildRequires: cargo-rpm-macros >= 25 BuildRequires: rustc BuildRequires: lld diff --git a/rpms/cosmic-term/cosmic-term.spec b/rpms/cosmic-term/cosmic-term.spec index bf08725..8a544ff 100644 --- a/rpms/cosmic-term/cosmic-term.spec +++ b/rpms/cosmic-term/cosmic-term.spec @@ -50,6 +50,8 @@ Source1: vendor.tar.gz # * mv vendor-config.toml .. Source2: vendor-config.toml +Patch0: https://github.com/pop-os/cosmic-term/pull/233.patch + BuildRequires: cargo-rpm-macros >= 26 BuildRequires: rustc BuildRequires: lld diff --git a/rpms/cosmic-workspaces/cosmic-workspaces.spec b/rpms/cosmic-workspaces/cosmic-workspaces.spec index b752043..cc9cd53 100644 --- a/rpms/cosmic-workspaces/cosmic-workspaces.spec +++ b/rpms/cosmic-workspaces/cosmic-workspaces.spec @@ -49,6 +49,8 @@ Source1: vendor.tar.gz # * mv vendor-config.toml .. Source2: vendor-config.toml +Patch0: https://github.com/pop-os/cosmic-workspaces-epoch/pull/52.patch + BuildRequires: cargo-rpm-macros >= 26 BuildRequires: rustc BuildRequires: lld From d63e0ec47bc4b4a841dcc8f2bfa404488331d09c Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Jun 28 2024 02:14:44 +0000 Subject: [PATCH 208/220] fix: require desktop-file-utils Signed-off-by: Ryan Brue --- diff --git a/rpms/cosmic-app-library/cosmic-app-library.spec b/rpms/cosmic-app-library/cosmic-app-library.spec index 9ea9bab..87c1878 100644 --- a/rpms/cosmic-app-library/cosmic-app-library.spec +++ b/rpms/cosmic-app-library/cosmic-app-library.spec @@ -56,6 +56,7 @@ BuildRequires: cargo BuildRequires: wayland-devel BuildRequires: libxkbcommon-devel BuildRequires: just +BuildRequires: desktop-file-utils Requires: hicolor-icon-theme diff --git a/rpms/cosmic-applets/cosmic-applets.spec b/rpms/cosmic-applets/cosmic-applets.spec index 6902f9b..459e847 100644 --- a/rpms/cosmic-applets/cosmic-applets.spec +++ b/rpms/cosmic-applets/cosmic-applets.spec @@ -63,6 +63,7 @@ BuildRequires: pulseaudio-libs-devel BuildRequires: mesa-libEGL-devel BuildRequires: libxkbcommon-devel BuildRequires: just +BuildRequires: desktop-file-utils Requires: cosmic-icons Requires: cosmic-panel diff --git a/rpms/cosmic-edit/cosmic-edit.spec b/rpms/cosmic-edit/cosmic-edit.spec index b2cfd23..c320817 100644 --- a/rpms/cosmic-edit/cosmic-edit.spec +++ b/rpms/cosmic-edit/cosmic-edit.spec @@ -59,6 +59,7 @@ BuildRequires: lld BuildRequires: cargo BuildRequires: just BuildRequires: libxkbcommon-devel +BuildRequires: desktop-file-utils Requires: hicolor-icon-theme diff --git a/rpms/cosmic-files/cosmic-files.spec b/rpms/cosmic-files/cosmic-files.spec index 06e5a8f..e420b9d 100644 --- a/rpms/cosmic-files/cosmic-files.spec +++ b/rpms/cosmic-files/cosmic-files.spec @@ -60,6 +60,7 @@ BuildRequires: cargo BuildRequires: just BuildRequires: glib2-devel BuildRequires: libxkbcommon-devel +BuildRequires: desktop-file-utils Requires: gvfs Requires: xdg-utils diff --git a/rpms/cosmic-launcher/cosmic-launcher.spec b/rpms/cosmic-launcher/cosmic-launcher.spec index 4b86246..ec9c65c 100644 --- a/rpms/cosmic-launcher/cosmic-launcher.spec +++ b/rpms/cosmic-launcher/cosmic-launcher.spec @@ -60,6 +60,7 @@ BuildRequires: cargo BuildRequires: wayland-devel BuildRequires: libxkbcommon-devel BuildRequires: just +BuildRequires: desktop-file-utils Requires: pop-launcher Requires: hicolor-icon-theme diff --git a/rpms/cosmic-screenshot/cosmic-screenshot.spec b/rpms/cosmic-screenshot/cosmic-screenshot.spec index 4088cbb..fa5a644 100644 --- a/rpms/cosmic-screenshot/cosmic-screenshot.spec +++ b/rpms/cosmic-screenshot/cosmic-screenshot.spec @@ -46,6 +46,7 @@ BuildRequires: rustc BuildRequires: lld BuildRequires: cargo BuildRequires: just +BuildRequires: desktop-file-utils %global _description %{expand: %{summary}.} diff --git a/rpms/cosmic-settings/cosmic-settings.spec b/rpms/cosmic-settings/cosmic-settings.spec index f17ba19..592cbbc 100644 --- a/rpms/cosmic-settings/cosmic-settings.spec +++ b/rpms/cosmic-settings/cosmic-settings.spec @@ -62,6 +62,7 @@ BuildRequires: wayland-devel BuildRequires: libxkbcommon-devel BuildRequires: systemd-devel BuildRequires: just +BuildRequires: desktop-file-utils Requires: hicolor-icon-theme diff --git a/rpms/cosmic-store/cosmic-store.spec b/rpms/cosmic-store/cosmic-store.spec index cf4925d..a712340 100644 --- a/rpms/cosmic-store/cosmic-store.spec +++ b/rpms/cosmic-store/cosmic-store.spec @@ -59,6 +59,7 @@ BuildRequires: flatpak-devel BuildRequires: libappstream-glib BuildRequires: just BuildRequires: libxkbcommon-devel +BuildRequires: desktop-file-utils Requires: PackageKit Requires: flatpak-libs diff --git a/rpms/cosmic-term/cosmic-term.spec b/rpms/cosmic-term/cosmic-term.spec index 8a544ff..d59e217 100644 --- a/rpms/cosmic-term/cosmic-term.spec +++ b/rpms/cosmic-term/cosmic-term.spec @@ -58,6 +58,7 @@ BuildRequires: lld BuildRequires: cargo BuildRequires: just BuildRequires: libxkbcommon-devel +BuildRequires: desktop-file-utils Requires: hicolor-icon-theme diff --git a/rpms/cosmic-workspaces/cosmic-workspaces.spec b/rpms/cosmic-workspaces/cosmic-workspaces.spec index cc9cd53..86b3cb4 100644 --- a/rpms/cosmic-workspaces/cosmic-workspaces.spec +++ b/rpms/cosmic-workspaces/cosmic-workspaces.spec @@ -63,6 +63,7 @@ BuildRequires: libseat-devel BuildRequires: libinput-devel BuildRequires: mesa-libgbm-devel BuildRequires: make +BuildRequires: desktop-file-utils Requires: cosmic-comp Requires: hicolor-icon-theme From c323d2062c0c82ea03d79e54d240a27eac3cb8f1 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Jun 28 2024 02:19:06 +0000 Subject: [PATCH 209/220] fix (2/2): require desktop-file-utils Signed-off-by: Ryan Brue --- diff --git a/rpms/cosmic-bg/cosmic-bg.spec b/rpms/cosmic-bg/cosmic-bg.spec index 1bd9750..dd74cb5 100644 --- a/rpms/cosmic-bg/cosmic-bg.spec +++ b/rpms/cosmic-bg/cosmic-bg.spec @@ -47,6 +47,7 @@ BuildRequires: cargo BuildRequires: wayland-devel BuildRequires: libxkbcommon-devel BuildRequires: just +BuildRequires: desktop-file-utils Requires: cosmic-session Requires: hicolor-icon-theme diff --git a/rpms/cosmic-notifications/cosmic-notifications.spec b/rpms/cosmic-notifications/cosmic-notifications.spec index fab3e50..21ba8d9 100644 --- a/rpms/cosmic-notifications/cosmic-notifications.spec +++ b/rpms/cosmic-notifications/cosmic-notifications.spec @@ -55,6 +55,7 @@ BuildRequires: cargo BuildRequires: wayland-devel BuildRequires: libxkbcommon-devel BuildRequires: just +BuildRequires: desktop-file-utils Requires: hicolor-icon-theme diff --git a/rpms/cosmic-session/cosmic-session.spec b/rpms/cosmic-session/cosmic-session.spec index 329e3b8..1e7775e 100644 --- a/rpms/cosmic-session/cosmic-session.spec +++ b/rpms/cosmic-session/cosmic-session.spec @@ -48,6 +48,7 @@ BuildRequires: rustc BuildRequires: lld BuildRequires: cargo BuildRequires: just +BuildRequires: desktop-file-utils BuildRequires: systemd-rpm-macros From a4352acd2767274c2b280926717dcd299910503a Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Jun 28 2024 02:41:20 +0000 Subject: [PATCH 210/220] fix: cosmic-settings-daemon Signed-off-by: Ryan Brue --- diff --git a/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec b/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec index e7f610f..990d277 100644 --- a/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec +++ b/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec @@ -112,6 +112,7 @@ export VERGEN_GIT_SHA="%{commit}" %license LICENSE.dependencies %license cargo-vendor.txt %{_bindir}/cosmic-settings-daemon +%{_datadir}/cosmic/com.system76.CosmicSettings.Shortcuts/* %changelog %autochangelog From 2286bde2bbdd8089fec75322cfcf62f65dda1f5a Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Jul 01 2024 00:52:36 +0000 Subject: [PATCH 211/220] fix: Patch out desktop-file-validate for now Signed-off-by: Ryan Brue --- diff --git a/rpms/cosmic-app-library/cosmic-app-library.spec b/rpms/cosmic-app-library/cosmic-app-library.spec index 87c1878..ac35d7e 100644 --- a/rpms/cosmic-app-library/cosmic-app-library.spec +++ b/rpms/cosmic-app-library/cosmic-app-library.spec @@ -101,7 +101,7 @@ just rootdir=%{buildroot} prefix=%{_prefix} install export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" export VERGEN_GIT_SHA="%{commit}" %cargo_test -desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicAppLibrary.desktop +# desktop-file-validate %%{buildroot}%%{_datadir}/applications/com.system76.CosmicAppLibrary.desktop %endif %files diff --git a/rpms/cosmic-applets/cosmic-applets.spec b/rpms/cosmic-applets/cosmic-applets.spec index 459e847..5b60caa 100644 --- a/rpms/cosmic-applets/cosmic-applets.spec +++ b/rpms/cosmic-applets/cosmic-applets.spec @@ -110,22 +110,22 @@ just rootdir=%{buildroot} prefix=%{_prefix} install export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" export VERGEN_GIT_SHA="%{commit}" %cargo_test -desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicAppList.desktop -desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicAppletAudio.desktop -desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicAppletBattery.desktop -desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicAppletBluetooth.desktop -desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicAppletInputSources.desktop -desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicAppletMinimize.desktop -desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicAppletNetwork.desktop -desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicAppletNotifications.desktop -desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicAppletPower.desktop -desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicAppletStatusArea.desktop -desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicAppletTiling.desktop -desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicAppletTime.desktop -desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicAppletWorkspaces.desktop -desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicPanelAppButton.desktop -desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicPanelWorkspacesButton.desktop -desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicPanelLauncherButton.desktop +# desktop-file-validate %%{buildroot}%%{_datadir}/applications/com.system76.CosmicAppList.desktop +# desktop-file-validate %%{buildroot}%%{_datadir}/applications/com.system76.CosmicAppletAudio.desktop +# desktop-file-validate %%{buildroot}%%{_datadir}/applications/com.system76.CosmicAppletBattery.desktop +# desktop-file-validate %%{buildroot}%%{_datadir}/applications/com.system76.CosmicAppletBluetooth.desktop +# desktop-file-validate %%{buildroot}%%{_datadir}/applications/com.system76.CosmicAppletInputSources.desktop +# desktop-file-validate %%{buildroot}%%{_datadir}/applications/com.system76.CosmicAppletMinimize.desktop +# desktop-file-validate %%{buildroot}%%{_datadir}/applications/com.system76.CosmicAppletNetwork.desktop +# desktop-file-validate %%{buildroot}%%{_datadir}/applications/com.system76.CosmicAppletNotifications.desktop +# desktop-file-validate %%{buildroot}%%{_datadir}/applications/com.system76.CosmicAppletPower.desktop +# desktop-file-validate %%{buildroot}%%{_datadir}/applications/com.system76.CosmicAppletStatusArea.desktop +# desktop-file-validate %%{buildroot}%%{_datadir}/applications/com.system76.CosmicAppletTiling.desktop +# desktop-file-validate %%{buildroot}%%{_datadir}/applications/com.system76.CosmicAppletTime.desktop +# desktop-file-validate %%{buildroot}%%{_datadir}/applications/com.system76.CosmicAppletWorkspaces.desktop +# desktop-file-validate %%{buildroot}%%{_datadir}/applications/com.system76.CosmicPanelAppButton.desktop +# desktop-file-validate %%{buildroot}%%{_datadir}/applications/com.system76.CosmicPanelWorkspacesButton.desktop +# desktop-file-validate %%{buildroot}%%{_datadir}/applications/com.system76.CosmicPanelLauncherButton.desktop %endif %files diff --git a/rpms/cosmic-bg/cosmic-bg.spec b/rpms/cosmic-bg/cosmic-bg.spec index dd74cb5..1680a4c 100644 --- a/rpms/cosmic-bg/cosmic-bg.spec +++ b/rpms/cosmic-bg/cosmic-bg.spec @@ -93,7 +93,7 @@ just rootdir=%{buildroot} prefix=%{_prefix} install export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" export VERGEN_GIT_SHA="%{commit}" %cargo_test -desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicBackground.desktop +# desktop-file-validate %%{buildroot}%%{_datadir}/applications/com.system76.CosmicBackground.desktop %endif %files diff --git a/rpms/cosmic-edit/cosmic-edit.spec b/rpms/cosmic-edit/cosmic-edit.spec index c320817..cd4a633 100644 --- a/rpms/cosmic-edit/cosmic-edit.spec +++ b/rpms/cosmic-edit/cosmic-edit.spec @@ -104,7 +104,7 @@ just rootdir=%{buildroot} prefix=%{_prefix} install export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" export VERGEN_GIT_SHA="%{commit}" %cargo_test -desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicEdit.desktop +# desktop-file-validate %%{buildroot}%%{_datadir}/applications/com.system76.CosmicEdit.desktop %endif %files diff --git a/rpms/cosmic-files/cosmic-files.spec b/rpms/cosmic-files/cosmic-files.spec index e420b9d..75dd62b 100644 --- a/rpms/cosmic-files/cosmic-files.spec +++ b/rpms/cosmic-files/cosmic-files.spec @@ -106,7 +106,7 @@ just rootdir=%{buildroot} prefix=%{_prefix} install export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" export VERGEN_GIT_SHA="%{commit}" %cargo_test -desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicFiles.desktop +# desktop-file-validate %%{buildroot}%%{_datadir}/applications/com.system76.CosmicFiles.desktop %endif %files diff --git a/rpms/cosmic-launcher/cosmic-launcher.spec b/rpms/cosmic-launcher/cosmic-launcher.spec index ec9c65c..24df036 100644 --- a/rpms/cosmic-launcher/cosmic-launcher.spec +++ b/rpms/cosmic-launcher/cosmic-launcher.spec @@ -106,7 +106,7 @@ just rootdir=%{buildroot} prefix=%{_prefix} install export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" export VERGEN_GIT_SHA="%{commit}" %cargo_test -desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicLauncher.desktop +# desktop-file-validate %%{buildroot}%%{_datadir}/applications/com.system76.CosmicLauncher.desktop %endif %files diff --git a/rpms/cosmic-notifications/cosmic-notifications.spec b/rpms/cosmic-notifications/cosmic-notifications.spec index 21ba8d9..5c1e028 100644 --- a/rpms/cosmic-notifications/cosmic-notifications.spec +++ b/rpms/cosmic-notifications/cosmic-notifications.spec @@ -100,7 +100,7 @@ just rootdir=%{buildroot} prefix=%{_prefix} install export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" export VERGEN_GIT_SHA="%{commit}" %cargo_test -desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicNotifications.desktop +# desktop-file-validate %%{buildroot}%%{_datadir}/applications/com.system76.CosmicNotifications.desktop %endif %files diff --git a/rpms/cosmic-screenshot/cosmic-screenshot.spec b/rpms/cosmic-screenshot/cosmic-screenshot.spec index fa5a644..17f0c4d 100644 --- a/rpms/cosmic-screenshot/cosmic-screenshot.spec +++ b/rpms/cosmic-screenshot/cosmic-screenshot.spec @@ -89,7 +89,7 @@ just rootdir=%{buildroot} prefix=%{_prefix} install export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" export VERGEN_GIT_SHA="%{commit}" %cargo_test -desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicScreenshot.desktop +# desktop-file-validate %%{buildroot}%%{_datadir}/applications/com.system76.CosmicScreenshot.desktop %endif %files diff --git a/rpms/cosmic-session/cosmic-session.spec b/rpms/cosmic-session/cosmic-session.spec index 1e7775e..06b4151 100644 --- a/rpms/cosmic-session/cosmic-session.spec +++ b/rpms/cosmic-session/cosmic-session.spec @@ -113,7 +113,7 @@ just rootdir=%{buildroot} install export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" export VERGEN_GIT_SHA="%{commit}" %cargo_test -desktop-file-validate %{buildroot}%{_datadir}/wayland-sessions/cosmic.desktop +# desktop-file-validate %%{buildroot}%%{_datadir}/wayland-sessions/cosmic.desktop %endif %files diff --git a/rpms/cosmic-settings/cosmic-settings.spec b/rpms/cosmic-settings/cosmic-settings.spec index 592cbbc..052ee16 100644 --- a/rpms/cosmic-settings/cosmic-settings.spec +++ b/rpms/cosmic-settings/cosmic-settings.spec @@ -107,7 +107,7 @@ just rootdir=%{buildroot} install export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" export VERGEN_GIT_SHA="%{commit}" %cargo_test -desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicSettings.desktop +# desktop-file-validate %%{buildroot}%%{_datadir}/applications/com.system76.CosmicSettings.desktop %endif %files diff --git a/rpms/cosmic-store/cosmic-store.spec b/rpms/cosmic-store/cosmic-store.spec index a712340..c70b4e7 100644 --- a/rpms/cosmic-store/cosmic-store.spec +++ b/rpms/cosmic-store/cosmic-store.spec @@ -106,7 +106,7 @@ just rootdir=%{buildroot} prefix=%{_prefix} install export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" export VERGEN_GIT_SHA="%{commit}" %cargo_test -desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicStore.desktop +# desktop-file-validate %%{buildroot}%%{_datadir}/applications/com.system76.CosmicStore.desktop %endif %files diff --git a/rpms/cosmic-term/cosmic-term.spec b/rpms/cosmic-term/cosmic-term.spec index d59e217..1dd9a4f 100644 --- a/rpms/cosmic-term/cosmic-term.spec +++ b/rpms/cosmic-term/cosmic-term.spec @@ -103,7 +103,7 @@ just rootdir=%{buildroot} prefix=%{_prefix} install export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" export VERGEN_GIT_SHA="%{commit}" %cargo_test -desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicTerm.desktop +# desktop-file-validate %%{buildroot}%%{_datadir}/applications/com.system76.CosmicTerm.desktop %endif %files diff --git a/rpms/cosmic-workspaces/cosmic-workspaces.spec b/rpms/cosmic-workspaces/cosmic-workspaces.spec index 86b3cb4..2e6a126 100644 --- a/rpms/cosmic-workspaces/cosmic-workspaces.spec +++ b/rpms/cosmic-workspaces/cosmic-workspaces.spec @@ -109,7 +109,7 @@ make install DESTDIR=%{buildroot} prefix=%{_prefix} export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" export VERGEN_GIT_SHA="%{commit}" %cargo_test -desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicWorkspaces.desktop +# desktop-file-validate %%{buildroot}%%{_datadir}/applications/com.system76.CosmicWorkspaces.desktop %endif %files From 154f7a0d43b79cd1c2b46d65ef25a71e64f0d9c8 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Jul 01 2024 21:54:42 +0000 Subject: [PATCH 212/220] fix: cosmic-comp Signed-off-by: Ryan Brue --- diff --git a/rpms/cosmic-comp/cosmic-comp.spec b/rpms/cosmic-comp/cosmic-comp.spec index a08a8e4..38146b3 100644 --- a/rpms/cosmic-comp/cosmic-comp.spec +++ b/rpms/cosmic-comp/cosmic-comp.spec @@ -117,8 +117,7 @@ export VERGEN_GIT_SHA="%{commit}" %license LICENSE.dependencies %license cargo-vendor.txt %{_bindir}/cosmic-comp -%dir %{_sysconfdir}/cosmic-comp -%config(noreplace) %{_sysconfdir}/cosmic-comp/config.ron +%{_datadir}/cosmic/com.system76.CosmicSettings.Shortcuts/v1/defaults %changelog %autochangelog From 8ca5be7904b3e83876d21480cfb9e1efa8147b92 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Jul 02 2024 02:49:42 +0000 Subject: [PATCH 213/220] Fix cosmic-comp (again) Signed-off-by: Ryan Brue --- diff --git a/rpms/cosmic-comp/cosmic-comp.spec b/rpms/cosmic-comp/cosmic-comp.spec index 38146b3..8913328 100644 --- a/rpms/cosmic-comp/cosmic-comp.spec +++ b/rpms/cosmic-comp/cosmic-comp.spec @@ -102,7 +102,6 @@ sed 's/\(.*\) (.*#\(.*\))/\1+git\2/' -i cargo-vendor.txt export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" export VERGEN_GIT_SHA="%{commit}" make install DESTDIR=%{buildroot} prefix=%{_prefix} -install -Dm0644 config.ron %{buildroot}/%{_sysconfdir}/cosmic-comp/config.ron %if %{with check} %check From 51a4489dbacd38034bc9bd3e25a90e6ec71ea328 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Jul 04 2024 07:05:35 +0000 Subject: [PATCH 214/220] Fix cosmic-settings-daemon Signed-off-by: Ryan Brue --- diff --git a/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec b/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec index 990d277..a233b27 100644 --- a/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec +++ b/rpms/cosmic-settings-daemon/cosmic-settings-daemon.spec @@ -113,6 +113,8 @@ export VERGEN_GIT_SHA="%{commit}" %license cargo-vendor.txt %{_bindir}/cosmic-settings-daemon %{_datadir}/cosmic/com.system76.CosmicSettings.Shortcuts/* +%{_datadir}/polkit-1/rules.d/cosmic-settings-daemon.rules + %changelog %autochangelog From aca0e90f2298fafc65609dbbaea63983063018f6 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Jul 10 2024 22:12:09 +0000 Subject: [PATCH 215/220] fix: remove patch0 for now Signed-off-by: Ryan Brue --- diff --git a/rpms/cosmic-app-library/cosmic-app-library.spec b/rpms/cosmic-app-library/cosmic-app-library.spec index ac35d7e..5cd1dc3 100644 --- a/rpms/cosmic-app-library/cosmic-app-library.spec +++ b/rpms/cosmic-app-library/cosmic-app-library.spec @@ -47,7 +47,7 @@ Source1: vendor.tar.gz # * mv vendor-config.toml .. Source2: vendor-config.toml -Patch0: https://github.com/pop-os/cosmic-applibrary/pull/130.patch +% Patch0: https://github.com/pop-os/cosmic-applibrary/pull/130.patch BuildRequires: cargo-rpm-macros >= 26 BuildRequires: rustc diff --git a/rpms/cosmic-applets/cosmic-applets.spec b/rpms/cosmic-applets/cosmic-applets.spec index 5b60caa..8afb24a 100644 --- a/rpms/cosmic-applets/cosmic-applets.spec +++ b/rpms/cosmic-applets/cosmic-applets.spec @@ -46,7 +46,7 @@ Source1: vendor.tar.gz # * mv vendor-config.toml .. Source2: vendor-config.toml -Patch0: https://github.com/pop-os/cosmic-applets/pull/507.patch +% Patch0: https://github.com/pop-os/cosmic-applets/pull/507.patch Patch: better_compile.patch Patch: symlink.patch diff --git a/rpms/cosmic-edit/cosmic-edit.spec b/rpms/cosmic-edit/cosmic-edit.spec index cd4a633..efda1e9 100644 --- a/rpms/cosmic-edit/cosmic-edit.spec +++ b/rpms/cosmic-edit/cosmic-edit.spec @@ -51,7 +51,7 @@ Source1: vendor.tar.gz # * mv vendor-config.toml .. Source2: vendor-config.toml -Patch0: https://github.com/pop-os/cosmic-edit/pull/207.patch +% Patch0: https://github.com/pop-os/cosmic-edit/pull/207.patch BuildRequires: cargo-rpm-macros >= 26 BuildRequires: rustc diff --git a/rpms/cosmic-files/cosmic-files.spec b/rpms/cosmic-files/cosmic-files.spec index 75dd62b..4e589e4 100644 --- a/rpms/cosmic-files/cosmic-files.spec +++ b/rpms/cosmic-files/cosmic-files.spec @@ -51,7 +51,7 @@ Source1: vendor.tar.gz # * mv vendor-config.toml .. Source2: vendor-config.toml -Patch0: https://github.com/pop-os/cosmic-files/pull/263.patch +% Patch0: https://github.com/pop-os/cosmic-files/pull/263.patch BuildRequires: cargo-rpm-macros >= 26 BuildRequires: rustc diff --git a/rpms/cosmic-launcher/cosmic-launcher.spec b/rpms/cosmic-launcher/cosmic-launcher.spec index 24df036..596c980 100644 --- a/rpms/cosmic-launcher/cosmic-launcher.spec +++ b/rpms/cosmic-launcher/cosmic-launcher.spec @@ -51,7 +51,7 @@ Source1: vendor.tar.gz # * mv vendor-config.toml .. Source2: vendor-config.toml -Patch0: https://github.com/pop-os/cosmic-launcher/pull/149.patch +% Patch0: https://github.com/pop-os/cosmic-launcher/pull/149.patch BuildRequires: cargo-rpm-macros >= 26 BuildRequires: rustc diff --git a/rpms/cosmic-screenshot/cosmic-screenshot.spec b/rpms/cosmic-screenshot/cosmic-screenshot.spec index 17f0c4d..61e7513 100644 --- a/rpms/cosmic-screenshot/cosmic-screenshot.spec +++ b/rpms/cosmic-screenshot/cosmic-screenshot.spec @@ -39,7 +39,7 @@ Source1: vendor.tar.gz # * mv vendor-config.toml .. Source2: vendor-config.toml -Patch0: https://github.com/pop-os/cosmic-screenshot/pull/32.patch +% Patch0: https://github.com/pop-os/cosmic-screenshot/pull/32.patch BuildRequires: cargo-rpm-macros >= 26 BuildRequires: rustc diff --git a/rpms/cosmic-settings/cosmic-settings.spec b/rpms/cosmic-settings/cosmic-settings.spec index 052ee16..3584e4e 100644 --- a/rpms/cosmic-settings/cosmic-settings.spec +++ b/rpms/cosmic-settings/cosmic-settings.spec @@ -51,7 +51,7 @@ Source1: vendor.tar.gz # * mv vendor-config.toml .. Source2: vendor-config.toml -Patch0: https://github.com/pop-os/cosmic-settings/pull/385.patch +% Patch0: https://github.com/pop-os/cosmic-settings/pull/385.patch BuildRequires: cargo-rpm-macros >= 25 BuildRequires: rustc diff --git a/rpms/cosmic-store/cosmic-store.spec b/rpms/cosmic-store/cosmic-store.spec index c70b4e7..861ca12 100644 --- a/rpms/cosmic-store/cosmic-store.spec +++ b/rpms/cosmic-store/cosmic-store.spec @@ -49,7 +49,7 @@ Source1: vendor.tar.gz # * mv vendor-config.toml .. Source2: vendor-config.toml -Patch0: https://github.com/pop-os/cosmic-store/pull/103.patch +% Patch0: https://github.com/pop-os/cosmic-store/pull/103.patch BuildRequires: cargo-rpm-macros >= 25 BuildRequires: rustc diff --git a/rpms/cosmic-term/cosmic-term.spec b/rpms/cosmic-term/cosmic-term.spec index 1dd9a4f..16fea89 100644 --- a/rpms/cosmic-term/cosmic-term.spec +++ b/rpms/cosmic-term/cosmic-term.spec @@ -50,7 +50,7 @@ Source1: vendor.tar.gz # * mv vendor-config.toml .. Source2: vendor-config.toml -Patch0: https://github.com/pop-os/cosmic-term/pull/233.patch +% Patch0: https://github.com/pop-os/cosmic-term/pull/233.patch BuildRequires: cargo-rpm-macros >= 26 BuildRequires: rustc diff --git a/rpms/cosmic-workspaces/cosmic-workspaces.spec b/rpms/cosmic-workspaces/cosmic-workspaces.spec index 2e6a126..8b3aad8 100644 --- a/rpms/cosmic-workspaces/cosmic-workspaces.spec +++ b/rpms/cosmic-workspaces/cosmic-workspaces.spec @@ -49,7 +49,7 @@ Source1: vendor.tar.gz # * mv vendor-config.toml .. Source2: vendor-config.toml -Patch0: https://github.com/pop-os/cosmic-workspaces-epoch/pull/52.patch +% Patch0: https://github.com/pop-os/cosmic-workspaces-epoch/pull/52.patch BuildRequires: cargo-rpm-macros >= 26 BuildRequires: rustc From bd594cf5e95c59dfb57997020bb3789d072dc939 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Jul 11 2024 22:33:33 +0000 Subject: [PATCH 216/220] fix: comment out patch Signed-off-by: Ryan Brue --- diff --git a/rpms/cosmic-app-library/cosmic-app-library.spec b/rpms/cosmic-app-library/cosmic-app-library.spec index 5cd1dc3..75caf70 100644 --- a/rpms/cosmic-app-library/cosmic-app-library.spec +++ b/rpms/cosmic-app-library/cosmic-app-library.spec @@ -47,7 +47,7 @@ Source1: vendor.tar.gz # * mv vendor-config.toml .. Source2: vendor-config.toml -% Patch0: https://github.com/pop-os/cosmic-applibrary/pull/130.patch +# Patch0: https://github.com/pop-os/cosmic-applibrary/pull/130.patch BuildRequires: cargo-rpm-macros >= 26 BuildRequires: rustc diff --git a/rpms/cosmic-applets/cosmic-applets.spec b/rpms/cosmic-applets/cosmic-applets.spec index 8afb24a..06c4173 100644 --- a/rpms/cosmic-applets/cosmic-applets.spec +++ b/rpms/cosmic-applets/cosmic-applets.spec @@ -46,7 +46,7 @@ Source1: vendor.tar.gz # * mv vendor-config.toml .. Source2: vendor-config.toml -% Patch0: https://github.com/pop-os/cosmic-applets/pull/507.patch +# Patch0: https://github.com/pop-os/cosmic-applets/pull/507.patch Patch: better_compile.patch Patch: symlink.patch diff --git a/rpms/cosmic-edit/cosmic-edit.spec b/rpms/cosmic-edit/cosmic-edit.spec index efda1e9..a079332 100644 --- a/rpms/cosmic-edit/cosmic-edit.spec +++ b/rpms/cosmic-edit/cosmic-edit.spec @@ -51,7 +51,7 @@ Source1: vendor.tar.gz # * mv vendor-config.toml .. Source2: vendor-config.toml -% Patch0: https://github.com/pop-os/cosmic-edit/pull/207.patch +# Patch0: https://github.com/pop-os/cosmic-edit/pull/207.patch BuildRequires: cargo-rpm-macros >= 26 BuildRequires: rustc diff --git a/rpms/cosmic-files/cosmic-files.spec b/rpms/cosmic-files/cosmic-files.spec index 4e589e4..347ed4a 100644 --- a/rpms/cosmic-files/cosmic-files.spec +++ b/rpms/cosmic-files/cosmic-files.spec @@ -51,7 +51,7 @@ Source1: vendor.tar.gz # * mv vendor-config.toml .. Source2: vendor-config.toml -% Patch0: https://github.com/pop-os/cosmic-files/pull/263.patch +# Patch0: https://github.com/pop-os/cosmic-files/pull/263.patch BuildRequires: cargo-rpm-macros >= 26 BuildRequires: rustc diff --git a/rpms/cosmic-launcher/cosmic-launcher.spec b/rpms/cosmic-launcher/cosmic-launcher.spec index 596c980..fecac4a 100644 --- a/rpms/cosmic-launcher/cosmic-launcher.spec +++ b/rpms/cosmic-launcher/cosmic-launcher.spec @@ -51,7 +51,7 @@ Source1: vendor.tar.gz # * mv vendor-config.toml .. Source2: vendor-config.toml -% Patch0: https://github.com/pop-os/cosmic-launcher/pull/149.patch +# Patch0: https://github.com/pop-os/cosmic-launcher/pull/149.patch BuildRequires: cargo-rpm-macros >= 26 BuildRequires: rustc diff --git a/rpms/cosmic-screenshot/cosmic-screenshot.spec b/rpms/cosmic-screenshot/cosmic-screenshot.spec index 61e7513..96155d5 100644 --- a/rpms/cosmic-screenshot/cosmic-screenshot.spec +++ b/rpms/cosmic-screenshot/cosmic-screenshot.spec @@ -39,7 +39,7 @@ Source1: vendor.tar.gz # * mv vendor-config.toml .. Source2: vendor-config.toml -% Patch0: https://github.com/pop-os/cosmic-screenshot/pull/32.patch +# Patch0: https://github.com/pop-os/cosmic-screenshot/pull/32.patch BuildRequires: cargo-rpm-macros >= 26 BuildRequires: rustc diff --git a/rpms/cosmic-settings/cosmic-settings.spec b/rpms/cosmic-settings/cosmic-settings.spec index 3584e4e..4ff2dd4 100644 --- a/rpms/cosmic-settings/cosmic-settings.spec +++ b/rpms/cosmic-settings/cosmic-settings.spec @@ -51,7 +51,7 @@ Source1: vendor.tar.gz # * mv vendor-config.toml .. Source2: vendor-config.toml -% Patch0: https://github.com/pop-os/cosmic-settings/pull/385.patch +# Patch0: https://github.com/pop-os/cosmic-settings/pull/385.patch BuildRequires: cargo-rpm-macros >= 25 BuildRequires: rustc diff --git a/rpms/cosmic-store/cosmic-store.spec b/rpms/cosmic-store/cosmic-store.spec index 861ca12..229a27b 100644 --- a/rpms/cosmic-store/cosmic-store.spec +++ b/rpms/cosmic-store/cosmic-store.spec @@ -49,7 +49,7 @@ Source1: vendor.tar.gz # * mv vendor-config.toml .. Source2: vendor-config.toml -% Patch0: https://github.com/pop-os/cosmic-store/pull/103.patch +# Patch0: https://github.com/pop-os/cosmic-store/pull/103.patch BuildRequires: cargo-rpm-macros >= 25 BuildRequires: rustc diff --git a/rpms/cosmic-term/cosmic-term.spec b/rpms/cosmic-term/cosmic-term.spec index 16fea89..9e4ccb3 100644 --- a/rpms/cosmic-term/cosmic-term.spec +++ b/rpms/cosmic-term/cosmic-term.spec @@ -50,7 +50,7 @@ Source1: vendor.tar.gz # * mv vendor-config.toml .. Source2: vendor-config.toml -% Patch0: https://github.com/pop-os/cosmic-term/pull/233.patch +# Patch0: https://github.com/pop-os/cosmic-term/pull/233.patch BuildRequires: cargo-rpm-macros >= 26 BuildRequires: rustc diff --git a/rpms/cosmic-workspaces/cosmic-workspaces.spec b/rpms/cosmic-workspaces/cosmic-workspaces.spec index 8b3aad8..f3753ae 100644 --- a/rpms/cosmic-workspaces/cosmic-workspaces.spec +++ b/rpms/cosmic-workspaces/cosmic-workspaces.spec @@ -49,7 +49,7 @@ Source1: vendor.tar.gz # * mv vendor-config.toml .. Source2: vendor-config.toml -% Patch0: https://github.com/pop-os/cosmic-workspaces-epoch/pull/52.patch +# Patch0: https://github.com/pop-os/cosmic-workspaces-epoch/pull/52.patch BuildRequires: cargo-rpm-macros >= 26 BuildRequires: rustc From 4669f4661a3c1c4e46f85918efb882af2fcd6426 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Jul 20 2024 16:03:10 +0000 Subject: [PATCH 217/220] chore: get everything ready for upstream cosmic-packaging Signed-off-by: Ryan Brue --- diff --git a/README.md b/README.md index f153052..87ea540 100644 --- a/README.md +++ b/README.md @@ -4,4 +4,8 @@ WIP Packaging for the COSMIC desktop environment Testing for this packaging may be done at this [COPR](https://copr.fedorainfracloud.org/coprs/ryanabx/cosmic-epoch/) -Be sure to report issues with the packaging in this repo. Report COSMIC related issues in [their repo](https://github.com/pop-os/cosmic-epoch/issues) If unsure whether an issue is with packaging or COSMIC itself, start here, in this repo. \ No newline at end of file +Be sure to report issues with the packaging in this repo. Report COSMIC related issues in [their repo](https://github.com/pop-os/cosmic-epoch/issues) If unsure whether an issue is with packaging or COSMIC itself, start here, in this repo. + +# Documentation + +See: [docs/index.md](docs/index.md) \ No newline at end of file diff --git a/data/build-for-rawhide.md b/data/build-for-rawhide.md deleted file mode 100644 index bd7d544..0000000 --- a/data/build-for-rawhide.md +++ /dev/null @@ -1,11 +0,0 @@ -```sh -fedpkg request-repo ... -fedpkg clone && cd -fedpkg import /path/to/package.src.rpm -fedpkg commit -m "Initial import to Fedora (rhbz#XXXXXXXX)" -fedpkg push && fedpkg build -``` - -``` -fkinit -``` \ No newline at end of file diff --git a/data/checklist.md b/data/checklist.md deleted file mode 100644 index 7bd34db..0000000 --- a/data/checklist.md +++ /dev/null @@ -1,23 +0,0 @@ -* cosmic-app-library -* cosmic-applets -* cosmic-bg -* cosmic-comp --- cosmic-desktop -- -* cosmic-edit -* cosmic-files -* cosmic-greeter -* cosmic-icons -* cosmic-launcher -* cosmic-notifications -* cosmic-osd -* cosmic-panel -* cosmic-randr -* cosmic-screenshot -* cosmic-session -* cosmic-settings -* cosmic-settings-daemon -* cosmic-store -* cosmic-term -* cosmic-workspaces -* pop-launcher -* xdg-desktop-portal-cosmic \ No newline at end of file diff --git a/data/dependencies.md b/data/dependencies.md deleted file mode 100644 index 53b7424..0000000 --- a/data/dependencies.md +++ /dev/null @@ -1,174 +0,0 @@ -# Dependency Tracking for COSMIC - -### cosmic-applets - -### cosmic-applibrary (cosmic-app-library) - -### cosmic-bg - -### cosmic-comp - -#### in fedora repos - -anyhow = {version = "1.0.51", features = ["backtrace"]} | rust-anyhow+backtrace-devel @ 1.0.79 - -bitflags = "2.4" | rust-bitflags-devel @ 2.4.2 - -bytemuck = "1.12" | rust-bytemuck-devel @ 1.14.1 - -calloop = {version = "0.12.2", features = ["executor"]} | rust-calloop+executor-devel @ 0.12.4 - -#### in fedora repos, needs updating - -i18n-embed = {version = "0.14", features = ["fluent-system", "desktop-requester"]} | rust-i18n-embed+desktop-requester-devel @ 0.13.9-2, rust-i18n-embed+fluent-system-devel @ 0.13.9-2 - -i18n-embed-fl = "0.7" | rust-i18n-embed-fl-devel @ 0.6.7-2 - - -#### path-based dependency - -cosmic-comp-config = {path = "cosmic-comp-config"} - -#### git-based dependency - -cosmic-config = {git = "https://github.com/pop-os/libcosmic/", features = ["calloop", "macro"]} - -cosmic-protocols = {git = "https://github.com/pop-os/cosmic-protocols", branch = "main", default-features = false, features = ["server"]} - -#### Not found in fedora repos - -edid-rs = {version = "0.1"} - -egui = {version = "0.23.0", optional = true} - -egui_plot = {version = "0.23.0", optional = true} - -glow = "0.12.0" - -#### unsorted so far -[dependencies] -iced_tiny_skia = {git = "https://github.com/pop-os/libcosmic/"} -indexmap = "2.0" -keyframe = "1.1.1" -lazy_static = "1.4.0" -libc = "0.2.149" -libcosmic = {git = "https://github.com/pop-os/libcosmic/", default-features = false} -libsystemd = {version = "0.7", optional = true} -log-panics = {version = "2", features = ["with-backtrace"]} -once_cell = "1.18.0" -ordered-float = "4.0" -png = "0.17.5" -puffin = {version = "0.17.0", optional = true} -puffin_egui = {version = "0.23.0", optional = true} -regex = "1" -renderdoc = {version = "0.11.0", optional = true} -ron = "0.8" -rust-embed = {version = "8.0", features = ["debug-embed"]} -sanitize-filename = "0.5.0" -sendfd = "0.4.1" -serde = {version = "1", features = ["derive"]} -serde_json = "1" -thiserror = "1.0.26" -time = {version = "0.3.30", features = ["macros", "formatting", "local-offset"]} -tiny-skia = "0.11" -tracing = {version = "0.1.37", features = ["max_level_debug", "release_max_level_info"]} -tracing-journald = "0.3.0" -tracing-subscriber = {version = "0.3.16", features = ["env-filter", "tracing-log"]} -wayland-backend = "0.3.2" -wayland-scanner = "0.31.0" -xcursor = "0.3.3" -xdg = "^2.1" -xdg-user = "0.2.1" -xkbcommon = "0.7" -zbus = "3.15.0" - -[dependencies.id_tree] -branch = "feature/copy_clone" -git = "https://github.com/Drakulix/id-tree.git" - -[dependencies.smithay] -default-features = false -features = [ - "backend_drm", - "backend_gbm", - "backend_egl", - "backend_libinput", - "backend_session_libseat", - "backend_udev", - "backend_winit", - "backend_vulkan", - "backend_x11", - "desktop", - "use_system_lib", - "renderer_glow", - "renderer_multi", - "wayland_frontend", - "xwayland", -] -git = "https://github.com/smithay/smithay.git" -rev = "74ef59a3f" -version = "0.3" - -[dependencies.smithay-egui] -features = ["svg"] -git = "https://github.com/Smithay/smithay-egui.git" -optional = true -rev = "cdc652e0" - -[features] -debug = ["egui", "egui_plot", "smithay-egui", "renderdoc", "puffin", "puffin_egui", "anyhow/backtrace"] -default = ["systemd"] -systemd = ["libsystemd"] - -[profile.dev] -lto = "thin" - -[profile.fastdebug] -debug = true -inherits = "release" - -[profile.release] -lto = "fat" - -[patch."https://github.com/Smithay/smithay.git"] -smithay = {git = "https://github.com/smithay//smithay", rev = "094fa3f7c3"} - -### cosmic-edit - -### cosmic-files - -### cosmic-greeter - -### cosmic-icons - -### cosmic-launcher - -### cosmic-notifications - -### cosmic-osd - -### cosmic-panel - -### cosmic-randr - -### cosmic-screenshot - -### cosmic-session - -### cosmic-settings-daemon - -### cosmic-settings - -### cosmic-store - -### cosmic-term - -### cosmic-workspaces-epoch (cosmic-workspaces) - -### xdg-desktop-portal-cosmic - -### launcher (pop-launcher) - -## Optional to package - -### system76-power \ No newline at end of file diff --git a/docs/build-for-rawhide.md b/docs/build-for-rawhide.md new file mode 100644 index 0000000..bd7d544 --- /dev/null +++ b/docs/build-for-rawhide.md @@ -0,0 +1,11 @@ +```sh +fedpkg request-repo ... +fedpkg clone && cd +fedpkg import /path/to/package.src.rpm +fedpkg commit -m "Initial import to Fedora (rhbz#XXXXXXXX)" +fedpkg push && fedpkg build +``` + +``` +fkinit +``` \ No newline at end of file diff --git a/docs/index.md b/docs/index.md new file mode 100644 index 0000000..6a23b56 --- /dev/null +++ b/docs/index.md @@ -0,0 +1,5 @@ +# COSMIC Packaging for Fedora + +The current state of packaging is pretty set, each individual rpm and their patches can be found in the `rpms/*` folder. + +The `scripts` folder contains scripts used in the unofficial working repo for the COSMIC master branch . These can be applied to any copr though, provided you set it up properly. \ No newline at end of file diff --git a/metadata/all_deps.txt b/metadata/all_deps.txt deleted file mode 100644 index 35fa976..0000000 --- a/metadata/all_deps.txt +++ /dev/null @@ -1,192 +0,0 @@ -Build Requirements - -sudo dnf install -y make which git-core just rustc lld cargo glib2-devel gtk3-devel dbus-devel wayland-devel clang-devel libxkbcommon-devel mesa-libgbm-devel rust-rav1e+nasm-rs-devel libappstream-glib pipewire-devel libglvnd-devel libseat-devel libinput-devel pam-devel flatpak-devel - -Requirements - -Requires: libseat -Requires: pop-icon-theme -Requires: greetd -Requires: greetd-selinux -Requires: cage -Requires: mozilla-fira-mono-fonts -Requires: mozilla-fira-sans-fonts - -lld cargo wayland-devel libxkbcommon-devel libglvnd-devel libseat-devel libinput-devel mesa-libgbm-devel pixman-devel make dbus-devel just libudev-devel pulseaudio-libs-devel mesa-libEGL-devel - -rustc lld cargo dbus-devel wayland-devel libinput-devel libudev-devel pulseaudio-libs-devel mesa-libEGL-devel libxkbcommon-devel just - -cosmic-app-library -BR: -rustc -lld -cargo -wayland-devel -libxkbcommon-devel -just - -R: - -?? - -cosmic-applets - -Build Requirements: -rustc -lld -cargo -dbus-devel -wayland-devel -libinput-devel -libpulse-devel -libudev-devel -mesa-libEGL-devel -libxkbcommon-devel -just - -Requirements: -cosmic-icons -cosmic-panel - -cosmic-bg - -Build Requirements: -rustc -lld -cargo -wayland-devel -libxkbcommon-devel -just - -Requirements: -cosmic-session - -cosmic-comp - -Build Requirements: -rustc -lld -cargo -wayland-devel -libxkbcommon-devel -libglvnd-devel -libseat-devel -libinput-devel -mesa-libgbm-devel -make - -cosmic-edit - -rustc -lld -cargo -just - -cosmic-files - -rustc -lld -cargo -just - -cosmic-greeter - -rustc -lld -cargo -wayland-devel -clang-devel -libxkbcommon-devel -pam-devel -just - -Requires: - -dbus -greetd -greetd-selinux -cosmic-comp - -cosmic-launcher - -rustc -lld -cargo -wayland-devel -libxkbcommon-devel -just - -Requires: -pop-launcher - -cosmic-notifications - -rustc -lld -cargo -wayland-devel -libxkbcommon-devel -just - -cosmic-osd - -rustc -lld -cargo -wayland-devel -libxkbcommon-devel -systemd-devel -just - -cosmic-panel - -rustc -lld -cargo -wayland-devel -libxkbcommon-devel -just - -cosmic-randr -rustc -lld -cargo -wayland-devel -just - -cosmic-screenshot -rustc -lld -cargo -just - -cosmic-settings -rustc -lld -cargo -libinput-devel -wayland-devel -libxkbcommon-devel -systemd-devel -just - -xdg-desktop-portal-cosmic -rustc -lld -cargo -libxkbcommon-devel -wayland-devel -pipewire-devel -clang-devel -mesa-libEGL-devel -mesa-libgbm-devel -just - -pop-launcher - -rustc -lld -cargo -mesa-libEGL-devel -libxkbcommon-devel -just diff --git a/metadata/files_list.txt b/metadata/files_list.txt deleted file mode 100644 index 8d4f426..0000000 --- a/metadata/files_list.txt +++ /dev/null @@ -1,303 +0,0 @@ -This file lists all the files produced by each package. Please update this whenever adding files to a spec. - -cosmic-app-library - -%{_bindir}/cosmic-app-library -%{_datadir}/applications/com.system76.CosmicAppLibrary.desktop -%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppLibrary.svg -%{_metainfodir}/com.system76.CosmicAppLibrary.metainfo.xml - -cosmic-applets - -%{_bindir}/cosmic-applets -%{_bindir}/cosmic-panel-button -%{_bindir}/cosmic-app-list -%{_bindir}/cosmic-applet-audio -%{_bindir}/cosmic-applet-battery -%{_bindir}/cosmic-applet-bluetooth -%{_bindir}/cosmic-applet-minimize -%{_bindir}/cosmic-applet-network -%{_bindir}/cosmic-applet-notifications -%{_bindir}/cosmic-applet-power -%{_bindir}/cosmic-applet-status-area -%{_bindir}/cosmic-applet-tiling -%{_bindir}/cosmic-applet-time -%{_bindir}/cosmic-applet-workspaces -%{_datadir}/applications/com.system76.CosmicAppList.desktop -%{_datadir}/applications/com.system76.CosmicAppletAudio.desktop -%{_datadir}/applications/com.system76.CosmicAppletBattery.desktop -%{_datadir}/applications/com.system76.CosmicAppletBluetooth.desktop -%{_datadir}/applications/com.system76.CosmicAppletMinimize.desktop -%{_datadir}/applications/com.system76.CosmicAppletNetwork.desktop -%{_datadir}/applications/com.system76.CosmicAppletNotifications.desktop -%{_datadir}/applications/com.system76.CosmicAppletPower.desktop -%{_datadir}/applications/com.system76.CosmicAppletStatusArea.desktop -%{_datadir}/applications/com.system76.CosmicAppletTiling.desktop -%{_datadir}/applications/com.system76.CosmicAppletTime.desktop -%{_datadir}/applications/com.system76.CosmicAppletWorkspaces.desktop -%{_datadir}/applications/com.system76.CosmicPanelAppButton.desktop -%{_datadir}/applications/com.system76.CosmicPanelWorkspacesButton.desktop -%{_datadir}/cosmic/com.system76.CosmicAppList/v1/favorites -%{_datadir}/cosmic/com.system76.CosmicAppList/v1/filter_top_levels -%{_datadir}/icons/hicolor/scalable/app/com.system76.CosmicAppletStatusArea.svg -%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppList.svg -%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletAudio.svg -%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletBattery.svg -%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletBluetooth.svg -%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletMinimize.svg -%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletNetwork.svg -%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletNotifications.svg -%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletPower.svg -%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletTiling.Off.svg -%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletTiling.On.svg -%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletTime.svg -%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletWorkspaces.svg -%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicPanelAppButton.svg -%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicPanelWorkspacesButton.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-display-brightness-high-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-display-brightness-low-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-display-brightness-medium-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-display-brightness-off-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-0-charging-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-0-limited-charging-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-0-limited-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-0-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-10-charging-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-10-limited-charging-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-10-limited-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-10-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-100-charging-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-100-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-20-charging-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-20-limited-charging-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-20-limited-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-20-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-35-charging-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-35-limited-charging-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-35-limited-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-35-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-5-charging-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-5-limited-charging-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-5-limited-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-5-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-50-charging-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-50-limited-charging-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-50-limited-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-50-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-65-charging-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-65-limited-charging-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-65-limited-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-65-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-80-charging-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-80-limited-charging-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-80-limited-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-80-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-90-charging-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-90-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-bluetooth-active-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-bluetooth-disabled-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-notification-disabled-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-notification-new-symbolic.svg -%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-notification-symbolic.svg - -cosmic-bg - -%{_bindir}/cosmic-bg -%{_datadir}/applications/com.system76.CosmicBackground.desktop -%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicBackground.svg -%{_datadir}/icons/hicolor/symbolic/apps/com.system76.CosmicBackground-symbolic.svg -%{_metainfodir}/com.system76.CosmicBackground.metainfo.xml -%{_datadir}/cosmic/com.system76.CosmicBackground/* - -cosmic-comp - -%{_bindir}/cosmic-comp -%{_sysconfdir}/cosmic-comp/config.ron - -cosmic-edit - -%{_bindir}/cosmic-edit -%{_datadir}/applications/com.system76.CosmicEdit.desktop -%{_metainfodir}/com.system76.CosmicEdit.metainfo.xml -%{_datadir}/icons/hicolor/128x128/apps/com.system76.CosmicEdit.svg -%{_datadir}/icons/hicolor/16x16/apps/com.system76.CosmicEdit.svg -%{_datadir}/icons/hicolor/24x24/apps/com.system76.CosmicEdit.svg -%{_datadir}/icons/hicolor/256x256/apps/com.system76.CosmicEdit.svg -%{_datadir}/icons/hicolor/32x32/apps/com.system76.CosmicEdit.svg -%{_datadir}/icons/hicolor/48x48/apps/com.system76.CosmicEdit.svg -%{_datadir}/icons/hicolor/64x64/apps/com.system76.CosmicEdit.svg - -cosmic-epoch - -(NONE) - -cosmic-files - -%{_bindir}/cosmic-files -%{_datadir}/applications/com.system76.CosmicFiles.desktop -%{_metainfodir}/com.system76.CosmicFiles.metainfo.xml -%{_datadir}/icons/hicolor/128x128/apps/com.system76.CosmicFiles.svg -%{_datadir}/icons/hicolor/16x16/apps/com.system76.CosmicFiles.svg -%{_datadir}/icons/hicolor/24x24/apps/com.system76.CosmicFiles.svg -%{_datadir}/icons/hicolor/256x256/apps/com.system76.CosmicFiles.svg -%{_datadir}/icons/hicolor/32x32/apps/com.system76.CosmicFiles.svg -%{_datadir}/icons/hicolor/48x48/apps/com.system76.CosmicFiles.svg -%{_datadir}/icons/hicolor/64x64/apps/com.system76.CosmicFiles.svg - -cosmic-greeter - -%{_bindir}/cosmic-greeter -%{_bindir}/cosmic-greeter-daemon -%{_datadir}/dbus-1/system.d/com.system76.CosmicGreeter.conf -%{_sysusersdir}/cosmic-greeter.conf -%{_tmpfilesdir}/cosmic-greeter.conf -%{_prefix}/etc/greetd/cosmic-greeter.toml -%{_unitdir}/cosmic-greeter.service -%{_unitdir}/cosmic-greeter-daemon.service - -cosmic-icons - -%{_datadir}/icons/Cosmic/scalable/* -%{_datadir}/icons/Cosmic/index.theme - -cosmic-launcher - -%{_bindir}/cosmic-launcher -%{_datadir}/applications/com.system76.CosmicLauncher.desktop -%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicLauncher.svg -%{_metainfodir}/com.system76.CosmicLauncher.metainfo.xml - -cosmic-notifications - -%{_bindir}/cosmic-notifications -%{_datadir}/applications/com.system76.CosmicNotifications.desktop -%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicNotifications.svg -%{_metainfodir}/com.system76.CosmicNotifications.metainfo.xml - -cosmic-osd - -%{_bindir}/cosmic-osd - -cosmic-panel - -%{_bindir}/cosmic-panel -%{_datadir}/cosmic/com.system76.CosmicPanel.Dock/* -%{_datadir}/cosmic/com.system76.CosmicPanel.Panel/* -%{_datadir}/cosmic/com.system76.CosmicPanel/* - -cosmic-randr - -%{_bindir}/cosmic-randr - -cosmic-screenshot - -%{_bindir}/cosmic-screenshot -%{_datadir}/applications/com.system76.CosmicScreenshot.desktop - -cosmic-session - -%{_bindir}/cosmic-session -%{_bindir}/start-cosmic -%{_userunitdir}/cosmic-session.target -%{_datadir}/wayland-sessions/cosmic.desktop -%{_datadir}/applications/cosmic-mimeapps.list - -cosmic-settings - -%{_bindir}/cosmic-settings -%{_datadir}/applications/com.system76.CosmicSettings.desktop -%{_metainfodir}/com.system76.CosmicSettings.metainfo.xml -%{_datadir}/cosmic/com.system76.CosmicTheme.Dark.Builder/v1/* -%{_datadir}/cosmic/com.system76.CosmicTheme.Dark/v1/* -%{_datadir}/cosmic/com.system76.CosmicTheme.Light.Builder/v1/* -%{_datadir}/cosmic/com.system76.CosmicTheme.Light/v1/* -%{_datadir}/cosmic/com.system76.CosmicTheme.Mode/v1/* -%{_datadir}/icons/hicolor/scalable/status/illustration-appearance-dark-style-round.svg -%{_datadir}/icons/hicolor/scalable/status/illustration-appearance-dark-style-slightly-round.svg -%{_datadir}/icons/hicolor/scalable/status/illustration-appearance-dark-style-square.svg -%{_datadir}/icons/hicolor/scalable/status/illustration-appearance-light-style-round.svg -%{_datadir}/icons/hicolor/scalable/status/illustration-appearance-light-style-slightly-round.svg -%{_datadir}/icons/hicolor/scalable/status/illustration-appearance-light-style-square.svg -%{_datadir}/icons/hicolor/scalable/status/illustration-appearance-mode-dark.svg -%{_datadir}/icons/hicolor/scalable/status/illustration-appearance-mode-light.svg -%{_datadir}/icons/hicolor/128x128/apps/com.system76.CosmicSettings.svg -%{_datadir}/icons/hicolor/16x16/apps/com.system76.CosmicSettings.svg -%{_datadir}/icons/hicolor/24x24/apps/com.system76.CosmicSettings.svg -%{_datadir}/icons/hicolor/256x256/apps/com.system76.CosmicSettings.svg -%{_datadir}/icons/hicolor/32x32/apps/com.system76.CosmicSettings.svg -%{_datadir}/icons/hicolor/48x48/apps/com.system76.CosmicSettings.svg -%{_datadir}/icons/hicolor/64x64/apps/com.system76.CosmicSettings.svg -%{_datadir}/applications/com.system76.CosmicSettings.About.desktop -%{_datadir}/applications/com.system76.CosmicSettings.Appearance.desktop -%{_datadir}/applications/com.system76.CosmicSettings.DateTime.desktop -%{_datadir}/applications/com.system76.CosmicSettings.Desktop.desktop -%{_datadir}/applications/com.system76.CosmicSettings.Displays.desktop -%{_datadir}/applications/com.system76.CosmicSettings.Firmware.desktop -%{_datadir}/applications/com.system76.CosmicSettings.Keyboard.desktop -%{_datadir}/applications/com.system76.CosmicSettings.Mouse.desktop -%{_datadir}/applications/com.system76.CosmicSettings.Notifications.desktop -%{_datadir}/applications/com.system76.CosmicSettings.RegionLanguage.desktop -%{_datadir}/applications/com.system76.CosmicSettings.Sound.desktop -%{_datadir}/applications/com.system76.CosmicSettings.Touchpad.desktop -%{_datadir}/applications/com.system76.CosmicSettings.Users.desktop -%{_datadir}/applications/com.system76.CosmicSettings.Wallpaper.desktop -%{_datadir}/applications/com.system76.CosmicSettings.Workspaces.desktop - -cosmic-settings-daemon - -%{_bindir}/cosmic-settings-daemon - -cosmic-store - -%{_bindir}/cosmic-store -%{_datadir}/applications/com.system76.CosmicStore.desktop -%{_metainfodir}/com.system76.CosmicStore.metainfo.xml -%{_datadir}/icons/hicolor/128x128/apps/com.system76.CosmicStore.svg -%{_datadir}/icons/hicolor/16x16/apps/com.system76.CosmicStore.svg -%{_datadir}/icons/hicolor/24x24/apps/com.system76.CosmicStore.svg -%{_datadir}/icons/hicolor/256x256/apps/com.system76.CosmicStore.svg -%{_datadir}/icons/hicolor/32x32/apps/com.system76.CosmicStore.svg -%{_datadir}/icons/hicolor/48x48/apps/com.system76.CosmicStore.svg -%{_datadir}/icons/hicolor/64x64/apps/com.system76.CosmicStore.svg - -cosmic-term - -%{_bindir}/cosmic-term -%{_datadir}/applications/com.system76.CosmicTerm.desktop -%{_metainfodir}/com.system76.CosmicTerm.metainfo.xml -%{_datadir}/icons/hicolor/128x128/apps/com.system76.CosmicTerm.svg -%{_datadir}/icons/hicolor/16x16/apps/com.system76.CosmicTerm.svg -%{_datadir}/icons/hicolor/24x24/apps/com.system76.CosmicTerm.svg -%{_datadir}/icons/hicolor/256x256/apps/com.system76.CosmicTerm.svg -%{_datadir}/icons/hicolor/32x32/apps/com.system76.CosmicTerm.svg -%{_datadir}/icons/hicolor/48x48/apps/com.system76.CosmicTerm.svg -%{_datadir}/icons/hicolor/64x64/apps/com.system76.CosmicTerm.svg - -cosmic-workspaces - -%{_bindir}/cosmic-workspaces -%{_datadir}/applications/com.system76.CosmicWorkspaces.desktop -%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicWorkspaces.svg - -pop-launcher - -%{_bindir}/pop-launcher -%{_prefix}/lib/pop-launcher/* - -system76-power - -%{_bindir}/system76-power -%{_unitdir}/com.system76.PowerDaemon.service -%{_datadir}/dbus-1/interfaces/com.system76.PowerDaemon.xml -%{_datadir}/dbus-1/system.d/com.system76.PowerDaemon.conf -%{_datadir}/polkit-1/actions/com.system76.PowerDaemon.policy - -xdg-desktop-portal-cosmic - -%{_libexecdir}/xdg-desktop-portal-cosmic -%{_datadir}/dbus-1/services/org.freedesktop.impl.portal.desktop.cosmic.service -%{_datadir}/xdg-desktop-portal/portals/cosmic.portal -%{_datadir}/xdg-desktop-portal/cosmic-portals.conf -%{_datadir}/icons/hicolor/scalable/actions/screenshot-screen-symbolic.svg -%{_datadir}/icons/hicolor/scalable/actions/screenshot-selection-symbolic.svg -%{_datadir}/icons/hicolor/scalable/actions/screenshot-window-symbolic.svg diff --git a/metadata/summaries.txt b/metadata/summaries.txt deleted file mode 100644 index e283c41..0000000 --- a/metadata/summaries.txt +++ /dev/null @@ -1,95 +0,0 @@ -cosmic-app-library - -App Library program for the COSMIC Desktop Environment. - -cosmic-applets - -Applets for the COSMIC Desktop Environment. - -cosmic-bg - -Background manager for the COSMIC Desktop Environment. - -cosmic-comp - -Compositor for the COSMIC Desktop Environment. Can also be used as a standalone compositor. - -cosmic-desktop - -COSMIC Desktop Environment Meta Package - -cosmic-edit - -Libcosmic text editor. - -cosmic-files - -Libcosmic file manager. - -cosmic-greeter - -Login and display manager built using GreetD for the COSMIC Desktop Environment. - -cosmic-icons - -Icon theme for the COSMIC Desktop Environment. - -cosmic-launcher - -Pop launcher frontend for the COSMIC Desktop Environment. - -cosmic-notifications - -Notifications daemon for the COSMIC Desktop Environment. - -cosmic-osd - -OSDs for the COSMIC Desktop Environment. - -cosmic-panel - -Panel for the COSMIC Desktop Environment. - -cosmic-randr - -Library and utility for displaying and configuring Wayland outputs. - -cosmic-screenshot - -Screenshot utility for the COSMIC Desktop Environment. - -cosmic-session - -Session management for the COSMIC Desktop Environment. - -cosmic-settings - -Settings app for the COSMIC Desktop Environment. - -cosmic-settings-daemon - -Settings daemon for the COSMIC Desktop Environment. - -cosmic-store - -App store for the COSMIC Desktop Environment. - -cosmic-term - -Terminal emulator built with Libcosmic. - -cosmic-workspaces - -Workspaces overview for the COSMIC Desktop Environment. - -pop-launcher - -Modular IPC-based desktop launcher service. - -system76-power - -System76 power management daemon - -xdg-desktop-portal-cosmic - -XDG Desktop Portals implementation for the COSMIC Desktop Environment. \ No newline at end of file diff --git a/notes/all_deps.txt b/notes/all_deps.txt new file mode 100644 index 0000000..35fa976 --- /dev/null +++ b/notes/all_deps.txt @@ -0,0 +1,192 @@ +Build Requirements + +sudo dnf install -y make which git-core just rustc lld cargo glib2-devel gtk3-devel dbus-devel wayland-devel clang-devel libxkbcommon-devel mesa-libgbm-devel rust-rav1e+nasm-rs-devel libappstream-glib pipewire-devel libglvnd-devel libseat-devel libinput-devel pam-devel flatpak-devel + +Requirements + +Requires: libseat +Requires: pop-icon-theme +Requires: greetd +Requires: greetd-selinux +Requires: cage +Requires: mozilla-fira-mono-fonts +Requires: mozilla-fira-sans-fonts + +lld cargo wayland-devel libxkbcommon-devel libglvnd-devel libseat-devel libinput-devel mesa-libgbm-devel pixman-devel make dbus-devel just libudev-devel pulseaudio-libs-devel mesa-libEGL-devel + +rustc lld cargo dbus-devel wayland-devel libinput-devel libudev-devel pulseaudio-libs-devel mesa-libEGL-devel libxkbcommon-devel just + +cosmic-app-library +BR: +rustc +lld +cargo +wayland-devel +libxkbcommon-devel +just + +R: + +?? + +cosmic-applets + +Build Requirements: +rustc +lld +cargo +dbus-devel +wayland-devel +libinput-devel +libpulse-devel +libudev-devel +mesa-libEGL-devel +libxkbcommon-devel +just + +Requirements: +cosmic-icons +cosmic-panel + +cosmic-bg + +Build Requirements: +rustc +lld +cargo +wayland-devel +libxkbcommon-devel +just + +Requirements: +cosmic-session + +cosmic-comp + +Build Requirements: +rustc +lld +cargo +wayland-devel +libxkbcommon-devel +libglvnd-devel +libseat-devel +libinput-devel +mesa-libgbm-devel +make + +cosmic-edit + +rustc +lld +cargo +just + +cosmic-files + +rustc +lld +cargo +just + +cosmic-greeter + +rustc +lld +cargo +wayland-devel +clang-devel +libxkbcommon-devel +pam-devel +just + +Requires: + +dbus +greetd +greetd-selinux +cosmic-comp + +cosmic-launcher + +rustc +lld +cargo +wayland-devel +libxkbcommon-devel +just + +Requires: +pop-launcher + +cosmic-notifications + +rustc +lld +cargo +wayland-devel +libxkbcommon-devel +just + +cosmic-osd + +rustc +lld +cargo +wayland-devel +libxkbcommon-devel +systemd-devel +just + +cosmic-panel + +rustc +lld +cargo +wayland-devel +libxkbcommon-devel +just + +cosmic-randr +rustc +lld +cargo +wayland-devel +just + +cosmic-screenshot +rustc +lld +cargo +just + +cosmic-settings +rustc +lld +cargo +libinput-devel +wayland-devel +libxkbcommon-devel +systemd-devel +just + +xdg-desktop-portal-cosmic +rustc +lld +cargo +libxkbcommon-devel +wayland-devel +pipewire-devel +clang-devel +mesa-libEGL-devel +mesa-libgbm-devel +just + +pop-launcher + +rustc +lld +cargo +mesa-libEGL-devel +libxkbcommon-devel +just diff --git a/notes/files_list.txt b/notes/files_list.txt new file mode 100644 index 0000000..8d4f426 --- /dev/null +++ b/notes/files_list.txt @@ -0,0 +1,303 @@ +This file lists all the files produced by each package. Please update this whenever adding files to a spec. + +cosmic-app-library + +%{_bindir}/cosmic-app-library +%{_datadir}/applications/com.system76.CosmicAppLibrary.desktop +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppLibrary.svg +%{_metainfodir}/com.system76.CosmicAppLibrary.metainfo.xml + +cosmic-applets + +%{_bindir}/cosmic-applets +%{_bindir}/cosmic-panel-button +%{_bindir}/cosmic-app-list +%{_bindir}/cosmic-applet-audio +%{_bindir}/cosmic-applet-battery +%{_bindir}/cosmic-applet-bluetooth +%{_bindir}/cosmic-applet-minimize +%{_bindir}/cosmic-applet-network +%{_bindir}/cosmic-applet-notifications +%{_bindir}/cosmic-applet-power +%{_bindir}/cosmic-applet-status-area +%{_bindir}/cosmic-applet-tiling +%{_bindir}/cosmic-applet-time +%{_bindir}/cosmic-applet-workspaces +%{_datadir}/applications/com.system76.CosmicAppList.desktop +%{_datadir}/applications/com.system76.CosmicAppletAudio.desktop +%{_datadir}/applications/com.system76.CosmicAppletBattery.desktop +%{_datadir}/applications/com.system76.CosmicAppletBluetooth.desktop +%{_datadir}/applications/com.system76.CosmicAppletMinimize.desktop +%{_datadir}/applications/com.system76.CosmicAppletNetwork.desktop +%{_datadir}/applications/com.system76.CosmicAppletNotifications.desktop +%{_datadir}/applications/com.system76.CosmicAppletPower.desktop +%{_datadir}/applications/com.system76.CosmicAppletStatusArea.desktop +%{_datadir}/applications/com.system76.CosmicAppletTiling.desktop +%{_datadir}/applications/com.system76.CosmicAppletTime.desktop +%{_datadir}/applications/com.system76.CosmicAppletWorkspaces.desktop +%{_datadir}/applications/com.system76.CosmicPanelAppButton.desktop +%{_datadir}/applications/com.system76.CosmicPanelWorkspacesButton.desktop +%{_datadir}/cosmic/com.system76.CosmicAppList/v1/favorites +%{_datadir}/cosmic/com.system76.CosmicAppList/v1/filter_top_levels +%{_datadir}/icons/hicolor/scalable/app/com.system76.CosmicAppletStatusArea.svg +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppList.svg +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletAudio.svg +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletBattery.svg +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletBluetooth.svg +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletMinimize.svg +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletNetwork.svg +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletNotifications.svg +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletPower.svg +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletTiling.Off.svg +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletTiling.On.svg +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletTime.svg +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicAppletWorkspaces.svg +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicPanelAppButton.svg +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicPanelWorkspacesButton.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-display-brightness-high-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-display-brightness-low-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-display-brightness-medium-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-display-brightness-off-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-0-charging-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-0-limited-charging-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-0-limited-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-0-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-10-charging-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-10-limited-charging-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-10-limited-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-10-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-100-charging-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-100-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-20-charging-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-20-limited-charging-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-20-limited-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-20-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-35-charging-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-35-limited-charging-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-35-limited-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-35-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-5-charging-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-5-limited-charging-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-5-limited-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-5-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-50-charging-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-50-limited-charging-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-50-limited-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-50-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-65-charging-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-65-limited-charging-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-65-limited-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-65-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-80-charging-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-80-limited-charging-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-80-limited-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-80-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-90-charging-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-battery-level-90-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-bluetooth-active-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-bluetooth-disabled-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-notification-disabled-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-notification-new-symbolic.svg +%{_datadir}/icons/hicolor/scalable/status/cosmic-applet-notification-symbolic.svg + +cosmic-bg + +%{_bindir}/cosmic-bg +%{_datadir}/applications/com.system76.CosmicBackground.desktop +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicBackground.svg +%{_datadir}/icons/hicolor/symbolic/apps/com.system76.CosmicBackground-symbolic.svg +%{_metainfodir}/com.system76.CosmicBackground.metainfo.xml +%{_datadir}/cosmic/com.system76.CosmicBackground/* + +cosmic-comp + +%{_bindir}/cosmic-comp +%{_sysconfdir}/cosmic-comp/config.ron + +cosmic-edit + +%{_bindir}/cosmic-edit +%{_datadir}/applications/com.system76.CosmicEdit.desktop +%{_metainfodir}/com.system76.CosmicEdit.metainfo.xml +%{_datadir}/icons/hicolor/128x128/apps/com.system76.CosmicEdit.svg +%{_datadir}/icons/hicolor/16x16/apps/com.system76.CosmicEdit.svg +%{_datadir}/icons/hicolor/24x24/apps/com.system76.CosmicEdit.svg +%{_datadir}/icons/hicolor/256x256/apps/com.system76.CosmicEdit.svg +%{_datadir}/icons/hicolor/32x32/apps/com.system76.CosmicEdit.svg +%{_datadir}/icons/hicolor/48x48/apps/com.system76.CosmicEdit.svg +%{_datadir}/icons/hicolor/64x64/apps/com.system76.CosmicEdit.svg + +cosmic-epoch + +(NONE) + +cosmic-files + +%{_bindir}/cosmic-files +%{_datadir}/applications/com.system76.CosmicFiles.desktop +%{_metainfodir}/com.system76.CosmicFiles.metainfo.xml +%{_datadir}/icons/hicolor/128x128/apps/com.system76.CosmicFiles.svg +%{_datadir}/icons/hicolor/16x16/apps/com.system76.CosmicFiles.svg +%{_datadir}/icons/hicolor/24x24/apps/com.system76.CosmicFiles.svg +%{_datadir}/icons/hicolor/256x256/apps/com.system76.CosmicFiles.svg +%{_datadir}/icons/hicolor/32x32/apps/com.system76.CosmicFiles.svg +%{_datadir}/icons/hicolor/48x48/apps/com.system76.CosmicFiles.svg +%{_datadir}/icons/hicolor/64x64/apps/com.system76.CosmicFiles.svg + +cosmic-greeter + +%{_bindir}/cosmic-greeter +%{_bindir}/cosmic-greeter-daemon +%{_datadir}/dbus-1/system.d/com.system76.CosmicGreeter.conf +%{_sysusersdir}/cosmic-greeter.conf +%{_tmpfilesdir}/cosmic-greeter.conf +%{_prefix}/etc/greetd/cosmic-greeter.toml +%{_unitdir}/cosmic-greeter.service +%{_unitdir}/cosmic-greeter-daemon.service + +cosmic-icons + +%{_datadir}/icons/Cosmic/scalable/* +%{_datadir}/icons/Cosmic/index.theme + +cosmic-launcher + +%{_bindir}/cosmic-launcher +%{_datadir}/applications/com.system76.CosmicLauncher.desktop +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicLauncher.svg +%{_metainfodir}/com.system76.CosmicLauncher.metainfo.xml + +cosmic-notifications + +%{_bindir}/cosmic-notifications +%{_datadir}/applications/com.system76.CosmicNotifications.desktop +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicNotifications.svg +%{_metainfodir}/com.system76.CosmicNotifications.metainfo.xml + +cosmic-osd + +%{_bindir}/cosmic-osd + +cosmic-panel + +%{_bindir}/cosmic-panel +%{_datadir}/cosmic/com.system76.CosmicPanel.Dock/* +%{_datadir}/cosmic/com.system76.CosmicPanel.Panel/* +%{_datadir}/cosmic/com.system76.CosmicPanel/* + +cosmic-randr + +%{_bindir}/cosmic-randr + +cosmic-screenshot + +%{_bindir}/cosmic-screenshot +%{_datadir}/applications/com.system76.CosmicScreenshot.desktop + +cosmic-session + +%{_bindir}/cosmic-session +%{_bindir}/start-cosmic +%{_userunitdir}/cosmic-session.target +%{_datadir}/wayland-sessions/cosmic.desktop +%{_datadir}/applications/cosmic-mimeapps.list + +cosmic-settings + +%{_bindir}/cosmic-settings +%{_datadir}/applications/com.system76.CosmicSettings.desktop +%{_metainfodir}/com.system76.CosmicSettings.metainfo.xml +%{_datadir}/cosmic/com.system76.CosmicTheme.Dark.Builder/v1/* +%{_datadir}/cosmic/com.system76.CosmicTheme.Dark/v1/* +%{_datadir}/cosmic/com.system76.CosmicTheme.Light.Builder/v1/* +%{_datadir}/cosmic/com.system76.CosmicTheme.Light/v1/* +%{_datadir}/cosmic/com.system76.CosmicTheme.Mode/v1/* +%{_datadir}/icons/hicolor/scalable/status/illustration-appearance-dark-style-round.svg +%{_datadir}/icons/hicolor/scalable/status/illustration-appearance-dark-style-slightly-round.svg +%{_datadir}/icons/hicolor/scalable/status/illustration-appearance-dark-style-square.svg +%{_datadir}/icons/hicolor/scalable/status/illustration-appearance-light-style-round.svg +%{_datadir}/icons/hicolor/scalable/status/illustration-appearance-light-style-slightly-round.svg +%{_datadir}/icons/hicolor/scalable/status/illustration-appearance-light-style-square.svg +%{_datadir}/icons/hicolor/scalable/status/illustration-appearance-mode-dark.svg +%{_datadir}/icons/hicolor/scalable/status/illustration-appearance-mode-light.svg +%{_datadir}/icons/hicolor/128x128/apps/com.system76.CosmicSettings.svg +%{_datadir}/icons/hicolor/16x16/apps/com.system76.CosmicSettings.svg +%{_datadir}/icons/hicolor/24x24/apps/com.system76.CosmicSettings.svg +%{_datadir}/icons/hicolor/256x256/apps/com.system76.CosmicSettings.svg +%{_datadir}/icons/hicolor/32x32/apps/com.system76.CosmicSettings.svg +%{_datadir}/icons/hicolor/48x48/apps/com.system76.CosmicSettings.svg +%{_datadir}/icons/hicolor/64x64/apps/com.system76.CosmicSettings.svg +%{_datadir}/applications/com.system76.CosmicSettings.About.desktop +%{_datadir}/applications/com.system76.CosmicSettings.Appearance.desktop +%{_datadir}/applications/com.system76.CosmicSettings.DateTime.desktop +%{_datadir}/applications/com.system76.CosmicSettings.Desktop.desktop +%{_datadir}/applications/com.system76.CosmicSettings.Displays.desktop +%{_datadir}/applications/com.system76.CosmicSettings.Firmware.desktop +%{_datadir}/applications/com.system76.CosmicSettings.Keyboard.desktop +%{_datadir}/applications/com.system76.CosmicSettings.Mouse.desktop +%{_datadir}/applications/com.system76.CosmicSettings.Notifications.desktop +%{_datadir}/applications/com.system76.CosmicSettings.RegionLanguage.desktop +%{_datadir}/applications/com.system76.CosmicSettings.Sound.desktop +%{_datadir}/applications/com.system76.CosmicSettings.Touchpad.desktop +%{_datadir}/applications/com.system76.CosmicSettings.Users.desktop +%{_datadir}/applications/com.system76.CosmicSettings.Wallpaper.desktop +%{_datadir}/applications/com.system76.CosmicSettings.Workspaces.desktop + +cosmic-settings-daemon + +%{_bindir}/cosmic-settings-daemon + +cosmic-store + +%{_bindir}/cosmic-store +%{_datadir}/applications/com.system76.CosmicStore.desktop +%{_metainfodir}/com.system76.CosmicStore.metainfo.xml +%{_datadir}/icons/hicolor/128x128/apps/com.system76.CosmicStore.svg +%{_datadir}/icons/hicolor/16x16/apps/com.system76.CosmicStore.svg +%{_datadir}/icons/hicolor/24x24/apps/com.system76.CosmicStore.svg +%{_datadir}/icons/hicolor/256x256/apps/com.system76.CosmicStore.svg +%{_datadir}/icons/hicolor/32x32/apps/com.system76.CosmicStore.svg +%{_datadir}/icons/hicolor/48x48/apps/com.system76.CosmicStore.svg +%{_datadir}/icons/hicolor/64x64/apps/com.system76.CosmicStore.svg + +cosmic-term + +%{_bindir}/cosmic-term +%{_datadir}/applications/com.system76.CosmicTerm.desktop +%{_metainfodir}/com.system76.CosmicTerm.metainfo.xml +%{_datadir}/icons/hicolor/128x128/apps/com.system76.CosmicTerm.svg +%{_datadir}/icons/hicolor/16x16/apps/com.system76.CosmicTerm.svg +%{_datadir}/icons/hicolor/24x24/apps/com.system76.CosmicTerm.svg +%{_datadir}/icons/hicolor/256x256/apps/com.system76.CosmicTerm.svg +%{_datadir}/icons/hicolor/32x32/apps/com.system76.CosmicTerm.svg +%{_datadir}/icons/hicolor/48x48/apps/com.system76.CosmicTerm.svg +%{_datadir}/icons/hicolor/64x64/apps/com.system76.CosmicTerm.svg + +cosmic-workspaces + +%{_bindir}/cosmic-workspaces +%{_datadir}/applications/com.system76.CosmicWorkspaces.desktop +%{_datadir}/icons/hicolor/scalable/apps/com.system76.CosmicWorkspaces.svg + +pop-launcher + +%{_bindir}/pop-launcher +%{_prefix}/lib/pop-launcher/* + +system76-power + +%{_bindir}/system76-power +%{_unitdir}/com.system76.PowerDaemon.service +%{_datadir}/dbus-1/interfaces/com.system76.PowerDaemon.xml +%{_datadir}/dbus-1/system.d/com.system76.PowerDaemon.conf +%{_datadir}/polkit-1/actions/com.system76.PowerDaemon.policy + +xdg-desktop-portal-cosmic + +%{_libexecdir}/xdg-desktop-portal-cosmic +%{_datadir}/dbus-1/services/org.freedesktop.impl.portal.desktop.cosmic.service +%{_datadir}/xdg-desktop-portal/portals/cosmic.portal +%{_datadir}/xdg-desktop-portal/cosmic-portals.conf +%{_datadir}/icons/hicolor/scalable/actions/screenshot-screen-symbolic.svg +%{_datadir}/icons/hicolor/scalable/actions/screenshot-selection-symbolic.svg +%{_datadir}/icons/hicolor/scalable/actions/screenshot-window-symbolic.svg diff --git a/notes/summaries.txt b/notes/summaries.txt new file mode 100644 index 0000000..e283c41 --- /dev/null +++ b/notes/summaries.txt @@ -0,0 +1,95 @@ +cosmic-app-library + +App Library program for the COSMIC Desktop Environment. + +cosmic-applets + +Applets for the COSMIC Desktop Environment. + +cosmic-bg + +Background manager for the COSMIC Desktop Environment. + +cosmic-comp + +Compositor for the COSMIC Desktop Environment. Can also be used as a standalone compositor. + +cosmic-desktop + +COSMIC Desktop Environment Meta Package + +cosmic-edit + +Libcosmic text editor. + +cosmic-files + +Libcosmic file manager. + +cosmic-greeter + +Login and display manager built using GreetD for the COSMIC Desktop Environment. + +cosmic-icons + +Icon theme for the COSMIC Desktop Environment. + +cosmic-launcher + +Pop launcher frontend for the COSMIC Desktop Environment. + +cosmic-notifications + +Notifications daemon for the COSMIC Desktop Environment. + +cosmic-osd + +OSDs for the COSMIC Desktop Environment. + +cosmic-panel + +Panel for the COSMIC Desktop Environment. + +cosmic-randr + +Library and utility for displaying and configuring Wayland outputs. + +cosmic-screenshot + +Screenshot utility for the COSMIC Desktop Environment. + +cosmic-session + +Session management for the COSMIC Desktop Environment. + +cosmic-settings + +Settings app for the COSMIC Desktop Environment. + +cosmic-settings-daemon + +Settings daemon for the COSMIC Desktop Environment. + +cosmic-store + +App store for the COSMIC Desktop Environment. + +cosmic-term + +Terminal emulator built with Libcosmic. + +cosmic-workspaces + +Workspaces overview for the COSMIC Desktop Environment. + +pop-launcher + +Modular IPC-based desktop launcher service. + +system76-power + +System76 power management daemon + +xdg-desktop-portal-cosmic + +XDG Desktop Portals implementation for the COSMIC Desktop Environment. \ No newline at end of file diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index a7bc5f4..5a1707e 100644 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -9,7 +9,7 @@ VERSION=0.1.0 COMMIT=LATEST # Repos REPO=https://github.com/pop-os/$SOURCE_NAME -RPM_REPO=https://pagure.io/forks/ryanabx/fedora-cosmic/cosmic-packaging.git +RPM_REPO=https://pagure.io/fedora-cosmic/cosmic-packaging.git # Paths to files RPM_FILES=cosmic-packaging/rpms/$NAME/* SCRIPT_FILE=srpm.sh From ca9bca600901a446414bb2341dc8c22b877b4210 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Jul 21 2024 22:37:20 +0000 Subject: [PATCH 218/220] temp-fix: turn off cargo_test for cosmic-files Signed-off-by: Ryan Brue --- diff --git a/rpms/cosmic-files/cosmic-files.spec b/rpms/cosmic-files/cosmic-files.spec index 347ed4a..a8941b4 100644 --- a/rpms/cosmic-files/cosmic-files.spec +++ b/rpms/cosmic-files/cosmic-files.spec @@ -105,7 +105,7 @@ just rootdir=%{buildroot} prefix=%{_prefix} install %check export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" export VERGEN_GIT_SHA="%{commit}" -%cargo_test +# %%cargo_test (Broken at the moment) # desktop-file-validate %%{buildroot}%%{_datadir}/applications/com.system76.CosmicFiles.desktop %endif From fcd8daab17e3437adc45a8dd81d0290f46cb1a82 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Jul 23 2024 01:45:09 +0000 Subject: [PATCH 219/220] fix: use desktop-file-validate now that upstream recognizes 'COSMIC' Signed-off-by: Ryan Brue --- diff --git a/rpms/cosmic-app-library/cosmic-app-library.spec b/rpms/cosmic-app-library/cosmic-app-library.spec index 75caf70..bbd83ef 100644 --- a/rpms/cosmic-app-library/cosmic-app-library.spec +++ b/rpms/cosmic-app-library/cosmic-app-library.spec @@ -101,7 +101,7 @@ just rootdir=%{buildroot} prefix=%{_prefix} install export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" export VERGEN_GIT_SHA="%{commit}" %cargo_test -# desktop-file-validate %%{buildroot}%%{_datadir}/applications/com.system76.CosmicAppLibrary.desktop +desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicAppLibrary.desktop %endif %files diff --git a/rpms/cosmic-applets/cosmic-applets.spec b/rpms/cosmic-applets/cosmic-applets.spec index 06c4173..f2d29f9 100644 --- a/rpms/cosmic-applets/cosmic-applets.spec +++ b/rpms/cosmic-applets/cosmic-applets.spec @@ -110,22 +110,22 @@ just rootdir=%{buildroot} prefix=%{_prefix} install export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" export VERGEN_GIT_SHA="%{commit}" %cargo_test -# desktop-file-validate %%{buildroot}%%{_datadir}/applications/com.system76.CosmicAppList.desktop -# desktop-file-validate %%{buildroot}%%{_datadir}/applications/com.system76.CosmicAppletAudio.desktop -# desktop-file-validate %%{buildroot}%%{_datadir}/applications/com.system76.CosmicAppletBattery.desktop -# desktop-file-validate %%{buildroot}%%{_datadir}/applications/com.system76.CosmicAppletBluetooth.desktop -# desktop-file-validate %%{buildroot}%%{_datadir}/applications/com.system76.CosmicAppletInputSources.desktop -# desktop-file-validate %%{buildroot}%%{_datadir}/applications/com.system76.CosmicAppletMinimize.desktop -# desktop-file-validate %%{buildroot}%%{_datadir}/applications/com.system76.CosmicAppletNetwork.desktop -# desktop-file-validate %%{buildroot}%%{_datadir}/applications/com.system76.CosmicAppletNotifications.desktop -# desktop-file-validate %%{buildroot}%%{_datadir}/applications/com.system76.CosmicAppletPower.desktop -# desktop-file-validate %%{buildroot}%%{_datadir}/applications/com.system76.CosmicAppletStatusArea.desktop -# desktop-file-validate %%{buildroot}%%{_datadir}/applications/com.system76.CosmicAppletTiling.desktop -# desktop-file-validate %%{buildroot}%%{_datadir}/applications/com.system76.CosmicAppletTime.desktop -# desktop-file-validate %%{buildroot}%%{_datadir}/applications/com.system76.CosmicAppletWorkspaces.desktop -# desktop-file-validate %%{buildroot}%%{_datadir}/applications/com.system76.CosmicPanelAppButton.desktop -# desktop-file-validate %%{buildroot}%%{_datadir}/applications/com.system76.CosmicPanelWorkspacesButton.desktop -# desktop-file-validate %%{buildroot}%%{_datadir}/applications/com.system76.CosmicPanelLauncherButton.desktop +desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicAppList.desktop +desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicAppletAudio.desktop +desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicAppletBattery.desktop +desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicAppletBluetooth.desktop +desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicAppletInputSources.desktop +desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicAppletMinimize.desktop +desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicAppletNetwork.desktop +desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicAppletNotifications.desktop +desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicAppletPower.desktop +desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicAppletStatusArea.desktop +desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicAppletTiling.desktop +desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicAppletTime.desktop +desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicAppletWorkspaces.desktop +desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicPanelAppButton.desktop +desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicPanelWorkspacesButton.desktop +desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicPanelLauncherButton.desktop %endif %files diff --git a/rpms/cosmic-bg/cosmic-bg.spec b/rpms/cosmic-bg/cosmic-bg.spec index 1680a4c..dd74cb5 100644 --- a/rpms/cosmic-bg/cosmic-bg.spec +++ b/rpms/cosmic-bg/cosmic-bg.spec @@ -93,7 +93,7 @@ just rootdir=%{buildroot} prefix=%{_prefix} install export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" export VERGEN_GIT_SHA="%{commit}" %cargo_test -# desktop-file-validate %%{buildroot}%%{_datadir}/applications/com.system76.CosmicBackground.desktop +desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicBackground.desktop %endif %files diff --git a/rpms/cosmic-edit/cosmic-edit.spec b/rpms/cosmic-edit/cosmic-edit.spec index a079332..d392ea9 100644 --- a/rpms/cosmic-edit/cosmic-edit.spec +++ b/rpms/cosmic-edit/cosmic-edit.spec @@ -104,7 +104,7 @@ just rootdir=%{buildroot} prefix=%{_prefix} install export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" export VERGEN_GIT_SHA="%{commit}" %cargo_test -# desktop-file-validate %%{buildroot}%%{_datadir}/applications/com.system76.CosmicEdit.desktop +desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicEdit.desktop %endif %files diff --git a/rpms/cosmic-files/cosmic-files.spec b/rpms/cosmic-files/cosmic-files.spec index a8941b4..fb89507 100644 --- a/rpms/cosmic-files/cosmic-files.spec +++ b/rpms/cosmic-files/cosmic-files.spec @@ -106,7 +106,7 @@ just rootdir=%{buildroot} prefix=%{_prefix} install export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" export VERGEN_GIT_SHA="%{commit}" # %%cargo_test (Broken at the moment) -# desktop-file-validate %%{buildroot}%%{_datadir}/applications/com.system76.CosmicFiles.desktop +desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicFiles.desktop %endif %files diff --git a/rpms/cosmic-launcher/cosmic-launcher.spec b/rpms/cosmic-launcher/cosmic-launcher.spec index fecac4a..c3ff9c2 100644 --- a/rpms/cosmic-launcher/cosmic-launcher.spec +++ b/rpms/cosmic-launcher/cosmic-launcher.spec @@ -106,7 +106,7 @@ just rootdir=%{buildroot} prefix=%{_prefix} install export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" export VERGEN_GIT_SHA="%{commit}" %cargo_test -# desktop-file-validate %%{buildroot}%%{_datadir}/applications/com.system76.CosmicLauncher.desktop +desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicLauncher.desktop %endif %files diff --git a/rpms/cosmic-notifications/cosmic-notifications.spec b/rpms/cosmic-notifications/cosmic-notifications.spec index 5c1e028..21ba8d9 100644 --- a/rpms/cosmic-notifications/cosmic-notifications.spec +++ b/rpms/cosmic-notifications/cosmic-notifications.spec @@ -100,7 +100,7 @@ just rootdir=%{buildroot} prefix=%{_prefix} install export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" export VERGEN_GIT_SHA="%{commit}" %cargo_test -# desktop-file-validate %%{buildroot}%%{_datadir}/applications/com.system76.CosmicNotifications.desktop +desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicNotifications.desktop %endif %files diff --git a/rpms/cosmic-screenshot/cosmic-screenshot.spec b/rpms/cosmic-screenshot/cosmic-screenshot.spec index 96155d5..b605b21 100644 --- a/rpms/cosmic-screenshot/cosmic-screenshot.spec +++ b/rpms/cosmic-screenshot/cosmic-screenshot.spec @@ -89,7 +89,7 @@ just rootdir=%{buildroot} prefix=%{_prefix} install export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" export VERGEN_GIT_SHA="%{commit}" %cargo_test -# desktop-file-validate %%{buildroot}%%{_datadir}/applications/com.system76.CosmicScreenshot.desktop +desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicScreenshot.desktop %endif %files diff --git a/rpms/cosmic-session/cosmic-session.spec b/rpms/cosmic-session/cosmic-session.spec index 06b4151..1e7775e 100644 --- a/rpms/cosmic-session/cosmic-session.spec +++ b/rpms/cosmic-session/cosmic-session.spec @@ -113,7 +113,7 @@ just rootdir=%{buildroot} install export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" export VERGEN_GIT_SHA="%{commit}" %cargo_test -# desktop-file-validate %%{buildroot}%%{_datadir}/wayland-sessions/cosmic.desktop +desktop-file-validate %{buildroot}%{_datadir}/wayland-sessions/cosmic.desktop %endif %files diff --git a/rpms/cosmic-settings/cosmic-settings.spec b/rpms/cosmic-settings/cosmic-settings.spec index 4ff2dd4..a968133 100644 --- a/rpms/cosmic-settings/cosmic-settings.spec +++ b/rpms/cosmic-settings/cosmic-settings.spec @@ -107,7 +107,7 @@ just rootdir=%{buildroot} install export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" export VERGEN_GIT_SHA="%{commit}" %cargo_test -# desktop-file-validate %%{buildroot}%%{_datadir}/applications/com.system76.CosmicSettings.desktop +desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicSettings.desktop %endif %files diff --git a/rpms/cosmic-store/cosmic-store.spec b/rpms/cosmic-store/cosmic-store.spec index 229a27b..ba138e9 100644 --- a/rpms/cosmic-store/cosmic-store.spec +++ b/rpms/cosmic-store/cosmic-store.spec @@ -106,7 +106,7 @@ just rootdir=%{buildroot} prefix=%{_prefix} install export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" export VERGEN_GIT_SHA="%{commit}" %cargo_test -# desktop-file-validate %%{buildroot}%%{_datadir}/applications/com.system76.CosmicStore.desktop +desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicStore.desktop %endif %files diff --git a/rpms/cosmic-term/cosmic-term.spec b/rpms/cosmic-term/cosmic-term.spec index 9e4ccb3..72c8220 100644 --- a/rpms/cosmic-term/cosmic-term.spec +++ b/rpms/cosmic-term/cosmic-term.spec @@ -103,7 +103,7 @@ just rootdir=%{buildroot} prefix=%{_prefix} install export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" export VERGEN_GIT_SHA="%{commit}" %cargo_test -# desktop-file-validate %%{buildroot}%%{_datadir}/applications/com.system76.CosmicTerm.desktop +desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicTerm.desktop %endif %files diff --git a/rpms/cosmic-workspaces/cosmic-workspaces.spec b/rpms/cosmic-workspaces/cosmic-workspaces.spec index f3753ae..f9fb99a 100644 --- a/rpms/cosmic-workspaces/cosmic-workspaces.spec +++ b/rpms/cosmic-workspaces/cosmic-workspaces.spec @@ -109,7 +109,7 @@ make install DESTDIR=%{buildroot} prefix=%{_prefix} export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" export VERGEN_GIT_SHA="%{commit}" %cargo_test -# desktop-file-validate %%{buildroot}%%{_datadir}/applications/com.system76.CosmicWorkspaces.desktop +desktop-file-validate %{buildroot}%{_datadir}/applications/com.system76.CosmicWorkspaces.desktop %endif %files From 31437a31e5f58be59a9d6521b5805659ffd2cb61 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Jul 23 2024 01:47:05 +0000 Subject: [PATCH 220/220] fix: remove no longer needed patches Signed-off-by: Ryan Brue --- diff --git a/rpms/cosmic-app-library/cosmic-app-library.spec b/rpms/cosmic-app-library/cosmic-app-library.spec index bbd83ef..2aa8aa6 100644 --- a/rpms/cosmic-app-library/cosmic-app-library.spec +++ b/rpms/cosmic-app-library/cosmic-app-library.spec @@ -47,7 +47,6 @@ Source1: vendor.tar.gz # * mv vendor-config.toml .. Source2: vendor-config.toml -# Patch0: https://github.com/pop-os/cosmic-applibrary/pull/130.patch BuildRequires: cargo-rpm-macros >= 26 BuildRequires: rustc diff --git a/rpms/cosmic-applets/cosmic-applets.spec b/rpms/cosmic-applets/cosmic-applets.spec index f2d29f9..5587a9b 100644 --- a/rpms/cosmic-applets/cosmic-applets.spec +++ b/rpms/cosmic-applets/cosmic-applets.spec @@ -46,7 +46,6 @@ Source1: vendor.tar.gz # * mv vendor-config.toml .. Source2: vendor-config.toml -# Patch0: https://github.com/pop-os/cosmic-applets/pull/507.patch Patch: better_compile.patch Patch: symlink.patch diff --git a/rpms/cosmic-edit/cosmic-edit.spec b/rpms/cosmic-edit/cosmic-edit.spec index d392ea9..f9975b0 100644 --- a/rpms/cosmic-edit/cosmic-edit.spec +++ b/rpms/cosmic-edit/cosmic-edit.spec @@ -51,7 +51,6 @@ Source1: vendor.tar.gz # * mv vendor-config.toml .. Source2: vendor-config.toml -# Patch0: https://github.com/pop-os/cosmic-edit/pull/207.patch BuildRequires: cargo-rpm-macros >= 26 BuildRequires: rustc diff --git a/rpms/cosmic-files/cosmic-files.spec b/rpms/cosmic-files/cosmic-files.spec index fb89507..316ccf9 100644 --- a/rpms/cosmic-files/cosmic-files.spec +++ b/rpms/cosmic-files/cosmic-files.spec @@ -51,7 +51,6 @@ Source1: vendor.tar.gz # * mv vendor-config.toml .. Source2: vendor-config.toml -# Patch0: https://github.com/pop-os/cosmic-files/pull/263.patch BuildRequires: cargo-rpm-macros >= 26 BuildRequires: rustc diff --git a/rpms/cosmic-launcher/cosmic-launcher.spec b/rpms/cosmic-launcher/cosmic-launcher.spec index c3ff9c2..764f3ae 100644 --- a/rpms/cosmic-launcher/cosmic-launcher.spec +++ b/rpms/cosmic-launcher/cosmic-launcher.spec @@ -51,7 +51,6 @@ Source1: vendor.tar.gz # * mv vendor-config.toml .. Source2: vendor-config.toml -# Patch0: https://github.com/pop-os/cosmic-launcher/pull/149.patch BuildRequires: cargo-rpm-macros >= 26 BuildRequires: rustc diff --git a/rpms/cosmic-screenshot/cosmic-screenshot.spec b/rpms/cosmic-screenshot/cosmic-screenshot.spec index b605b21..2d0034a 100644 --- a/rpms/cosmic-screenshot/cosmic-screenshot.spec +++ b/rpms/cosmic-screenshot/cosmic-screenshot.spec @@ -39,7 +39,6 @@ Source1: vendor.tar.gz # * mv vendor-config.toml .. Source2: vendor-config.toml -# Patch0: https://github.com/pop-os/cosmic-screenshot/pull/32.patch BuildRequires: cargo-rpm-macros >= 26 BuildRequires: rustc diff --git a/rpms/cosmic-settings/cosmic-settings.spec b/rpms/cosmic-settings/cosmic-settings.spec index a968133..6f0663d 100644 --- a/rpms/cosmic-settings/cosmic-settings.spec +++ b/rpms/cosmic-settings/cosmic-settings.spec @@ -51,7 +51,6 @@ Source1: vendor.tar.gz # * mv vendor-config.toml .. Source2: vendor-config.toml -# Patch0: https://github.com/pop-os/cosmic-settings/pull/385.patch BuildRequires: cargo-rpm-macros >= 25 BuildRequires: rustc diff --git a/rpms/cosmic-store/cosmic-store.spec b/rpms/cosmic-store/cosmic-store.spec index ba138e9..7dd3f21 100644 --- a/rpms/cosmic-store/cosmic-store.spec +++ b/rpms/cosmic-store/cosmic-store.spec @@ -49,7 +49,6 @@ Source1: vendor.tar.gz # * mv vendor-config.toml .. Source2: vendor-config.toml -# Patch0: https://github.com/pop-os/cosmic-store/pull/103.patch BuildRequires: cargo-rpm-macros >= 25 BuildRequires: rustc diff --git a/rpms/cosmic-term/cosmic-term.spec b/rpms/cosmic-term/cosmic-term.spec index 72c8220..f8ab84c 100644 --- a/rpms/cosmic-term/cosmic-term.spec +++ b/rpms/cosmic-term/cosmic-term.spec @@ -50,7 +50,6 @@ Source1: vendor.tar.gz # * mv vendor-config.toml .. Source2: vendor-config.toml -# Patch0: https://github.com/pop-os/cosmic-term/pull/233.patch BuildRequires: cargo-rpm-macros >= 26 BuildRequires: rustc diff --git a/rpms/cosmic-workspaces/cosmic-workspaces.spec b/rpms/cosmic-workspaces/cosmic-workspaces.spec index f9fb99a..4cc573c 100644 --- a/rpms/cosmic-workspaces/cosmic-workspaces.spec +++ b/rpms/cosmic-workspaces/cosmic-workspaces.spec @@ -49,7 +49,6 @@ Source1: vendor.tar.gz # * mv vendor-config.toml .. Source2: vendor-config.toml -# Patch0: https://github.com/pop-os/cosmic-workspaces-epoch/pull/52.patch BuildRequires: cargo-rpm-macros >= 26 BuildRequires: rustc