From ef2d6c48ff1fa40e1e6098dce737d348b1f843b0 Mon Sep 17 00:00:00 2001 From: Ding-Yi Chen Date: Nov 23 2020 05:45:30 +0000 Subject: Fixed bz#1863572 fluxbox: FTBFS in Fedora rawhide/f33 --- diff --git a/fluxbox.spec b/fluxbox.spec index 4d0eb55..fd33f9d 100644 --- a/fluxbox.spec +++ b/fluxbox.spec @@ -1,6 +1,6 @@ Name: fluxbox Version: 1.3.7 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Window Manager based on Blackbox @@ -105,9 +105,9 @@ touch -r ChangeLog %{buildroot}%{_sysconfdir}/fluxbox-pulseaudio # vim syntax files mkdir -p %{buildroot}%{_datadir}/vim/vimfiles/syntax/ -install -m 0644 -p %{S:3rd/vim/vim/syntax/fluxapps.vim} %{buildroot}%{_datadir}/vim/vimfiles/syntax/fluxapps.vim -install -m 0644 -p %{S:3rd/vim/vim/syntax/fluxkeys.vim} %{buildroot}%{_datadir}/vim/vimfiles/syntax/fluxkeys.vim -install -m 0644 -p %{S:3rd/vim/vim/syntax/fluxmenu.vim} %{buildroot}%{_datadir}/vim/vimfiles/syntax/fluxmenu.vim +install -m 0644 -p 3rd/vim/vim/syntax/fluxapps.vim %{buildroot}%{_datadir}/vim/vimfiles/syntax/fluxapps.vim +install -m 0644 -p 3rd/vim/vim/syntax/fluxkeys.vim %{buildroot}%{_datadir}/vim/vimfiles/syntax/fluxkeys.vim +install -m 0644 -p 3rd/vim/vim/syntax/fluxmenu.vim %{buildroot}%{_datadir}/vim/vimfiles/syntax/fluxmenu.vim %files %doc AUTHORS ChangeLog INSTALL NEWS README TODO @@ -123,11 +123,12 @@ install -m 0644 -p %{S:3rd/vim/vim/syntax/fluxmenu.vim} %{buildroot}%{_datadir}/ %{_sysconfdir}/fluxbox-pulseaudio %files vim-syntax -%{_datadir}/vim/vimfiles/syntax/%{S:fluxapps.vim} -%{_datadir}/vim/vimfiles/syntax/%{S:fluxkeys.vim} -%{_datadir}/vim/vimfiles/syntax/%{S:fluxmenu.vim} +%{_datadir}/vim/vimfiles/syntax/flux*.vim %changelog +* Mon Nov 23 2020 Ding-Yi Chen - 1.3.7-15 +- Remove S macro, as it does not seem to work with Fedora 33 + * Sat Aug 01 2020 Fedora Release Engineering - 1.3.7-14 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild