Compare commits

..

No commits in common. "factory" and "devel" have entirely different histories.

8 changed files with 37 additions and 77 deletions

View File

@ -2,11 +2,10 @@
<service name="obs_scm" mode="manual">
<param name="scm">git</param>
<param name="url">https://github.com/openSUSE/openSUSEway.git</param>
<param name="revision">0.17.0</param>
<param name="revision">0.16.3</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="versionrewrite-pattern">(.*)</param>
<param name="extract">openSUSEway.spec</param>
<param name="extract">openSUSEway.rpmlintrc</param>
</service>
<service name="set_version" mode="manual"/>
<service name="format_spec_file" mode="manual">

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:465ac6ae371fbdf2f7f472882bca76ed382af141f98515c37d3cd454cd7fb919
size 1101324

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:45b46d8a181de51d85c2f51c46bcd0be316e143832724aa1154cdc258995a6d6
size 4088332

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:dbd0fc610f965b8849becdff1c495e10314165479d9f360467281a3da45ffd5e
size 4089356

View File

@ -1,29 +1,3 @@
-------------------------------------------------------------------
Fri Mar 7 16:42:23 UTC 2025 - Filippo Bonazzi <filippo.bonazzi@suse.com>
- Update to version 0.17.0:
* waybar-branding-openSUSE: add fonts as dependencies
* Remove unused bash-completion dependency
* waybar style.css: make workspace and scratchpad have no left margins
* Rename waybar config to detect filetype
* Improve waybar pulseaudio module configuration
* Add client indicator and child_border colors for focused window
* Add openSUSEway.rpmlintrc
* Split off greetd branding into greetd-branding-openSUSE package
* Bump version to 0.17.0
-------------------------------------------------------------------
Wed Oct 30 16:27:14 UTC 2024 - Filippo Bonazzi <filippo.bonazzi@suse.com>
- Update to version 0.16.5:
* Support new openSUSE background
-------------------------------------------------------------------
Wed Sep 18 13:22:31 UTC 2024 - Filippo Bonazzi <filippo.bonazzi@suse.com>
- Update to version 0.16.4:
* Fix JSON parsing issue that was preventing waybar from launching
-------------------------------------------------------------------
Fri Sep 13 10:15:14 UTC 2024 - Filippo Bonazzi <filippo.bonazzi@suse.com>

View File

@ -1,4 +1,4 @@
name: openSUSEway
version: 0.17.0
mtime: 1741364825
commit: 7a3144a11c853f6817a6f206e318f87d56d14d33
version: 0.16.3
mtime: 1726222364
commit: 270a4291fee5e5f678865f8d2ee78874318dae40

View File

@ -1,6 +0,0 @@
# No check section required
addFilter("no-%check-section")
# This is just how it's called
addFilter("name-repeated-in-summary openSUSEway")
# Ignore error that causes other errors such as bsc#1205950
addFilter("branding-requires-unversioned adwaita-icon-theme")

View File

