Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add polycrystal entries #94

Merged
merged 1 commit into from
Nov 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions ultramarine/release/polycrystal-ultramarine-flagship.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
[
{
"id": "org.gnome.Calculator",
"remote": "flathub",
"branch": "stable"
},
{
"id": "org.gnome.Evince",
"remote": "flathub",
"branch": "stable"
},
{
"id": "org.gnome.Lollypop",
"remote": "flathub",
"branch": "stable"
}
]
72 changes: 72 additions & 0 deletions ultramarine/release/polycrystal-ultramarine-gnome.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
[
{
"id": "org.gnome.Extensions",
"remote": "flathub",
"branch": "stable"
},
{
"id": "org.gnome.Geary",
"remote": "flathub",
"branch": "stable"
},
{
"id": "org.gnome.Connections",
"remote": "flathub",
"branch": "stable"
},
{
"id": "org.gnome.TextEditor",
"remote": "flathub",
"branch": "stable"
},
{
"id": "org.gnome.Calculator",
"remote": "flathub",
"branch": "stable"
},
{
"id": "org.gnome.Calendar",
"remote": "flathub",
"branch": "stable"
},
{
"id": "org.gnome.clocks",
"remote": "flathub",
"branch": "stable"
},
{
"id": "org.gnome.Contacts",
"remote": "flathub",
"branch": "stable"
},
{
"id": "org.gnome.Maps",
"remote": "flathub",
"branch": "stable"
},
{
"id": "org.gnome.Weather",
"remote": "flathub",
"branch": "stable"
},
{
"id": "org.gnome.Snapshot",
"remote": "flathub",
"branch": "stable"
},
{
"id": "org.gnome.Showtime",
"remote": "flathub",
"branch": "stable"
},
{
"id": "org.gnome.Papers",
"remote": "flathub",
"branch": "stable"
},
{
"id": "org.gnome.Decibels",
"remote": "flathub",
"branch": "stable"
}
]
37 changes: 37 additions & 0 deletions ultramarine/release/polycrystal-ultramarine-plasma.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
[
{
"id": "org.kde.haruna",
"remote": "flathub",
"branch": "stable"
},
{
"id": "org.kde.kamoso",
"remote": "flathub",
"branch": "stable"
},
{
"id": "org.kde.kcalc",
"remote": "flathub",
"branch": "stable"
},
{
"id": "org.kde.kolourpaint",
"remote": "flathub",
"branch": "stable"
},
{
"id": "org.kde.kwrite",
"remote": "flathub",
"branch": "stable"
},
{
"id": "org.kde.okular",
"remote": "flathub",
"branch": "stable"
},
{
"id": "org.kde.elisa",
"remote": "flathub",
"branch": "stable"
}
]
17 changes: 17 additions & 0 deletions ultramarine/release/polycrystal-ultramarine-xfce.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
[
{
"id": "org.gnome.Calculator",
"remote": "flathub",
"branch": "stable"
},
{
"id": "org.gnome.Evince",
"remote": "flathub",
"branch": "stable"
},
{
"id": "org.gnome.Geary",
"remote": "flathub",
"branch": "stable"
}
]
32 changes: 31 additions & 1 deletion ultramarine/release/ultramarine-release.spec
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
Summary: Ultramarine Linux release files
Name: ultramarine-release
Version: %{dist_version}
Release: 4%{?dist}
Release: 5%{?dist}
License: MIT
Source0: LICENSE
URL: https://ultramarine-linux.org
Expand Down Expand Up @@ -109,6 +109,11 @@ Source64: 88-ultramarine-chromebook-default.preset

Source65: 91-ultramarine-surface-default.preset

Source70: polycrystal-ultramarine-flaghsip.json
Source71: polycrystal-ultramarine-gnome.json
Source72: polycrystal-ultramarine-plasma.json
Source73: polycrystal-ultramarine-xfce.json

BuildRequires: systemd-rpm-macros

