Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package zellij for openSUSE:Factory checked
in at 2023-04-03 17:45:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/zellij (Old)
and /work/SRC/openSUSE:Factory/.zellij.new.9019 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "zellij"
Mon Apr 3 17:45:58 2023 rev:11 rq:1076785 version:0.35.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/zellij/zellij.changes 2023-03-11
18:24:47.215114160 +0100
+++ /work/SRC/openSUSE:Factory/.zellij.new.9019/zellij.changes 2023-04-03
17:46:00.597605243 +0200
@@ -1,0 +2,15 @@
+Sun Mar 26 23:04:42 UTC 2023 - Soc Virnyl Estela <socvirnyl.est...@gmail.com>
+
+- Update to version 0.35.2:
+ * fix(sessions): attach --create regression
+ * fix(screen): hold and applylayout races
+ * fix(ansi): pad line end when erasing characters
+
+-------------------------------------------------------------------
+Mon Mar 13 14:25:31 UTC 2023 - Andreas Schneider <a...@cryptomilk.org>
+
+- Install the themes
+- Allow to load themes from /usr/share/zellij/themes/
+ * Added zellij-fix-theme-dir.patch
+
+-------------------------------------------------------------------
Old:
----
zellij-0.35.1.tar.gz
New:
----
zellij-0.35.2.tar.gz
zellij-fix-theme-dir.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ zellij.spec ++++++
--- /var/tmp/diff_new_pack.77jd9T/_old 2023-04-03 17:46:02.479061968 +0200
+++ /var/tmp/diff_new_pack.77jd9T/_new 2023-04-03 17:46:02.483065067 +0200
@@ -16,9 +16,13 @@
#
+%if "x%{?rust_tier1_arches}" == "x"
+%global rust_tier1_arches x86_64
+%endif
+
%bcond_with test
Name: zellij
-Version: 0.35.1
+Version: 0.35.2
Release: 0
Summary: Terminal workspace with batteries included
License: MIT
@@ -27,6 +31,7 @@
Source1: vendor.tar.zst
Source2: cargo_config
Source3: README.suse-maint.md
+Patch0: zellij-fix-theme-dir.patch
BuildRequires: cargo-packaging
BuildRequires: rust+cargo
BuildRequires: zstd
@@ -78,7 +83,7 @@
Zsh command-line completion support for %{name}.
%prep
-%autosetup -a1
+%autosetup -a1 -p1
mkdir -p .cargo
cp %{SOURCE2} .cargo/config
# Remove prebuilt binaries
@@ -124,6 +129,10 @@
%endif
%{cargo_install} --features unstable
+
+install -d -m 0755 %{buildroot}%{_datadir}/%{name}
+cp -av example/themes %{buildroot}%{_datadir}/%{name}
+
%if %{with test}
%check
%{cargo_test}
@@ -131,6 +140,8 @@
%files
%{_bindir}/zellij
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/themes
%{_datadir}/pixmaps/*
%{_datadir}/applications/*
++++++ _service ++++++
--- /var/tmp/diff_new_pack.77jd9T/_old 2023-04-03 17:46:02.563127056 +0200
+++ /var/tmp/diff_new_pack.77jd9T/_new 2023-04-03 17:46:02.567130155 +0200
@@ -1,7 +1,7 @@
<services>
<service name="download_files" mode="disabled" />
<service name="cargo_vendor" mode="disabled">
- <param name="srctar">zellij-0.35.1.tar.gz</param>
+ <param name="srctar">zellij-0.35.2.tar.gz</param>
<param name="compression">zst</param>
<param name="update">true</param>
</service>
++++++ vendor.tar.zst ++++++
Binary files /var/tmp/diff_new_pack.77jd9T/_old and
/var/tmp/diff_new_pack.77jd9T/_new differ
++++++ zellij-0.35.1.tar.gz -> zellij-0.35.2.tar.gz ++++++
/work/SRC/openSUSE:Factory/zellij/zellij-0.35.1.tar.gz
/work/SRC/openSUSE:Factory/.zellij.new.9019/zellij-0.35.2.tar.gz differ: char
13, line 1
++++++ zellij-fix-theme-dir.patch ++++++
Index: zellij-0.35.1/zellij-utils/src/setup.rs
===================================================================
--- zellij-0.35.1.orig/zellij-utils/src/setup.rs 2023-03-13
07:49:12.945032655 +0100
+++ zellij-0.35.1/zellij-utils/src/setup.rs 2023-03-13 15:15:59.796892796
+0100
@@ -85,8 +85,18 @@ pub fn get_layout_dir(config_dir: Option
}
pub fn get_theme_dir(config_dir: Option<PathBuf>) -> Option<PathBuf> {
- config_dir.map(|dir| dir.join("themes"))
+ const THEME_DIR: &str = "themes";
+
+ [
+ config_dir,
+ Some(get_default_data_dir())
+ ]
+ .into_iter()
+ .filter(|p| p.is_some())
+ .find(|dir| dir.clone().unwrap().join(THEME_DIR).exists())
+ .map(|dir| dir.clone().unwrap().join(THEME_DIR))
}
+
pub fn dump_asset(asset: &[u8]) -> std::io::Result<()> {
std::io::stdout().write_all(asset)?;
Ok(())
