Accepting request 1219025 from home:lkocman:branches:utilities

- Update release to 7.1.0-1
  * Start using gh#openSUSE/neofetch fork
  * Refresh Leap and TW distro logos
  * Drop 2342.patch and fix-shebang.patch as they're already
    included in our fork.

OBS-URL: https://build.opensuse.org/request/show/1219025
OBS-URL: https://build.opensuse.org/package/show/utilities/neofetch?expand=0&rev=25

7.1.0.tar.gz

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

fix-shebang.patch

@@ -1,8 +0,0 @@
---- a/neofetch	2018-04-07 18:39:20.893888503 -0400
-+++ b/neofetch	2018-04-07 18:39:26.769742245 -0400
-@@ -1,4 +1,4 @@
--#!/usr/bin/env bash
-+#!/bin/bash
- # set -x
- # vim: noai:ts=4:sw=4:expandtab
- #

neofetch-3.4.0.tar.gz

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

neofetch.changes

@@ -1,3 +1,246 @@
+-------------------------------------------------------------------
+Tue Oct 29 12:39:54 UTC 2024 - Lubos Kocman <lubos.kocman@suse.com>
+
+- Update release to 7.1.0-1
+  * Start using gh#openSUSE/neofetch fork
+  * Refresh Leap and TW distro logos
+  * Drop 2342.patch and fix-shebang.patch as they're already
+    included in our fork.
+
+-------------------------------------------------------------------
+Wed May  8 01:11:58 UTC 2024 - Bernhard Wiedemann <bwiedemann@suse.com>
+
+- Update 2342.patch to add Slowroll logo
+
+-------------------------------------------------------------------
+Sun Jul 16 16:29:17 UTC 2023 - malcolmlewis@opensuse.org
+
+- Spec cleanup and really apply 2342.patch.
+
+-------------------------------------------------------------------
+Sun Jul 16 16:05:15 UTC 2023 - Bernhard Wiedemann <bwiedemann@suse.com>
+
+- Add 2342.patch to smoothen the Tumbleweed logo
+
+-------------------------------------------------------------------
+Mon Aug  3 06:43:24 UTC 2020 - Michael Vetter <mvetter@suse.com>
+
+- Update to 7.1.0:
+  * [distro] added support for latest macOS.
+  * [distro] added automatic detection for Ubuntu flavours.
+  * [uptime] fixed seconds on Linux.
+  * [desktop environment] enabled version output by default.
+  * [distro] now displays whether -current or -release when OpenBSD is detected.
+  * [distro] added support for OpenStage Linux.
+  * [theme] change gtk3 config order.
+  * [distro] split AOSC into OS and OS/Retro.
+  * [distro] added support for openmamba 
+  * [general] added support for OIL shell.
+  * [distro] added support for Alter Linux
+  * [distro] added support for Serene Linux 
+  * [window manager] added support for xmonad.
+  * [packages] sped up guix.
+  * [shell] added es shell support.
+  * [distro] added support for OS Elbrus.
+  * [distro] added support for sambabox.
+  * [disk] fixed bug with disk entries and spaces in filenames.
+  * [resolution] multi-monitor Windows support.
+  * [distro] added support for Venom Linux.
+  * [song] added playerctl support.
+  * [general] updated iOS device information.
+  * [distro] added support for Hash Linux.
+  * [distro] added support for Garuda Linux.
+  * [window manager] added support for x11fs.
+  * [song] added Tauon Music Box support.
+  * [distro] added support for DarkOS.
+  * [song] added support for Olivia player.
+  * [distro] added support for ITX.
+  * [resolution] fixed output when monitor connected but turned off.
+  * [ascii] added logo for Ubuntu Cinnamon.
+  * [distro] added support for OpenEuler.
+  * [terminal] added support for Windows terminal.
+  * [memory] added support for changing output unit (kb, mb, gb).
+  * [wallpaper] added LXQT support.
+
+-------------------------------------------------------------------
+Sun Mar  8 15:03:04 UTC 2020 - Martin Rey <mrey@suse.com>
+
+- Update to 7.0.0:
+  * Start of Neofetch code cleanup.
+  * ASCII: Added various new small logos.
+  * ASCII: Added various small logos from pfetch.
+  * ASCII: New Linux Mint logo.
+  * window manager: Fixed bugs in window manager detection.
+  * window manager: Added KWin Wayland detection.
+  * window manager: Added GNOME Wayland detection.
+  * desktop environment: Added support for showing DE version.
+  * desktop environment: Added Regolith linux support.
+  * image display: Fixed terminal size detection issues.
+  * terminal font: Added font detection for ConEmu.
+  * terminal font: Konsole fixes.
+  * uptime: Fixed Haiku uptime detection.
+  * song: Added support for Muine player.
+  * song: Added support for Elementary music player.
+  * song: Various fixes.
+  * theme: Fixed Plasma issues.
+  * theme: Fixed Openbox issues.
+  * color blocks: Added option to position color blocks
+    horizontally.
+  * wallpaper: Added Plasma desktop support.
+  * disk: Added '--disk_subtitle none'.
+  * disk: Added '--disk_percent'.
+  * resolution: Added TTY support.
+  * resolution: Added naive Wayland support.
+  * title: Added --title_fqdn.
+  * CPU: AMD fixes.
+  * packages: Appimage support.
+  * shell: Fixed yash support.
+- remove CHANGELOG.md file from %files section of spec file
+
+-------------------------------------------------------------------
+Mon Sep  2 12:06:27 UTC 2019 - mvetter@suse.com
+
+- Update to 6.1.0:
+  OS:
+  * Added support for KISS Linux.
+  * Added support for Bonsai Linux. @mitchweaver
+  * Added support for Radix Linux.
+  ASCII:
+  * ascii: Fixed bug causing ascii files to not work.
+  * Fix big Puffy ascii logo. Charlène
+  * ASCII: Updated Artix ASCII with new logo. @konimex
+  * Add ascii art for Clear Linux. @chrisweeksnz
+  * new logo for Ataraxia Linux. @protonesso
+  * ASCII: Add fedora_small. @zyg812
+  * Added a case for displaying the Ubuntu logo for i3buntu. @chrissxYT
+  * New Peppermint Logo. @Mark-Peppermint
+  * ascii: Fix void.
+  * update Red Hat with new 2019 logo. @infinitewarp
+  * ascii: Add back old redhat logo (--ascii_distro redhat_old).
+  * ASCII: Added Feren OS. @konimex
+  * Linux: Update ASCII for Sailfish OS. @konimex
+  * Linux: Fix ASCII for Sailfish OS. @Michal-Szczepaniak
+  * Small tweak to the colours used for the Feren OS Logo. @feren
+  Images:
+  * general: fix image sizing in VTE terminals.
+  * general: Fix issue with URxvt and no internal border.
+  * display_image: Allow Chafa backend to stretch image to desired size. @hpjansson
+  Terminal:
+  * term_font [kitty]: Fix bug with empty config.
+  * term_font: fix issue with konsole font detection. Michael Straube
+  * Robuster kitty font parsing. @SibrenVasse
+  * term_font: Fix crash when parsing Xresources.
+  * kitty font parsing where font name has whitespaces. @lebensterben
+  * term: Fix wrapper scripts in NixOS. Thanks Tdeo.
+  Memory:
+  * Memory [AIX]: Detect memory based on pages (like Solaris) for more accuracy. @konimex
+  CPU:
+  * CPU [Linux/ARM]: Use Hardware field directly. @konimex
+  GPU:
+  * Properly work with multiple GPUs. @lebensterben
+  * Fix GPU parsing.
+  Packages:
+  * Set nullglob for package counting. @14mRh4X0r
+  * packages: Check brew on Linux. @dawidd6
+  Theme:
+  * WM Theme: update for Mojave. @iandrewt
+  * Handle ${GTK2_RC_FILES} with multiple values. @edward-p
+  * use "$GTK2_RC_FILES". @edward-p
+  Song:
+  * song: add strawberry player. Michael Straube
+  * song: Added support for plasma-browser-integration.
+  * song: add gogglesmm. Michael Straube
+  * song: add xnoise. Michael Straube
+  IP:
+  * Retrieve public IP info via drill. @vaygr
+  Shell:
+  * support other versions of ksh. @mitchweaver
+
+-------------------------------------------------------------------
+Wed Jan  9 12:47:28 UTC 2019 - Alexander Graul <agraul@suse.com>
+
+- Update to 6.0.0:
+  * Breaking change: Removed get_line_break() from config
+  * Added support for arbitrary shell commands for ASCII art
+  * Added plain text output for individual functions that can be
+    used in scripts
+  * Color Blocks now have padding built-in
+  * Public IP: Added configurable timeout to requests
+  * Fixed numerous "Song" issues
+  * Complete changelog can be found at https://github.com/dylanaraps/neofetch/releases/tag/6.0.0
+- Drop remove-non-linux.patch, maintenance cost is high and not
+  enough space is saved to justify it
+
+-------------------------------------------------------------------
+Fri Jul 27 13:25:57 UTC 2018 - idonmez@suse.com
+
+- Use %license everywhere.
+- No need to manually require bash.
+
+-------------------------------------------------------------------
+Thu Jul 26 10:28:52 UTC 2018 - jengelh@inai.de
+
+- Reword description not to assume a particular user.
+
+-------------------------------------------------------------------
+Wed Jul 25 14:54:49 UTC 2018 - agraul@suse.com
+
+- remove suse-defaults.patch since it is not used anymore
+
+-------------------------------------------------------------------
+Wed Jul 25 14:29:55 UTC 2018 - mvetter@suse.com
+
+- Add 5.0.0.tar.gz tarball and remove service file
+
+-------------------------------------------------------------------
+Tue Jul 24 13:58:30 UTC 2018 - agraul@suse.com
+
+- add w3m-inline-image to "Recommends" for image mode
+
+-------------------------------------------------------------------
+Thu Jul 12 09:34:53 UTC 2018 - agraul@suse.com
+
+- Update to 5.0.0
+  * Added json output option
+  * Fixed bug in prompt location after Neofetch ran
+  * Removed all deprecated options and functions
+  * Removed install date information
+  * Images: Improved performance
+  * Images: removed catimg support
+  * Images: fixed tycat, sixel and kittty icat image sizes
+  * Removed screenshot functionality (including uploading)
+  * Packages: added support for snap
+  * Packages: added support for flatpak 
+  * Song: added support for gmusicbrowser
+  * Song: added support for SMPlayer
+  * Song: added support for Dragon Player
+  * Song: fixed song output on systems using C locale
+  * Song: added mpc_args to send additional arguments to mpc
+  * Resolution: added support for xwininfo
+- Included updates from 4.0.0
+  * Neofetch is a single executable now
+  * Simplified --version output
+  * Fixed theme issues
+  * Wallpaper: added wal/pywal support
+  * Wallpaper: added setroot support
+  * Images: added kitty image backend
+  * Song: added VLC support
+  * Song: added Sayonara support
+  * Song: added album data to song output
+  * Song: added song_format to configure display format
+  * Fixed unexpected backslash in title on some systems
+  * CPU: added temperature support for Zen processors
+  * GPU: fixed duplicate Intel GPUs
+  * WM: added dwm support 
+  * Terminal: added st support 
+  * Terminal: added qterminal support
+  * Terminal: fixed kitty font bug
+- drop suse-defaults.patch, there is no separate "ascii" directory anymore
+- remove additional-art package, ascii art is in the single executable now
+- refresh remove-non-linux.patch to handle source changes
+- refresh fix-shebang.patch to handle source changes
+
+
 -------------------------------------------------------------------
 Sat Apr  7 21:21:52 UTC 2018 - avindra@opensuse.org
 

