From 3c14ef3559efe4b1d73cddfbe4d4f86ef7956424 Mon Sep 17 00:00:00 2001 From: guibuilder_pel7x64builder0 Date: Tue, 14 Apr 2020 00:58:12 +0200 Subject: [PATCH] icewm update Signed-off-by: guibuilder_pel7x64builder0 --- SPECS/icewm.spec | 110 +---------------------------------------------- 1 file changed, 1 insertion(+), 109 deletions(-) diff --git a/SPECS/icewm.spec b/SPECS/icewm.spec index 6e249e0..6b1af10 100644 --- a/SPECS/icewm.spec +++ b/SPECS/icewm.spec @@ -1,12 +1,6 @@ -# Autotools/CMake -%bcond_with fallback_build_tool - -%if 0%{?fedora} || 0%{?rhel} >= 8 # Enable LTO %global optflags %{optflags} -flto %global build_ldflags %{build_ldflags} -flto -%endif - %global awe_commit 60d40b83ad214e41956f604b4b65d9da45441613 %global awe_shortcommit %(c=%{awe_commit}; echo ${c:0:7}) @@ -14,62 +8,42 @@ Name: icewm Version: 1.6.4 Release: 1%{?dist} Summary: Window manager designed for speed, usability, and consistency - License: LGPLv2+ 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 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 - # Missing library link # * https://github.com/ice-wm/icewm/issues/6 Patch10: https://github.com/ice-wm/icewm/commit/6b1721fec3e5608327e553c43f3fd8f761cb66a7.patch#/missing-ytimer-link.patch - -%if %{with fallback_build_tool} -BuildRequires: automake -BuildRequires: autoconf -%else BuildRequires: cmake3 -%endif - BuildRequires: asciidoc BuildRequires: gcc-c++ BuildRequires: intltool BuildRequires: libtool -%if 0%{?fedora} || 0%{?rhel} >= 8 BuildRequires: perl-Pod-Html -%endif BuildRequires: pkgconfig(alsa) BuildRequires: pkgconfig(ao) BuildRequires: pkgconfig(fontconfig) @@ -94,64 +68,12 @@ Requires: adwaita-icon-theme Requires: alsa-utils%{?_isa} 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 -# Compositor for X11 -Recommends: compton-ng%{?_isa} - -# Notification daemon -Recommends: dunst%{?_isa} - -# Display resolution control -Recommends: lxrandr%{?_isa} - -# Night mode -Recommends: redshift-gtk%{?_isa} - -# Launcher -Recommends: rofi%{?_isa} - -# Volume control -Recommends: volumeicon%{?_isa} - -Recommends: conky%{?_isa} -Recommends: gnome-screenshot%{?_isa} -Recommends: gnome-terminal%{?_isa} -Recommends: network-manager-applet%{?_isa} -Suggests: %{name}-minimal-session = %{version}-%{release} - -# Various additional useful tools -# * Screenshot -Suggests: deepin-screenshot%{?_isa} -Suggests: flameshot%{?_isa} - -# * Volume control -Suggests: pasystray%{?_isa} -Suggests: pavucontrol%{?_isa} - -# * Graphical app launcher for X with minimal dependencies -Suggests: xlunch%{?_isa} - -# https://github.com/bbidulock/icewm/issues/379 -Suggests: xterm%{?_isa} -%endif - -%if 0%{?fedora} -# Screen brightness control (not available in EPEL8 yet) -Recommends: xbacklight%{?_isa} -%endif %description IceWM is a window manager for the X Window System (freedesktop, XFree86). The goal of IceWM is speed, simplicity, and not getting in the user's way. - You can install minimal version of IceWM without all optional dependencies: - sudo dnf install %{name}-minimal-session --setopt=install_weak_deps=False @@ -159,9 +81,7 @@ You can install minimal version of IceWM without all optional dependencies: %package data Summary: Data files for %{name} BuildArch: noarch - Requires: %{name} = %{version}-%{release} - %description data Data files for %{name}. @@ -170,9 +90,7 @@ Data files for %{name}. %package themes Summary: Extra themes for %{name} BuildArch: noarch - Requires: %{name} = %{version}-%{release} - %description themes Extra themes for %{name}. @@ -181,9 +99,7 @@ Extra themes for %{name}. %package minimal-session Summary: Minimal session for %{name} BuildArch: noarch - Requires: %{name} = %{version}-%{release} - %description minimal-session Minimal, lightweight session for %{name}. @@ -192,9 +108,7 @@ Minimal, lightweight session for %{name}. %package wallpaper Summary: Wallpaper for %{name} BuildArch: noarch - Requires: %{name} - %description wallpaper Wallpaper for %{name}. @@ -203,9 +117,7 @@ Wallpaper for %{name}. %package fonts-settings Summary: Font settings and tweaks for %{name} BuildArch: noarch - Requires: %{name} = %{version}-%{release} - %description fonts-settings Font settings and tweaks for %{name}. @@ -214,9 +126,7 @@ Font settings and tweaks for %{name}. %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}. @@ -255,19 +165,11 @@ mkdir -p %{_target_platform} %build -%if 0%{?fedora} || 0%{?rhel} >= 8 # Enable LTO export AR=%{_bindir}/gcc-ar export RANLIB=%{_bindir}/gcc-ranlib export NM=%{_bindir}/gcc-nm -%endif -%if %{with fallback_build_tool} -#./autogen.sh -autoreconf -fiv -%configure \ - --with-xterm=%{_bindir}/gnome-terminal \ -%else pushd %{_target_platform} %cmake3 \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ @@ -275,24 +177,14 @@ pushd %{_target_platform} -DCONFIG_LIBPNG=on \ -DCONFIG_LIBRSVG=on \ -DCONFIG_XPM=on \ - -DXTERMCMD=%{_bindir}/gnome-terminal \ + -DXTERMCMD=%{_bindir}/xterm \ .. popd -%endif - -%if %{with fallback_build_tool} -%make_build -%else %make_build -C %{_target_platform} -%endif %install -%if %{with fallback_build_tool} -%make_install -%else %make_install -C %{_target_platform} -%endif # Themes cp -ap IceClearlooks2-* %{buildroot}%{_datadir}/%{name}/themes/