%description
Expand Down Expand Up @@ -181,6 +186,7 @@ Provides: system-release(%{version})
Provides: base-module(platform:f%{version})
Requires: ultramarine-release-common = %{version}-%{release}
Requires: ultramarine-release-desktop = %{version}-%{release}
Requires: polycrystal
Provides: system-release-product
# ultramarine-release-common Requires: ultramarine-release-identity, so at least one
# package must provide it. This Recommends: pulls in
Expand Down Expand Up @@ -219,6 +225,7 @@ Provides: base-module(platform:f%{version})
Requires: ultramarine-release-common = %{version}-%{release}
Requires: ultramarine-release-desktop = %{version}-%{release}
Requires: ultramarine-release-atomic-desktop = %{version}-%{release}
Requires: polycrystal
Provides: system-release-product
# ultramarine-release-common Requires: ultramarine-release-identity, so at least one
# package must provide it. This Recommends: pulls in
Expand Down Expand Up @@ -255,6 +262,7 @@ Provides: system-release(%{version})
Provides: base-module(platform:f%{version})
Requires: ultramarine-release-common = %{version}-%{release}
Requires: ultramarine-release-desktop = %{version}-%{release}
Requires: polycrystal
Provides: system-release-product
Provides: ultramarine-release-kde = %{version}-%{release}
Obsoletes: ultramarine-release-kde < 40-12
Expand Down Expand Up @@ -297,6 +305,7 @@ Provides: base-module(platform:f%{version})
Requires: ultramarine-release-common = %{version}-%{release}
Requires: ultramarine-release-desktop = %{version}-%{release}
Requires: ultramarine-release-atomic-desktop = %{version}-%{release}
Requires: polycrystal
Provides: system-release-product
# ultramarine-release-common Requires: ultramarine-release-identity, so at least one
# package must provide it. This Recommends: pulls in
Expand Down Expand Up @@ -334,6 +343,7 @@ Provides: system-release(%{version})
Provides: base-module(platform:f%{version})
Requires: ultramarine-release-common = %{version}-%{release}
Requires: ultramarine-release-desktop = %{version}-%{release}
Requires: polycrystal
Provides: system-release-product
Recommends: gnome-shell-extension-pop-shell
Recommends: gnome-shell-extension-appindicator
Expand Down Expand Up @@ -380,6 +390,7 @@ Provides: base-module(platform:f%{version})
Requires: ultramarine-release-common = %{version}-%{release}
Requires: ultramarine-release-desktop = %{version}-%{release}
Requires: ultramarine-release-atomic-desktop = %{version}-%{release}
Requires: polycrystal
Provides: system-release-product
Recommends: gnome-shell-extension-pop-shell
Recommends: gnome-shell-extension-appindicator
Expand Down Expand Up @@ -438,6 +449,7 @@ Provides: system-release(%{version})
Provides: base-module(platform:f%{version})
Requires: ultramarine-release-common = %{version}-%{release}
Requires: ultramarine-release-desktop = %{version}-%{release}
Requires: polycrystal
Provides: system-release-product
# ultramarine-release-common Requires: ultramarine-release-identity, so at least one
# package must provide it. This Recommends: pulls in
Expand Down Expand Up @@ -485,6 +497,7 @@ Provides: base-module(platform:f%{version})
Requires: ultramarine-release-common = %{version}-%{release}
Requires: ultramarine-release-desktop = %{version}-%{release}
Requires: ultramarine-release-atomic-desktop = %{version}-%{release}
Requires: polycrystal
Provides: system-release-product
# ultramarine-release-common Requires: ultramarine-release-identity, so at least one
# package must provide it. This Recommends: pulls in
Expand Down Expand Up @@ -790,7 +803,16 @@ mkdir -p %{buildroot}%{_prefix}/lib/sysctl.d/

#########################

#########################

# Polycrystal entries
mkdir -p %{buildroot}%{_sysconfdir}/polycrystal/entries
install %{SOURCE70} %{buildroot}%{_sysconfdir}/polycrystal/entries/ultramarine-flagship.conf
install %{SOURCE71} %{buildroot}%{_sysconfdir}/polycrystal/entries/ultramarine-gnome.conf
install %{SOURCE72} %{buildroot}%{_sysconfdir}/polycrystal/entries/ultramarine-plasma.conf
install %{SOURCE73} %{buildroot}%{_sysconfdir}/polycrystal/entries/ultramarine-xfce.conf

#########################

