diff --git a/.gitignore b/.gitignore index b2d695d..d291655 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ fvwm-2.5.30.tar.bz2 /fvwm-2.6.5.tar.bz2 /fvwm-2.6.6.tar.gz /fvwm-2.6.7.tar.gz +/fvwm-2.6.8.tar.gz diff --git a/fvwm-0001-Change-html-viewer-to-xdg-open.patch b/fvwm-0001-Change-html-viewer-to-xdg-open.patch index 827b095..9f1ff4d 100644 --- a/fvwm-0001-Change-html-viewer-to-xdg-open.patch +++ b/fvwm-0001-Change-html-viewer-to-xdg-open.patch @@ -4,10 +4,10 @@ Subject: [PATCH] Change html viewer to xdg-open diff --git a/bin/fvwm-menu-headlines.in b/bin/fvwm-menu-headlines.in -index 2a27953..4209b38 100644 +index b26694e2e..bc983f601 100644 --- a/bin/fvwm-menu-headlines.in +++ b/bin/fvwm-menu-headlines.in -@@ -208,7 +208,7 @@ my $site = undef; +@@ -207,7 +207,7 @@ my $site = undef; my $name = undef; my $title = undef; my $itemf = '%h\t%[(%Y-%m-%d %H:%M)]'; diff --git a/fvwm-0002-Use-mimeopen-instead-of-EDITOR.patch b/fvwm-0002-Use-mimeopen-instead-of-EDITOR.patch index a59f9c5..50281ae 100644 --- a/fvwm-0002-Use-mimeopen-instead-of-EDITOR.patch +++ b/fvwm-0002-Use-mimeopen-instead-of-EDITOR.patch @@ -4,10 +4,10 @@ Subject: [PATCH] Use mimeopen instead of EDITOR diff --git a/bin/fvwm-menu-directory.in b/bin/fvwm-menu-directory.in -index 8e1ff42..038f6b6 100644 +index 808b4e5c0..b47cea908 100644 --- a/bin/fvwm-menu-directory.in +++ b/bin/fvwm-menu-directory.in -@@ -40,7 +40,7 @@ my $home = $ENV{'HOME'} || '/tmp'; +@@ -39,7 +39,7 @@ my $home = $ENV{'HOME'} || '/tmp'; my $dir = $home; my $xterm = "xterm -e"; # the X terminal program to invoke my $exect = $ENV{'SHELL'} || '/bin/sh'; diff --git a/fvwm-0003-Increase-number-of-mouse-buttons-supported.patch b/fvwm-0003-Increase-number-of-mouse-buttons-supported.patch index cba8085..ace06a2 100644 --- a/fvwm-0003-Increase-number-of-mouse-buttons-supported.patch +++ b/fvwm-0003-Increase-number-of-mouse-buttons-supported.patch @@ -4,7 +4,7 @@ Subject: [PATCH] Increase number of mouse buttons supported diff --git a/libs/defaults.h b/libs/defaults.h -index ad39f8b..ad15994 100644 +index 0ea2aeb97..8dc8ac006 100644 --- a/libs/defaults.h +++ b/libs/defaults.h @@ -25,7 +25,7 @@ diff --git a/fvwm-0004-FvwmPager-be-more-careful-with-window-labels.patch b/fvwm-0004-FvwmPager-be-more-careful-with-window-labels.patch index 0553404..9006d50 100644 --- a/fvwm-0004-FvwmPager-be-more-careful-with-window-labels.patch +++ b/fvwm-0004-FvwmPager-be-more-careful-with-window-labels.patch @@ -5,10 +5,10 @@ Subject: [PATCH] FvwmPager: be more careful with window labels. Do not assume they contain properly encoded strings. diff --git a/modules/FvwmPager/x_pager.c b/modules/FvwmPager/x_pager.c -index 602ea44..dfd3dd9 100644 +index 70c1e08c4..322ed5872 100644 --- a/modules/FvwmPager/x_pager.c +++ b/modules/FvwmPager/x_pager.c -@@ -2796,6 +2796,11 @@ static void label_window_wrap(PagerWindow *t) +@@ -2795,6 +2795,11 @@ static void label_window_wrap(PagerWindow *t) len = FlocaleStringNumberOfBytes(FwindowFont, next); width = FlocaleTextWidth(FwindowFont, next, len); diff --git a/fvwm-0005-Don-t-use-git-for-versioning.patch b/fvwm-0005-Don-t-use-git-for-versioning.patch index 180375a..a4a288f 100644 --- a/fvwm-0005-Don-t-use-git-for-versioning.patch +++ b/fvwm-0005-Don-t-use-git-for-versioning.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Don't use git for versioning Signed-off-by: Peter Lemenkov diff --git a/configure.ac b/configure.ac -index c5d0955..8aa91c1 100644 +index d9f1e0946..af1760aaf 100644 --- a/configure.ac +++ b/configure.ac @@ -14,7 +14,7 @@ fi diff --git a/fvwm-0006-Skip-install-data-hook-for-default-configs.patch b/fvwm-0006-Skip-install-data-hook-for-default-configs.patch index 41fd1ec..5e845ff 100644 --- a/fvwm-0006-Skip-install-data-hook-for-default-configs.patch +++ b/fvwm-0006-Skip-install-data-hook-for-default-configs.patch @@ -5,19 +5,18 @@ Subject: [PATCH] Skip install-data-hook for default configs Signed-off-by: Peter Lemenkov diff --git a/default-config/Makefile.am b/default-config/Makefile.am -index 8867aa1..8bfd854 100644 +index 5404145a7..4dc5b3820 100644 --- a/default-config/Makefile.am +++ b/default-config/Makefile.am -@@ -14,12 +14,6 @@ EXTRA_DIST = images \ +@@ -15,11 +15,5 @@ EXTRA_DIST = images \ FvwmScript-ConfirmQuit \ FvwmScript-ConfirmCopyConfig -install-data-hook: -- cp -r images @FVWM_DATADIR@/default-config -- ln -sf @FVWM_DATADIR@/default-config/FvwmScript-DateTime @FVWM_DATADIR@ -- ln -sf @FVWM_DATADIR@/default-config/FvwmScript-ConfirmQuit @FVWM_DATADIR@ -- ln -sf @FVWM_DATADIR@/default-config/FvwmScript-ConfirmCopyConfig @FVWM_DATADIR@ +- cp -r $(srcdir)/images $(inst_location) +- ln -sf default-config/FvwmScript-DateTime $(inst_location)/.. +- ln -sf default-config/FvwmScript-ConfirmQuit $(inst_location)/.. +- ln -sf default-config/FvwmScript-ConfirmCopyConfig $(inst_location)/.. - uninstall-hook: - rm -fr $(configdir) - rm @FVWM_DATADIR@/FvwmScript-* + rm -fr $(DESTDIR)/$(configdir) diff --git a/fvwm-0007-Fix-syntax-error-to-close-issue-42.patch b/fvwm-0007-Fix-syntax-error-to-close-issue-42.patch deleted file mode 100644 index 8a49612..0000000 --- a/fvwm-0007-Fix-syntax-error-to-close-issue-42.patch +++ /dev/null @@ -1,19 +0,0 @@ -From: Liang Chen -Date: Wed, 5 Apr 2017 13:46:14 -0400 -Subject: [PATCH] Fix syntax error to close issue #42 - -Close https://github.com/fvwmorg/fvwm/issues/42 - -diff --git a/bin/fvwm-menu-desktop.in b/bin/fvwm-menu-desktop.in -index 1df034b..af6a801 100644 ---- a/bin/fvwm-menu-desktop.in -+++ b/bin/fvwm-menu-desktop.in -@@ -141,7 +141,7 @@ Standard output is a series Fvwm commands.""" - "desktop=", "size=", "theme=", "install-prefix=", "menu-type=", "regen-cmd=", - "title=", "get-menus=", "set-menus=", "insert-in-menu=", "mini-icon-dir=", - "app-icon=", "dir-icon=", "include-items=", "dynamic", "all-menus"]+obs_args+equaled_obs_parms) -- except getopt.GetoptError, err: -+ except getopt.GetoptError as err: - # print help information and exit: - print str(err) # will print something like "option -a not recognized" - print usage diff --git a/fvwm.spec b/fvwm.spec index c45cafd..afd0c50 100644 --- a/fvwm.spec +++ b/fvwm.spec @@ -1,6 +1,6 @@ Name: fvwm -Version: 2.6.7 -Release: 7%{?dist} +Version: 2.6.8 +Release: 1%{?dist} Summary: Highly configurable multiple virtual desktop window manager Group: User Interface/X @@ -26,10 +26,6 @@ Patch4: fvwm-0004-FvwmPager-be-more-careful-with-window-labels.patch Patch5: fvwm-0005-Don-t-use-git-for-versioning.patch Patch6: fvwm-0006-Skip-install-data-hook-for-default-configs.patch -# Backported from upstream: -# https://github.com/fvwmorg/fvwm/issues/42 -Patch7: fvwm-0007-Fix-syntax-error-to-close-issue-42.patch - BuildRequires: gcc BuildRequires: autoconf BuildRequires: automake @@ -60,14 +56,7 @@ and implement a virtual desktop. %prep -%setup -q -%patch1 -p1 -b .xdg-open -%patch2 -p1 -b .mimeopen -%patch3 -p1 -b .more-mouse-buttons -%patch4 -p1 -b .fix_pager -%patch5 -p1 -b .dont_use_git -%patch6 -p1 -b .no_install_hook -%patch7 -p1 -b .py3_fix +%autosetup -p1 %build @@ -98,6 +87,9 @@ install -D -m0644 -p %{SOURCE1} \ %changelog +* Wed Jul 11 2018 Peter Lemenkov - 2.6.8-1 +- Ver. 2.6.8 + * Wed Feb 07 2018 Fedora Release Engineering - 2.6.7-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index 03195d3..06f1652 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (fvwm-2.6.7.tar.gz) = cd113633010a6841a96c95f1793e1cb0fa193d5421468ccfca299ed5b0f872f46b0b498e2a0a2447344c931ef8e797fc0658ab00c492bf445567a9091c5eb5c2 +SHA512 (fvwm-2.6.8.tar.gz) = 0f54d59f5cf84a82dd16a95f49f98e7aadaa3be3906b78207c21e858db0072f7e7b4dc1ef68da6ec8da8f7d84d11c3ad2ab09a876c6f79047841d1e6bd5c97bf