neofetch.spec

@@ -1,8 +1,8 @@
 #
 # spec file for package neofetch
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
-# Copyright (c) 2017 Malcolm J Lewis <malcolmlewis@opensuse.org>
+# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2017-2023 Malcolm J Lewis <malcolmlewis@opensuse.org>
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -13,54 +13,34 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
 Name:           neofetch
-Version:        3.4.0
+Version:        7.1.0
 Release:        0
 Summary:        CLI system information tool written in BASH
 License:        MIT
 Group:          Productivity/Text/Utilities
-Url:            https://github.com/dylanaraps/neofetch
-Source0:        https://github.com/dylanaraps/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
-# PATCH-FIX-SUSE Strips useless blocks of non-linux code from the script
-Patch0:         remove-non-linux.patch
-# PATCH-FIX-SUSE Support separate packaging of additional icons
-Patch1:         suse-defaults.patch
-# PATCH-FIX-SUSE Fix E: env-script-interpreter
-Patch2:         fix-shebang.patch
+URL:            https://github.com/openSUSE/neofetch
+Source0:        https://github.com/openSUSE/%{name}/archive/%{version}.tar.gz
 Recommends:     maim
+Recommends:     w3m-inline-image
 BuildArch:      noarch
-# MANUAL BEGIN
-Requires:       bash >= 3.2
-# MANUAL END
 
 %description