# Budgie config
mkdir -p %{buildroot}%{_sysconfdir}/lightdm/lightdm.conf.d/
Expand Down Expand Up @@ -963,6 +985,7 @@ install -Dm0644 %{SOURCE32} -t %{buildroot}%{_datadir}/polkit-1/rules.d/
%{_prefix}/lib/os-release.flagship
%attr(0644,root,root) %{_swidtagdir}/org.ultramarinelinux.Ultramarine-edition.swidtag.flagship
%{_sysconfdir}/dnf/protected.d/ultramarine-flagship.conf
%config %{_sysconfdir}/polycrystal/entries/ultramarine-flagship.json
%{_sysconfdir}/lightdm/lightdm.conf.d/60-ultramarine-presets.conf
%{_sysconfdir}/lightdm/lightdm.conf.d/50-ultramarine-flagship-lightdm-gtk-greeter.conf
%endif
Expand All @@ -972,6 +995,7 @@ install -Dm0644 %{SOURCE32} -t %{buildroot}%{_datadir}/polkit-1/rules.d/
%files identity-atomic-flagship
%{_prefix}/lib/os-release.atomic-flagship
%attr(0644,root,root) %{_swidtagdir}/org.ultramarinelinux.Ultramarine-edition.swidtag.atomic-flagship
%config %{_sysconfdir}/polycrystal/entries/ultramarine-flagship.json
%{_sysconfdir}/lightdm/lightdm.conf.d/60-ultramarine-presets.conf
%{_sysconfdir}/lightdm/lightdm.conf.d/50-ultramarine-flagship-lightdm-gtk-greeter.conf
%endif
Expand All @@ -981,6 +1005,7 @@ install -Dm0644 %{SOURCE32} -t %{buildroot}%{_datadir}/polkit-1/rules.d/
%files identity-plasma
%{_prefix}/lib/os-release.plasma
%attr(0644,root,root) %{_swidtagdir}/org.ultramarinelinux.Ultramarine-edition.swidtag.plasma
%config %{_sysconfdir}/polycrystal/entries/ultramarine-plasma.json
%{_sysconfdir}/dnf/protected.d/ultramarine-plasma.conf
%config %_userunitdir/enable-kwin-system76-scheduler-integration.service
%endif
Expand All @@ -990,6 +1015,7 @@ install -Dm0644 %{SOURCE32} -t %{buildroot}%{_datadir}/polkit-1/rules.d/
%files identity-atomic-plasma
%{_prefix}/lib/os-release.atomic-plasma
%attr(0644,root,root) %{_swidtagdir}/org.ultramarinelinux.Ultramarine-edition.swidtag.atomic-plasma
%config %{_sysconfdir}/polycrystal/entries/ultramarine-plasma.json
%config %_userunitdir/enable-kwin-system76-scheduler-integration.service
%endif

Expand All @@ -999,6 +1025,7 @@ install -Dm0644 %{SOURCE32} -t %{buildroot}%{_datadir}/polkit-1/rules.d/
%{_prefix}/lib/os-release.gnome
%attr(0644,root,root) %{_swidtagdir}/org.ultramarinelinux.Ultramarine-edition.swidtag.gnome
%{_sysconfdir}/dnf/protected.d/ultramarine-gnome.conf
%config %{_sysconfdir}/polycrystal/entries/ultramarine-gnome.json
%{_datadir}/glib-2.0/schemas/50_ultramarine-gnome.gschema.override
%{_prefix}/lib/systemd/system-preset/80-workstation.preset
%endif
Expand All @@ -1008,6 +1035,7 @@ install -Dm0644 %{SOURCE32} -t %{buildroot}%{_datadir}/polkit-1/rules.d/
%files identity-atomic-gnome
%{_prefix}/lib/os-release.atomic-gnome
%attr(0644,root,root) %{_swidtagdir}/org.ultramarinelinux.Ultramarine-edition.swidtag.atomic-gnome
%config %{_sysconfdir}/polycrystal/entries/ultramarine-gnome.json
%{_datadir}/glib-2.0/schemas/50_ultramarine-gnome.gschema.override
%{_prefix}/lib/systemd/system-preset/80-workstation.preset
%endif
Expand All @@ -1018,6 +1046,7 @@ install -Dm0644 %{SOURCE32} -t %{buildroot}%{_datadir}/polkit-1/rules.d/
%{_prefix}/lib/os-release.xfce
%attr(0644,root,root) %{_swidtagdir}/org.ultramarinelinux.Ultramarine-edition.swidtag.xfce
%{_sysconfdir}/dnf/protected.d/ultramarine-xfce.conf
%config %{_sysconfdir}/polycrystal/entries/ultramarine-xfce.json
%{_sysconfdir}/skel/.config/xfce4/
%{_sysconfdir}/lightdm/lightdm.conf.d/60-ultramarine-presets.conf
%{_sysconfdir}/lightdm/lightdm.conf.d/50-ultramarine-xfce-lightdm-gtk-greeter.conf
Expand All @@ -1028,6 +1057,7 @@ install -Dm0644 %{SOURCE32} -t %{buildroot}%{_datadir}/polkit-1/rules.d/
%files identity-atomic-xfce
%{_prefix}/lib/os-release.atomic-xfce
%attr(0644,root,root) %{_swidtagdir}/org.ultramarinelinux.Ultramarine-edition.swidtag.atomic-xfce
%config %{_sysconfdir}/polycrystal/entries/ultramarine-xfce.json
%{_sysconfdir}/skel/.config/xfce4/
%{_sysconfdir}/lightdm/lightdm.conf.d/60-ultramarine-presets.conf
%{_sysconfdir}/lightdm/lightdm.conf.d/50-ultramarine-xfce-lightdm-gtk-greeter.conf
Expand Down
Loading