diff --git a/.gitignore b/.gitignore
index 0984d71..c882f73 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,4 @@ icewm-1.2.37.tar.gz
/icewm-1.8.0.tar.gz
/icewm-1.8.1.tar.gz
/icewm-wallpaper.png
+/awesome-icewm.gita7986e5.tar.gz
diff --git a/conky.conf b/conky.conf
deleted file mode 100644
index 2009e60..0000000
--- a/conky.conf
+++ /dev/null
@@ -1,88 +0,0 @@
---[[
-Conky, a system monitor, based on torsmo
-
-Any original torsmo code is licensed under the BSD license
-
-All code written since the fork of torsmo is licensed under the GPL
-
-Please see COPYING for details
-
-Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen
-Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. (see AUTHORS)
-All rights reserved.
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-]]
-
-conky.config = {
- alignment = 'top_right',
- background = false,
- border_width = 1,
- cpu_avg_samples = 2,
- default_color = 'eeeeec',
- default_outline_color = 'eeeeec',
- default_shade_color = 'eeeeec',
- double_buffer = true,
- draw_borders = false,
- draw_graph_borders = true,
- draw_outline = false,
- draw_shades = false,
- extra_newline = false,
- font = 'Source Code Pro:size=10',
- gap_x = 60,
- gap_y = 60,
- minimum_height = 5,
- minimum_width = 5,
- net_avg_samples = 2,
- no_buffers = true,
- out_to_console = false,
- out_to_ncurses = false,
- out_to_stderr = false,
- out_to_x = true,
- own_window = true,
- own_window_class = 'Conky',
- own_window_type = 'desktop',
- show_graph_range = false,
- show_graph_scale = false,
- stippled_borders = 0,
- update_interval = 2.0,
- uppercase = false,
- use_spacer = 'none',
- use_xft = true,
- own_window_colour = '2e3436',
--- own_window_argb_visual = true,
--- own_window_argb_value = '32',
--- own_window_transparent = true,
-}
-
-conky.text = [[
-${color grey}Info:$color ${scroll 32 $sysname $nodename $kernel $machine}
-$hr
-${color grey}Uptime:$color $uptime
-${color grey}Frequency (in GHz):$color $freq_g
-${color grey}RAM Usage:$color $mem/$memmax - $memperc% ${membar 4}
-${color grey}Swap Usage:$color $swap/$swapmax - $swapperc% ${swapbar 4}
-${color grey}CPU Usage:$color $cpu% ${cpubar 4}
-${color grey}Processes:$color $processes ${color grey}Running:$color $running_processes
-$hr
-${color grey}File systems:
- / $color${fs_used /}/${fs_size /} ${fs_bar 6 /}
-${color grey}Networking:
-Up:$color ${upspeed} ${color grey} - Down:$color ${downspeed}
-$hr
-${color grey}Name PID CPU% MEM%
-${color lightgrey} ${top name 1} ${top pid 1} ${top cpu 1} ${top mem 1}
-${color lightgrey} ${top name 2} ${top pid 2} ${top cpu 2} ${top mem 2}
-${color lightgrey} ${top name 3} ${top pid 3} ${top cpu 3} ${top mem 3}
-${color lightgrey} ${top name 4} ${top pid 4} ${top cpu 4} ${top mem 4}
-]]
diff --git a/dunstrc b/dunstrc
deleted file mode 100644
index e2b1c58..0000000
--- a/dunstrc
+++ /dev/null
@@ -1,414 +0,0 @@
-[global]
- ### Display ###
-
- # Which monitor should the notifications be displayed on.
- monitor = 0
-
- # Display notification on focused monitor. Possible modes are:
- # mouse: follow mouse pointer
- # keyboard: follow window with keyboard focus
- # none: don't follow anything
- #
- # "keyboard" needs a window manager that exports the
- # _NET_ACTIVE_WINDOW property.
- # This should be the case for almost all modern window managers.
- #
- # If this option is set to mouse or keyboard, the monitor option
- # will be ignored.
- follow = mouse
-
- # The geometry of the window:
- # [{width}]x{height}[+/-{x}+/-{y}]
- # The geometry of the message window.
- # The height is measured in number of notifications everything else
- # in pixels. If the width is omitted but the height is given
- # ("-geometry x2"), the message window expands over the whole screen
- # (dmenu-like). If width is 0, the window expands to the longest
- # message displayed. A positive x is measured from the left, a
- # negative from the right side of the screen. Y is measured from
- # the top and down respectively.
- # The width can be negative. In this case the actual width is the
- # screen width minus the width defined in within the geometry option.
- geometry = "300x5-30+20"
-
- # Show how many messages are currently hidden (because of geometry).
- indicate_hidden = yes
-
- # Shrink window if it's smaller than the width. Will be ignored if
- # width is 0.
- shrink = no
-
- # The transparency of the window. Range: [0; 100].
- # This option will only work if a compositing window manager is
- # present (e.g. xcompmgr, compiz, etc.).
- transparency = 10
-
- # The height of the entire notification. If the height is smaller
- # than the font height and padding combined, it will be raised
- # to the font height and padding.
- notification_height = 0
-
- # Draw a line of "separator_height" pixel height between two
- # notifications.
- # Set to 0 to disable.
- separator_height = 2
-
- # Padding between text and separator.
- padding = 8
-
- # Horizontal padding.
- horizontal_padding = 8
-
- # Defines width in pixels of frame around the notification window.
- # Set to 0 to disable.
- frame_width = 3
-
- # Defines color of the frame around the notification window.
- frame_color = "#aaaaaa"
-
- # Define a color for the separator.
- # possible values are:
- # * auto: dunst tries to find a color fitting to the background;
- # * foreground: use the same color as the foreground;
- # * frame: use the same color as the frame;
- # * anything else will be interpreted as a X color.
- separator_color = frame
-
- # Sort messages by urgency.
- sort = yes
-
- # Don't remove messages, if the user is idle (no mouse or keyboard input)
- # for longer than idle_threshold seconds.
- # Set to 0 to disable.
- # A client can set the 'transient' hint to bypass this. See the rules
- # section for how to disable this if necessary
- idle_threshold = 120
-
- ### Text ###
-
- font = Source Code Pro 10
-
- # The spacing between lines. If the height is smaller than the
- # font height, it will get raised to the font height.
- line_height = 0
-
- # Possible values are:
- # full: Allow a small subset of html markup in notifications:
- # bold
- # italic
- # strikethrough
- # underline
- #
- # For a complete reference see
- # .
- #
- # strip: This setting is provided for compatibility with some broken
- # clients that send markup even though it's not enabled on the
- # server. Dunst will try to strip the markup but the parsing is
- # simplistic so using this option outside of matching rules for
- # specific applications *IS GREATLY DISCOURAGED*.
- #
- # no: Disable markup parsing, incoming notifications will be treated as
- # plain text. Dunst will not advertise that it has the body-markup
- # capability if this is set as a global setting.
- #
- # It's important to note that markup inside the format option will be parsed
- # regardless of what this is set to.
- markup = full
-
- # The format of the message. Possible variables are:
- # %a appname
- # %s summary
- # %b body
- # %i iconname (including its path)
- # %I iconname (without its path)
- # %p progress value if set ([ 0%] to [100%]) or nothing
- # %n progress value if set without any extra characters
- # %% Literal %
- # Markup is allowed
- format = "%s\n%b"
-
- # Alignment of message text.
- # Possible values are "left", "center" and "right".
- alignment = left
-
- # Show age of message if message is older than show_age_threshold
- # seconds.
- # Set to -1 to disable.
- show_age_threshold = 60
-
- # Split notifications into multiple lines if they don't fit into
- # geometry.
- word_wrap = yes
-
- # When word_wrap is set to no, specify where to make an ellipsis in long lines.
- # Possible values are "start", "middle" and "end".
- ellipsize = middle
-
- # Ignore newlines '\n' in notifications.
- ignore_newline = no
-
- # Stack together notifications with the same content
- stack_duplicates = true
-
- # Hide the count of stacked notifications with the same content
- hide_duplicate_count = false
-
- # Display indicators for URLs (U) and actions (A).
- show_indicators = yes
-
- ### Icons ###
-
- # Align icons left/right/off
- icon_position = left
-
- # Scale larger icons down to this size, set to 0 to disable
- max_icon_size = 32
-
- # Paths to default icons.
- icon_path = /usr/share/icons/Adwaita/32x32/status/:/usr/share/icons/Adwaita/32x32/devices/
-
- ### History ###
-
- # Should a notification popped up from history be sticky or timeout
- # as if it would normally do.
- sticky_history = yes
-
- # Maximum amount of notifications kept in history
- history_length = 20
-
- ### Misc/Advanced ###
-
- # dmenu path.
- dmenu = /usr/bin/dmenu -p dunst:
-
- # Browser for opening urls in context menu.
- browser = /usr/bin/firefox -new-tab
-
- # Always run rule-defined scripts, even if the notification is suppressed
- always_run_script = true
-
- # Define the title of the windows spawned by dunst
- title = Dunst
-
- # Define the class of the windows spawned by dunst
- class = Dunst
-
- # Print a notification on startup.
- # This is mainly for error detection, since dbus (re-)starts dunst
- # automatically after a crash.
- startup_notification = false
-
- # Manage dunst's desire for talking
- # Can be one of the following values:
- # crit: Critical features. Dunst aborts
- # warn: Only non-fatal warnings
- # mesg: Important Messages
- # info: all unimportant stuff
- # debug: all less than unimportant stuff
- verbosity = mesg
-
- # Define the corner radius of the notification window
- # in pixel size. If the radius is 0, you have no rounded
- # corners.
- # The radius will be automatically lowered if it exceeds half of the
- # notification height to avoid clipping text and/or icons.
- corner_radius = 0
-
- ### Legacy
-
- # Use the Xinerama extension instead of RandR for multi-monitor support.
- # This setting is provided for compatibility with older nVidia drivers that
- # do not support RandR and using it on systems that support RandR is highly
- # discouraged.
- #
- # By enabling this setting dunst will not be able to detect when a monitor
- # is connected or disconnected which might break follow mode if the screen
- # layout changes.
- force_xinerama = false
-
- ### mouse
-
- # Defines action of mouse event
- # Possible values are:
- # * none: Don't do anything.
- # * do_action: If the notification has exactly one action, or one is marked as default,
- # invoke it. If there are multiple and no default, open the context menu.
- # * close_current: Close current notification.
- # * close_all: Close all notifications.
- mouse_left_click = close_current
- mouse_middle_click = do_action
- mouse_right_click = close_all
-
-# Experimental features that may or may not work correctly. Do not expect them
-# to have a consistent behaviour across releases.
-[experimental]
- # Calculate the dpi to use on a per-monitor basis.
- # If this setting is enabled the Xft.dpi value will be ignored and instead
- # dunst will attempt to calculate an appropriate dpi value for each monitor
- # using the resolution and physical size. This might be useful in setups
- # where there are multiple screens with very different dpi values.
- per_monitor_dpi = false
-
-[shortcuts]
-
- # Shortcuts are specified as [modifier+][modifier+]...key
- # Available modifiers are "ctrl", "mod1" (the alt-key), "mod2",
- # "mod3" and "mod4" (windows-key).
- # Xev might be helpful to find names for keys.
-
- # Close notification.
- close = ctrl+space
-
- # Close all notifications.
- close_all = ctrl+shift+space
-
- # Redisplay last message(s).
- # On the US keyboard layout "grave" is normally above TAB and left
- # of "1". Make sure this key actually exists on your keyboard layout,
- # e.g. check output of 'xmodmap -pke'
- history = ctrl+grave
-
- # Context menu.
- context = ctrl+shift+period
-
-[urgency_low]
- # IMPORTANT: colors have to be defined in quotation marks.
- # Otherwise the "#" and following would be interpreted as a comment.
- background = "#222222"
- foreground = "#888888"
- timeout = 10
- # Icon for notifications with low urgency, uncomment to enable
- #icon = /path/to/icon
-
-[urgency_normal]
- background = "#3584e4"
- foreground = "#ffffff"
- timeout = 10
- # Icon for notifications with normal urgency, uncomment to enable
- #icon = /path/to/icon
-
-[urgency_critical]
- background = "#900000"
- foreground = "#ffffff"
- frame_color = "#ff0000"
- timeout = 0
- # Icon for notifications with critical urgency, uncomment to enable
- #icon = /path/to/icon
-
-# Every section that isn't one of the above is interpreted as a rules to
-# override settings for certain messages.
-#
-# Messages can be matched by
-# appname (discouraged, see desktop_entry)
-# body
-# category
-# desktop_entry
-# icon
-# match_transient
-# msg_urgency
-# stack_tag
-# summary
-#
-# and you can override the
-# background
-# foreground
-# format
-# frame_color
-# fullscreen
-# new_icon
-# set_stack_tag
-# set_transient
-# timeout
-# urgency
-#
-# Shell-like globbing will get expanded.
-#
-# Instead of the appname filter, it's recommended to use the desktop_entry filter.
-# GLib based applications export their desktop-entry name. In comparison to the appname,
-# the desktop-entry won't get localized.
-#
-# SCRIPTING
-# You can specify a script that gets run when the rule matches by
-# setting the "script" option.
-# The script will be called as follows:
-# script appname summary body icon urgency
-# where urgency can be "LOW", "NORMAL" or "CRITICAL".
-#
-# NOTE: if you don't want a notification to be displayed, set the format
-# to "".
-# NOTE: It might be helpful to run dunst -print in a terminal in order
-# to find fitting options for rules.
-
-# Disable the transient hint so that idle_threshold cannot be bypassed from the
-# client
-#[transient_disable]
-# match_transient = yes
-# set_transient = no
-#
-# Make the handling of transient notifications more strict by making them not
-# be placed in history.
-#[transient_history_ignore]
-# match_transient = yes
-# history_ignore = yes
-
-# fullscreen values
-# show: show the notifications, regardless if there is a fullscreen window opened
-# delay: displays the new notification, if there is no fullscreen window active
-# If the notification is already drawn, it won't get undrawn.
-# pushback: same as delay, but when switching into fullscreen, the notification will get
-# withdrawn from screen again and will get delayed like a new notification
-#[fullscreen_delay_everything]
-# fullscreen = delay
-#[fullscreen_show_critical]
-# msg_urgency = critical
-# fullscreen = show
-
-#[espeak]
-# summary = "*"
-# script = dunst_espeak.sh
-
-#[script-test]
-# summary = "*script*"
-# script = dunst_test.sh
-
-#[ignore]
-# # This notification will not be displayed
-# summary = "foobar"
-# format = ""
-
-#[history-ignore]
-# # This notification will not be saved in history
-# summary = "foobar"
-# history_ignore = yes
-
-#[skip-display]
-# # This notification will not be displayed, but will be included in the history
-# summary = "foobar"
-# skip_display = yes
-
-#[signed_on]
-# appname = Pidgin
-# summary = "*signed on*"
-# urgency = low
-#
-#[signed_off]
-# appname = Pidgin
-# summary = *signed off*
-# urgency = low
-#
-#[says]
-# appname = Pidgin
-# summary = *says*
-# urgency = critical
-#
-#[twitter]
-# appname = Pidgin
-# summary = *twitter.com*
-# urgency = normal
-#
-#[stack-volumes]
-# appname = "some_volume_notifiers"
-# set_stack_tag = "volume"
-#
-# vim: ft=cfg
diff --git a/icewm.spec b/icewm.spec
index faf3de4..ecf2044 100644
--- a/icewm.spec
+++ b/icewm.spec
@@ -1,6 +1,6 @@
# Note: there is always trade off between build IceWM more like full DE or
-# vanilla build. One group of people ask for first one and pre-configured out of
-# box another one for for second.
+# vanilla build. One group of people ask for first one and pre-configured out
+# of box another one for for second.
# https://fedoraproject.org/wiki/Changes/CMake_to_do_out-of-source_builds
%undefine __cmake_in_source_build
@@ -8,12 +8,12 @@
# Autotools/CMake
%bcond_with fallback_build_tool
-%global awe_commit 60d40b83ad214e41956f604b4b65d9da45441613
+%global awe_commit a7986e53727f948dc1d3882f06afedb2a408381b
%global awe_shortcommit %(c=%{awe_commit}; echo ${c:0:7})
Name: icewm
Version: 1.8.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Window manager designed for speed, usability, and consistency
License: LGPLv2+
@@ -21,34 +21,13 @@ URL: https://ice-wm.org/
Source0: https://github.com/ice-wm/%{name}/archive/%{version}/%{name}-%{version}.tar.gz
Source1: https://github.com/tim77/awesome-%{name}/archive/%{awe_commit}/awesome-%{name}.git%{awe_shortcommit}.tar.gz
-# Themes
-# * https://www.box-look.org/p/1310273/
-Source10: IceClearlooks2-ColorsMas_theme_pack-0.8.tar.bz2
-
-# * https://www.box-look.org/p/1266477/
-Source12: KDE-Core-20181026134422.tar.bz2
-
-# * https://www.box-look.org/p/1163246/
-Source13: Windows7ice1.tar.xz
-
-# * https://www.box-look.org/p/1321163/
-Source14: Araita+.tar.bz2
-Source15: Araita-Dark+.tar.bz2
-
-# Better font rendering on non HiDPI screens
+# For better font rendering on non HiDPI screens (very weak dep)
Source20: local.conf
Source21: gtkrc-2.0
Source22: gkt3-settings.ini
Source30: %{name}-startup
-# Wallpaper
-Source40: %{name}-wallpaper.png
-
-# 3rd party config files
-Source50: dunstrc
-Source51: conky.conf
-
Patch0: %{name}-keys.patch
Patch1: %{name}-toolbar.patch
Patch2: %{name}-menu.patch
@@ -94,19 +73,14 @@ Requires: %{name}-data = %{version}-%{release}
Requires: xdg-utils
%if 0%{?fedora} || 0%{?rhel} >= 8
-Recommends: %{name}-3rd-party-cfg
-Recommends: %{name}-fonts-settings = %{version}-%{release}
Recommends: %{name}-themes = %{version}-%{release}
-Recommends: %{name}-wallpaper
Recommends: abattis-cantarell-fonts
+Recommends: gnome-backgrounds
# Various additional useful tools
# * Compositor for X11
Recommends: picom%{?_isa}
-# * Notification daemon
-Recommends: dunst%{?_isa}
-
# * Display resolution control
Recommends: lxrandr%{?_isa}
@@ -122,18 +96,18 @@ Recommends: gnome-screenshot%{?_isa}
Recommends: gnome-terminal%{?_isa}
Recommends: network-manager-applet%{?_isa}
+Suggests: %{name}-fonts-settings = %{version}-%{release}
Suggests: %{name}-minimal-session = %{version}-%{release}
-# * Volume control
-Suggests: pasystray%{?_isa}
-Suggests: pavucontrol%{?_isa}
-
# * https://github.com/bbidulock/icewm/issues/379
Suggests: xterm%{?_isa}
# * Night mode
Suggests: redshift-gtk%{?_isa}
+# * Notification daemon
+Suggests: dunst%{?_isa}
+
# * For antiX like IceWM
Suggests: conky%{?_isa}
%endif
@@ -185,17 +159,6 @@ Requires: %{name} = %{version}-%{release}
Minimal, lightweight session for %{name}.
-# Wallpaper package
-%package wallpaper
-Summary: Wallpaper for %{name}
-BuildArch: noarch
-
-Requires: %{name}
-
-%description wallpaper
-Wallpaper for %{name}.
-
-
# Fonts-settings package
%package fonts-settings
Summary: Font settings and tweaks for %{name}
@@ -207,62 +170,29 @@ Requires: %{name} = %{version}-%{release}
Font settings and tweaks for %{name}.
-# 3rd-party-cfg package
-%package 3rd-party-cfg
-Summary: Config files for 3rd-party apps to play nicely with %{name}
-BuildArch: noarch
-
-Requires: %{name} = %{version}-%{release}
-
-%description 3rd-party-cfg
-Various config files for 3rd-party apps to play nicely with %{name}.
-
-
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%setup -q -D -T -a1
-%setup -q -D -T -a10
-
-# Tweak IceClearlooks2 theme
-sed -i 's!sans-serif:size=10!Cantarell:size=11!' IceClearlooks2*/*.theme
-sed -i 's!MenuFontNameXft = Cantarell:size=11!MenuFontNameXft = Cantarell:size=10!' IceClearlooks2*/*.theme
-sed -i 's!xmirs!xmis!' IceClearlooks2*/*.theme
-sed -i 's!#DesktopBackgroundScaled=1 # 0 / 1!DesktopBackgroundScaled=1 # 0 / 1!' IceClearlooks2*/*.theme
-sed -i 's!#DesktopBackgroundImage = "/home/ren/Imágenes/cafe70.jpg"!DesktopBackgroundImage = "%{_datadir}/backgrounds/%{name}-wallpaper.png"!' \
- IceClearlooks2*/*.theme
-
-%setup -q -D -T -a12
-%setup -q -D -T -a13
-find Windows7ice1/. -type f -executable -exec chmod -x "{}" \;
-%setup -q -D -T -a14
-%setup -q -D -T -a15
-
-# Tweak Araita theme
-sed -i 's!carlito:size=12!Cantarell:size=11!' Araita*/*.theme
-sed -i 's!carlito:size=13!Cantarell:size=11!' Araita*/*.theme
-sed -i 's!22!16!' Araita*/*.theme
-sed -i 's!#DesktopBackgroundImage= "/usr/share/wallpapers/default.jpg"!DesktopBackgroundImage= "%{_datadir}/backgrounds/%{name}-wallpaper.png"!' \
- Araita*/*.theme
%build
%if %{with fallback_build_tool}
#./autogen.sh
autoreconf -fiv
-%configure \
- --with-xterm=%{_bindir}/gnome-terminal \
+%configure \
+ --with-xterm=%{_bindir}/gnome-terminal \
--sysconfdir=%{_sysconfdir}/%{name}
%else
-%cmake \
- -DCFGDIR=%{_sysconfdir}/%{name} \
- -DCMAKE_BUILD_TYPE=RelWithDebInfo \
- -DCONFIG_GDK_PIXBUF_XLIB=on \
- -DCONFIG_LIBPNG=on \
- -DCONFIG_LIBRSVG=on \
- -DCONFIG_XPM=on \
+%cmake \
+ -DCFGDIR=%{_sysconfdir}/%{name} \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCONFIG_GDK_PIXBUF_XLIB=on \
+ -DCONFIG_LIBPNG=on \
+ -DCONFIG_LIBRSVG=on \
+ -DCONFIG_XPM=on \
-DXTERMCMD=%{_bindir}/gnome-terminal
%endif
@@ -281,41 +211,29 @@ autoreconf -fiv
%endif
# Themes
-cp -ap IceClearlooks2-* %{buildroot}%{_datadir}/%{name}/themes/
cp -rap awesome-%{name}-%{awe_commit}/themes/AntiX-collection/* %{buildroot}%{_datadir}/%{name}/themes/
-cp -rap awesome-%{name}-%{awe_commit}/themes/IceAdwaita-* %{buildroot}%{_datadir}/%{name}/themes/
-install -m 0644 -p awesome-%{name}-%{awe_commit}/distro-logos/fedora/icewm.xpm %{buildroot}%{_datadir}/%{name}/themes/IceAdwaita-Small/taskbar/icewm.xpm
-install -m 0644 -p awesome-%{name}-%{awe_commit}/distro-logos/fedora/icewm-24.xpm %{buildroot}%{_datadir}/%{name}/themes/IceAdwaita-Medium/taskbar/icewm.xpm
-install -m 0644 -p awesome-%{name}-%{awe_commit}/distro-logos/fedora/icewm-24.xpm %{buildroot}%{_datadir}/%{name}/themes/IceAdwaita-Dark-Medium-alpha/taskbar/icewm.xpm
-install -m 0644 -p awesome-%{name}-%{awe_commit}/distro-logos/fedora/icewm-32.xpm %{buildroot}%{_datadir}/%{name}/themes/IceAdwaita-Large/taskbar/icewm.xpm
-cp -ap KDE-Core %{buildroot}%{_datadir}/%{name}/themes/
-cp -ap Windows7ice1 %{buildroot}%{_datadir}/%{name}/themes/
-cp -ap Araita+ %{buildroot}%{_datadir}/%{name}/themes/
-cp -ap Araita-Dark+ %{buildroot}%{_datadir}/%{name}/themes/
+cp -rap awesome-%{name}-%{awe_commit}/themes/IceAdwaita-* %{buildroot}%{_datadir}/%{name}/themes/
+install -m0644 -p awesome-%{name}-%{awe_commit}/distro-logos/fedora/icewm.xpm %{buildroot}%{_datadir}/%{name}/themes/IceAdwaita-Small/taskbar/icewm.xpm
+install -m0644 -p awesome-%{name}-%{awe_commit}/distro-logos/fedora/icewm-24.xpm %{buildroot}%{_datadir}/%{name}/themes/IceAdwaita-Medium/taskbar/icewm.xpm
+install -m0644 -p awesome-%{name}-%{awe_commit}/distro-logos/fedora/icewm-24.xpm %{buildroot}%{_datadir}/%{name}/themes/IceAdwaita-Dark-Medium-alpha/taskbar/icewm.xpm
+install -m0644 -p awesome-%{name}-%{awe_commit}/distro-logos/fedora/icewm-32.xpm %{buildroot}%{_datadir}/%{name}/themes/IceAdwaita-Large/taskbar/icewm.xpm
+
echo "Theme=\"IceAdwaita-Medium/default.theme\"" > %{buildroot}%{_datadir}/%{name}/theme
# Font settings
-install -Dp -m 0644 %{SOURCE20} %{buildroot}%{_sysconfdir}/fonts/local.conf
-install -Dp -m 0644 %{SOURCE21} %{buildroot}%{_sysconfdir}/gtk-2.0/gtkrc
-install -Dp -m 0644 %{SOURCE22} %{buildroot}%{_sysconfdir}/gtk-3.0/settings.ini
+install -Dp -m0644 %{SOURCE20} %{buildroot}%{_sysconfdir}/fonts/local.conf
+install -Dp -m0644 %{SOURCE21} %{buildroot}%{_sysconfdir}/gtk-2.0/gtkrc
+install -Dp -m0644 %{SOURCE22} %{buildroot}%{_sysconfdir}/gtk-3.0/settings.ini
+
+install -Dp -m0755 %{SOURCE30} %{buildroot}%{_datadir}/%{name}/startup
-install -Dp -m 0755 %{SOURCE30} %{buildroot}%{_datadir}/%{name}/startup
-install -Dp -m 0644 %{SOURCE40} %{buildroot}%{_datadir}/backgrounds/%{name}-wallpaper.png
%find_lang %{name}
# Tweak default settings
sed -i 's!# TaskBarShowMailboxStatus=1 # 0/1!TaskBarShowMailboxStatus=0 # 0/1!' %{buildroot}%{_datadir}/%{name}/preferences
-sed -i 's!# TaskBarShowCPUStatus=1 # 0/1!TaskBarShowCPUStatus=0 # 0/1!' %{buildroot}%{_datadir}/%{name}/preferences
-sed -i 's!# TaskBarShowMEMStatus=1 # 0/1!TaskBarShowMEMStatus=0 # 0/1!' %{buildroot}%{_datadir}/%{name}/preferences
-sed -i 's!# TaskBarShowNetStatus=1 # 0/1!TaskBarShowNetStatus=0 # 0/1!' %{buildroot}%{_datadir}/%{name}/preferences
-
-# 3rd-party configs
-install -Dp -m 0644 %{SOURCE50} %{buildroot}%{_sysconfdir}/xdg/dunst/dunstrc
-install -Dp -m 0644 %{SOURCE51} %{buildroot}%{_sysconfdir}/xdg/conky/conky.conf
-
-# Better default conky config
-%post 3rd-party-cfg
-install -m 0644 -p %{_sysconfdir}/xdg/conky/conky.conf %{_sysconfdir}/conky/conky.conf
+sed -i 's!# TaskBarShowCPUStatus=1 # 0/1!TaskBarShowCPUStatus=0 # 0/1!' %{buildroot}%{_datadir}/%{name}/preferences
+sed -i 's!# TaskBarShowMEMStatus=1 # 0/1!TaskBarShowMEMStatus=0 # 0/1!' %{buildroot}%{_datadir}/%{name}/preferences
+sed -i 's!# TaskBarShowNetStatus=1 # 0/1!TaskBarShowNetStatus=0 # 0/1!' %{buildroot}%{_datadir}/%{name}/preferences
%files -f %{name}.lang
@@ -355,19 +273,14 @@ install -m 0644 -p %{_sysconfdir}/xdg/conky/conky.conf %{_sysconfdir}/conky/conk
%dir %{_datadir}/%{name}/themes/
%files themes
-%{_datadir}/%{name}/themes/Araita+/
-%{_datadir}/%{name}/themes/Araita-Dark+/
%{_datadir}/%{name}/themes/CrystalBlue/
%{_datadir}/%{name}/themes/Helix/
-%{_datadir}/%{name}/themes/IceClearlooks2-*/
%{_datadir}/%{name}/themes/icedesert/
%{_datadir}/%{name}/themes/Infadel2/
-%{_datadir}/%{name}/themes/KDE-Core/
%{_datadir}/%{name}/themes/metal2/
%{_datadir}/%{name}/themes/motif/
%{_datadir}/%{name}/themes/NanoBlue/
%{_datadir}/%{name}/themes/win95/
-%{_datadir}/%{name}/themes/Windows7ice1/
# AntiX-collection
%{_datadir}/%{name}/themes/AntiX-*
@@ -394,20 +307,17 @@ install -m 0644 -p %{_sysconfdir}/xdg/conky/conky.conf %{_sysconfdir}/conky/conk
%files minimal-session
%{_datadir}/xsessions/%{name}.desktop
-%files wallpaper
-%{_datadir}/backgrounds/%{name}-wallpaper.png
-
%files fonts-settings
%{_sysconfdir}/fonts/local.conf
%{_sysconfdir}/gtk-2.0/gtkrc
%{_sysconfdir}/gtk-3.0/settings.ini
-%files 3rd-party-cfg
-%{_sysconfdir}/xdg/dunst/dunstrc
-%{_sysconfdir}/xdg/conky/conky.conf
-
%changelog
+* Wed Sep 2 07:05:42 EEST 2020 Artem Polishchuk - 1.8.1-2
+- Simplify SPEC file and build radically
+- Drop few themes, tweaks, deps
+
* Mon Aug 31 2020 Artem Polishchuk - 1.8.1-1
- Update to 1.8.1
diff --git a/sources b/sources
index 6294b05..15e70ad 100644
--- a/sources
+++ b/sources
@@ -1,8 +1,2 @@
-SHA512 (Araita+.tar.bz2) = 587addc5c4d8d23cba759bd768abdb7351b3043df2de069bc278ea369b4e813459d9ca209f31168960094f1f7959e0fabfefae20efeee2db43716a061e3787a8
-SHA512 (Araita-Dark+.tar.bz2) = a263190dd4ab1362621358fea58fe1774351c7bd3ff0f6e75aba8fca1ab9da32585e4916acb71f51d2a15d3c3a5633d1aa597775ff884fb8f6bbbe116b991702
-SHA512 (IceClearlooks2-ColorsMas_theme_pack-0.8.tar.bz2) = 3c79f2914135ea9074876e6e05e7c8b770faa131bb9c8b7b68659129f57360b6f744efaa0022ac01ffb4ebba694b0a8764bc336c1ca59b2e5f70dc2568658426
-SHA512 (KDE-Core-20181026134422.tar.bz2) = a946637167385893fefc01a0725fab2262a9a74d686070f68125dd0c297abf7dfda0808c0a48f0d53acb9a6ef0650927c778e46708b267975708909e118a27ab
-SHA512 (Windows7ice1.tar.xz) = c02ccf8a74c54488571654a319247311abde1db906ba65882d43144b376f6700d107be2af2475e54d2b6078ef3bd1fdafa2b42808e467a5eeb8f074a211e44b9
-SHA512 (awesome-icewm.git60d40b8.tar.gz) = 66a79c2c8d469351a59fe4ad5eb138a674a2a5001cfa9279f852c413d6988ae33a45751018741b4e6e646fc86b3713d62ddaa8167269e8ac8bed88f063b95100
+SHA512 (awesome-icewm.gita7986e5.tar.gz) = 3d6043c3fd472e860e1358252e76ee3cb548a5d1dfc28b41d6f94373cb1a2bce23edee37730d5945dcd2cd27421414d8317a13d2d675eb6e88b7e4d5cc238a3f
SHA512 (icewm-1.8.1.tar.gz) = 8e15391f0768284fc0ac76ef633773bfca7178df9de79fbd91ce11ccf81c82983d532e0dfa45dd84a232afef38036a332ffbd1e60ecd6e389018f66eed66930e
-SHA512 (icewm-wallpaper.png) = 5d55ec6f9e0c11c58cd5ea370b2a5bfe0e5c2886d3edb000a7f0647b8b9d10c463ffad41e264ad45ca3536cedeb76f9a8b6d29b5a404e35a4a007804716cd5a8