From ec42c4e7326358793ee3d98f58de44517c040799 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Nov 03 2024 18:51:42 +0000 Subject: [PATCH 1/2] add copr-wiki.md Signed-off-by: Ryan Brue --- diff --git a/docs/src/SUMMARY.md b/docs/src/SUMMARY.md index 30db5f3..27c9b6c 100644 --- a/docs/src/SUMMARY.md +++ b/docs/src/SUMMARY.md @@ -4,3 +4,4 @@ - [Building for Rawhide](./building-for-rawhide.md) - [Generating license](./generating-license.md) - [Dependency Graph](./dependency-graph.md) +- [Wiki on the COPR](./copr-wiki.md) \ No newline at end of file diff --git a/docs/src/copr-wiki.md b/docs/src/copr-wiki.md new file mode 100644 index 0000000..f450f68 --- /dev/null +++ b/docs/src/copr-wiki.md @@ -0,0 +1,34 @@ +# COSMIC Desktop Environment on Fedora + +## Installation (Tagged Releases) + +The simplest way to install COSMIC on Fedora is installing from the official repository: + +```sh +dnf install @cosmic-desktop-environment +``` + +This will give you the COSMIC session and everything else required to run the desktop. + +## Installation (Nightly releases) + +Installing the latest of COSMIC involves installing COSMIC through a COPR + +```sh +dnf copr enable ryanabx/cosmic-epoch +dnf install cosmic-desktop +``` + +## Migration from nightly to tagged releases + +Now that the Fedora repos include the latest stable version of COSMIC, it is recommended to use those packages for a more supported experience. If you'd like to migrate, the process is simple! + +```sh +dnf remove cosmic-desktop +dnf copr disable ryanabx/cosmic-epoch +dnf install @cosmic-desktop-environment +``` + +## What is COSMIC? + +COSMIC is a next-generation desktop environment primarily developed by System76, and by independent contributors. The desktop is written in rust, and prioritizes modularity for vendors, such that they can create the experience they require for their end-users. The desktop's defaults provide a very slick experience, and Fedora tends to keep these defaults intact. Despite this, the end user can customize COSMIC completely to their liking! \ No newline at end of file From 69d6ee22450ccdff55ff5394ccc1f80c56f444aa Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Nov 03 2024 20:52:18 +0000 Subject: [PATCH 2/2] make some changes made to upstream spec files Signed-off-by: Ryan Brue --- diff --git a/rpms/cosmic-applets/cosmic-applets.spec b/rpms/cosmic-applets/cosmic-applets.spec index 6c97569..7bdeea9 100644 --- a/rpms/cosmic-applets/cosmic-applets.spec +++ b/rpms/cosmic-applets/cosmic-applets.spec @@ -85,6 +85,9 @@ export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" export VERGEN_GIT_SHA="%{commit}" just rootdir=%{buildroot} prefix=%{_prefix} install +# Fix Firefox desktop file reference +sed -e 's/"firefox"/"org.mozilla.firefox"/' -i %{buildroot}%{_datadir}/cosmic/com.system76.CosmicAppList/v1/favorites + # COSMIC is not a valid category pre-fedora 41 %if %{defined fedora} && 0%{?fedora} < 41 diff --git a/rpms/cosmic-bg/cosmic-bg.spec b/rpms/cosmic-bg/cosmic-bg.spec index a6898b8..7b94fae 100644 --- a/rpms/cosmic-bg/cosmic-bg.spec +++ b/rpms/cosmic-bg/cosmic-bg.spec @@ -38,6 +38,7 @@ BuildRequires: just BuildRequires: desktop-file-utils Requires: cosmic-icon-theme >= %{cosmic_minver} +Requires: desktop-backgrounds-compat %global _description %{expand: %{summary}.} @@ -74,6 +75,12 @@ export VERGEN_GIT_COMMIT_DATE="date --utc '%{commitdatestring}'" export VERGEN_GIT_SHA="%{commit}" just rootdir=%{buildroot} prefix=%{_prefix} install +# Set default background to system branding +sed -e 's|source: Path(".*"),|source: Path("/usr/share/backgrounds/default-dark.png"),|' -i %{buildroot}%{_datadir}/cosmic/com.system76.CosmicBackground/v1/all + +# Set default setting for backgrounds on all displays +echo "true" > %{buildroot}%{_datadir}/cosmic/com.system76.CosmicBackground/v1/same-on-all + # COSMIC is not a valid category pre-fedora 41 %if %{defined fedora} && 0%{?fedora} < 41 desktop-file-install \