From c521c4eba0808c80786d3d392f00182f3044d309 Mon Sep 17 00:00:00 2001 From: Artem Polishchuk Date: Mar 17 2020 11:34:19 +0000 Subject: Update to 1.6.5 --- diff --git a/.gitignore b/.gitignore index 1ece651..7aa6717 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ icewm-1.2.37.tar.gz /awesome-icewm.git60d40b8.tar.gz /icewm-1.6.3.tar.gz /icewm-1.6.4.tar.gz +/icewm-1.6.5.tar.gz diff --git a/icewm.spec b/icewm.spec index 22ef51b..45b3d0d 100644 --- a/icewm.spec +++ b/icewm.spec @@ -11,8 +11,8 @@ %global awe_shortcommit %(c=%{awe_commit}; echo ${c:0:7}) Name: icewm -Version: 1.6.4 -Release: 2%{?dist} +Version: 1.6.5 +Release: 1%{?dist} Summary: Window manager designed for speed, usability, and consistency License: LGPLv2+ @@ -52,10 +52,6 @@ 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 @@ -90,10 +86,12 @@ BuildRequires: pkgconfig(xinerama) BuildRequires: pkgconfig(xpm) BuildRequires: pkgconfig(xrandr) BuildRequires: pkgconfig(xrender) + 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} @@ -102,7 +100,7 @@ Recommends: %{name}-wallpaper Recommends: abattis-cantarell-fonts # Compositor for X11 -Recommends: compton-ng%{?_isa} +Recommends: picom%{?_isa} # Notification daemon Recommends: dunst%{?_isa} @@ -110,19 +108,16 @@ 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 @@ -139,6 +134,11 @@ Suggests: xlunch%{?_isa} # https://github.com/bbidulock/icewm/issues/379 Suggests: xterm%{?_isa} + +# Night mode +Suggests: redshift-gtk%{?_isa} + +Suggests: conky%{?_isa} %endif %if 0%{?fedora} @@ -147,8 +147,8 @@ 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. +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: @@ -226,7 +226,6 @@ Various config files for 3rd-party apps to play nicely with %{name}. %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch10 -p1 %setup -q -D -T -a1 %setup -q -D -T -a10 @@ -265,17 +264,19 @@ export NM=%{_bindir}/gcc-nm %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 pushd %{_target_platform} -%cmake3 \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DCONFIG_GDK_PIXBUF_XLIB=on \ - -DCONFIG_LIBPNG=on \ - -DCONFIG_LIBRSVG=on \ - -DCONFIG_XPM=on \ - -DXTERMCMD=%{_bindir}/gnome-terminal \ +%cmake3 \ + -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 \ .. popd %endif @@ -351,15 +352,15 @@ install -m 0644 -p %{_sysconfdir}/xdg/conky/conky.conf %{_sysconfdir}/conky/conk %files data %{_datadir}/%{name}/IceWM.jpg -%{_datadir}/%{name}/icons +%{_datadir}/%{name}/icons/ %{_datadir}/%{name}/keys -%{_datadir}/%{name}/ledclock -%{_datadir}/%{name}/mailbox +%{_datadir}/%{name}/ledclock/ +%{_datadir}/%{name}/mailbox/ %{_datadir}/%{name}/menu %{_datadir}/%{name}/preferences %{_datadir}/%{name}/programs %{_datadir}/%{name}/startup -%{_datadir}/%{name}/taskbar +%{_datadir}/%{name}/taskbar/ %{_datadir}/%{name}/theme %{_datadir}/%{name}/themes/default %{_datadir}/%{name}/themes/IceAdwaita-* @@ -422,6 +423,9 @@ install -m 0644 -p %{_sysconfdir}/xdg/conky/conky.conf %{_sysconfdir}/conky/conk %changelog +* Tue Mar 17 2020 Artem Polishchuk - 1.6.5-1 +- Update to 1.6.5 + * Wed Jan 29 2020 Fedora Release Engineering - 1.6.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/missing-ytimer-link.patch b/missing-ytimer-link.patch deleted file mode 100644 index a60f0c9..0000000 --- a/missing-ytimer-link.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 6b1721fec3e5608327e553c43f3fd8f761cb66a7 Mon Sep 17 00:00:00 2001 -From: Nathan -Date: Wed, 8 Jan 2020 06:07:40 +0000 -Subject: [PATCH] Missing ytimer link - -Closes: #6 ---- - src/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 56c78f26..31d6a42e 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -505,7 +505,7 @@ ADD_EXECUTABLE(icewmhint${EXEEXT} icewmhint.cc ${MISC_SRCS}) - target_compile_options(icewmhint${EXEEXT} PUBLIC ${CXXFLAGS_COMMON} ${icewm_pc_flags}) - TARGET_LINK_LIBRARIES(icewmhint${EXEEXT} ${xext_LDFLAGS} ${x11_LDFLAGS} ${nls_LIBS} ${EXTRA_LIBS}) - --ADD_EXECUTABLE(icesh${EXEEXT} icesh.cc misc.cc mstring.cc ref.cc yarray.cc) -+ADD_EXECUTABLE(icesh${EXEEXT} icesh.cc misc.cc mstring.cc ref.cc yarray.cc ytimer.cc) - target_compile_options(icesh${EXEEXT} PUBLIC ${CXXFLAGS_COMMON} ${icewm_pc_flags}) - TARGET_LINK_LIBRARIES(icesh${EXEEXT} ${xext_LDFLAGS} ${xrandr_LDFLAGS} ${xinerama_LDFLAGS} ${x11_LDFLAGS} ${nls_LIBS} ${EXTRA_LIBS}) - diff --git a/sources b/sources index 00da9a7..a47fd57 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (icewm-1.6.4.tar.gz) = 0fe838dea56618c0ba3e5570aa31a8dd72c8ff5905a4ab3e3aa16e29d32bd75dfd72f96e7b470f0276b7f0699e1fe8ff81a3b9817ce777a41b726299f20c5b49 +SHA512 (icewm-1.6.5.tar.gz) = c384507a5f720c9010345fc8a10d47cb89d22722fdf43c0bda941a2805e1e03d18d5ca911aa5bada767c371a4911ce829289c0e67f64117dd0050e4da08085a1 SHA512 (awesome-icewm.git60d40b8.tar.gz) = 66a79c2c8d469351a59fe4ad5eb138a674a2a5001cfa9279f852c413d6988ae33a45751018741b4e6e646fc86b3713d62ddaa8167269e8ac8bed88f063b95100 SHA512 (Araita+.tar.bz2) = 587addc5c4d8d23cba759bd768abdb7351b3043df2de069bc278ea369b4e813459d9ca209f31168960094f1f7959e0fabfefae20efeee2db43716a061e3787a8 SHA512 (Araita-Dark+.tar.bz2) = a263190dd4ab1362621358fea58fe1774351c7bd3ff0f6e75aba8fca1ab9da32585e4916acb71f51d2a15d3c3a5633d1aa597775ff884fb8f6bbbe116b991702