-Displays information about your system next to an image, your OS logo, or any
-ASCII file of your choice. The main purpose of Neofetch is to be used in
-screenshots to show other users what OS/Distro you're running, what Theme/Icons
-you're using etc.
+Displays information about the system next to an image, the OS logo, or any
+ASCII file of choice. The main purpose of Neofetch is to be used in
+screenshots to show other users what OS/Distro is running, what Theme/Icons
+are being used, etc.
 
-Highly customizable through the use of command line flags or the user config file.
+Customizable through the use of command line flags or the user config file.
 There are over 50 config options to mess around with and there's the `print_info()
 function and friends which let you add your own custom info.
 
-%package additional-art
-Summary:        Additional ascii art for neofetch
-BuildArch:      noarch
-
-%description additional-art
-Additional ascii art for neofetch. This package contains the ascii art for non-SUSE
-distributions. Install this if you want to display the logo of another distribution
-or operating system on a SUSE installation.
-
 %prep
-%setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
+%autosetup -p1
 
 %build
 # Placeholder, no build required.
@@ -68,37 +48,10 @@ or operating system on a SUSE installation.
 %install
 %make_install
 
-# only ship sensible defaults to the main package.
-# the rest will be available in a subpackage.
-#
-# keep list in sync with suse-defaults.patch
-mkdir -p \
-   %{buildroot}/%{_datadir}/%{name}/ascii/default
-
-mv %{buildroot}/%{_datadir}/%{name}/ascii/distro/{linux,suse,tumbleweed} \
-   %{buildroot}/%{_datadir}/%{name}/ascii/default
-
 %files
