Skip to content

Commit

Permalink
Merge branch 'um41' of github.com:Ultramarine-Linux/packages into um41
Browse files Browse the repository at this point in the history
  • Loading branch information
madonuko committed Aug 29, 2024
2 parents 65e3c5e + f11b793 commit d599348
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 7 deletions.
4 changes: 2 additions & 2 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
7 changes: 2 additions & 5 deletions ultramarine/release/ultramarine-release.spec
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
Summary: Ultramarine Linux release files
Name: ultramarine-release
Version: %{dist_version}
Release: 1%{?dist}
Release: 2%{?dist}
License: MIT
Source0: LICENSE
URL: https://ultramarine-linux.org
Expand Down Expand Up @@ -151,16 +151,13 @@ Release files for Ultramarine Linux.
%package identity-basic
Summary: Package providing the basic Ultramarine identity
RemovePathPostfixes: .basic
Provides: ultramarine-release = %{version}-%{release}
Provides: ultramarine-release-basic = %{version}-%{release}
Provides: ultramarine-release-identity = %{version}-%{release}
Conflicts: ultramarine-release-identity
Conflicts: fedora-release-identity-basic
Requires(meta): ultramarine-release-basic = %{version}-%{release}

%description identity-basic
Provides the necessary files for a Ultramarine installation that is not identifying
itself as a particular Edition or Spin.
itself as a particular Edition.

%endif

Expand Down

0 comments on commit d599348

Please sign in to comment.