Skip to content

Commit

Permalink
Merge branch 'um41' into w/kde-fcitx5
Browse files Browse the repository at this point in the history
  • Loading branch information
madonuko authored Sep 9, 2024
2 parents da57447 + 368e32d commit cdae993
Show file tree
Hide file tree
Showing 7 changed files with 182 additions and 258 deletions.
64 changes: 64 additions & 0 deletions .github/ISSUE_TEMPLATE/package_request.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
name: Package Request
description: Request a package to be patched and added to Ultramarine Linux repos
title: "[Request] "
labels: ["enhancement"]
body:
- type: markdown
attributes:
value: |
# README
You are submitting a package request in the **[Ultramarine-Linux/packages]** repository.
This repository only hosts packages specific to Ultramarine Linux, such as OS identity files,
branding files, desktop configurations, release files, etc.
If you are requesting packages for software that **works fine on other Linux distributions
or operating systems**, chances are you should [submit this to Terra] instead.
However, if the package for some reason will not meet [Terra's packaging policies], we do
welcome such submissions to be included into Ultramarine exclusively instead. Possible
cases include:
- packages that alters existing Fedora installations/setups significantly
- e.g. a version of `uutils-coreutils` that replaces the `coreutils` package in Fedora
- e.g. replacing Fedora kernels with the Liquorix kernels
- packages that only works on Ultramarine
- e.g. [Ultramarine Hop] (`umswitch`, allowing users to switch between editions)
- but not [dive] (chroot utility for Ultramrine but works on other distros too)
**TL;DR: When in doubt, [submit this to Terra] instead.**
[Ultramarine-Linux/packages]: https://github.com/Ultramarine-Linux/packages
[Submit this to Terra]: https://github.com/terrapkg/packages/issues
[Terra's packaging policies]: https://developer.fyralabs.com/terra/policy
[Ultramarine Hop]: https://github.com/Ultramarine-Linux/hop
[dive]: https://github.com/Ultramarine-Linux/dive
- type: textarea
id: pkgs
attributes:
labels: List of packages to add
description: Also include their links if applicable.
placeholder: |
- nya (https://example.com)
- fyra (https://fyralabs.com)
validations:
required: true
- type: checkboxes
id: checklist
attributes:
label: Checklist
options:
- label: Package is not already in the Ultramarine repositories
required: true
- label: Package is not in [Fedora repositories](https://packages.fedoraproject.org/), unless it is a patched/forked version or an upstream version
required: true
- label: Package is not deprecated or obsolete
required: true
- label: Package is not a private package or illegal to distribute (e.g a cracked copy or a package that is not publicly available for download)
required: true
- label: Package is buildable and tested
required: true
validations:
required: true
- type: input
id: maintainer
attributes:
label: Nominate a Maintainer
79 changes: 22 additions & 57 deletions comps.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@
<packagereq type="default">ultramarine-fun</packagereq>
<packagereq type="default">ultramarine-phony-bookmarks</packagereq>
<packagereq type="default">git</packagereq>
<packagereq type="default">um</packagereq>
<packagereq type="default">golang-github-ultramarine-linux-um</packagereq>
<packagereq type="default">fastfetch</packagereq>
<packagereq type="default">linux-firmware</packagereq>
<packagereq type="default">nmtui</packagereq>
<packagereq type="default">NetworkManager-tui</packagereq>
</packagelist>
</group>
<group>
Expand Down Expand Up @@ -72,8 +72,6 @@
<packagereq type="default">ultramarine-backgrounds-gnome</packagereq>
<packagereq type="default">ultramarine-backgrounds</packagereq>
<packagereq type="default">lightdm-gtk</packagereq>
<packagereq type="default">nemo</packagereq>
<packagereq type="default">nemo-fileroller</packagereq>
<packagereq type="default">nemo-python</packagereq>
<packagereq type="default">nemo-preview</packagereq>
<packagereq type="default">nemo-emblems</packagereq>
Expand Down Expand Up @@ -116,43 +114,6 @@
<groupid>ultramarine-flagship-product</groupid>
</grouplist>
</environment>
<group>
<id>ultramarine-pantheon-product</id>
<name>Ultramarine Pantheon product core</name>
<description>Packages mandatory for the Ultramarine Pantheon product.</description>
<default>false</default>
<uservisible>false</uservisible>
<packagelist>
<packagereq type="default">ultramarine-release-pantheon</packagereq>
<packagereq type="default">ultramarine-release-identity-pantheon</packagereq>
</packagelist>
</group>
<environment>
<id>ultramarine-pantheon-product-environment</id>
<name>Ultramarine Pantheon</name>
<description>Ultramarine Pantheon is an Ultramarine experience powered by ElementaryOS' Pantheon desktop environment.</description>
<grouplist>
<groupid>base-x</groupid>
<groupid>container-management</groupid>
<groupid>core</groupid>
<groupid>standard</groupid>
<groupid>firefox</groupid>
<groupid>fonts</groupid>
<groupid>pantheon-desktop</groupid>
<groupid>guest-desktop-agents</groupid>
<groupid>hardware-support</groupid>
<groupid>libreoffice</groupid>
<groupid>multimedia</groupid>
<groupid>sound-and-video</groupid>
<groupid>networkmanager-submodules</groupid>
<groupid>printing</groupid>
<groupid>desktop-accessibility</groupid>
<groupid>input-methods</groupid>
<groupid>ultramarine-product-common</groupid>
<groupid>ultramarine-desktop-product-common</groupid>
<groupid>ultramarine-pantheon-product</groupid>
</grouplist>
</environment>
<group>
<id>ultramarine-gnome-product</id>
<name>Ultramarine GNOME product core</name>
Expand All @@ -161,10 +122,7 @@
<uservisible>false</uservisible>
<packagelist>
<packagereq type="default">gnome-extensions-app</packagereq>
<packagereq type="default">pop-launcher</packagereq>
<packagereq type="default">qalculate</packagereq>
<packagereq type="default">gnome-shell-extension-appindicator</packagereq>
<packagereq type="default">gnome-shell-extension-pop-shell</packagereq>
<packagereq type="default">gnome-shell-extension-windowsNavigator</packagereq>
<packagereq type="default">gnome-shell-extension-appmenu-is-back</packagereq>
<packagereq type="default">ultramarine-backgrounds-gnome</packagereq>
Expand Down Expand Up @@ -201,37 +159,44 @@
</grouplist>
</environment>
<group>
<id>ultramarine-kde-product</id>
<name>Ultramarine KDE product core</name>
<description>Packages mandatory for the Ultramarine KDE product.</description>
<id>ultramarine-plasma-product</id>
<name>Ultramarine Plasma product core</name>
<description>Packages mandatory for the Ultramarine Plasma product.</description>
<default>false</default>
<uservisible>false</uservisible>
<packagelist>
<packagereq type="default">kwin-system76-scheduler-integration</packagereq>
<packagereq type="default">ultramarine-appstream-metadata</packagereq>
<packagereq type="default">ultramarine-release-kde</packagereq>
<packagereq type="default">ultramarine-release-identity-kde</packagereq>
<packagereq type="default">ultramarine-release-plasma</packagereq>
<packagereq type="default">ultramarine-release-identity-plasma</packagereq>
<packagereq type="default">fcitx5-mozc</packagereq>
<packagereq type="default">fcitx5-gtk</packagereq>
<packagereq type="default">fcitx5-qt</packagereq>
<packagereq type="default">fcitx5-configtool</packagereq>
<packagereq type="default">kcm-fcitx5</packagereq>
<packagereq type="default">okular</packagereq>
<packagereq type="default">gwenview</packagereq>
<packagereq type="default">kamoso</packagereq>
<packagereq type="default">kolourpaint</packagereq>
<packagereq type="default">kate</packagereq>
<packagereq type="default">kmail</packagereq>
<packagereq type="default">vlc</packagereq>
<packagereq type="default">kalk</packagereq>
</packagelist>
</group>
<environment>
<id>ultramarine-kde-product-environment</id>
<name>Ultramarine KDE</name>
<description>Ultramarine KDE is an Ultramarine experience powered by the KDE desktop environment.</description>
<id>ultramarine-plasma-product-environment</id>
<name>Ultramarine plasma</name>
<description>Ultramarine Plasma is an Ultramarine experience powered by the Plasma desktop environment.</description>
<grouplist>
<groupid>base-graphical</groupid>
<groupid>container-management</groupid>
<groupid>core</groupid>
<groupid>standard</groupid>
<groupid>standard</groupid>
<groupid>firefox</groupid>
<groupid>fonts</groupid>
<groupid>kde-desktop</groupid>
<groupid>kde-apps</groupid>
<groupid>kde-media</groupid>
<groupid>critical-path-kde</groupid>
<groupid>guest-desktop-agents</groupid>
<groupid>hardware-support</groupid>
<groupid>libreoffice</groupid>
Expand All @@ -243,7 +208,7 @@
<groupid>input-methods</groupid>
<groupid>ultramarine-product-common</groupid>
<groupid>ultramarine-desktop-product-common</groupid>
<groupid>ultramarine-kde-product</groupid>
<groupid>ultramarine-plasma-product</groupid>
</grouplist>
</environment>
<group>
Expand All @@ -268,7 +233,7 @@
<packagereq type="default">ultramarine-backgrounds-common</packagereq>
<packagereq type="default">seahorse</packagereq>
<packagereq type="default">gnome-software</packagereq>
<packagereq type="default">evince</packagereq>
<packagereq type="default">atril</packagereq>
<packagereq type="default">catfish</packagereq>
<packagereq type="default">geary</packagereq>
<packagereq type="default">firefox</packagereq>
Expand Down
20 changes: 15 additions & 5 deletions ultramarine/hyfetch/hyfetch.spec
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Name: hyfetch
Version: 1.4.1
Release: 2%{?dist}
Version: 1.4.11
Release: 1%{?dist}
Summary: neofetch with pride flags <3
URL: https://github.com/hykilpikonna/hyfetch
Source0: %{url}/archive/refs/tags/1.4.1.tar.gz
Source0: %{url}/archive/refs/tags/%version.tar.gz
License: MIT

BuildArch: noarch
Expand All @@ -13,6 +13,7 @@ BuildRequires: python3-devel
BuildRequires: python3-setuptools
BuildRequires: python3-wheel
BuildRequires: python3-pip
BuildRequires: python-unversioned-command
Requires: bash >= 3.2
Requires: bind-utils
Requires: catimg
Expand All @@ -33,7 +34,8 @@ Recommends: xwininfo
%package -n hyfetch-neofetch
Summary: Replacement for neofetch

Obsoletes: neofetch < 7.1.0
Obsoletes: neofetch <= 7.3
Conflicts: hyfetch
Provides: neofetch = 7.3.1-%{release}
Requires: bash >= 3.2
Requires: bind-utils
Expand All @@ -55,8 +57,11 @@ Recommends: xwininfo
%description -n hyfetch-neofetch
%{summary}.
%files -n hyfetch-neofetch
%{_bindir}/neowofetch
%{_bindir}/neofetch
%{_mandir}/man1/neofetch.1.gz
%{_mandir}/man1/neowofetch.1.gz
%python3_sitelib/HyFetch-%version-py%{python3_version}.egg-info


%description
Expand All @@ -73,7 +78,12 @@ Recommends: xwininfo
#%%pyproject_wheel

%install
%make_install
make install PREFIX=%buildroot%_prefix
make install-doc DESTDIR=%{?buildroot} INSTALL="%{__install} -p"
mv %buildroot%_bindir/{hyfetch,neofetch}
mv %buildroot%_mandir/man1/{hyfetch,neofetch}.1
sed -i 's@#!/usr/bin/python@#!/usr/bin/python3@' %buildroot%_bindir/neofetch
rm -rf %buildroot/usr/lib/python*/site-packages/typing_extensions-*.egg
#%%pyproject_install
#%%pyproject_save_files hyfetch
# bash commands
Expand Down
7 changes: 2 additions & 5 deletions ultramarine/release/README.developers
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
The ultramarine-release package is a clone of the fedora-release packages, made for Ultramarine Linux.

Basically, this package will install files such as the os-release file and all the things that make other apps know that you're running Ultramarine Linux.
Currently, alot of stuff resides in the ultramarine-release.spec file, which basically runs a heredoc to generate all our LSB release information.
This package will install files such as the os-release file and all the things that make other apps know that you're running Ultramarine Linux.

ultramarine-releases generates an Anaconda release profile, which does all the branding for us for the installer.

We also add some branding stuff under other packages, which we'll probably move to a seperate package in the future.
ultramarine-release generates an Anaconda release profile, previously this was to brand the installer, but in a Readymade world it's for initial setup.
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
# Anaconda profile for Ultramarine Linux KDE
# Anaconda profile for Ultramarine Linux Plasma

[Profile]
# Define the profile.
profile_id = ultramarine-kde
profile_id = ultramarine-plasma
base_profile = ultramarine

[Profile Detection]
# Match os-release values.
os_id = ultramarine
variant_id = kde
variant_id = plasma

[Payload]
default_environment = ultramarine-kde-product-environment
default_environment = ultramarine-plasma-product-environment

[Bootloader]
menu_auto_hide = True
Expand Down
Loading

0 comments on commit cdae993

Please sign in to comment.