@ -1,7 +1,7 @@
#
# spec file for package openSUSEway
#
# Copyright (c) 2025 SUSE LLC
# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -20,14 +20,13 @@
%define waybar_version %(rpm -q --queryformat "%%{version}" waybar)
Name: openSUSEway
Version: 0.17.0
Version: 0.16.3
Release: 0
Summary: The openSUSEway desktop environment meta package
License: MIT
Group: Metapackages
URL: https://github.com/openSUSE/openSUSEway
Source0: https://github.com/openSUSE/openSUSEway/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
Source1: openSUSEway.rpmlintrc
BuildArch: noarch
BuildRequires: aaa_base
@ -37,6 +36,7 @@ BuildRequires: pkgconfig(systemd)
Requires: wget
Requires: NetworkManager
Requires: aaa_base
Requires: bash-completion
Requires: bzip2
Requires: command-not-found
Requires: curl
@ -50,9 +50,10 @@ Requires: sudo
Requires: tar
# basic DE
Requires: (gtkgreet or wlgreet)
Requires: greetd
Requires: pipewire
Requires: sway-marker
Requires: (gtkgreet or wlgreet)
Recommends: bluez
Recommends: firefox
Recommends: grim
@ -70,7 +71,6 @@ Requires: wl-clipboard
# branding
Requires: waybar-branding-openSUSE
Requires: greetd-branding-openSUSE
Requires: sway-branding-openSUSE
%ifarch x86_64 %{ix86}
Requires: gfxboot-branding-openSUSE
@ -159,29 +159,13 @@ BuildRequires: waybar
Provides: waybar-branding = %{version}
Conflicts: waybar-branding
Supplements: (waybar and branding-openSUSE)
Requires: adobe-sourcesanspro-fonts
Requires: fontawesome-fonts
#BRAND: /etc/xdg/waybar/config.jsonc and /etc/xdg/waybar/style.css
#BRAND: /etc/xdg/waybar/config and /etc/xdg/waybar/style.css
#BRAND: contain openSUSE config and branding
%description -n waybar-branding-openSUSE
This package provides the openSUSE look and feel for waybar.
%package -n greetd-branding-openSUSE
Summary: openSUSE branding of greetd
Group: System/Management
BuildRequires: greetd
Provides: greetd-branding = %{version}
Conflicts: greetd-branding
Supplements: (greetd and branding-openSUSE)
#BRAND: /etc/greetd/config, /etc/greetd/environments, /etc/greetd/sway-config,
#BRAND: and /etc/greetd/style.css contain openSUSE config and branding
%description -n greetd-branding-openSUSE
This package provides the openSUSE look and feel for greetd.
%prep
%autosetup -p1 -n openSUSEway-%{version}
@ -192,12 +176,11 @@ This package provides the openSUSE look and feel for greetd.
## openSUSEway package
### qt5ct config to configure dark theme
install -D -p -m 644 qt5ct.conf %{buildroot}%{_sysconfdir}/xdg/qt5ct/qt5ct.conf
## greetd
install -D -p -m 644 greetd/config.toml %{buildroot}%{_sysconfdir}/greetd/config.toml
install -D -p -m 644 greetd/environments %{buildroot}%{_sysconfdir}/greetd/environments
install -D -p -m 644 greetd/style.css %{buildroot}%{_sysconfdir}/greetd/style.css
install -D -p -m 644 greetd/sway-config %{buildroot}%{_sysconfdir}/greetd/sway-config
### greetd as a login manager
install -D -p -m 644 greetd/sway-config %{buildroot}%{_sysconfdir}/greetd/sway-config
install -D -p -m 644 greetd/config.toml %{buildroot}%{_sysconfdir}/greetd/config.toml.way
install -D -p -m 644 greetd/environments %{buildroot}%{_sysconfdir}/greetd/environments
install -D -p -m 644 greetd/style.css %{buildroot}%{_sysconfdir}/greetd/style.css
## openSUSEway pattern package
mkdir -p %{buildroot}/%{_defaultdocdir}/patterns/
@ -225,7 +208,7 @@ install -D -p -m 644 .config/wofi/style.css %{buildroot}%{_sysconfdir}/wofi/styl
sed -i -e "s|wofi --show.*|wofi --conf=%{_sysconfdir}/wofi/config --style=%{_sysconfdir}/wofi/style.css|g" %{buildroot}%{_sysconfdir}/sway/config.d/50-openSUSE.conf
## waybar
install -D -p -m 644 .config/waybar/config.jsonc %{buildroot}%{_sysconfdir}/xdg/waybar/config.jsonc
install -D -p -m 644 .config/waybar/config %{buildroot}%{_sysconfdir}/xdg/waybar/config
install -D -p -m 644 .config/waybar/style.css %{buildroot}%{_sysconfdir}/xdg/waybar/style.css
install -D -p -m 755 .config/waybar/scratchpad-indicator.sh %{buildroot}%{_datadir}/openSUSEway/helpers/scratchpad-indicator.sh
@ -244,6 +227,15 @@ install -D -p -m 644 .config/swaylock/openSUSEway.conf %{buildroot}%{_sysconfdir
test -e %{_sysconfdir}/profile.d/openSUSEway.sh && rm %{_sysconfdir}/profile.d/openSUSEway.sh || true
test -e %{_prefix}/lib/environment.d/50-openSUSEway.conf && rm %{_prefix}/lib/environment.d/50-openSUSEway.conf || true
%post -n openSUSEway
test -e %{_sysconfdir}/greetd/config.toml && \
mv -n %{_sysconfdir}/greetd/config.toml %{_sysconfdir}/greetd/config.toml.orig || true
cp %{_sysconfdir}/greetd/config.toml.way %{_sysconfdir}/greetd/config.toml
%postun -n openSUSEway
test -e %{_sysconfdir}/greetd/config.toml.orig && \
mv %{_sysconfdir}/greetd/config.toml.orig %{_sysconfdir}/greetd/config.toml || true
%pre -n sway-branding-openSUSE
%service_add_pre sway-session.target sway.service
@ -264,16 +256,14 @@ test -e %{_datadir}/wayland-sessions/sway.desktop.orig && \
%files
%dir %{_sysconfdir}/xdg/qt5ct/
%config(noreplace) %{_sysconfdir}/xdg/qt5ct/qt5ct.conf
%dir %{_sysconfdir}/greetd/
%attr(644,greeter,greeter) %config %{_sysconfdir}/greetd/config.toml.way
%attr(644,greeter,greeter) %config %{_sysconfdir}/greetd/sway-config
%attr(644,greeter,greeter) %config %{_sysconfdir}/greetd/environments
%attr(644,greeter,greeter) %config %{_sysconfdir}/greetd/style.css
%dir %{_datadir}/openSUSEway/
%dir %{_datadir}/openSUSEway/helpers/
%files -n greetd-branding-openSUSE
%dir %{_sysconfdir}/greetd/
%attr(644,greeter,greeter) %config(noreplace) %{_sysconfdir}/greetd/config.toml
%attr(644,greeter,greeter) %config(noreplace) %{_sysconfdir}/greetd/sway-config
%attr(644,greeter,greeter) %config(noreplace) %{_sysconfdir}/greetd/environments
%attr(644,greeter,greeter) %config(noreplace) %{_sysconfdir}/greetd/style.css
%files -n patterns-openSUSEway
%dir %{_defaultdocdir}/patterns
%{_defaultdocdir}/patterns/openSUSEway.txt
@ -309,7 +299,7 @@ test -e %{_datadir}/wayland-sessions/sway.desktop.orig && \
%files -n waybar-branding-openSUSE
%dir %{_sysconfdir}/xdg/waybar
%config(noreplace) %{_sysconfdir}/xdg/waybar/config.jsonc
%config(noreplace) %{_sysconfdir}/xdg/waybar/config
%config(noreplace) %{_sysconfdir}/xdg/waybar/style.css
%{_datadir}/openSUSEway/helpers/scratchpad-indicator.sh