-%doc CHANGELOG.md README.md
-%if ( 0%{?suse_version} == 1315 && 0%{?sle_version} <= 120200 ) || ! 0%{?is_opensuse}
-# Needed if Leap 42.2/3 or SLE build targets
-%doc LICENSE.md
-%else
+%doc README.md
 %license LICENSE.md
-%endif
-%dir %{_sysconfdir}/%{name}
-%config %{_sysconfdir}/%{name}/config.conf
 %{_bindir}/%{name}
-%dir %{_datadir}/%{name}
-%dir %{_datadir}/%{name}/ascii
-%dir %{_datadir}/%{name}/ascii/default
-%{_datadir}/%{name}/ascii/default/*
 %{_mandir}/man1/%{name}.1%{?ext_man}
 
-%files additional-art
-%dir %{_datadir}/%{name}
-%dir %{_datadir}/%{name}/ascii
-%dir %{_datadir}/%{name}/ascii/distro
-%{_datadir}/%{name}/ascii/distro/*
-
 %changelog

suse-defaults.patch

@@ -1,18 +0,0 @@
---- a/neofetch	2018-04-07 17:48:25.258833823 -0400
-+++ b/neofetch	2018-04-07 18:11:15.468119410 -0400
-@@ -1819,11 +1819,10 @@
-         [[ "$image_source" =~ \.(png|jpg|jpe|jpeg|gif)$ ]] && \
-             err "Image: Source is image file but ascii backend was selected. Using distro ascii."
- 
--        if [[ -d "ASCIIDIR" ]]; then
--            ascii_dir="ASCIIDIR"
--        else
--            [[ -z "$script_dir" ]] && script_dir="$(get_full_path "$0")"
--            ascii_dir="${script_dir%/*}/ascii/distro"
-+        ascii_dir="ASCIIDIR"
-+
-+        if [[ "$ascii_file" == "linux" ]] || [[ "$ascii_file" == "suse" ]] || [[ "$ascii_file" == "tumbleweed" ]]; then
-+            ascii_dir="${ascii_dir%/*}/default"
-         fi
- 
-         image_source="${ascii_dir}/${ascii_file}"