From b7d4e1264b45bf1b5153bd8a105a35da9aaa7fcc Mon Sep 17 00:00:00 2001 From: Pierre Dorbais Date: Thu, 15 Apr 2010 19:04:20 +0000 Subject: [PATCH 01/82] Initial RPM release --- .cvsignore | 1 + import.log | 1 + sources | 1 + vifm-chdorb.patch | 26 ++++++++++++++++++++ vifm.spec | 60 +++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 89 insertions(+) create mode 100644 import.log create mode 100644 vifm-chdorb.patch create mode 100644 vifm.spec diff --git a/.cvsignore b/.cvsignore index e69de29..e4b6e58 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +vifm-0.5.tar.bz2 diff --git a/import.log b/import.log new file mode 100644 index 0000000..47d0ad2 --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +vifm-0_5-3_fc12:HEAD:vifm-0.5-3.fc12.src.rpm:1271357810 diff --git a/sources b/sources index e69de29..d41be8b 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +76818f02d6acd4997d1f41db932438aa vifm-0.5.tar.bz2 diff --git a/vifm-chdorb.patch b/vifm-chdorb.patch new file mode 100644 index 0000000..c5412e0 --- /dev/null +++ b/vifm-chdorb.patch @@ -0,0 +1,26 @@ +diff -up vifm-0.5/src/config.c.chdorb vifm-0.5/src/config.c +--- vifm-0.5/src/config.c.chdorb 2010-04-12 18:30:35.255832340 +0200 ++++ vifm-0.5/src/config.c 2010-04-12 18:36:15.313608759 +0200 +@@ -16,8 +16,8 @@ + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + */ + +-#define CP_HELP "cp /usr/local/share/vifm/vifm-help.txt ~/.vifm" +-#define CP_RC "cp /usr/local/share/vifm/vifmrc ~/.vifm" ++#define CP_HELP "cp /usr/share/vifm/vifm-help.txt ~/.vifm" ++#define CP_RC "cp /usr/share/vifm/vifmrc ~/.vifm" + + #include /* FILE */ + #include /* getenv */ +@@ -143,9 +143,9 @@ set_config_dir(void) + + if(chdir(cfg.config_dir)) + { +- if(mkdir(cfg.config_dir, 0777)) ++ if(mkdir(cfg.config_dir, 0700)) + return; +- if(mkdir(cfg.trash_dir, 0777)) ++ if(mkdir(cfg.trash_dir, 0700)) + return; + if((f = fopen(help_file, "r")) == NULL) + create_help_file(); diff --git a/vifm.spec b/vifm.spec new file mode 100644 index 0000000..5d4591b --- /dev/null +++ b/vifm.spec @@ -0,0 +1,60 @@ +Name: vifm +Version: 0.5 +Release: 3%{?dist} +Summary: Lightweight file manager with vi like key-bindings + +Group: Applications/File +License: GPLv2+ +URL: http://%{name}.sourceforge.net/ +Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 +Patch0: vifm-chdorb.patch + +BuildRequires: ncurses-devel + +%description +A ncurses based CLI file manager with vi like key-bindings + +%prep +%setup -q +%patch0 -p1 -b .chdorb + + +%build +%configure +make %{?_smp_mflags} + + +%install +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" + +%clean +rm -rf $RPM_BUILD_ROOT + + +%files +%defattr(-,root,root,-) +%doc AUTHORS BUGS ChangeLog COPYING README TODO +%dir %{_datadir}/%{name} +%{_bindir}/pauseme +%{_bindir}/%{name} +%{_mandir}/man1/%{name}.1.gz +%{_datadir}/%{name}/%{name}-help.txt +%{_datadir}/%{name}/%{name}.txt +%{_datadir}/%{name}/%{name}.vim + + +%changelog +* Tue Apr 13 2010 Pierre Dorbais 0.5-3 +- Add dir macro to fix files listed twice +- Add blank lines between changelog entries + +* Mon Apr 12 2010 Pierre Dorbais 0.5-2 +- Add INSTALL variable to make +- Add patch Patch0 +- Add missing path to files macro +- Remove INSTALL doc file +- Remove BuildRoot tag + +* Mon Feb 08 2010 Pierre Dorbais 0.5-1 +- Initial RPM release From 17f7db25a32b89b9c1db219c4bd42fb1f306366f Mon Sep 17 00:00:00 2001 From: Pierre Dorbais Date: Sat, 19 Jun 2010 14:12:21 +0000 Subject: [PATCH 02/82] Add patch to fix crash when deleting four or more files (Bug #592725) --- delete-n-files-array-overflow.patch | 102 ++++++++++++++++++++++++++++ import.log | 1 + vifm.spec | 7 +- 3 files changed, 109 insertions(+), 1 deletion(-) create mode 100644 delete-n-files-array-overflow.patch diff --git a/delete-n-files-array-overflow.patch b/delete-n-files-array-overflow.patch new file mode 100644 index 0000000..04ba10d --- /dev/null +++ b/delete-n-files-array-overflow.patch @@ -0,0 +1,102 @@ +diff -up vifm-0.5/src/keys.c.old vifm-0.5/src/keys.c +--- vifm-0.5/src/keys.c.old 2010-05-16 16:06:52.000000000 +0200 ++++ vifm-0.5/src/keys.c 2010-05-16 16:11:21.000000000 +0200 +@@ -330,6 +330,49 @@ restore_filename_filter(FileView *view) + moveto_list_pos(view, view->list_pos); + } + ++/** Deselects all files. ++ */ ++static void ++deselect_all_files(FileView* view) ++{ ++ int x; ++ for(x = 0; x < view->list_rows; x++) ++ view->dir_entry[x].selected = 0; ++ view->selected_files = 0; ++} ++ ++/** Selects given number of files or current file. ++ ++ If count == 0 and there is no selection, selects the current file. ++ Otherwise, if count == 1, selects number of files specified by ++ count_buf. ++ */ ++static void ++select_n_files(FileView* view, int count, char* count_buf) ++{ ++ if (count) ++ { ++ int x = 0; ++ int y = view->list_pos; ++ ++ deselect_all_files(view); ++ ++ for ( ; x < atoi(count_buf); x++) ++ { ++ view->dir_entry[y].selected = 1; ++ y++; ++ if (y >= view->list_rows) ++ break; ++ } ++ view->selected_files = y - view->list_pos; ++ } ++ else if (!view->selected_files) ++ { ++ view->dir_entry[view->list_pos].selected = 1; ++ view->selected_files = 1; ++ } ++} ++ + static void + yank_files(FileView *view, int count, char *count_buf) + { +@@ -376,6 +419,25 @@ yank_files(FileView *view, int count, ch + } + + static void ++delete_files(FileView *view, int count, char *count_buf) ++{ ++ char buf[32]; ++ ++ select_n_files(view, count, count_buf); ++ get_all_selected_files(view); ++ delete_file(view); ++ free_selected_file_array(view); ++ count = view->selected_files; ++ deselect_all_files(view); ++ ++ draw_dir_list(view, view->top_line, view->list_pos); ++ moveto_list_pos(view, view->list_pos); ++ snprintf(buf, sizeof(buf), " %d %s deleted.", count, ++ count == 1 ? "file" : "files"); ++ status_bar_message(buf); ++} ++ ++static void + tag_file(FileView *view) + { + if(view->dir_entry[view->list_pos].selected == 0) +@@ -1077,21 +1139,7 @@ main_key_press_cb(FileView *view) + if(curr_stats.last_char == 'd') + { + clear_num_window(); +- if(view->selected_files) +- delete_file(view); +- else if(count) +- { +- int x; +- int y = view->list_pos; +- for(x = 0; x < atoi(count_buf); x++) +- { +- view->dir_entry[y].selected = 1; +- y++; +- } +- delete_file(view); +- } +- else +- delete_file(view); ++ delete_files(view, count, count_buf); + reset_last_char = 1; + } + } diff --git a/import.log b/import.log index 47d0ad2..9e324a9 100644 --- a/import.log +++ b/import.log @@ -1 +1,2 @@ vifm-0_5-3_fc12:HEAD:vifm-0.5-3.fc12.src.rpm:1271357810 +vifm-0_5-4_fc12:HEAD:vifm-0.5-4.fc12.src.rpm:1276956695 diff --git a/vifm.spec b/vifm.spec index 5d4591b..98c69a1 100644 --- a/vifm.spec +++ b/vifm.spec @@ -1,6 +1,6 @@ Name: vifm Version: 0.5 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Lightweight file manager with vi like key-bindings Group: Applications/File @@ -8,6 +8,7 @@ License: GPLv2+ URL: http://%{name}.sourceforge.net/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 Patch0: vifm-chdorb.patch +Patch1: delete-n-files-array-overflow.patch BuildRequires: ncurses-devel @@ -17,6 +18,7 @@ A ncurses based CLI file manager with vi like key-bindings %prep %setup -q %patch0 -p1 -b .chdorb +%patch1 -p1 -b .old %build @@ -45,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Jun 19 2010 Pierre Dorbais 0.5-4 +- Add patch to fix crash when deleting four or more files (Bug #592725) + * Tue Apr 13 2010 Pierre Dorbais 0.5-3 - Add dir macro to fix files listed twice - Add blank lines between changelog entries From 47cc22206672484b7ba28d7e2aeaa693181e4bee Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 14:58:49 +0000 Subject: [PATCH 03/82] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- import.log | 2 -- 3 files changed, 23 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 6f19321..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: vifm -# $Id$ -NAME := vifm -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/import.log b/import.log deleted file mode 100644 index 9e324a9..0000000 --- a/import.log +++ /dev/null @@ -1,2 +0,0 @@ -vifm-0_5-3_fc12:HEAD:vifm-0.5-3.fc12.src.rpm:1271357810 -vifm-0_5-4_fc12:HEAD:vifm-0.5-4.fc12.src.rpm:1276956695 From a993cf7413d0b95abe50d2197d0263e339c307ae Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 7 Feb 2011 19:29:04 -0600 Subject: [PATCH 04/82] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- vifm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vifm.spec b/vifm.spec index 98c69a1..c0f3a50 100644 --- a/vifm.spec +++ b/vifm.spec @@ -1,6 +1,6 @@ Name: vifm Version: 0.5 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Lightweight file manager with vi like key-bindings Group: Applications/File @@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Feb 07 2011 Fedora Release Engineering - 0.5-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Sat Jun 19 2010 Pierre Dorbais 0.5-4 - Add patch to fix crash when deleting four or more files (Bug #592725) From c4451721a9af8d6fabcdcf39623d7be712ec5af7 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Fri, 24 Jun 2011 23:21:46 -0400 Subject: [PATCH 05/82] Spec files touchups --- vifm.spec | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/vifm.spec b/vifm.spec index c0f3a50..0a9f637 100644 --- a/vifm.spec +++ b/vifm.spec @@ -15,6 +15,7 @@ BuildRequires: ncurses-devel %description A ncurses based CLI file manager with vi like key-bindings + %prep %setup -q %patch0 -p1 -b .chdorb @@ -27,11 +28,7 @@ make %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" - -%clean -rm -rf $RPM_BUILD_ROOT +make install DESTDIR=%{buildroot} INSTALL="install -p" %files From 4c8bec130dd9743eb545fdad582b71922f4534c7 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Fri, 24 Jun 2011 23:22:06 -0400 Subject: [PATCH 06/82] Update to 0.6.2 --- .gitignore | 1 + delete-n-files-array-overflow.patch | 102 ---------------------------- sources | 2 +- vifm-0.6.2-chdorb.patch | 19 ++++++ vifm-chdorb.patch | 26 ------- vifm.spec | 12 ++-- 6 files changed, 28 insertions(+), 134 deletions(-) delete mode 100644 delete-n-files-array-overflow.patch create mode 100644 vifm-0.6.2-chdorb.patch delete mode 100644 vifm-chdorb.patch diff --git a/.gitignore b/.gitignore index e4b6e58..22f6d2a 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ vifm-0.5.tar.bz2 +/vifm-0.6.2.tar.bz2 diff --git a/delete-n-files-array-overflow.patch b/delete-n-files-array-overflow.patch deleted file mode 100644 index 04ba10d..0000000 --- a/delete-n-files-array-overflow.patch +++ /dev/null @@ -1,102 +0,0 @@ -diff -up vifm-0.5/src/keys.c.old vifm-0.5/src/keys.c ---- vifm-0.5/src/keys.c.old 2010-05-16 16:06:52.000000000 +0200 -+++ vifm-0.5/src/keys.c 2010-05-16 16:11:21.000000000 +0200 -@@ -330,6 +330,49 @@ restore_filename_filter(FileView *view) - moveto_list_pos(view, view->list_pos); - } - -+/** Deselects all files. -+ */ -+static void -+deselect_all_files(FileView* view) -+{ -+ int x; -+ for(x = 0; x < view->list_rows; x++) -+ view->dir_entry[x].selected = 0; -+ view->selected_files = 0; -+} -+ -+/** Selects given number of files or current file. -+ -+ If count == 0 and there is no selection, selects the current file. -+ Otherwise, if count == 1, selects number of files specified by -+ count_buf. -+ */ -+static void -+select_n_files(FileView* view, int count, char* count_buf) -+{ -+ if (count) -+ { -+ int x = 0; -+ int y = view->list_pos; -+ -+ deselect_all_files(view); -+ -+ for ( ; x < atoi(count_buf); x++) -+ { -+ view->dir_entry[y].selected = 1; -+ y++; -+ if (y >= view->list_rows) -+ break; -+ } -+ view->selected_files = y - view->list_pos; -+ } -+ else if (!view->selected_files) -+ { -+ view->dir_entry[view->list_pos].selected = 1; -+ view->selected_files = 1; -+ } -+} -+ - static void - yank_files(FileView *view, int count, char *count_buf) - { -@@ -376,6 +419,25 @@ yank_files(FileView *view, int count, ch - } - - static void -+delete_files(FileView *view, int count, char *count_buf) -+{ -+ char buf[32]; -+ -+ select_n_files(view, count, count_buf); -+ get_all_selected_files(view); -+ delete_file(view); -+ free_selected_file_array(view); -+ count = view->selected_files; -+ deselect_all_files(view); -+ -+ draw_dir_list(view, view->top_line, view->list_pos); -+ moveto_list_pos(view, view->list_pos); -+ snprintf(buf, sizeof(buf), " %d %s deleted.", count, -+ count == 1 ? "file" : "files"); -+ status_bar_message(buf); -+} -+ -+static void - tag_file(FileView *view) - { - if(view->dir_entry[view->list_pos].selected == 0) -@@ -1077,21 +1139,7 @@ main_key_press_cb(FileView *view) - if(curr_stats.last_char == 'd') - { - clear_num_window(); -- if(view->selected_files) -- delete_file(view); -- else if(count) -- { -- int x; -- int y = view->list_pos; -- for(x = 0; x < atoi(count_buf); x++) -- { -- view->dir_entry[y].selected = 1; -- y++; -- } -- delete_file(view); -- } -- else -- delete_file(view); -+ delete_files(view, count, count_buf); - reset_last_char = 1; - } - } diff --git a/sources b/sources index d41be8b..e82a2a8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -76818f02d6acd4997d1f41db932438aa vifm-0.5.tar.bz2 +d5d1547a4a10ff7acacc3c03947c3255 vifm-0.6.2.tar.bz2 diff --git a/vifm-0.6.2-chdorb.patch b/vifm-0.6.2-chdorb.patch new file mode 100644 index 0000000..2116dfd --- /dev/null +++ b/vifm-0.6.2-chdorb.patch @@ -0,0 +1,19 @@ +diff -u -r -U5 vifm/src/config.c vifm.chdorb/src/config.c +--- vifm/src/config.c 2011-06-19 09:52:25.000000000 -0400 ++++ vifm.chdorb/src/config.c 2011-06-24 23:09:33.830465393 -0400 +@@ -162,13 +162,13 @@ + snprintf(cfg.config_dir, sizeof(cfg.config_dir), "%s/.vifm", home_dir); + snprintf(cfg.trash_dir, sizeof(cfg.trash_dir), "%s/.vifm/Trash", home_dir); + + if(chdir(cfg.config_dir)) + { +- if(mkdir(cfg.config_dir, 0777)) ++ if(mkdir(cfg.config_dir, 0700)) + return; +- if(mkdir(cfg.trash_dir, 0777)) ++ if(mkdir(cfg.trash_dir, 0700)) + return; + if((f = fopen(help_file, "r")) == NULL) + create_help_file(); + if((f = fopen(rc_file, "r")) == NULL) + create_rc_file(); diff --git a/vifm-chdorb.patch b/vifm-chdorb.patch deleted file mode 100644 index c5412e0..0000000 --- a/vifm-chdorb.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -up vifm-0.5/src/config.c.chdorb vifm-0.5/src/config.c ---- vifm-0.5/src/config.c.chdorb 2010-04-12 18:30:35.255832340 +0200 -+++ vifm-0.5/src/config.c 2010-04-12 18:36:15.313608759 +0200 -@@ -16,8 +16,8 @@ - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - */ - --#define CP_HELP "cp /usr/local/share/vifm/vifm-help.txt ~/.vifm" --#define CP_RC "cp /usr/local/share/vifm/vifmrc ~/.vifm" -+#define CP_HELP "cp /usr/share/vifm/vifm-help.txt ~/.vifm" -+#define CP_RC "cp /usr/share/vifm/vifmrc ~/.vifm" - - #include /* FILE */ - #include /* getenv */ -@@ -143,9 +143,9 @@ set_config_dir(void) - - if(chdir(cfg.config_dir)) - { -- if(mkdir(cfg.config_dir, 0777)) -+ if(mkdir(cfg.config_dir, 0700)) - return; -- if(mkdir(cfg.trash_dir, 0777)) -+ if(mkdir(cfg.trash_dir, 0700)) - return; - if((f = fopen(help_file, "r")) == NULL) - create_help_file(); diff --git a/vifm.spec b/vifm.spec index 0a9f637..6e93431 100644 --- a/vifm.spec +++ b/vifm.spec @@ -1,14 +1,13 @@ Name: vifm -Version: 0.5 -Release: 5%{?dist} +Version: 0.6.2 +Release: 1%{?dist} Summary: Lightweight file manager with vi like key-bindings Group: Applications/File License: GPLv2+ URL: http://%{name}.sourceforge.net/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 -Patch0: vifm-chdorb.patch -Patch1: delete-n-files-array-overflow.patch +Patch0: vifm-0.6.2-chdorb.patch BuildRequires: ncurses-devel @@ -19,7 +18,6 @@ A ncurses based CLI file manager with vi like key-bindings %prep %setup -q %patch0 -p1 -b .chdorb -%patch1 -p1 -b .old %build @@ -44,6 +42,10 @@ make install DESTDIR=%{buildroot} INSTALL="install -p" %changelog +* Fri Jun 24 2011 Ben Boeckel - 0.6.2-1 +- Update to 0.6.2 +- Remove deletion patch (unable to reproduce original bug with new version) + * Mon Feb 07 2011 Fedora Release Engineering - 0.5-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From b254ec1a3a53e97d186f80d308e91b474f3ff1f4 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Fri, 24 Jun 2011 23:32:19 -0400 Subject: [PATCH 07/82] Set the directory name in the tarball --- vifm.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vifm.spec b/vifm.spec index 6e93431..d663edb 100644 --- a/vifm.spec +++ b/vifm.spec @@ -16,7 +16,7 @@ A ncurses based CLI file manager with vi like key-bindings %prep -%setup -q +%setup -q -n %{name} %patch0 -p1 -b .chdorb From 4ec4171583c0631b6c6d4cbbe8a361e78d6a44ca Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 14 Jan 2012 01:54:28 -0600 Subject: [PATCH 08/82] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- vifm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vifm.spec b/vifm.spec index d663edb..f33f93c 100644 --- a/vifm.spec +++ b/vifm.spec @@ -1,6 +1,6 @@ Name: vifm Version: 0.6.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Lightweight file manager with vi like key-bindings Group: Applications/File @@ -42,6 +42,9 @@ make install DESTDIR=%{buildroot} INSTALL="install -p" %changelog +* Sat Jan 14 2012 Fedora Release Engineering - 0.6.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Fri Jun 24 2011 Ben Boeckel - 0.6.2-1 - Update to 0.6.2 - Remove deletion patch (unable to reproduce original bug with new version) From 4fe7ee86c38830299c4ba59570cb590c9bb4f588 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 21 Jul 2012 21:43:33 -0500 Subject: [PATCH 09/82] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- vifm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vifm.spec b/vifm.spec index f33f93c..39e9a89 100644 --- a/vifm.spec +++ b/vifm.spec @@ -1,6 +1,6 @@ Name: vifm Version: 0.6.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Lightweight file manager with vi like key-bindings Group: Applications/File @@ -42,6 +42,9 @@ make install DESTDIR=%{buildroot} INSTALL="install -p" %changelog +* Sun Jul 22 2012 Fedora Release Engineering - 0.6.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Sat Jan 14 2012 Fedora Release Engineering - 0.6.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From 0292d84f185e3f168f2f5ec3e3657ffa2c4ca506 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Mon, 23 Jul 2012 19:11:52 -0400 Subject: [PATCH 10/82] Update to 0.7.3a --- .gitignore | 1 + sources | 2 +- vifm-0.6.2-chdorb.patch | 19 ------------------- vifm.spec | 9 +++++---- 4 files changed, 7 insertions(+), 24 deletions(-) delete mode 100644 vifm-0.6.2-chdorb.patch diff --git a/.gitignore b/.gitignore index 22f6d2a..b79e83d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ vifm-0.5.tar.bz2 /vifm-0.6.2.tar.bz2 +/vifm-0.7.3a.tar.bz2 diff --git a/sources b/sources index e82a2a8..4d34368 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d5d1547a4a10ff7acacc3c03947c3255 vifm-0.6.2.tar.bz2 +b5e2cb3471b13a0e6d42e45ea8286fd6 vifm-0.7.3a.tar.bz2 diff --git a/vifm-0.6.2-chdorb.patch b/vifm-0.6.2-chdorb.patch deleted file mode 100644 index 2116dfd..0000000 --- a/vifm-0.6.2-chdorb.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -u -r -U5 vifm/src/config.c vifm.chdorb/src/config.c ---- vifm/src/config.c 2011-06-19 09:52:25.000000000 -0400 -+++ vifm.chdorb/src/config.c 2011-06-24 23:09:33.830465393 -0400 -@@ -162,13 +162,13 @@ - snprintf(cfg.config_dir, sizeof(cfg.config_dir), "%s/.vifm", home_dir); - snprintf(cfg.trash_dir, sizeof(cfg.trash_dir), "%s/.vifm/Trash", home_dir); - - if(chdir(cfg.config_dir)) - { -- if(mkdir(cfg.config_dir, 0777)) -+ if(mkdir(cfg.config_dir, 0700)) - return; -- if(mkdir(cfg.trash_dir, 0777)) -+ if(mkdir(cfg.trash_dir, 0700)) - return; - if((f = fopen(help_file, "r")) == NULL) - create_help_file(); - if((f = fopen(rc_file, "r")) == NULL) - create_rc_file(); diff --git a/vifm.spec b/vifm.spec index 39e9a89..1dd50ee 100644 --- a/vifm.spec +++ b/vifm.spec @@ -1,13 +1,12 @@ Name: vifm -Version: 0.6.2 -Release: 3%{?dist} +Version: 0.7.3a +Release: 1%{?dist} Summary: Lightweight file manager with vi like key-bindings Group: Applications/File License: GPLv2+ URL: http://%{name}.sourceforge.net/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 -Patch0: vifm-0.6.2-chdorb.patch BuildRequires: ncurses-devel @@ -17,7 +16,6 @@ A ncurses based CLI file manager with vi like key-bindings %prep %setup -q -n %{name} -%patch0 -p1 -b .chdorb %build @@ -42,6 +40,9 @@ make install DESTDIR=%{buildroot} INSTALL="install -p" %changelog +* Mon Jul 23 2012 Ben Boeckel - 0.7.3a-1 +- Update to 0.7.3a + * Sun Jul 22 2012 Fedora Release Engineering - 0.6.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From 4542706b2222e6073bc22a9915ff08008a69ccb0 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Mon, 23 Jul 2012 21:03:59 -0400 Subject: [PATCH 11/82] Upstream tarball directory fixed --- vifm.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vifm.spec b/vifm.spec index 1dd50ee..3b37e14 100644 --- a/vifm.spec +++ b/vifm.spec @@ -15,7 +15,7 @@ A ncurses based CLI file manager with vi like key-bindings %prep -%setup -q -n %{name} +%setup -q %build From eaffb575b665aefb76ea48ec5ee85dd059125d33 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Mon, 23 Jul 2012 21:22:35 -0400 Subject: [PATCH 12/82] Update %files --- vifm.spec | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/vifm.spec b/vifm.spec index 3b37e14..4b91dc2 100644 --- a/vifm.spec +++ b/vifm.spec @@ -30,13 +30,11 @@ make install DESTDIR=%{buildroot} INSTALL="install -p" %files %defattr(-,root,root,-) %doc AUTHORS BUGS ChangeLog COPYING README TODO -%dir %{_datadir}/%{name} -%{_bindir}/pauseme %{_bindir}/%{name} +%{_bindir}/vifm-pause +%{_bindir}/vifmrc-converter %{_mandir}/man1/%{name}.1.gz -%{_datadir}/%{name}/%{name}-help.txt -%{_datadir}/%{name}/%{name}.txt -%{_datadir}/%{name}/%{name}.vim +%{_datadir}/%{name}/ %changelog From ffe10604ad0dbedbeadaee054395c3c2eb9f12c8 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Mon, 5 Nov 2012 00:10:13 -0500 Subject: [PATCH 13/82] Update to 0.7.4a --- vifm.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/vifm.spec b/vifm.spec index 4b91dc2..4ccbe3e 100644 --- a/vifm.spec +++ b/vifm.spec @@ -1,5 +1,5 @@ Name: vifm -Version: 0.7.3a +Version: 0.7.4a Release: 1%{?dist} Summary: Lightweight file manager with vi like key-bindings @@ -8,6 +8,7 @@ License: GPLv2+ URL: http://%{name}.sourceforge.net/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 +BuildRequires: file-devel BuildRequires: ncurses-devel %description @@ -33,11 +34,14 @@ make install DESTDIR=%{buildroot} INSTALL="install -p" %{_bindir}/%{name} %{_bindir}/vifm-pause %{_bindir}/vifmrc-converter -%{_mandir}/man1/%{name}.1.gz +%{_mandir}/man1/*.1.gz %{_datadir}/%{name}/ %changelog +* Sun Nov 04 2012 Ben Boeckel - 0.7.4a-1 +- Update to 0.7.4a + * Mon Jul 23 2012 Ben Boeckel - 0.7.3a-1 - Update to 0.7.3a From a41ee3faaf899f8ee97054d00ef065c6287cce5a Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Mon, 5 Nov 2012 00:10:23 -0500 Subject: [PATCH 14/82] Add switches for optional features --- vifm.spec | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/vifm.spec b/vifm.spec index 4ccbe3e..aa36617 100644 --- a/vifm.spec +++ b/vifm.spec @@ -1,3 +1,7 @@ +%bcond_with gtk +%bcond_without libmagic +%bcond_with x11 + Name: vifm Version: 0.7.4a Release: 1%{?dist} @@ -8,7 +12,16 @@ License: GPLv2+ URL: http://%{name}.sourceforge.net/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 +%if %{with gtk} +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(gtk+-2.0) +%endif +%if %{with libmagic} BuildRequires: file-devel +%endif +%if %{with x11} +BuildRequires: libX11-devel +%endif BuildRequires: ncurses-devel %description @@ -20,7 +33,22 @@ A ncurses based CLI file manager with vi like key-bindings %build -%configure +%configure \ +%if %{with gtk} + --with-gtk=yes \ +%else + --with-gtk=no \ +%endif +%if %{with libmagic} + --with-libmagic=yes \ +%else + --with-libmagic=no \ +%endif +%if %{with x11} + --with-X11=yes +%else + --with-X11=no +%endif make %{?_smp_mflags} From c375301914d7797f4e433297eafcbd3286c4bf52 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Mon, 5 Nov 2012 00:12:55 -0500 Subject: [PATCH 15/82] Update to 0.7.4a --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index b79e83d..5008bca 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ vifm-0.5.tar.bz2 /vifm-0.6.2.tar.bz2 /vifm-0.7.3a.tar.bz2 +/vifm-0.7.4a.tar.bz2 diff --git a/sources b/sources index 4d34368..006ada3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b5e2cb3471b13a0e6d42e45ea8286fd6 vifm-0.7.3a.tar.bz2 +eebd67ed31ab9309fbfc06c5510cc10d vifm-0.7.4a.tar.bz2 From 4f9a222cc0ef28d5e3b461a2c41358b93dd4e288 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 14 Feb 2013 20:47:04 -0600 Subject: [PATCH 16/82] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- vifm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vifm.spec b/vifm.spec index aa36617..abe69e9 100644 --- a/vifm.spec +++ b/vifm.spec @@ -4,7 +4,7 @@ Name: vifm Version: 0.7.4a -Release: 1%{?dist} +Release: 2%{?dist} Summary: Lightweight file manager with vi like key-bindings Group: Applications/File @@ -67,6 +67,9 @@ make install DESTDIR=%{buildroot} INSTALL="install -p" %changelog +* Fri Feb 15 2013 Fedora Release Engineering - 0.7.4a-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Sun Nov 04 2012 Ben Boeckel - 0.7.4a-1 - Update to 0.7.4a From 5ba4f2cd14a57cff9498459ea6857e76b54868c7 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Thu, 30 May 2013 22:20:12 -0400 Subject: [PATCH 17/82] Update to 0.7.5 --- vifm.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vifm.spec b/vifm.spec index abe69e9..6500354 100644 --- a/vifm.spec +++ b/vifm.spec @@ -3,8 +3,8 @@ %bcond_with x11 Name: vifm -Version: 0.7.4a -Release: 2%{?dist} +Version: 0.7.5 +Release: 1%{?dist} Summary: Lightweight file manager with vi like key-bindings Group: Applications/File @@ -67,6 +67,9 @@ make install DESTDIR=%{buildroot} INSTALL="install -p" %changelog +* Thu May 30 2013 Ben Boeckel - 0.7.5-1 +- Update to 0.7.5 + * Fri Feb 15 2013 Fedora Release Engineering - 0.7.4a-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From 12bec56e11e3e2323fe6ea47e059f12c204c90b3 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Thu, 30 May 2013 22:30:20 -0400 Subject: [PATCH 18/82] Upload sources --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 5008bca..a1c33dc 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ vifm-0.5.tar.bz2 /vifm-0.6.2.tar.bz2 /vifm-0.7.3a.tar.bz2 /vifm-0.7.4a.tar.bz2 +/vifm-0.7.5.tar.bz2 diff --git a/sources b/sources index 006ada3..2a44006 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -eebd67ed31ab9309fbfc06c5510cc10d vifm-0.7.4a.tar.bz2 +604f43dde5ba56b0aac03486f118f3ec vifm-0.7.5.tar.bz2 From c69113d9aae559164ab31e5ac87e755305153d82 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Thu, 30 May 2013 22:30:31 -0400 Subject: [PATCH 19/82] Add aarch64 patch --- vifm-aarch64.patch | 1629 ++++++++++++++++++++++++++++++++++++++++++++ vifm.spec | 2 + 2 files changed, 1631 insertions(+) create mode 100644 vifm-aarch64.patch diff --git a/vifm-aarch64.patch b/vifm-aarch64.patch new file mode 100644 index 0000000..a0c9aa7 --- /dev/null +++ b/vifm-aarch64.patch @@ -0,0 +1,1629 @@ +diff -urN vifm-0.7.4a/config.guess vifm-0.7.4a-aarch64/config.guess +--- vifm-0.7.4a/config.guess 2012-10-22 11:32:51.000000000 -0500 ++++ vifm-0.7.4a-aarch64/config.guess 2013-03-08 09:25:33.753415397 -0600 +@@ -1,10 +1,10 @@ + #! /bin/sh + # Attempt to guess a canonical system name. + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +-# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, +-# Inc. ++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, ++# 2011, 2012 Free Software Foundation, Inc. + +-timestamp='2007-07-22' ++timestamp='2012-09-25' + + # This file is free software; you can redistribute it and/or modify it + # under the terms of the GNU General Public License as published by +@@ -17,9 +17,7 @@ + # General Public License for more details. + # + # You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA +-# 02110-1301, USA. ++# along with this program; if not, see . + # + # As a special exception to the GNU General Public License, if you + # distribute this file as part of a program that contains a +@@ -27,16 +25,16 @@ + # the same distribution terms that you use for the rest of that program. + + +-# Originally written by Per Bothner . +-# Please send patches to . Submit a context +-# diff and a properly formatted ChangeLog entry. ++# Originally written by Per Bothner. Please send patches (context ++# diff format) to and include a ChangeLog ++# entry. + # + # This script attempts to guess a canonical system name similar to + # config.sub. If it succeeds, it prints the system name on stdout, and + # exits with 0. Otherwise, it exits with 1. + # +-# The plan is that this can be called by configure scripts if you +-# don't specify an explicit build system type. ++# You can get the latest version of this script from: ++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD + + me=`echo "$0" | sed -e 's,.*/,,'` + +@@ -56,7 +54,8 @@ + GNU config.guess ($timestamp) + + Originally written by Per Bothner. +-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 ++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, ++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 + Free Software Foundation, Inc. + + This is free software; see the source for copying conditions. There is NO +@@ -144,7 +143,7 @@ + case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in + *:NetBSD:*:*) + # NetBSD (nbsd) targets should (where applicable) match one or +- # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, ++ # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, + # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently + # switched to ELF, *-*-netbsd* would select the old + # object file format. This provides both forward +@@ -170,7 +169,7 @@ + arm*|i386|m68k|ns32k|sh3*|sparc|vax) + eval $set_cc_for_build + if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ +- | grep __ELF__ >/dev/null ++ | grep -q __ELF__ + then + # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). + # Return netbsd for either. FIX? +@@ -180,7 +179,7 @@ + fi + ;; + *) +- os=netbsd ++ os=netbsd + ;; + esac + # The OS release +@@ -201,6 +200,10 @@ + # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. + echo "${machine}-${os}${release}" + exit ;; ++ *:Bitrig:*:*) ++ UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` ++ echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} ++ exit ;; + *:OpenBSD:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} +@@ -223,7 +226,7 @@ + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` + ;; + *5.*) +- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` ++ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + ;; + esac + # According to Compaq, /usr/sbin/psrinfo has been available on +@@ -269,7 +272,10 @@ + # A Xn.n version is an unreleased experimental baselevel. + # 1.2 uses "1.2" for uname -r. + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` +- exit ;; ++ # Reset EXIT trap before exiting to avoid spurious non-zero exit code. ++ exitcode=$? ++ trap '' 0 ++ exit $exitcode ;; + Alpha\ *:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # Should we change UNAME_MACHINE based on the output of uname instead +@@ -295,12 +301,12 @@ + echo s390-ibm-zvmoe + exit ;; + *:OS400:*:*) +- echo powerpc-ibm-os400 ++ echo powerpc-ibm-os400 + exit ;; + arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) + echo arm-acorn-riscix${UNAME_RELEASE} + exit ;; +- arm:riscos:*:*|arm:RISCOS:*:*) ++ arm*:riscos:*:*|arm*:RISCOS:*:*) + echo arm-unknown-riscos + exit ;; + SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) +@@ -324,14 +330,33 @@ + case `/usr/bin/uname -p` in + sparc) echo sparc-icl-nx7; exit ;; + esac ;; ++ s390x:SunOS:*:*) ++ echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` ++ exit ;; + sun4H:SunOS:5.*:*) + echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) + echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; ++ i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) ++ echo i386-pc-auroraux${UNAME_RELEASE} ++ exit ;; + i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) +- echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` ++ eval $set_cc_for_build ++ SUN_ARCH="i386" ++ # If there is a compiler, see if it is configured for 64-bit objects. ++ # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. ++ # This test works for both compilers. ++ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then ++ if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ ++ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ ++ grep IS_64BIT_ARCH >/dev/null ++ then ++ SUN_ARCH="x86_64" ++ fi ++ fi ++ echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + sun4*:SunOS:6*:*) + # According to config.sub, this is the proper way to canonicalize +@@ -375,23 +400,23 @@ + # MiNT. But MiNT is downward compatible to TOS, so this should + # be no problem. + atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) +- echo m68k-atari-mint${UNAME_RELEASE} ++ echo m68k-atari-mint${UNAME_RELEASE} + exit ;; + atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} +- exit ;; ++ exit ;; + *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) +- echo m68k-atari-mint${UNAME_RELEASE} ++ echo m68k-atari-mint${UNAME_RELEASE} + exit ;; + milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) +- echo m68k-milan-mint${UNAME_RELEASE} +- exit ;; ++ echo m68k-milan-mint${UNAME_RELEASE} ++ exit ;; + hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) +- echo m68k-hades-mint${UNAME_RELEASE} +- exit ;; ++ echo m68k-hades-mint${UNAME_RELEASE} ++ exit ;; + *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) +- echo m68k-unknown-mint${UNAME_RELEASE} +- exit ;; ++ echo m68k-unknown-mint${UNAME_RELEASE} ++ exit ;; + m68k:machten:*:*) + echo m68k-apple-machten${UNAME_RELEASE} + exit ;; +@@ -461,8 +486,8 @@ + echo m88k-motorola-sysv3 + exit ;; + AViiON:dgux:*:*) +- # DG/UX returns AViiON for all architectures +- UNAME_PROCESSOR=`/usr/bin/uname -p` ++ # DG/UX returns AViiON for all architectures ++ UNAME_PROCESSOR=`/usr/bin/uname -p` + if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] + then + if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ +@@ -475,7 +500,7 @@ + else + echo i586-dg-dgux${UNAME_RELEASE} + fi +- exit ;; ++ exit ;; + M88*:DolphinOS:*:*) # DolphinOS (SVR3) + echo m88k-dolphin-sysv3 + exit ;; +@@ -532,7 +557,7 @@ + echo rs6000-ibm-aix3.2 + fi + exit ;; +- *:AIX:*:[45]) ++ *:AIX:*:[4567]) + IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` + if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then + IBM_ARCH=rs6000 +@@ -575,52 +600,52 @@ + 9000/[678][0-9][0-9]) + if [ -x /usr/bin/getconf ]; then + sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` +- sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` +- case "${sc_cpu_version}" in +- 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 +- 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 +- 532) # CPU_PA_RISC2_0 +- case "${sc_kernel_bits}" in +- 32) HP_ARCH="hppa2.0n" ;; +- 64) HP_ARCH="hppa2.0w" ;; ++ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` ++ case "${sc_cpu_version}" in ++ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 ++ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 ++ 532) # CPU_PA_RISC2_0 ++ case "${sc_kernel_bits}" in ++ 32) HP_ARCH="hppa2.0n" ;; ++ 64) HP_ARCH="hppa2.0w" ;; + '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 +- esac ;; +- esac ++ esac ;; ++ esac + fi + if [ "${HP_ARCH}" = "" ]; then + eval $set_cc_for_build +- sed 's/^ //' << EOF >$dummy.c ++ sed 's/^ //' << EOF >$dummy.c + +- #define _HPUX_SOURCE +- #include +- #include +- +- int main () +- { +- #if defined(_SC_KERNEL_BITS) +- long bits = sysconf(_SC_KERNEL_BITS); +- #endif +- long cpu = sysconf (_SC_CPU_VERSION); +- +- switch (cpu) +- { +- case CPU_PA_RISC1_0: puts ("hppa1.0"); break; +- case CPU_PA_RISC1_1: puts ("hppa1.1"); break; +- case CPU_PA_RISC2_0: +- #if defined(_SC_KERNEL_BITS) +- switch (bits) +- { +- case 64: puts ("hppa2.0w"); break; +- case 32: puts ("hppa2.0n"); break; +- default: puts ("hppa2.0"); break; +- } break; +- #else /* !defined(_SC_KERNEL_BITS) */ +- puts ("hppa2.0"); break; +- #endif +- default: puts ("hppa1.0"); break; +- } +- exit (0); +- } ++ #define _HPUX_SOURCE ++ #include ++ #include ++ ++ int main () ++ { ++ #if defined(_SC_KERNEL_BITS) ++ long bits = sysconf(_SC_KERNEL_BITS); ++ #endif ++ long cpu = sysconf (_SC_CPU_VERSION); ++ ++ switch (cpu) ++ { ++ case CPU_PA_RISC1_0: puts ("hppa1.0"); break; ++ case CPU_PA_RISC1_1: puts ("hppa1.1"); break; ++ case CPU_PA_RISC2_0: ++ #if defined(_SC_KERNEL_BITS) ++ switch (bits) ++ { ++ case 64: puts ("hppa2.0w"); break; ++ case 32: puts ("hppa2.0n"); break; ++ default: puts ("hppa2.0"); break; ++ } break; ++ #else /* !defined(_SC_KERNEL_BITS) */ ++ puts ("hppa2.0"); break; ++ #endif ++ default: puts ("hppa1.0"); break; ++ } ++ exit (0); ++ } + EOF + (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` + test -z "$HP_ARCH" && HP_ARCH=hppa +@@ -640,7 +665,7 @@ + # => hppa64-hp-hpux11.23 + + if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | +- grep __LP64__ >/dev/null ++ grep -q __LP64__ + then + HP_ARCH="hppa2.0w" + else +@@ -711,22 +736,22 @@ + exit ;; + C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) + echo c1-convex-bsd +- exit ;; ++ exit ;; + C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) + if getsysinfo -f scalar_acc + then echo c32-convex-bsd + else echo c2-convex-bsd + fi +- exit ;; ++ exit ;; + C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) + echo c34-convex-bsd +- exit ;; ++ exit ;; + C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) + echo c38-convex-bsd +- exit ;; ++ exit ;; + C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) + echo c4-convex-bsd +- exit ;; ++ exit ;; + CRAY*Y-MP:*:*:*) + echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; +@@ -750,14 +775,14 @@ + exit ;; + F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) + FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` +- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` +- FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` +- echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" +- exit ;; ++ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` ++ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` ++ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" ++ exit ;; + 5000:UNIX_System_V:4.*:*) +- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` +- FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` +- echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" ++ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` ++ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` ++ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; + i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) + echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} +@@ -769,40 +794,51 @@ + echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} + exit ;; + *:FreeBSD:*:*) +- case ${UNAME_MACHINE} in +- pc98) +- echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; ++ UNAME_PROCESSOR=`/usr/bin/uname -p` ++ case ${UNAME_PROCESSOR} in + amd64) + echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + *) +- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; ++ echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + esac + exit ;; + i*:CYGWIN*:*) + echo ${UNAME_MACHINE}-pc-cygwin + exit ;; ++ *:MINGW64*:*) ++ echo ${UNAME_MACHINE}-pc-mingw64 ++ exit ;; + *:MINGW*:*) + echo ${UNAME_MACHINE}-pc-mingw32 + exit ;; ++ i*:MSYS*:*) ++ echo ${UNAME_MACHINE}-pc-msys ++ exit ;; + i*:windows32*:*) +- # uname -m includes "-pc" on this system. +- echo ${UNAME_MACHINE}-mingw32 ++ # uname -m includes "-pc" on this system. ++ echo ${UNAME_MACHINE}-mingw32 + exit ;; + i*:PW*:*) + echo ${UNAME_MACHINE}-pc-pw32 + exit ;; +- *:Interix*:[3456]*) +- case ${UNAME_MACHINE} in ++ *:Interix*:*) ++ case ${UNAME_MACHINE} in + x86) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; +- EM64T | authenticamd) ++ authenticamd | genuineintel | EM64T) + echo x86_64-unknown-interix${UNAME_RELEASE} + exit ;; ++ IA64) ++ echo ia64-unknown-interix${UNAME_RELEASE} ++ exit ;; + esac ;; + [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) + echo i${UNAME_MACHINE}-pc-mks + exit ;; ++ 8664:Windows_NT:*) ++ echo x86_64-pc-mks ++ exit ;; + i*:Windows_NT*:* | Pentium*:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we +@@ -832,20 +868,68 @@ + i*86:Minix:*:*) + echo ${UNAME_MACHINE}-pc-minix + exit ;; +- arm*:Linux:*:*) ++ aarch64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; ++ aarch64_be:Linux:*:*) ++ UNAME_MACHINE=aarch64_be ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ alpha:Linux:*:*) ++ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in ++ EV5) UNAME_MACHINE=alphaev5 ;; ++ EV56) UNAME_MACHINE=alphaev56 ;; ++ PCA56) UNAME_MACHINE=alphapca56 ;; ++ PCA57) UNAME_MACHINE=alphapca56 ;; ++ EV6) UNAME_MACHINE=alphaev6 ;; ++ EV67) UNAME_MACHINE=alphaev67 ;; ++ EV68*) UNAME_MACHINE=alphaev68 ;; ++ esac ++ objdump --private-headers /bin/sh | grep -q ld.so.1 ++ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi ++ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ++ exit ;; ++ arm*:Linux:*:*) ++ eval $set_cc_for_build ++ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ ++ | grep -q __ARM_EABI__ ++ then ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ else ++ if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ ++ | grep -q __ARM_PCS_VFP ++ then ++ echo ${UNAME_MACHINE}-unknown-linux-gnueabi ++ else ++ echo ${UNAME_MACHINE}-unknown-linux-gnueabihf ++ fi ++ fi ++ exit ;; + avr32*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + cris:Linux:*:*) +- echo cris-axis-linux-gnu ++ echo ${UNAME_MACHINE}-axis-linux-gnu + exit ;; + crisv32:Linux:*:*) +- echo crisv32-axis-linux-gnu ++ echo ${UNAME_MACHINE}-axis-linux-gnu + exit ;; + frv:Linux:*:*) +- echo frv-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ hexagon:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ i*86:Linux:*:*) ++ LIBC=gnu ++ eval $set_cc_for_build ++ sed 's/^ //' << EOF >$dummy.c ++ #ifdef __dietlibc__ ++ LIBC=dietlibc ++ #endif ++EOF ++ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` ++ echo "${UNAME_MACHINE}-pc-linux-${LIBC}" + exit ;; + ia64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu +@@ -856,74 +940,33 @@ + m68*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; +- mips:Linux:*:*) ++ mips:Linux:*:* | mips64:Linux:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #undef CPU +- #undef mips +- #undef mipsel ++ #undef ${UNAME_MACHINE} ++ #undef ${UNAME_MACHINE}el + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) +- CPU=mipsel ++ CPU=${UNAME_MACHINE}el + #else + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) +- CPU=mips ++ CPU=${UNAME_MACHINE} + #else + CPU= + #endif + #endif + EOF +- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' +- /^CPU/{ +- s: ::g +- p +- }'`" +- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } +- ;; +- mips64:Linux:*:*) +- eval $set_cc_for_build +- sed 's/^ //' << EOF >$dummy.c +- #undef CPU +- #undef mips64 +- #undef mips64el +- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) +- CPU=mips64el +- #else +- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) +- CPU=mips64 +- #else +- CPU= +- #endif +- #endif +-EOF +- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' +- /^CPU/{ +- s: ::g +- p +- }'`" ++ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + ;; + or32:Linux:*:*) +- echo or32-unknown-linux-gnu +- exit ;; +- ppc:Linux:*:*) +- echo powerpc-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; +- ppc64:Linux:*:*) +- echo powerpc64-unknown-linux-gnu ++ padre:Linux:*:*) ++ echo sparc-unknown-linux-gnu + exit ;; +- alpha:Linux:*:*) +- case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in +- EV5) UNAME_MACHINE=alphaev5 ;; +- EV56) UNAME_MACHINE=alphaev56 ;; +- PCA56) UNAME_MACHINE=alphapca56 ;; +- PCA57) UNAME_MACHINE=alphapca56 ;; +- EV6) UNAME_MACHINE=alphaev6 ;; +- EV67) UNAME_MACHINE=alphaev67 ;; +- EV68*) UNAME_MACHINE=alphaev68 ;; +- esac +- objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null +- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi +- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ++ parisc64:Linux:*:* | hppa64:Linux:*:*) ++ echo hppa64-unknown-linux-gnu + exit ;; + parisc:Linux:*:* | hppa:Linux:*:*) + # Look for CPU level +@@ -933,14 +976,17 @@ + *) echo hppa-unknown-linux-gnu ;; + esac + exit ;; +- parisc64:Linux:*:* | hppa64:Linux:*:*) +- echo hppa64-unknown-linux-gnu ++ ppc64:Linux:*:*) ++ echo powerpc64-unknown-linux-gnu ++ exit ;; ++ ppc:Linux:*:*) ++ echo powerpc-unknown-linux-gnu + exit ;; + s390:Linux:*:* | s390x:Linux:*:*) + echo ${UNAME_MACHINE}-ibm-linux + exit ;; + sh64*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + sh*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu +@@ -948,78 +994,18 @@ + sparc:Linux:*:* | sparc64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; ++ tile*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; + vax:Linux:*:*) + echo ${UNAME_MACHINE}-dec-linux-gnu + exit ;; + x86_64:Linux:*:*) +- echo x86_64-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; +- xtensa:Linux:*:*) +- echo xtensa-unknown-linux-gnu ++ xtensa*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; +- i*86:Linux:*:*) +- # The BFD linker knows what the default object file format is, so +- # first see if it will tell us. cd to the root directory to prevent +- # problems with other programs or directories called `ld' in the path. +- # Set LC_ALL=C to ensure ld outputs messages in English. +- ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ +- | sed -ne '/supported targets:/!d +- s/[ ][ ]*/ /g +- s/.*supported targets: *// +- s/ .*// +- p'` +- case "$ld_supported_targets" in +- elf32-i386) +- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" +- ;; +- a.out-i386-linux) +- echo "${UNAME_MACHINE}-pc-linux-gnuaout" +- exit ;; +- coff-i386) +- echo "${UNAME_MACHINE}-pc-linux-gnucoff" +- exit ;; +- "") +- # Either a pre-BFD a.out linker (linux-gnuoldld) or +- # one that does not give us useful --help. +- echo "${UNAME_MACHINE}-pc-linux-gnuoldld" +- exit ;; +- esac +- # Determine whether the default compiler is a.out or elf +- eval $set_cc_for_build +- sed 's/^ //' << EOF >$dummy.c +- #include +- #ifdef __ELF__ +- # ifdef __GLIBC__ +- # if __GLIBC__ >= 2 +- LIBC=gnu +- # else +- LIBC=gnulibc1 +- # endif +- # else +- LIBC=gnulibc1 +- # endif +- #else +- #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) +- LIBC=gnu +- #else +- LIBC=gnuaout +- #endif +- #endif +- #ifdef __dietlibc__ +- LIBC=dietlibc +- #endif +-EOF +- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' +- /^LIBC/{ +- s: ::g +- p +- }'`" +- test x"${LIBC}" != x && { +- echo "${UNAME_MACHINE}-pc-linux-${LIBC}" +- exit +- } +- test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } +- ;; + i*86:DYNIX/ptx:4*:*) + # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. + # earlier versions are messed up and put the nodename in both +@@ -1027,11 +1013,11 @@ + echo i386-sequent-sysv4 + exit ;; + i*86:UNIX_SV:4.2MP:2.*) +- # Unixware is an offshoot of SVR4, but it has its own version +- # number series starting with 2... +- # I am not positive that other SVR4 systems won't match this, ++ # Unixware is an offshoot of SVR4, but it has its own version ++ # number series starting with 2... ++ # I am not positive that other SVR4 systems won't match this, + # I just have to hope. -- rms. +- # Use sysv4.2uw... so that sysv4* matches it. ++ # Use sysv4.2uw... so that sysv4* matches it. + echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} + exit ;; + i*86:OS/2:*:*) +@@ -1048,7 +1034,7 @@ + i*86:syllable:*:*) + echo ${UNAME_MACHINE}-pc-syllable + exit ;; +- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) ++ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) + echo i386-unknown-lynxos${UNAME_RELEASE} + exit ;; + i*86:*DOS:*:*) +@@ -1063,7 +1049,7 @@ + fi + exit ;; + i*86:*:5:[678]*) +- # UnixWare 7.x, OpenUNIX and OpenServer 6. ++ # UnixWare 7.x, OpenUNIX and OpenServer 6. + case `/bin/uname -X | grep "^Machine"` in + *486*) UNAME_MACHINE=i486 ;; + *Pentium) UNAME_MACHINE=i586 ;; +@@ -1091,10 +1077,13 @@ + exit ;; + pc:*:*:*) + # Left here for compatibility: +- # uname -m prints for DJGPP always 'pc', but it prints nothing about +- # the processor, so we play safe by assuming i386. +- echo i386-pc-msdosdjgpp +- exit ;; ++ # uname -m prints for DJGPP always 'pc', but it prints nothing about ++ # the processor, so we play safe by assuming i586. ++ # Note: whatever this is, it MUST be the same as what config.sub ++ # prints for the "djgpp" host, or else GDB configury will decide that ++ # this is a cross-build. ++ echo i586-pc-msdosdjgpp ++ exit ;; + Intel:Mach:3*:*) + echo i386-pc-mach3 + exit ;; +@@ -1129,8 +1118,18 @@ + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) +- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ +- && { echo i486-ncr-sysv4; exit; } ;; ++ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ ++ && { echo i486-ncr-sysv4; exit; } ;; ++ NCR*:*:4.2:* | MPRAS*:*:4.2:*) ++ OS_REL='.3' ++ test -r /etc/.relid \ ++ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` ++ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ ++ && { echo i486-ncr-sysv4.3${OS_REL}; exit; } ++ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ ++ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ++ /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ ++ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) + echo m68k-unknown-lynxos${UNAME_RELEASE} + exit ;; +@@ -1143,7 +1142,7 @@ + rs6000:LynxOS:2.*:*) + echo rs6000-unknown-lynxos${UNAME_RELEASE} + exit ;; +- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) ++ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) + echo powerpc-unknown-lynxos${UNAME_RELEASE} + exit ;; + SM[BE]S:UNIX_SV:*:*) +@@ -1163,10 +1162,10 @@ + echo ns32k-sni-sysv + fi + exit ;; +- PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort +- # says +- echo i586-unisys-sysv4 +- exit ;; ++ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort ++ # says ++ echo i586-unisys-sysv4 ++ exit ;; + *:UNIX_System_V:4*:FTX*) + # From Gerald Hewes . + # How about differentiating between stratus architectures? -djm +@@ -1192,11 +1191,11 @@ + exit ;; + R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) + if [ -d /usr/nec ]; then +- echo mips-nec-sysv${UNAME_RELEASE} ++ echo mips-nec-sysv${UNAME_RELEASE} + else +- echo mips-unknown-sysv${UNAME_RELEASE} ++ echo mips-unknown-sysv${UNAME_RELEASE} + fi +- exit ;; ++ exit ;; + BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. + echo powerpc-be-beos + exit ;; +@@ -1206,6 +1205,12 @@ + BePC:BeOS:*:*) # BeOS running on Intel PC compatible. + echo i586-pc-beos + exit ;; ++ BePC:Haiku:*:*) # Haiku running on Intel PC compatible. ++ echo i586-pc-haiku ++ exit ;; ++ x86_64:Haiku:*:*) ++ echo x86_64-unknown-haiku ++ exit ;; + SX-4:SUPER-UX:*:*) + echo sx4-nec-superux${UNAME_RELEASE} + exit ;; +@@ -1233,6 +1238,16 @@ + *:Darwin:*:*) + UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown + case $UNAME_PROCESSOR in ++ i386) ++ eval $set_cc_for_build ++ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then ++ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ ++ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ ++ grep IS_64BIT_ARCH >/dev/null ++ then ++ UNAME_PROCESSOR="x86_64" ++ fi ++ fi ;; + unknown) UNAME_PROCESSOR=powerpc ;; + esac + echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} +@@ -1248,7 +1263,10 @@ + *:QNX:*:4*) + echo i386-pc-qnx + exit ;; +- NSE-?:NONSTOP_KERNEL:*:*) ++ NEO-?:NONSTOP_KERNEL:*:*) ++ echo neo-tandem-nsk${UNAME_RELEASE} ++ exit ;; ++ NSE-*:NONSTOP_KERNEL:*:*) + echo nse-tandem-nsk${UNAME_RELEASE} + exit ;; + NSR-?:NONSTOP_KERNEL:*:*) +@@ -1293,13 +1311,13 @@ + echo pdp10-unknown-its + exit ;; + SEI:*:*:SEIUX) +- echo mips-sei-seiux${UNAME_RELEASE} ++ echo mips-sei-seiux${UNAME_RELEASE} + exit ;; + *:DragonFly:*:*) + echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + exit ;; + *:*VMS:*:*) +- UNAME_MACHINE=`(uname -p) 2>/dev/null` ++ UNAME_MACHINE=`(uname -p) 2>/dev/null` + case "${UNAME_MACHINE}" in + A*) echo alpha-dec-vms ; exit ;; + I*) echo ia64-dec-vms ; exit ;; +@@ -1314,11 +1332,14 @@ + i*86:rdos:*:*) + echo ${UNAME_MACHINE}-pc-rdos + exit ;; ++ i*86:AROS:*:*) ++ echo ${UNAME_MACHINE}-pc-aros ++ exit ;; ++ x86_64:VMkernel:*:*) ++ echo ${UNAME_MACHINE}-unknown-esx ++ exit ;; + esac + +-#echo '(No uname command or uname output not recognized.)' 1>&2 +-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 +- + eval $set_cc_for_build + cat >$dummy.c < + printf ("m68k-sony-newsos%s\n", + #ifdef NEWSOS4 +- "4" ++ "4" + #else +- "" ++ "" + #endif +- ); exit (0); ++ ); exit (0); + #endif + #endif + +@@ -1474,9 +1495,9 @@ + the operating system you are using. It is advised that you + download the most up to date version of the config scripts from + +- http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess ++ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD + and +- http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub ++ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD + + If the version you run ($0) is already up to date, please + send the following data and any information you think might be +diff -urN vifm-0.7.4a/config.sub vifm-0.7.4a-aarch64/config.sub +--- vifm-0.7.4a/config.sub 2012-10-22 11:32:51.000000000 -0500 ++++ vifm-0.7.4a-aarch64/config.sub 2013-03-08 09:25:33.804409528 -0600 +@@ -1,10 +1,10 @@ + #! /bin/sh + # Configuration validation subroutine script. + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +-# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, +-# Inc. ++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, ++# 2011, 2012 Free Software Foundation, Inc. + +-timestamp='2007-06-28' ++timestamp='2012-10-10' + + # This file is (in principle) common to ALL GNU software. + # The presence of a machine in this file suggests that SOME GNU software +@@ -21,9 +21,7 @@ + # 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, write to the Free Software +-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA +-# 02110-1301, USA. ++# along with this program; if not, see . + # + # As a special exception to the GNU General Public License, if you + # distribute this file as part of a program that contains a +@@ -32,13 +30,16 @@ + + + # Please send patches to . Submit a context +-# diff and a properly formatted ChangeLog entry. ++# diff and a properly formatted GNU ChangeLog entry. + # + # Configuration subroutine to validate and canonicalize a configuration type. + # Supply the specified configuration type as an argument. + # If it is invalid, we print an error message on stderr and exit with code 1. + # Otherwise, we print the canonical config type on stdout and succeed. + ++# You can get the latest version of this script from: ++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD ++ + # This file is supposed to be the same for all GNU packages + # and recognize all the CPU types, system types and aliases + # that are meaningful with *any* GNU software. +@@ -72,7 +73,8 @@ + version="\ + GNU config.sub ($timestamp) + +-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 ++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, ++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 + Free Software Foundation, Inc. + + This is free software; see the source for copying conditions. There is NO +@@ -120,12 +122,18 @@ + # Here we must recognize all the valid KERNEL-OS combinations. + maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` + case $maybe_os in +- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ +- uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ ++ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ ++ linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ ++ knetbsd*-gnu* | netbsd*-gnu* | \ ++ kopensolaris*-gnu* | \ + storm-chaos* | os2-emx* | rtmk-nova*) + os=-$maybe_os + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` + ;; ++ android-linux) ++ os=-linux-android ++ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown ++ ;; + *) + basic_machine=`echo $1 | sed 's/-[^-]*$//'` + if [ $basic_machine != $1 ] +@@ -148,10 +156,13 @@ + -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ + -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ + -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ +- -apple | -axis | -knuth | -cray) ++ -apple | -axis | -knuth | -cray | -microblaze*) + os= + basic_machine=$1 + ;; ++ -bluegene*) ++ os=-cnk ++ ;; + -sim | -cisco | -oki | -wec | -winbond) + os= + basic_machine=$1 +@@ -166,10 +177,10 @@ + os=-chorusos + basic_machine=$1 + ;; +- -chorusrdb) +- os=-chorusrdb ++ -chorusrdb) ++ os=-chorusrdb + basic_machine=$1 +- ;; ++ ;; + -hiux*) + os=-hiuxwe2 + ;; +@@ -214,6 +225,12 @@ + -isc*) + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; ++ -lynx*178) ++ os=-lynxos178 ++ ;; ++ -lynx*5) ++ os=-lynxos5 ++ ;; + -lynx*) + os=-lynxos + ;; +@@ -238,24 +255,32 @@ + # Some are omitted here because they have special meanings below. + 1750a | 580 \ + | a29k \ ++ | aarch64 | aarch64_be \ + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ + | am33_2.0 \ + | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ ++ | be32 | be64 \ + | bfin \ + | c4x | clipper \ + | d10v | d30v | dlx | dsp16xx \ ++ | epiphany \ + | fido | fr30 | frv \ + | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ ++ | hexagon \ + | i370 | i860 | i960 | ia64 \ + | ip2k | iq2000 \ ++ | le32 | le64 \ ++ | lm32 \ + | m32c | m32r | m32rle | m68000 | m68k | m88k \ +- | maxq | mb | microblaze | mcore | mep \ ++ | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ + | mips | mipsbe | mipseb | mipsel | mipsle \ + | mips16 \ + | mips64 | mips64el \ +- | mips64vr | mips64vrel \ ++ | mips64octeon | mips64octeonel \ + | mips64orion | mips64orionel \ ++ | mips64r5900 | mips64r5900el \ ++ | mips64vr | mips64vrel \ + | mips64vr4100 | mips64vr4100el \ + | mips64vr4300 | mips64vr4300el \ + | mips64vr5000 | mips64vr5000el \ +@@ -268,29 +293,42 @@ + | mipsisa64sr71k | mipsisa64sr71kel \ + | mipstx39 | mipstx39el \ + | mn10200 | mn10300 \ ++ | moxie \ + | mt \ + | msp430 \ ++ | nds32 | nds32le | nds32be \ + | nios | nios2 \ + | ns16k | ns32k \ ++ | open8 \ + | or32 \ + | pdp10 | pdp11 | pj | pjl \ +- | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ ++ | powerpc | powerpc64 | powerpc64le | powerpcle \ + | pyramid \ ++ | rl78 | rx \ + | score \ +- | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ ++ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh64 | sh64le \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ +- | spu | strongarm \ +- | tahoe | thumb | tic4x | tic80 | tron \ +- | v850 | v850e \ ++ | spu \ ++ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ ++ | ubicom32 \ ++ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ + | we32k \ +- | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ +- | z8k) ++ | x86 | xc16x | xstormy16 | xtensa \ ++ | z8k | z80) + basic_machine=$basic_machine-unknown + ;; +- m6811 | m68hc11 | m6812 | m68hc12) +- # Motorola 68HC11/12. ++ c54x) ++ basic_machine=tic54x-unknown ++ ;; ++ c55x) ++ basic_machine=tic55x-unknown ++ ;; ++ c6x) ++ basic_machine=tic6x-unknown ++ ;; ++ m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) + basic_machine=$basic_machine-unknown + os=-none + ;; +@@ -300,6 +338,21 @@ + basic_machine=mt-unknown + ;; + ++ strongarm | thumb | xscale) ++ basic_machine=arm-unknown ++ ;; ++ xgate) ++ basic_machine=$basic_machine-unknown ++ os=-none ++ ;; ++ xscaleeb) ++ basic_machine=armeb-unknown ++ ;; ++ ++ xscaleel) ++ basic_machine=armel-unknown ++ ;; ++ + # We use `pc' rather than `unknown' + # because (1) that's what they normally are, and + # (2) the word "unknown" tends to confuse beginning users. +@@ -314,29 +367,37 @@ + # Recognize the basic CPU types with company name. + 580-* \ + | a29k-* \ ++ | aarch64-* | aarch64_be-* \ + | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ + | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ + | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ + | avr-* | avr32-* \ ++ | be32-* | be64-* \ + | bfin-* | bs2000-* \ +- | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ ++ | c[123]* | c30-* | [cjt]90-* | c4x-* \ + | clipper-* | craynv-* | cydra-* \ + | d10v-* | d30v-* | dlx-* \ + | elxsi-* \ + | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ + | h8300-* | h8500-* \ + | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ ++ | hexagon-* \ + | i*86-* | i860-* | i960-* | ia64-* \ + | ip2k-* | iq2000-* \ ++ | le32-* | le64-* \ ++ | lm32-* \ + | m32c-* | m32r-* | m32rle-* \ + | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ +- | m88110-* | m88k-* | maxq-* | mcore-* \ ++ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ ++ | microblaze-* | microblazeel-* \ + | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ + | mips16-* \ + | mips64-* | mips64el-* \ +- | mips64vr-* | mips64vrel-* \ ++ | mips64octeon-* | mips64octeonel-* \ + | mips64orion-* | mips64orionel-* \ ++ | mips64r5900-* | mips64r5900el-* \ ++ | mips64vr-* | mips64vrel-* \ + | mips64vr4100-* | mips64vr4100el-* \ + | mips64vr4300-* | mips64vr4300el-* \ + | mips64vr5000-* | mips64vr5000el-* \ +@@ -351,27 +412,36 @@ + | mmix-* \ + | mt-* \ + | msp430-* \ ++ | nds32-* | nds32le-* | nds32be-* \ + | nios-* | nios2-* \ + | none-* | np1-* | ns16k-* | ns32k-* \ ++ | open8-* \ + | orion-* \ + | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ +- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ ++ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ + | pyramid-* \ +- | romp-* | rs6000-* \ +- | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ ++ | rl78-* | romp-* | rs6000-* | rx-* \ ++ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ + | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ + | sparclite-* \ +- | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ +- | tahoe-* | thumb-* \ ++ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ ++ | tahoe-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ ++ | tile*-* \ + | tron-* \ +- | v850-* | v850e-* | vax-* \ ++ | ubicom32-* \ ++ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ ++ | vax-* \ + | we32k-* \ +- | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ +- | xstormy16-* | xtensa-* \ ++ | x86-* | x86_64-* | xc16x-* | xps100-* \ ++ | xstormy16-* | xtensa*-* \ + | ymp-* \ +- | z8k-*) ++ | z8k-* | z80-*) ++ ;; ++ # Recognize the basic CPU types without company name, with glob match. ++ xtensa*) ++ basic_machine=$basic_machine-unknown + ;; + # Recognize the various machine names and aliases which stand + # for a CPU type and a company and sometimes even an OS. +@@ -389,7 +459,7 @@ + basic_machine=a29k-amd + os=-udi + ;; +- abacus) ++ abacus) + basic_machine=abacus-unknown + ;; + adobe68k) +@@ -435,6 +505,10 @@ + basic_machine=m68k-apollo + os=-bsd + ;; ++ aros) ++ basic_machine=i386-pc ++ os=-aros ++ ;; + aux) + basic_machine=m68k-apple + os=-aux +@@ -443,10 +517,35 @@ + basic_machine=ns32k-sequent + os=-dynix + ;; ++ blackfin) ++ basic_machine=bfin-unknown ++ os=-linux ++ ;; ++ blackfin-*) ++ basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` ++ os=-linux ++ ;; ++ bluegene*) ++ basic_machine=powerpc-ibm ++ os=-cnk ++ ;; ++ c54x-*) ++ basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; ++ c55x-*) ++ basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; ++ c6x-*) ++ basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; + c90) + basic_machine=c90-cray + os=-unicos + ;; ++ cegcc) ++ basic_machine=arm-unknown ++ os=-cegcc ++ ;; + convex-c1) + basic_machine=c1-convex + os=-bsd +@@ -475,7 +574,7 @@ + basic_machine=craynv-cray + os=-unicosmp + ;; +- cr16) ++ cr16 | cr16-*) + basic_machine=cr16-unknown + os=-elf + ;; +@@ -514,6 +613,10 @@ + basic_machine=m88k-motorola + os=-sysv3 + ;; ++ dicos) ++ basic_machine=i686-pc ++ os=-dicos ++ ;; + djgpp) + basic_machine=i586-pc + os=-msdosdjgpp +@@ -629,7 +732,6 @@ + i370-ibm* | ibm*) + basic_machine=i370-ibm + ;; +-# I'm not sure what "Sysv32" means. Should this be sysv3.2? + i*86v32) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-sysv32 +@@ -668,6 +770,14 @@ + basic_machine=m68k-isi + os=-sysv + ;; ++ m68knommu) ++ basic_machine=m68k-unknown ++ os=-linux ++ ;; ++ m68knommu-*) ++ basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` ++ os=-linux ++ ;; + m88k-omron*) + basic_machine=m88k-omron + ;; +@@ -679,6 +789,13 @@ + basic_machine=ns32k-utek + os=-sysv + ;; ++ microblaze*) ++ basic_machine=microblaze-xilinx ++ ;; ++ mingw64) ++ basic_machine=x86_64-pc ++ os=-mingw64 ++ ;; + mingw32) + basic_machine=i386-pc + os=-mingw32 +@@ -715,10 +832,18 @@ + ms1-*) + basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` + ;; ++ msys) ++ basic_machine=i386-pc ++ os=-msys ++ ;; + mvs) + basic_machine=i370-ibm + os=-mvs + ;; ++ nacl) ++ basic_machine=le32-unknown ++ os=-nacl ++ ;; + ncr3000) + basic_machine=i486-ncr + os=-sysv4 +@@ -783,6 +908,12 @@ + np1) + basic_machine=np1-gould + ;; ++ neo-tandem) ++ basic_machine=neo-tandem ++ ;; ++ nse-tandem) ++ basic_machine=nse-tandem ++ ;; + nsr-tandem) + basic_machine=nsr-tandem + ;; +@@ -813,6 +944,14 @@ + basic_machine=i860-intel + os=-osf + ;; ++ parisc) ++ basic_machine=hppa-unknown ++ os=-linux ++ ;; ++ parisc-*) ++ basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` ++ os=-linux ++ ;; + pbd) + basic_machine=sparc-tti + ;; +@@ -857,9 +996,10 @@ + ;; + power) basic_machine=power-ibm + ;; +- ppc) basic_machine=powerpc-unknown ++ ppc | ppcbe) basic_machine=powerpc-unknown + ;; +- ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ppc-* | ppcbe-*) ++ basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppcle | powerpclittle | ppc-le | powerpc-little) + basic_machine=powerpcle-unknown +@@ -953,6 +1093,9 @@ + basic_machine=i860-stratus + os=-sysv4 + ;; ++ strongarm-* | thumb-*) ++ basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; + sun2) + basic_machine=m68000-sun + ;; +@@ -1009,17 +1152,9 @@ + basic_machine=t90-cray + os=-unicos + ;; +- tic54x | c54x*) +- basic_machine=tic54x-unknown +- os=-coff +- ;; +- tic55x | c55x*) +- basic_machine=tic55x-unknown +- os=-coff +- ;; +- tic6x | c6x*) +- basic_machine=tic6x-unknown +- os=-coff ++ tile*) ++ basic_machine=$basic_machine-unknown ++ os=-linux-gnu + ;; + tx39) + basic_machine=mipstx39-unknown +@@ -1088,6 +1223,9 @@ + xps | xps100) + basic_machine=xps100-honeywell + ;; ++ xscale-* | xscalee[bl]-*) ++ basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` ++ ;; + ymp) + basic_machine=ymp-cray + os=-unicos +@@ -1096,6 +1234,10 @@ + basic_machine=z8k-unknown + os=-sim + ;; ++ z80-*-coff) ++ basic_machine=z80-unknown ++ os=-sim ++ ;; + none) + basic_machine=none-none + os=-none +@@ -1134,7 +1276,7 @@ + we32k) + basic_machine=we32k-att + ;; +- sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) ++ sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) + basic_machine=sh-unknown + ;; + sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) +@@ -1181,9 +1323,12 @@ + if [ x"$os" != x"" ] + then + case $os in +- # First match some system type aliases +- # that might get confused with valid system types. ++ # First match some system type aliases ++ # that might get confused with valid system types. + # -solaris* is a basic system type, with this one exception. ++ -auroraux) ++ os=-auroraux ++ ;; + -solaris1 | -solaris1.*) + os=`echo $os | sed -e 's|solaris1|sunos4|'` + ;; +@@ -1204,21 +1349,23 @@ + # Each alternative MUST END IN A *, to match a version number. + # -sysv* is not here because it comes later, after sysvr4. + -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ +- | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ +- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ ++ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ ++ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ ++ | -sym* | -kopensolaris* \ + | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ +- | -aos* \ ++ | -aos* | -aros* \ + | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ + | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ +- | -openbsd* | -solidbsd* \ ++ | -bitrig* | -openbsd* | -solidbsd* \ + | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ + | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ + | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ +- | -chorusos* | -chorusrdb* \ +- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ +- | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ ++ | -chorusos* | -chorusrdb* | -cegcc* \ ++ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ ++ | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ ++ | -linux-newlib* | -linux-musl* | -linux-uclibc* \ + | -uxpv* | -beos* | -mpeix* | -udk* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ + | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ +@@ -1226,7 +1373,7 @@ + | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ + | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ +- | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) ++ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) + # Remember, each alternative MUST END IN *, to match a version number. + ;; + -qnx*) +@@ -1265,7 +1412,7 @@ + -opened*) + os=-openedition + ;; +- -os400*) ++ -os400*) + os=-os400 + ;; + -wince*) +@@ -1314,7 +1461,7 @@ + -sinix*) + os=-sysv4 + ;; +- -tpf*) ++ -tpf*) + os=-tpf + ;; + -triton*) +@@ -1356,6 +1503,11 @@ + -zvmoe) + os=-zvmoe + ;; ++ -dicos*) ++ os=-dicos ++ ;; ++ -nacl*) ++ ;; + -none) + ;; + *) +@@ -1378,10 +1530,10 @@ + # system, and we'll never get to this point. + + case $basic_machine in +- score-*) ++ score-*) + os=-elf + ;; +- spu-*) ++ spu-*) + os=-elf + ;; + *-acorn) +@@ -1393,8 +1545,20 @@ + arm*-semi) + os=-aout + ;; +- c4x-* | tic4x-*) +- os=-coff ++ c4x-* | tic4x-*) ++ os=-coff ++ ;; ++ hexagon-*) ++ os=-elf ++ ;; ++ tic54x-*) ++ os=-coff ++ ;; ++ tic55x-*) ++ os=-coff ++ ;; ++ tic6x-*) ++ os=-coff + ;; + # This must come before the *-dec entry. + pdp10-*) +@@ -1414,14 +1578,11 @@ + ;; + m68000-sun) + os=-sunos3 +- # This also exists in the configure program, but was not the +- # default. +- # os=-sunos4 + ;; + m68*-cisco) + os=-aout + ;; +- mep-*) ++ mep-*) + os=-elf + ;; + mips*-cisco) +@@ -1448,7 +1609,7 @@ + *-ibm) + os=-aix + ;; +- *-knuth) ++ *-knuth) + os=-mmixware + ;; + *-wec) +@@ -1553,7 +1714,7 @@ + -sunos*) + vendor=sun + ;; +- -aix*) ++ -cnk*|-aix*) + vendor=ibm + ;; + -beos*) diff --git a/vifm.spec b/vifm.spec index 6500354..2e2bf8c 100644 --- a/vifm.spec +++ b/vifm.spec @@ -11,6 +11,7 @@ Group: Applications/File License: GPLv2+ URL: http://%{name}.sourceforge.net/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 +Patch0: vifm-aarch64.patch %if %{with gtk} BuildRequires: pkgconfig(glib-2.0) @@ -30,6 +31,7 @@ A ncurses based CLI file manager with vi like key-bindings %prep %setup -q +%patch0 -p1 -b .aarch64 %build From 353bf3a4ce10960b1655d235c686aca9d46aa176 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 4 Aug 2013 01:11:34 -0500 Subject: [PATCH 20/82] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- vifm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vifm.spec b/vifm.spec index 2e2bf8c..e8ed2d9 100644 --- a/vifm.spec +++ b/vifm.spec @@ -4,7 +4,7 @@ Name: vifm Version: 0.7.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Lightweight file manager with vi like key-bindings Group: Applications/File @@ -69,6 +69,9 @@ make install DESTDIR=%{buildroot} INSTALL="install -p" %changelog +* Sun Aug 04 2013 Fedora Release Engineering - 0.7.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Thu May 30 2013 Ben Boeckel - 0.7.5-1 - Update to 0.7.5 From 5b9d62724c35bd5c2a0f49d73b781e551a468fd8 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Wed, 20 Nov 2013 23:32:09 -0500 Subject: [PATCH 21/82] Update to 0.7.6 --- .gitignore | 1 + sources | 2 +- vifm-aarch64.patch | 1629 -------------------------------------------- vifm.spec | 9 +- 4 files changed, 7 insertions(+), 1634 deletions(-) delete mode 100644 vifm-aarch64.patch diff --git a/.gitignore b/.gitignore index a1c33dc..5581966 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ vifm-0.5.tar.bz2 /vifm-0.7.3a.tar.bz2 /vifm-0.7.4a.tar.bz2 /vifm-0.7.5.tar.bz2 +/vifm-0.7.6.tar.bz2 diff --git a/sources b/sources index 2a44006..87e1a8f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -604f43dde5ba56b0aac03486f118f3ec vifm-0.7.5.tar.bz2 +90c19079288e53aa3f9ee63f324cdfb4 vifm-0.7.6.tar.bz2 diff --git a/vifm-aarch64.patch b/vifm-aarch64.patch deleted file mode 100644 index a0c9aa7..0000000 --- a/vifm-aarch64.patch +++ /dev/null @@ -1,1629 +0,0 @@ -diff -urN vifm-0.7.4a/config.guess vifm-0.7.4a-aarch64/config.guess ---- vifm-0.7.4a/config.guess 2012-10-22 11:32:51.000000000 -0500 -+++ vifm-0.7.4a-aarch64/config.guess 2013-03-08 09:25:33.753415397 -0600 -@@ -1,10 +1,10 @@ - #! /bin/sh - # Attempt to guess a canonical system name. - # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, --# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, --# Inc. -+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -+# 2011, 2012 Free Software Foundation, Inc. - --timestamp='2007-07-22' -+timestamp='2012-09-25' - - # This file is free software; you can redistribute it and/or modify it - # under the terms of the GNU General Public License as published by -@@ -17,9 +17,7 @@ - # General Public License for more details. - # - # You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA --# 02110-1301, USA. -+# along with this program; if not, see . - # - # As a special exception to the GNU General Public License, if you - # distribute this file as part of a program that contains a -@@ -27,16 +25,16 @@ - # the same distribution terms that you use for the rest of that program. - - --# Originally written by Per Bothner . --# Please send patches to . Submit a context --# diff and a properly formatted ChangeLog entry. -+# Originally written by Per Bothner. Please send patches (context -+# diff format) to and include a ChangeLog -+# entry. - # - # This script attempts to guess a canonical system name similar to - # config.sub. If it succeeds, it prints the system name on stdout, and - # exits with 0. Otherwise, it exits with 1. - # --# The plan is that this can be called by configure scripts if you --# don't specify an explicit build system type. -+# You can get the latest version of this script from: -+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD - - me=`echo "$0" | sed -e 's,.*/,,'` - -@@ -56,7 +54,8 @@ - GNU config.guess ($timestamp) - - Originally written by Per Bothner. --Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 - Free Software Foundation, Inc. - - This is free software; see the source for copying conditions. There is NO -@@ -144,7 +143,7 @@ - case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in - *:NetBSD:*:*) - # NetBSD (nbsd) targets should (where applicable) match one or -- # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, -+ # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, - # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently - # switched to ELF, *-*-netbsd* would select the old - # object file format. This provides both forward -@@ -170,7 +169,7 @@ - arm*|i386|m68k|ns32k|sh3*|sparc|vax) - eval $set_cc_for_build - if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ -- | grep __ELF__ >/dev/null -+ | grep -q __ELF__ - then - # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). - # Return netbsd for either. FIX? -@@ -180,7 +179,7 @@ - fi - ;; - *) -- os=netbsd -+ os=netbsd - ;; - esac - # The OS release -@@ -201,6 +200,10 @@ - # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "${machine}-${os}${release}" - exit ;; -+ *:Bitrig:*:*) -+ UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` -+ echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} -+ exit ;; - *:OpenBSD:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} -@@ -223,7 +226,7 @@ - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` - ;; - *5.*) -- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` -+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` - ;; - esac - # According to Compaq, /usr/sbin/psrinfo has been available on -@@ -269,7 +272,10 @@ - # A Xn.n version is an unreleased experimental baselevel. - # 1.2 uses "1.2" for uname -r. - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` -- exit ;; -+ # Reset EXIT trap before exiting to avoid spurious non-zero exit code. -+ exitcode=$? -+ trap '' 0 -+ exit $exitcode ;; - Alpha\ *:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # Should we change UNAME_MACHINE based on the output of uname instead -@@ -295,12 +301,12 @@ - echo s390-ibm-zvmoe - exit ;; - *:OS400:*:*) -- echo powerpc-ibm-os400 -+ echo powerpc-ibm-os400 - exit ;; - arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) - echo arm-acorn-riscix${UNAME_RELEASE} - exit ;; -- arm:riscos:*:*|arm:RISCOS:*:*) -+ arm*:riscos:*:*|arm*:RISCOS:*:*) - echo arm-unknown-riscos - exit ;; - SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) -@@ -324,14 +330,33 @@ - case `/usr/bin/uname -p` in - sparc) echo sparc-icl-nx7; exit ;; - esac ;; -+ s390x:SunOS:*:*) -+ echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -+ exit ;; - sun4H:SunOS:5.*:*) - echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) - echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; -+ i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) -+ echo i386-pc-auroraux${UNAME_RELEASE} -+ exit ;; - i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) -- echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -+ eval $set_cc_for_build -+ SUN_ARCH="i386" -+ # If there is a compiler, see if it is configured for 64-bit objects. -+ # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. -+ # This test works for both compilers. -+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then -+ if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ -+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ -+ grep IS_64BIT_ARCH >/dev/null -+ then -+ SUN_ARCH="x86_64" -+ fi -+ fi -+ echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - sun4*:SunOS:6*:*) - # According to config.sub, this is the proper way to canonicalize -@@ -375,23 +400,23 @@ - # MiNT. But MiNT is downward compatible to TOS, so this should - # be no problem. - atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) -- echo m68k-atari-mint${UNAME_RELEASE} -+ echo m68k-atari-mint${UNAME_RELEASE} - exit ;; - atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} -- exit ;; -+ exit ;; - *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) -- echo m68k-atari-mint${UNAME_RELEASE} -+ echo m68k-atari-mint${UNAME_RELEASE} - exit ;; - milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) -- echo m68k-milan-mint${UNAME_RELEASE} -- exit ;; -+ echo m68k-milan-mint${UNAME_RELEASE} -+ exit ;; - hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) -- echo m68k-hades-mint${UNAME_RELEASE} -- exit ;; -+ echo m68k-hades-mint${UNAME_RELEASE} -+ exit ;; - *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) -- echo m68k-unknown-mint${UNAME_RELEASE} -- exit ;; -+ echo m68k-unknown-mint${UNAME_RELEASE} -+ exit ;; - m68k:machten:*:*) - echo m68k-apple-machten${UNAME_RELEASE} - exit ;; -@@ -461,8 +486,8 @@ - echo m88k-motorola-sysv3 - exit ;; - AViiON:dgux:*:*) -- # DG/UX returns AViiON for all architectures -- UNAME_PROCESSOR=`/usr/bin/uname -p` -+ # DG/UX returns AViiON for all architectures -+ UNAME_PROCESSOR=`/usr/bin/uname -p` - if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] - then - if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ -@@ -475,7 +500,7 @@ - else - echo i586-dg-dgux${UNAME_RELEASE} - fi -- exit ;; -+ exit ;; - M88*:DolphinOS:*:*) # DolphinOS (SVR3) - echo m88k-dolphin-sysv3 - exit ;; -@@ -532,7 +557,7 @@ - echo rs6000-ibm-aix3.2 - fi - exit ;; -- *:AIX:*:[45]) -+ *:AIX:*:[4567]) - IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` - if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then - IBM_ARCH=rs6000 -@@ -575,52 +600,52 @@ - 9000/[678][0-9][0-9]) - if [ -x /usr/bin/getconf ]; then - sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` -- sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` -- case "${sc_cpu_version}" in -- 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 -- 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 -- 532) # CPU_PA_RISC2_0 -- case "${sc_kernel_bits}" in -- 32) HP_ARCH="hppa2.0n" ;; -- 64) HP_ARCH="hppa2.0w" ;; -+ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` -+ case "${sc_cpu_version}" in -+ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 -+ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 -+ 532) # CPU_PA_RISC2_0 -+ case "${sc_kernel_bits}" in -+ 32) HP_ARCH="hppa2.0n" ;; -+ 64) HP_ARCH="hppa2.0w" ;; - '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 -- esac ;; -- esac -+ esac ;; -+ esac - fi - if [ "${HP_ARCH}" = "" ]; then - eval $set_cc_for_build -- sed 's/^ //' << EOF >$dummy.c -+ sed 's/^ //' << EOF >$dummy.c - -- #define _HPUX_SOURCE -- #include -- #include -- -- int main () -- { -- #if defined(_SC_KERNEL_BITS) -- long bits = sysconf(_SC_KERNEL_BITS); -- #endif -- long cpu = sysconf (_SC_CPU_VERSION); -- -- switch (cpu) -- { -- case CPU_PA_RISC1_0: puts ("hppa1.0"); break; -- case CPU_PA_RISC1_1: puts ("hppa1.1"); break; -- case CPU_PA_RISC2_0: -- #if defined(_SC_KERNEL_BITS) -- switch (bits) -- { -- case 64: puts ("hppa2.0w"); break; -- case 32: puts ("hppa2.0n"); break; -- default: puts ("hppa2.0"); break; -- } break; -- #else /* !defined(_SC_KERNEL_BITS) */ -- puts ("hppa2.0"); break; -- #endif -- default: puts ("hppa1.0"); break; -- } -- exit (0); -- } -+ #define _HPUX_SOURCE -+ #include -+ #include -+ -+ int main () -+ { -+ #if defined(_SC_KERNEL_BITS) -+ long bits = sysconf(_SC_KERNEL_BITS); -+ #endif -+ long cpu = sysconf (_SC_CPU_VERSION); -+ -+ switch (cpu) -+ { -+ case CPU_PA_RISC1_0: puts ("hppa1.0"); break; -+ case CPU_PA_RISC1_1: puts ("hppa1.1"); break; -+ case CPU_PA_RISC2_0: -+ #if defined(_SC_KERNEL_BITS) -+ switch (bits) -+ { -+ case 64: puts ("hppa2.0w"); break; -+ case 32: puts ("hppa2.0n"); break; -+ default: puts ("hppa2.0"); break; -+ } break; -+ #else /* !defined(_SC_KERNEL_BITS) */ -+ puts ("hppa2.0"); break; -+ #endif -+ default: puts ("hppa1.0"); break; -+ } -+ exit (0); -+ } - EOF - (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` - test -z "$HP_ARCH" && HP_ARCH=hppa -@@ -640,7 +665,7 @@ - # => hppa64-hp-hpux11.23 - - if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | -- grep __LP64__ >/dev/null -+ grep -q __LP64__ - then - HP_ARCH="hppa2.0w" - else -@@ -711,22 +736,22 @@ - exit ;; - C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) - echo c1-convex-bsd -- exit ;; -+ exit ;; - C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi -- exit ;; -+ exit ;; - C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) - echo c34-convex-bsd -- exit ;; -+ exit ;; - C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) - echo c38-convex-bsd -- exit ;; -+ exit ;; - C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) - echo c4-convex-bsd -- exit ;; -+ exit ;; - CRAY*Y-MP:*:*:*) - echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; -@@ -750,14 +775,14 @@ - exit ;; - F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) - FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` -- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` -- FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` -- echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" -- exit ;; -+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` -+ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` -+ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" -+ exit ;; - 5000:UNIX_System_V:4.*:*) -- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` -- FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` -- echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" -+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` -+ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` -+ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; - i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) - echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} -@@ -769,40 +794,51 @@ - echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} - exit ;; - *:FreeBSD:*:*) -- case ${UNAME_MACHINE} in -- pc98) -- echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; -+ UNAME_PROCESSOR=`/usr/bin/uname -p` -+ case ${UNAME_PROCESSOR} in - amd64) - echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - *) -- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; -+ echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - esac - exit ;; - i*:CYGWIN*:*) - echo ${UNAME_MACHINE}-pc-cygwin - exit ;; -+ *:MINGW64*:*) -+ echo ${UNAME_MACHINE}-pc-mingw64 -+ exit ;; - *:MINGW*:*) - echo ${UNAME_MACHINE}-pc-mingw32 - exit ;; -+ i*:MSYS*:*) -+ echo ${UNAME_MACHINE}-pc-msys -+ exit ;; - i*:windows32*:*) -- # uname -m includes "-pc" on this system. -- echo ${UNAME_MACHINE}-mingw32 -+ # uname -m includes "-pc" on this system. -+ echo ${UNAME_MACHINE}-mingw32 - exit ;; - i*:PW*:*) - echo ${UNAME_MACHINE}-pc-pw32 - exit ;; -- *:Interix*:[3456]*) -- case ${UNAME_MACHINE} in -+ *:Interix*:*) -+ case ${UNAME_MACHINE} in - x86) - echo i586-pc-interix${UNAME_RELEASE} - exit ;; -- EM64T | authenticamd) -+ authenticamd | genuineintel | EM64T) - echo x86_64-unknown-interix${UNAME_RELEASE} - exit ;; -+ IA64) -+ echo ia64-unknown-interix${UNAME_RELEASE} -+ exit ;; - esac ;; - [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) - echo i${UNAME_MACHINE}-pc-mks - exit ;; -+ 8664:Windows_NT:*) -+ echo x86_64-pc-mks -+ exit ;; - i*:Windows_NT*:* | Pentium*:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we -@@ -832,20 +868,68 @@ - i*86:Minix:*:*) - echo ${UNAME_MACHINE}-pc-minix - exit ;; -- arm*:Linux:*:*) -+ aarch64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; -+ aarch64_be:Linux:*:*) -+ UNAME_MACHINE=aarch64_be -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; -+ alpha:Linux:*:*) -+ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in -+ EV5) UNAME_MACHINE=alphaev5 ;; -+ EV56) UNAME_MACHINE=alphaev56 ;; -+ PCA56) UNAME_MACHINE=alphapca56 ;; -+ PCA57) UNAME_MACHINE=alphapca56 ;; -+ EV6) UNAME_MACHINE=alphaev6 ;; -+ EV67) UNAME_MACHINE=alphaev67 ;; -+ EV68*) UNAME_MACHINE=alphaev68 ;; -+ esac -+ objdump --private-headers /bin/sh | grep -q ld.so.1 -+ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi -+ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} -+ exit ;; -+ arm*:Linux:*:*) -+ eval $set_cc_for_build -+ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ -+ | grep -q __ARM_EABI__ -+ then -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ else -+ if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ -+ | grep -q __ARM_PCS_VFP -+ then -+ echo ${UNAME_MACHINE}-unknown-linux-gnueabi -+ else -+ echo ${UNAME_MACHINE}-unknown-linux-gnueabihf -+ fi -+ fi -+ exit ;; - avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - cris:Linux:*:*) -- echo cris-axis-linux-gnu -+ echo ${UNAME_MACHINE}-axis-linux-gnu - exit ;; - crisv32:Linux:*:*) -- echo crisv32-axis-linux-gnu -+ echo ${UNAME_MACHINE}-axis-linux-gnu - exit ;; - frv:Linux:*:*) -- echo frv-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; -+ hexagon:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; -+ i*86:Linux:*:*) -+ LIBC=gnu -+ eval $set_cc_for_build -+ sed 's/^ //' << EOF >$dummy.c -+ #ifdef __dietlibc__ -+ LIBC=dietlibc -+ #endif -+EOF -+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` -+ echo "${UNAME_MACHINE}-pc-linux-${LIBC}" - exit ;; - ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu -@@ -856,74 +940,33 @@ - m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; -- mips:Linux:*:*) -+ mips:Linux:*:* | mips64:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #undef CPU -- #undef mips -- #undef mipsel -+ #undef ${UNAME_MACHINE} -+ #undef ${UNAME_MACHINE}el - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) -- CPU=mipsel -+ CPU=${UNAME_MACHINE}el - #else - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) -- CPU=mips -+ CPU=${UNAME_MACHINE} - #else - CPU= - #endif - #endif - EOF -- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' -- /^CPU/{ -- s: ::g -- p -- }'`" -- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } -- ;; -- mips64:Linux:*:*) -- eval $set_cc_for_build -- sed 's/^ //' << EOF >$dummy.c -- #undef CPU -- #undef mips64 -- #undef mips64el -- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) -- CPU=mips64el -- #else -- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) -- CPU=mips64 -- #else -- CPU= -- #endif -- #endif --EOF -- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' -- /^CPU/{ -- s: ::g -- p -- }'`" -+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } - ;; - or32:Linux:*:*) -- echo or32-unknown-linux-gnu -- exit ;; -- ppc:Linux:*:*) -- echo powerpc-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; -- ppc64:Linux:*:*) -- echo powerpc64-unknown-linux-gnu -+ padre:Linux:*:*) -+ echo sparc-unknown-linux-gnu - exit ;; -- alpha:Linux:*:*) -- case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in -- EV5) UNAME_MACHINE=alphaev5 ;; -- EV56) UNAME_MACHINE=alphaev56 ;; -- PCA56) UNAME_MACHINE=alphapca56 ;; -- PCA57) UNAME_MACHINE=alphapca56 ;; -- EV6) UNAME_MACHINE=alphaev6 ;; -- EV67) UNAME_MACHINE=alphaev67 ;; -- EV68*) UNAME_MACHINE=alphaev68 ;; -- esac -- objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null -- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi -- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} -+ parisc64:Linux:*:* | hppa64:Linux:*:*) -+ echo hppa64-unknown-linux-gnu - exit ;; - parisc:Linux:*:* | hppa:Linux:*:*) - # Look for CPU level -@@ -933,14 +976,17 @@ - *) echo hppa-unknown-linux-gnu ;; - esac - exit ;; -- parisc64:Linux:*:* | hppa64:Linux:*:*) -- echo hppa64-unknown-linux-gnu -+ ppc64:Linux:*:*) -+ echo powerpc64-unknown-linux-gnu -+ exit ;; -+ ppc:Linux:*:*) -+ echo powerpc-unknown-linux-gnu - exit ;; - s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux - exit ;; - sh64*:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu -@@ -948,78 +994,18 @@ - sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; -+ tile*:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; - vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-gnu - exit ;; - x86_64:Linux:*:*) -- echo x86_64-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; -- xtensa:Linux:*:*) -- echo xtensa-unknown-linux-gnu -+ xtensa*:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; -- i*86:Linux:*:*) -- # The BFD linker knows what the default object file format is, so -- # first see if it will tell us. cd to the root directory to prevent -- # problems with other programs or directories called `ld' in the path. -- # Set LC_ALL=C to ensure ld outputs messages in English. -- ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ -- | sed -ne '/supported targets:/!d -- s/[ ][ ]*/ /g -- s/.*supported targets: *// -- s/ .*// -- p'` -- case "$ld_supported_targets" in -- elf32-i386) -- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" -- ;; -- a.out-i386-linux) -- echo "${UNAME_MACHINE}-pc-linux-gnuaout" -- exit ;; -- coff-i386) -- echo "${UNAME_MACHINE}-pc-linux-gnucoff" -- exit ;; -- "") -- # Either a pre-BFD a.out linker (linux-gnuoldld) or -- # one that does not give us useful --help. -- echo "${UNAME_MACHINE}-pc-linux-gnuoldld" -- exit ;; -- esac -- # Determine whether the default compiler is a.out or elf -- eval $set_cc_for_build -- sed 's/^ //' << EOF >$dummy.c -- #include -- #ifdef __ELF__ -- # ifdef __GLIBC__ -- # if __GLIBC__ >= 2 -- LIBC=gnu -- # else -- LIBC=gnulibc1 -- # endif -- # else -- LIBC=gnulibc1 -- # endif -- #else -- #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) -- LIBC=gnu -- #else -- LIBC=gnuaout -- #endif -- #endif -- #ifdef __dietlibc__ -- LIBC=dietlibc -- #endif --EOF -- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' -- /^LIBC/{ -- s: ::g -- p -- }'`" -- test x"${LIBC}" != x && { -- echo "${UNAME_MACHINE}-pc-linux-${LIBC}" -- exit -- } -- test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } -- ;; - i*86:DYNIX/ptx:4*:*) - # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. - # earlier versions are messed up and put the nodename in both -@@ -1027,11 +1013,11 @@ - echo i386-sequent-sysv4 - exit ;; - i*86:UNIX_SV:4.2MP:2.*) -- # Unixware is an offshoot of SVR4, but it has its own version -- # number series starting with 2... -- # I am not positive that other SVR4 systems won't match this, -+ # Unixware is an offshoot of SVR4, but it has its own version -+ # number series starting with 2... -+ # I am not positive that other SVR4 systems won't match this, - # I just have to hope. -- rms. -- # Use sysv4.2uw... so that sysv4* matches it. -+ # Use sysv4.2uw... so that sysv4* matches it. - echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} - exit ;; - i*86:OS/2:*:*) -@@ -1048,7 +1034,7 @@ - i*86:syllable:*:*) - echo ${UNAME_MACHINE}-pc-syllable - exit ;; -- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) -+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) - echo i386-unknown-lynxos${UNAME_RELEASE} - exit ;; - i*86:*DOS:*:*) -@@ -1063,7 +1049,7 @@ - fi - exit ;; - i*86:*:5:[678]*) -- # UnixWare 7.x, OpenUNIX and OpenServer 6. -+ # UnixWare 7.x, OpenUNIX and OpenServer 6. - case `/bin/uname -X | grep "^Machine"` in - *486*) UNAME_MACHINE=i486 ;; - *Pentium) UNAME_MACHINE=i586 ;; -@@ -1091,10 +1077,13 @@ - exit ;; - pc:*:*:*) - # Left here for compatibility: -- # uname -m prints for DJGPP always 'pc', but it prints nothing about -- # the processor, so we play safe by assuming i386. -- echo i386-pc-msdosdjgpp -- exit ;; -+ # uname -m prints for DJGPP always 'pc', but it prints nothing about -+ # the processor, so we play safe by assuming i586. -+ # Note: whatever this is, it MUST be the same as what config.sub -+ # prints for the "djgpp" host, or else GDB configury will decide that -+ # this is a cross-build. -+ echo i586-pc-msdosdjgpp -+ exit ;; - Intel:Mach:3*:*) - echo i386-pc-mach3 - exit ;; -@@ -1129,8 +1118,18 @@ - /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; - 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) -- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ -- && { echo i486-ncr-sysv4; exit; } ;; -+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ -+ && { echo i486-ncr-sysv4; exit; } ;; -+ NCR*:*:4.2:* | MPRAS*:*:4.2:*) -+ OS_REL='.3' -+ test -r /etc/.relid \ -+ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` -+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ -+ && { echo i486-ncr-sysv4.3${OS_REL}; exit; } -+ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ -+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } -+ /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ -+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; - m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) - echo m68k-unknown-lynxos${UNAME_RELEASE} - exit ;; -@@ -1143,7 +1142,7 @@ - rs6000:LynxOS:2.*:*) - echo rs6000-unknown-lynxos${UNAME_RELEASE} - exit ;; -- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) -+ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) - echo powerpc-unknown-lynxos${UNAME_RELEASE} - exit ;; - SM[BE]S:UNIX_SV:*:*) -@@ -1163,10 +1162,10 @@ - echo ns32k-sni-sysv - fi - exit ;; -- PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort -- # says -- echo i586-unisys-sysv4 -- exit ;; -+ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort -+ # says -+ echo i586-unisys-sysv4 -+ exit ;; - *:UNIX_System_V:4*:FTX*) - # From Gerald Hewes . - # How about differentiating between stratus architectures? -djm -@@ -1192,11 +1191,11 @@ - exit ;; - R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) - if [ -d /usr/nec ]; then -- echo mips-nec-sysv${UNAME_RELEASE} -+ echo mips-nec-sysv${UNAME_RELEASE} - else -- echo mips-unknown-sysv${UNAME_RELEASE} -+ echo mips-unknown-sysv${UNAME_RELEASE} - fi -- exit ;; -+ exit ;; - BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. - echo powerpc-be-beos - exit ;; -@@ -1206,6 +1205,12 @@ - BePC:BeOS:*:*) # BeOS running on Intel PC compatible. - echo i586-pc-beos - exit ;; -+ BePC:Haiku:*:*) # Haiku running on Intel PC compatible. -+ echo i586-pc-haiku -+ exit ;; -+ x86_64:Haiku:*:*) -+ echo x86_64-unknown-haiku -+ exit ;; - SX-4:SUPER-UX:*:*) - echo sx4-nec-superux${UNAME_RELEASE} - exit ;; -@@ -1233,6 +1238,16 @@ - *:Darwin:*:*) - UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - case $UNAME_PROCESSOR in -+ i386) -+ eval $set_cc_for_build -+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then -+ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ -+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ -+ grep IS_64BIT_ARCH >/dev/null -+ then -+ UNAME_PROCESSOR="x86_64" -+ fi -+ fi ;; - unknown) UNAME_PROCESSOR=powerpc ;; - esac - echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} -@@ -1248,7 +1263,10 @@ - *:QNX:*:4*) - echo i386-pc-qnx - exit ;; -- NSE-?:NONSTOP_KERNEL:*:*) -+ NEO-?:NONSTOP_KERNEL:*:*) -+ echo neo-tandem-nsk${UNAME_RELEASE} -+ exit ;; -+ NSE-*:NONSTOP_KERNEL:*:*) - echo nse-tandem-nsk${UNAME_RELEASE} - exit ;; - NSR-?:NONSTOP_KERNEL:*:*) -@@ -1293,13 +1311,13 @@ - echo pdp10-unknown-its - exit ;; - SEI:*:*:SEIUX) -- echo mips-sei-seiux${UNAME_RELEASE} -+ echo mips-sei-seiux${UNAME_RELEASE} - exit ;; - *:DragonFly:*:*) - echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` - exit ;; - *:*VMS:*:*) -- UNAME_MACHINE=`(uname -p) 2>/dev/null` -+ UNAME_MACHINE=`(uname -p) 2>/dev/null` - case "${UNAME_MACHINE}" in - A*) echo alpha-dec-vms ; exit ;; - I*) echo ia64-dec-vms ; exit ;; -@@ -1314,11 +1332,14 @@ - i*86:rdos:*:*) - echo ${UNAME_MACHINE}-pc-rdos - exit ;; -+ i*86:AROS:*:*) -+ echo ${UNAME_MACHINE}-pc-aros -+ exit ;; -+ x86_64:VMkernel:*:*) -+ echo ${UNAME_MACHINE}-unknown-esx -+ exit ;; - esac - --#echo '(No uname command or uname output not recognized.)' 1>&2 --#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 -- - eval $set_cc_for_build - cat >$dummy.c < - printf ("m68k-sony-newsos%s\n", - #ifdef NEWSOS4 -- "4" -+ "4" - #else -- "" -+ "" - #endif -- ); exit (0); -+ ); exit (0); - #endif - #endif - -@@ -1474,9 +1495,9 @@ - the operating system you are using. It is advised that you - download the most up to date version of the config scripts from - -- http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess -+ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD - and -- http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub -+ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD - - If the version you run ($0) is already up to date, please - send the following data and any information you think might be -diff -urN vifm-0.7.4a/config.sub vifm-0.7.4a-aarch64/config.sub ---- vifm-0.7.4a/config.sub 2012-10-22 11:32:51.000000000 -0500 -+++ vifm-0.7.4a-aarch64/config.sub 2013-03-08 09:25:33.804409528 -0600 -@@ -1,10 +1,10 @@ - #! /bin/sh - # Configuration validation subroutine script. - # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, --# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, --# Inc. -+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -+# 2011, 2012 Free Software Foundation, Inc. - --timestamp='2007-06-28' -+timestamp='2012-10-10' - - # This file is (in principle) common to ALL GNU software. - # The presence of a machine in this file suggests that SOME GNU software -@@ -21,9 +21,7 @@ - # 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, write to the Free Software --# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA --# 02110-1301, USA. -+# along with this program; if not, see . - # - # As a special exception to the GNU General Public License, if you - # distribute this file as part of a program that contains a -@@ -32,13 +30,16 @@ - - - # Please send patches to . Submit a context --# diff and a properly formatted ChangeLog entry. -+# diff and a properly formatted GNU ChangeLog entry. - # - # Configuration subroutine to validate and canonicalize a configuration type. - # Supply the specified configuration type as an argument. - # If it is invalid, we print an error message on stderr and exit with code 1. - # Otherwise, we print the canonical config type on stdout and succeed. - -+# You can get the latest version of this script from: -+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD -+ - # This file is supposed to be the same for all GNU packages - # and recognize all the CPU types, system types and aliases - # that are meaningful with *any* GNU software. -@@ -72,7 +73,8 @@ - version="\ - GNU config.sub ($timestamp) - --Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 - Free Software Foundation, Inc. - - This is free software; see the source for copying conditions. There is NO -@@ -120,12 +122,18 @@ - # Here we must recognize all the valid KERNEL-OS combinations. - maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` - case $maybe_os in -- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ -- uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ -+ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ -+ linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ -+ knetbsd*-gnu* | netbsd*-gnu* | \ -+ kopensolaris*-gnu* | \ - storm-chaos* | os2-emx* | rtmk-nova*) - os=-$maybe_os - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` - ;; -+ android-linux) -+ os=-linux-android -+ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown -+ ;; - *) - basic_machine=`echo $1 | sed 's/-[^-]*$//'` - if [ $basic_machine != $1 ] -@@ -148,10 +156,13 @@ - -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ - -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ - -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ -- -apple | -axis | -knuth | -cray) -+ -apple | -axis | -knuth | -cray | -microblaze*) - os= - basic_machine=$1 - ;; -+ -bluegene*) -+ os=-cnk -+ ;; - -sim | -cisco | -oki | -wec | -winbond) - os= - basic_machine=$1 -@@ -166,10 +177,10 @@ - os=-chorusos - basic_machine=$1 - ;; -- -chorusrdb) -- os=-chorusrdb -+ -chorusrdb) -+ os=-chorusrdb - basic_machine=$1 -- ;; -+ ;; - -hiux*) - os=-hiuxwe2 - ;; -@@ -214,6 +225,12 @@ - -isc*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; -+ -lynx*178) -+ os=-lynxos178 -+ ;; -+ -lynx*5) -+ os=-lynxos5 -+ ;; - -lynx*) - os=-lynxos - ;; -@@ -238,24 +255,32 @@ - # Some are omitted here because they have special meanings below. - 1750a | 580 \ - | a29k \ -+ | aarch64 | aarch64_be \ - | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ - | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ - | am33_2.0 \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ -+ | be32 | be64 \ - | bfin \ - | c4x | clipper \ - | d10v | d30v | dlx | dsp16xx \ -+ | epiphany \ - | fido | fr30 | frv \ - | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ -+ | hexagon \ - | i370 | i860 | i960 | ia64 \ - | ip2k | iq2000 \ -+ | le32 | le64 \ -+ | lm32 \ - | m32c | m32r | m32rle | m68000 | m68k | m88k \ -- | maxq | mb | microblaze | mcore | mep \ -+ | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ - | mips | mipsbe | mipseb | mipsel | mipsle \ - | mips16 \ - | mips64 | mips64el \ -- | mips64vr | mips64vrel \ -+ | mips64octeon | mips64octeonel \ - | mips64orion | mips64orionel \ -+ | mips64r5900 | mips64r5900el \ -+ | mips64vr | mips64vrel \ - | mips64vr4100 | mips64vr4100el \ - | mips64vr4300 | mips64vr4300el \ - | mips64vr5000 | mips64vr5000el \ -@@ -268,29 +293,42 @@ - | mipsisa64sr71k | mipsisa64sr71kel \ - | mipstx39 | mipstx39el \ - | mn10200 | mn10300 \ -+ | moxie \ - | mt \ - | msp430 \ -+ | nds32 | nds32le | nds32be \ - | nios | nios2 \ - | ns16k | ns32k \ -+ | open8 \ - | or32 \ - | pdp10 | pdp11 | pj | pjl \ -- | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ -+ | powerpc | powerpc64 | powerpc64le | powerpcle \ - | pyramid \ -+ | rl78 | rx \ - | score \ -- | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ -+ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ - | sh64 | sh64le \ - | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ - | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ -- | spu | strongarm \ -- | tahoe | thumb | tic4x | tic80 | tron \ -- | v850 | v850e \ -+ | spu \ -+ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ -+ | ubicom32 \ -+ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ - | we32k \ -- | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ -- | z8k) -+ | x86 | xc16x | xstormy16 | xtensa \ -+ | z8k | z80) - basic_machine=$basic_machine-unknown - ;; -- m6811 | m68hc11 | m6812 | m68hc12) -- # Motorola 68HC11/12. -+ c54x) -+ basic_machine=tic54x-unknown -+ ;; -+ c55x) -+ basic_machine=tic55x-unknown -+ ;; -+ c6x) -+ basic_machine=tic6x-unknown -+ ;; -+ m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) - basic_machine=$basic_machine-unknown - os=-none - ;; -@@ -300,6 +338,21 @@ - basic_machine=mt-unknown - ;; - -+ strongarm | thumb | xscale) -+ basic_machine=arm-unknown -+ ;; -+ xgate) -+ basic_machine=$basic_machine-unknown -+ os=-none -+ ;; -+ xscaleeb) -+ basic_machine=armeb-unknown -+ ;; -+ -+ xscaleel) -+ basic_machine=armel-unknown -+ ;; -+ - # We use `pc' rather than `unknown' - # because (1) that's what they normally are, and - # (2) the word "unknown" tends to confuse beginning users. -@@ -314,29 +367,37 @@ - # Recognize the basic CPU types with company name. - 580-* \ - | a29k-* \ -+ | aarch64-* | aarch64_be-* \ - | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ - | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ - | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* | avr32-* \ -+ | be32-* | be64-* \ - | bfin-* | bs2000-* \ -- | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ -+ | c[123]* | c30-* | [cjt]90-* | c4x-* \ - | clipper-* | craynv-* | cydra-* \ - | d10v-* | d30v-* | dlx-* \ - | elxsi-* \ - | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ - | h8300-* | h8500-* \ - | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ -+ | hexagon-* \ - | i*86-* | i860-* | i960-* | ia64-* \ - | ip2k-* | iq2000-* \ -+ | le32-* | le64-* \ -+ | lm32-* \ - | m32c-* | m32r-* | m32rle-* \ - | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ -- | m88110-* | m88k-* | maxq-* | mcore-* \ -+ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ -+ | microblaze-* | microblazeel-* \ - | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ - | mips16-* \ - | mips64-* | mips64el-* \ -- | mips64vr-* | mips64vrel-* \ -+ | mips64octeon-* | mips64octeonel-* \ - | mips64orion-* | mips64orionel-* \ -+ | mips64r5900-* | mips64r5900el-* \ -+ | mips64vr-* | mips64vrel-* \ - | mips64vr4100-* | mips64vr4100el-* \ - | mips64vr4300-* | mips64vr4300el-* \ - | mips64vr5000-* | mips64vr5000el-* \ -@@ -351,27 +412,36 @@ - | mmix-* \ - | mt-* \ - | msp430-* \ -+ | nds32-* | nds32le-* | nds32be-* \ - | nios-* | nios2-* \ - | none-* | np1-* | ns16k-* | ns32k-* \ -+ | open8-* \ - | orion-* \ - | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ -- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ -+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ - | pyramid-* \ -- | romp-* | rs6000-* \ -- | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ -+ | rl78-* | romp-* | rs6000-* | rx-* \ -+ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ - | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ - | sparclite-* \ -- | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ -- | tahoe-* | thumb-* \ -+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ -+ | tahoe-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ -+ | tile*-* \ - | tron-* \ -- | v850-* | v850e-* | vax-* \ -+ | ubicom32-* \ -+ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ -+ | vax-* \ - | we32k-* \ -- | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ -- | xstormy16-* | xtensa-* \ -+ | x86-* | x86_64-* | xc16x-* | xps100-* \ -+ | xstormy16-* | xtensa*-* \ - | ymp-* \ -- | z8k-*) -+ | z8k-* | z80-*) -+ ;; -+ # Recognize the basic CPU types without company name, with glob match. -+ xtensa*) -+ basic_machine=$basic_machine-unknown - ;; - # Recognize the various machine names and aliases which stand - # for a CPU type and a company and sometimes even an OS. -@@ -389,7 +459,7 @@ - basic_machine=a29k-amd - os=-udi - ;; -- abacus) -+ abacus) - basic_machine=abacus-unknown - ;; - adobe68k) -@@ -435,6 +505,10 @@ - basic_machine=m68k-apollo - os=-bsd - ;; -+ aros) -+ basic_machine=i386-pc -+ os=-aros -+ ;; - aux) - basic_machine=m68k-apple - os=-aux -@@ -443,10 +517,35 @@ - basic_machine=ns32k-sequent - os=-dynix - ;; -+ blackfin) -+ basic_machine=bfin-unknown -+ os=-linux -+ ;; -+ blackfin-*) -+ basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` -+ os=-linux -+ ;; -+ bluegene*) -+ basic_machine=powerpc-ibm -+ os=-cnk -+ ;; -+ c54x-*) -+ basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ;; -+ c55x-*) -+ basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ;; -+ c6x-*) -+ basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ;; - c90) - basic_machine=c90-cray - os=-unicos - ;; -+ cegcc) -+ basic_machine=arm-unknown -+ os=-cegcc -+ ;; - convex-c1) - basic_machine=c1-convex - os=-bsd -@@ -475,7 +574,7 @@ - basic_machine=craynv-cray - os=-unicosmp - ;; -- cr16) -+ cr16 | cr16-*) - basic_machine=cr16-unknown - os=-elf - ;; -@@ -514,6 +613,10 @@ - basic_machine=m88k-motorola - os=-sysv3 - ;; -+ dicos) -+ basic_machine=i686-pc -+ os=-dicos -+ ;; - djgpp) - basic_machine=i586-pc - os=-msdosdjgpp -@@ -629,7 +732,6 @@ - i370-ibm* | ibm*) - basic_machine=i370-ibm - ;; --# I'm not sure what "Sysv32" means. Should this be sysv3.2? - i*86v32) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv32 -@@ -668,6 +770,14 @@ - basic_machine=m68k-isi - os=-sysv - ;; -+ m68knommu) -+ basic_machine=m68k-unknown -+ os=-linux -+ ;; -+ m68knommu-*) -+ basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` -+ os=-linux -+ ;; - m88k-omron*) - basic_machine=m88k-omron - ;; -@@ -679,6 +789,13 @@ - basic_machine=ns32k-utek - os=-sysv - ;; -+ microblaze*) -+ basic_machine=microblaze-xilinx -+ ;; -+ mingw64) -+ basic_machine=x86_64-pc -+ os=-mingw64 -+ ;; - mingw32) - basic_machine=i386-pc - os=-mingw32 -@@ -715,10 +832,18 @@ - ms1-*) - basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` - ;; -+ msys) -+ basic_machine=i386-pc -+ os=-msys -+ ;; - mvs) - basic_machine=i370-ibm - os=-mvs - ;; -+ nacl) -+ basic_machine=le32-unknown -+ os=-nacl -+ ;; - ncr3000) - basic_machine=i486-ncr - os=-sysv4 -@@ -783,6 +908,12 @@ - np1) - basic_machine=np1-gould - ;; -+ neo-tandem) -+ basic_machine=neo-tandem -+ ;; -+ nse-tandem) -+ basic_machine=nse-tandem -+ ;; - nsr-tandem) - basic_machine=nsr-tandem - ;; -@@ -813,6 +944,14 @@ - basic_machine=i860-intel - os=-osf - ;; -+ parisc) -+ basic_machine=hppa-unknown -+ os=-linux -+ ;; -+ parisc-*) -+ basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` -+ os=-linux -+ ;; - pbd) - basic_machine=sparc-tti - ;; -@@ -857,9 +996,10 @@ - ;; - power) basic_machine=power-ibm - ;; -- ppc) basic_machine=powerpc-unknown -+ ppc | ppcbe) basic_machine=powerpc-unknown - ;; -- ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ppc-* | ppcbe-*) -+ basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppcle | powerpclittle | ppc-le | powerpc-little) - basic_machine=powerpcle-unknown -@@ -953,6 +1093,9 @@ - basic_machine=i860-stratus - os=-sysv4 - ;; -+ strongarm-* | thumb-*) -+ basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ;; - sun2) - basic_machine=m68000-sun - ;; -@@ -1009,17 +1152,9 @@ - basic_machine=t90-cray - os=-unicos - ;; -- tic54x | c54x*) -- basic_machine=tic54x-unknown -- os=-coff -- ;; -- tic55x | c55x*) -- basic_machine=tic55x-unknown -- os=-coff -- ;; -- tic6x | c6x*) -- basic_machine=tic6x-unknown -- os=-coff -+ tile*) -+ basic_machine=$basic_machine-unknown -+ os=-linux-gnu - ;; - tx39) - basic_machine=mipstx39-unknown -@@ -1088,6 +1223,9 @@ - xps | xps100) - basic_machine=xps100-honeywell - ;; -+ xscale-* | xscalee[bl]-*) -+ basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` -+ ;; - ymp) - basic_machine=ymp-cray - os=-unicos -@@ -1096,6 +1234,10 @@ - basic_machine=z8k-unknown - os=-sim - ;; -+ z80-*-coff) -+ basic_machine=z80-unknown -+ os=-sim -+ ;; - none) - basic_machine=none-none - os=-none -@@ -1134,7 +1276,7 @@ - we32k) - basic_machine=we32k-att - ;; -- sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) -+ sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) - basic_machine=sh-unknown - ;; - sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) -@@ -1181,9 +1323,12 @@ - if [ x"$os" != x"" ] - then - case $os in -- # First match some system type aliases -- # that might get confused with valid system types. -+ # First match some system type aliases -+ # that might get confused with valid system types. - # -solaris* is a basic system type, with this one exception. -+ -auroraux) -+ os=-auroraux -+ ;; - -solaris1 | -solaris1.*) - os=`echo $os | sed -e 's|solaris1|sunos4|'` - ;; -@@ -1204,21 +1349,23 @@ - # Each alternative MUST END IN A *, to match a version number. - # -sysv* is not here because it comes later, after sysvr4. - -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ -- | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ -- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ -+ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ -+ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ -+ | -sym* | -kopensolaris* \ - | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ -- | -aos* \ -+ | -aos* | -aros* \ - | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ - | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ -- | -openbsd* | -solidbsd* \ -+ | -bitrig* | -openbsd* | -solidbsd* \ - | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ - | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ - | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ -- | -chorusos* | -chorusrdb* \ -- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ -- | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ -+ | -chorusos* | -chorusrdb* | -cegcc* \ -+ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ -+ | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ -+ | -linux-newlib* | -linux-musl* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* \ - | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ - | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ -@@ -1226,7 +1373,7 @@ - | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ - | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ - | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ -- | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) -+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) - # Remember, each alternative MUST END IN *, to match a version number. - ;; - -qnx*) -@@ -1265,7 +1412,7 @@ - -opened*) - os=-openedition - ;; -- -os400*) -+ -os400*) - os=-os400 - ;; - -wince*) -@@ -1314,7 +1461,7 @@ - -sinix*) - os=-sysv4 - ;; -- -tpf*) -+ -tpf*) - os=-tpf - ;; - -triton*) -@@ -1356,6 +1503,11 @@ - -zvmoe) - os=-zvmoe - ;; -+ -dicos*) -+ os=-dicos -+ ;; -+ -nacl*) -+ ;; - -none) - ;; - *) -@@ -1378,10 +1530,10 @@ - # system, and we'll never get to this point. - - case $basic_machine in -- score-*) -+ score-*) - os=-elf - ;; -- spu-*) -+ spu-*) - os=-elf - ;; - *-acorn) -@@ -1393,8 +1545,20 @@ - arm*-semi) - os=-aout - ;; -- c4x-* | tic4x-*) -- os=-coff -+ c4x-* | tic4x-*) -+ os=-coff -+ ;; -+ hexagon-*) -+ os=-elf -+ ;; -+ tic54x-*) -+ os=-coff -+ ;; -+ tic55x-*) -+ os=-coff -+ ;; -+ tic6x-*) -+ os=-coff - ;; - # This must come before the *-dec entry. - pdp10-*) -@@ -1414,14 +1578,11 @@ - ;; - m68000-sun) - os=-sunos3 -- # This also exists in the configure program, but was not the -- # default. -- # os=-sunos4 - ;; - m68*-cisco) - os=-aout - ;; -- mep-*) -+ mep-*) - os=-elf - ;; - mips*-cisco) -@@ -1448,7 +1609,7 @@ - *-ibm) - os=-aix - ;; -- *-knuth) -+ *-knuth) - os=-mmixware - ;; - *-wec) -@@ -1553,7 +1714,7 @@ - -sunos*) - vendor=sun - ;; -- -aix*) -+ -cnk*|-aix*) - vendor=ibm - ;; - -beos*) diff --git a/vifm.spec b/vifm.spec index e8ed2d9..92a3c83 100644 --- a/vifm.spec +++ b/vifm.spec @@ -3,15 +3,14 @@ %bcond_with x11 Name: vifm -Version: 0.7.5 -Release: 2%{?dist} +Version: 0.7.6 +Release: 1%{?dist} Summary: Lightweight file manager with vi like key-bindings Group: Applications/File License: GPLv2+ URL: http://%{name}.sourceforge.net/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 -Patch0: vifm-aarch64.patch %if %{with gtk} BuildRequires: pkgconfig(glib-2.0) @@ -31,7 +30,6 @@ A ncurses based CLI file manager with vi like key-bindings %prep %setup -q -%patch0 -p1 -b .aarch64 %build @@ -69,6 +67,9 @@ make install DESTDIR=%{buildroot} INSTALL="install -p" %changelog +* Wed Nov 20 2013 Ben Boeckel - 0.7.6-1 +- Update to 0.7.6 + * Sun Aug 04 2013 Fedora Release Engineering - 0.7.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From d10c728ab7474f0eee1e80d37c980073b4e700d2 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 22:39:44 -0500 Subject: [PATCH 22/82] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- vifm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vifm.spec b/vifm.spec index 92a3c83..9df875f 100644 --- a/vifm.spec +++ b/vifm.spec @@ -4,7 +4,7 @@ Name: vifm Version: 0.7.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Lightweight file manager with vi like key-bindings Group: Applications/File @@ -67,6 +67,9 @@ make install DESTDIR=%{buildroot} INSTALL="install -p" %changelog +* Sun Jun 08 2014 Fedora Release Engineering - 0.7.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Wed Nov 20 2013 Ben Boeckel - 0.7.6-1 - Update to 0.7.6 From 1a6ce5c6e9379ef5bcafc95ce3381991e9f9a02f Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Fri, 8 Aug 2014 01:56:08 -0500 Subject: [PATCH 23/82] Fix %%files for 0.7.6 (#1107084) --- vifm.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/vifm.spec b/vifm.spec index 9df875f..da445d1 100644 --- a/vifm.spec +++ b/vifm.spec @@ -4,7 +4,7 @@ Name: vifm Version: 0.7.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Lightweight file manager with vi like key-bindings Group: Applications/File @@ -23,6 +23,7 @@ BuildRequires: file-devel BuildRequires: libX11-devel %endif BuildRequires: ncurses-devel +BuildRequires: desktop-file-utils %description A ncurses based CLI file manager with vi like key-bindings @@ -55,6 +56,8 @@ make %{?_smp_mflags} %install make install DESTDIR=%{buildroot} INSTALL="install -p" +desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop + %files %defattr(-,root,root,-) @@ -63,10 +66,15 @@ make install DESTDIR=%{buildroot} INSTALL="install -p" %{_bindir}/vifm-pause %{_bindir}/vifmrc-converter %{_mandir}/man1/*.1.gz +%{_datadir}/applications/%{name}.desktop +%{_datadir}/pixmaps/%{name}.png %{_datadir}/%{name}/ %changelog +* Fri Aug 08 2014 Yaakov Selkowitz - 0.7.6-3 +- Fix %%files for 0.7.6 (#1107084) + * Sun Jun 08 2014 Fedora Release Engineering - 0.7.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From f0f325d3f06fc8897feb0e0e78da8554660fb0a6 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 18 Aug 2014 07:51:24 +0000 Subject: [PATCH 24/82] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- vifm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vifm.spec b/vifm.spec index da445d1..c687341 100644 --- a/vifm.spec +++ b/vifm.spec @@ -4,7 +4,7 @@ Name: vifm Version: 0.7.6 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Lightweight file manager with vi like key-bindings Group: Applications/File @@ -72,6 +72,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop %changelog +* Mon Aug 18 2014 Fedora Release Engineering - 0.7.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Fri Aug 08 2014 Yaakov Selkowitz - 0.7.6-3 - Fix %%files for 0.7.6 (#1107084) From a7e122c8631e7ac3f7273baba279707ad87661c4 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Wed, 10 Dec 2014 23:00:44 -0500 Subject: [PATCH 25/82] Update to 0.7.8 --- .gitignore | 1 + sources | 1 + vifm.spec | 7 +++++-- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 5581966..a026a45 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ vifm-0.5.tar.bz2 /vifm-0.7.4a.tar.bz2 /vifm-0.7.5.tar.bz2 /vifm-0.7.6.tar.bz2 +/vifm-0.7.8.tar.bz2 diff --git a/sources b/sources index 87e1a8f..c61fdf6 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 90c19079288e53aa3f9ee63f324cdfb4 vifm-0.7.6.tar.bz2 +cd3928c5548eaaac232b1d83e48f1889 vifm-0.7.8.tar.bz2 diff --git a/vifm.spec b/vifm.spec index c687341..18e7aba 100644 --- a/vifm.spec +++ b/vifm.spec @@ -3,8 +3,8 @@ %bcond_with x11 Name: vifm -Version: 0.7.6 -Release: 4%{?dist} +Version: 0.7.8 +Release: 1%{?dist} Summary: Lightweight file manager with vi like key-bindings Group: Applications/File @@ -72,6 +72,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop %changelog +* Wed Dec 10 2014 Ben Boeckel - 0.7.8-1 +- Update to 0.7.8 + * Mon Aug 18 2014 Fedora Release Engineering - 0.7.6-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From 342cf9e443f19fd2aee03cb29ef46b43d559e89f Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 19 Jun 2015 01:59:52 +0000 Subject: [PATCH 26/82] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- vifm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vifm.spec b/vifm.spec index 18e7aba..29abe7b 100644 --- a/vifm.spec +++ b/vifm.spec @@ -4,7 +4,7 @@ Name: vifm Version: 0.7.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Lightweight file manager with vi like key-bindings Group: Applications/File @@ -72,6 +72,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop %changelog +* Fri Jun 19 2015 Fedora Release Engineering - 0.7.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Wed Dec 10 2014 Ben Boeckel - 0.7.8-1 - Update to 0.7.8 From ba50d62af68b07fbbbe0b62488c1f32326ada0aa Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Sun, 19 Jul 2015 12:27:00 -0400 Subject: [PATCH 27/82] Update to 0.8 --- .gitignore | 1 + sources | 3 +-- vifm.spec | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index a026a45..bd8adff 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ vifm-0.5.tar.bz2 /vifm-0.7.5.tar.bz2 /vifm-0.7.6.tar.bz2 /vifm-0.7.8.tar.bz2 +/vifm-0.8.tar.bz2 diff --git a/sources b/sources index c61fdf6..259fa3c 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -90c19079288e53aa3f9ee63f324cdfb4 vifm-0.7.6.tar.bz2 -cd3928c5548eaaac232b1d83e48f1889 vifm-0.7.8.tar.bz2 +e28258ba36e062a2852ea06bd5bfa0cb vifm-0.8.tar.bz2 diff --git a/vifm.spec b/vifm.spec index 29abe7b..28cee97 100644 --- a/vifm.spec +++ b/vifm.spec @@ -3,8 +3,8 @@ %bcond_with x11 Name: vifm -Version: 0.7.8 -Release: 2%{?dist} +Version: 0.8 +Release: 1%{?dist} Summary: Lightweight file manager with vi like key-bindings Group: Applications/File @@ -72,6 +72,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop %changelog +* Sun Jul 19 2015 Ben Boeckel - 0.8-1 +- Update to 0.8 + * Fri Jun 19 2015 Fedora Release Engineering - 0.7.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 91e1448b62acd092ddab92b1ce92d1d7ce2f7042 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Sun, 19 Jul 2015 12:42:47 -0400 Subject: [PATCH 28/82] package vifm-convert-dircolors --- vifm.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/vifm.spec b/vifm.spec index 28cee97..17362ae 100644 --- a/vifm.spec +++ b/vifm.spec @@ -63,6 +63,7 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop %defattr(-,root,root,-) %doc AUTHORS BUGS ChangeLog COPYING README TODO %{_bindir}/%{name} +%{_bindir}/vifm-convert-dircolors %{_bindir}/vifm-pause %{_bindir}/vifmrc-converter %{_mandir}/man1/*.1.gz From 7dcde82c86a67f4aabd5b6594e0b420fdf6fda63 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Mon, 20 Jul 2015 18:56:28 -0400 Subject: [PATCH 29/82] add patch for aarch64 support (also fixes armv7hl) --- vifm-0.8-aarch64.patch | 132 +++++++++++++++++++++++++++++++++++++++++ vifm.spec | 4 +- 2 files changed, 135 insertions(+), 1 deletion(-) create mode 100644 vifm-0.8-aarch64.patch diff --git a/vifm-0.8-aarch64.patch b/vifm-0.8-aarch64.patch new file mode 100644 index 0000000..99fad38 --- /dev/null +++ b/vifm-0.8-aarch64.patch @@ -0,0 +1,132 @@ +From be821157bb9c22ac1928c2f0e9b189880ce77505 Mon Sep 17 00:00:00 2001 +From: xaizek +Date: Mon, 20 Jul 2015 20:36:52 +0300 +Subject: [PATCH] Work around compilation on AArch64 GNU/Linux + +Or in general on systems where MAX_ARG_STRLEN is defined, but is +unusable (it's either shouldn't be defined or should work, not the +way it is at the moment). Thanks to Marcin Juszkiewicz (a.k.a. +hrw). +--- + ChangeLog | 3 +++ + THANKS | 1 + + config.h.in | 3 +++ + configure | 17 +++++++++++++++++ + configure.ac | 11 +++++++++++ + src/utils/utils_nix.c | 5 +++-- + 6 files changed, 38 insertions(+), 2 deletions(-) + +diff --git a/ChangeLog b/ChangeLog +index 837ed0c..772639c 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -22,6 +22,9 @@ + + Normalize surrounding spaces in menu and dialog titles. + ++ Work around compilation on systems where MAX_ARG_STRLEN is defined, but ++ unusable. Thanks to Marcin Juszkiewicz (a.k.a. hrw). ++ + Fixed resetting "vborder" of 'fillchars' after it has been set to + something (as in `:set fillchars=vborder:\* fillchars&`). + +diff --git a/THANKS b/THANKS +index 7f4ae95..93c4322 100644 +--- a/THANKS ++++ b/THANKS +@@ -53,6 +53,7 @@ lcj + Lomov Vladimir (lomov_vl) + lyuts + MadMaverick9 ++Marcin Juszkiewicz (hrw) + Martin Fischer + Marton Balazs (balmar) + Merovius +diff --git a/config.h.in b/config.h.in +index 9ad2014..6fa0c5a 100644 +--- a/config.h.in ++++ b/config.h.in +@@ -43,6 +43,9 @@ + /* malloc.h header is available. */ + #undef HAVE_MALLOC_H + ++/* MAX_ARG_STRLEN is available. */ ++#undef HAVE_MAX_ARG_STRLEN ++ + /* Define to 1 if you have the header file. */ + #undef HAVE_MEMORY_H + +diff --git a/configure b/configure +index f7ae7d5..3cfc647 100755 +--- a/configure ++++ b/configure +@@ -6315,6 +6315,23 @@ fi + + done + ++if test "$ac_cv_header_sys_user_h" = yes -a "$ac_cv_header_linux_binfmts_h" = yes; then ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++ #include ++ #include ++ int main() { (void)MAX_ARG_STRLEN; return 0; } ++ ++ ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ ++$as_echo "#define HAVE_MAX_ARG_STRLEN 1" >>confdefs.h ++ ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi + + ac_fn_c_check_type "$LINENO" "uid_t" "ac_cv_type_uid_t" "$ac_includes_default" + if test "x$ac_cv_type_uid_t" = xyes; then : +diff --git a/configure.ac b/configure.ac +index ee0200b..a81afc6 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -74,6 +74,17 @@ AC_CHECK_HEADER([wchar.h], [], [AC_MSG_ERROR([wchar.h header not found.])]) + AC_CHECK_HEADER([wctype.h], [], [AC_MSG_ERROR([wctype.h header not found.])]) + dnl Headers required for breaking too long command-lines. + AC_CHECK_HEADERS([sys/user.h linux/binfmts.h]) ++if test "$ac_cv_header_sys_user_h" = yes -a "$ac_cv_header_linux_binfmts_h" = yes; then ++ AC_COMPILE_IFELSE( ++ AC_LANG_SOURCE( ++ [[ ++ #include ++ #include ++ int main() { (void)MAX_ARG_STRLEN; return 0; } ++ ]] ++ ), ++ [AC_DEFINE([HAVE_MAX_ARG_STRLEN], [1], [MAX_ARG_STRLEN is available.])]) ++fi + + dnl Check for various system types. + AC_CHECK_TYPE([uid_t]) +diff --git a/src/utils/utils_nix.c b/src/utils/utils_nix.c +index 31efc0f..1d6a33d 100644 +--- a/src/utils/utils_nix.c ++++ b/src/utils/utils_nix.c +@@ -20,7 +20,8 @@ + #include "utils_nix.h" + #include "utils_int.h" + +-#if defined (HAVE_LINUX_BINFMTS_H) && defined (HAVE_SYS_USER_H) ++#ifdef HAVE_MAX_ARG_STRLEN ++/* MAX_ARG_STRLEN is the only reason we need these headers. */ + #include + #include + #endif +@@ -261,7 +262,7 @@ run_from_fork(int pipe[2], int err_only, char cmd[]) + char ** + make_execv_array(char shell[], char cmd[]) + { +-#ifdef MAX_ARG_STRLEN ++#ifdef HAVE_MAX_ARG_STRLEN + /* Don't use maximum length, leave some room or commands fail to run. */ + const size_t safe_arg_len = MIN(MAX_ARG_STRLEN, MAX_ARG_STRLEN - 4096U); + const size_t npieces = DIV_ROUND_UP(strlen(cmd 100 4114 0 4114 0 0 6979 0 --:--:-- --:--:-- --:--:-- 6972 +), safe_arg_len); diff --git a/vifm.spec b/vifm.spec index 17362ae..9fecb0e 100644 --- a/vifm.spec +++ b/vifm.spec @@ -9,8 +9,10 @@ Summary: Lightweight file manager with vi like key-bindings Group: Applications/File License: GPLv2+ -URL: http://%{name}.sourceforge.net/ +URL: http://vifm.info/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 +# https://github.com/vifm/vifm/commit/be821157bb9c22ac1928c2f0e9b189880ce77505 (issue #103) +Patch0: vifm-0.8-aarch64.patch %if %{with gtk} BuildRequires: pkgconfig(glib-2.0) From c1655f2abbd042bae629bec393e879ffa6845827 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Mon, 20 Jul 2015 19:08:58 -0400 Subject: [PATCH 30/82] apply patch and regenerate configure --- vifm.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/vifm.spec b/vifm.spec index 9fecb0e..e29c9d7 100644 --- a/vifm.spec +++ b/vifm.spec @@ -14,6 +14,7 @@ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar. # https://github.com/vifm/vifm/commit/be821157bb9c22ac1928c2f0e9b189880ce77505 (issue #103) Patch0: vifm-0.8-aarch64.patch +BuildRequires: autoconf %if %{with gtk} BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gtk+-2.0) @@ -33,9 +34,13 @@ A ncurses based CLI file manager with vi like key-bindings %prep %setup -q +%patch0 -p1 -b .aarch64 %build +# autoreconf for Patch0 +autoreconf -if + %configure \ %if %{with gtk} --with-gtk=yes \ From 8c23073a34ba94c887003d8d7ee66029d15e8ec2 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Mon, 20 Jul 2015 19:15:40 -0400 Subject: [PATCH 31/82] respin patch (conflicts in the changelog) --- vifm-0.8-aarch64.patch | 125 +++++++++++++++++++++-------------------- vifm.spec | 1 + 2 files changed, 65 insertions(+), 61 deletions(-) diff --git a/vifm-0.8-aarch64.patch b/vifm-0.8-aarch64.patch index 99fad38..6a05e5e 100644 --- a/vifm-0.8-aarch64.patch +++ b/vifm-0.8-aarch64.patch @@ -1,52 +1,26 @@ -From be821157bb9c22ac1928c2f0e9b189880ce77505 Mon Sep 17 00:00:00 2001 -From: xaizek -Date: Mon, 20 Jul 2015 20:36:52 +0300 -Subject: [PATCH] Work around compilation on AArch64 GNU/Linux - -Or in general on systems where MAX_ARG_STRLEN is defined, but is -unusable (it's either shouldn't be defined or should work, not the -way it is at the moment). Thanks to Marcin Juszkiewicz (a.k.a. -hrw). ---- - ChangeLog | 3 +++ - THANKS | 1 + - config.h.in | 3 +++ - configure | 17 +++++++++++++++++ - configure.ac | 11 +++++++++++ - src/utils/utils_nix.c | 5 +++-- - 6 files changed, 38 insertions(+), 2 deletions(-) - -diff --git a/ChangeLog b/ChangeLog -index 837ed0c..772639c 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -22,6 +22,9 @@ +diff -u -r -U5 --no-dereference vifm-0.8/ChangeLog vifm-0.8.aarch64/ChangeLog +--- vifm-0.8/ChangeLog 2015-07-09 12:00:42.000000000 -0400 ++++ vifm-0.8.aarch64/ChangeLog 2015-07-20 19:14:11.292314611 -0400 +@@ -94,10 +94,13 @@ + Fixed crash/leak on processing of background jobs. Thanks to Christian + Fillion (a.k.a. cfillion). - Normalize surrounding spaces in menu and dialog titles. + Fixed several memory access errors and leaks. + Work around compilation on systems where MAX_ARG_STRLEN is defined, but + unusable. Thanks to Marcin Juszkiewicz (a.k.a. hrw). + - Fixed resetting "vborder" of 'fillchars' after it has been set to - something (as in `:set fillchars=vborder:\* fillchars&`). + 0.7.8 to 0.8-beta + + Removed per-view last search pattern. Don't worry, you probably won't + even notice it: this doesn't affect regular use case, rather more exotic + one, which is hard to notice. +diff -u -r -U5 --no-dereference vifm-0.8/config.h.in vifm-0.8.aarch64/config.h.in +--- vifm-0.8/config.h.in 2015-07-09 12:01:49.000000000 -0400 ++++ vifm-0.8.aarch64/config.h.in 2015-07-20 19:13:41.539062375 -0400 +@@ -41,10 +41,13 @@ + #undef HAVE_LINUX_BINFMTS_H -diff --git a/THANKS b/THANKS -index 7f4ae95..93c4322 100644 ---- a/THANKS -+++ b/THANKS -@@ -53,6 +53,7 @@ lcj - Lomov Vladimir (lomov_vl) - lyuts - MadMaverick9 -+Marcin Juszkiewicz (hrw) - Martin Fischer - Marton Balazs (balmar) - Merovius -diff --git a/config.h.in b/config.h.in -index 9ad2014..6fa0c5a 100644 ---- a/config.h.in -+++ b/config.h.in -@@ -43,6 +43,9 @@ /* malloc.h header is available. */ #undef HAVE_MALLOC_H @@ -56,11 +30,14 @@ index 9ad2014..6fa0c5a 100644 /* Define to 1 if you have the header file. */ #undef HAVE_MEMORY_H -diff --git a/configure b/configure -index f7ae7d5..3cfc647 100755 ---- a/configure -+++ b/configure -@@ -6315,6 +6315,23 @@ fi + /* Define to 1 if you have the header file. */ + #undef HAVE_MNTENT_H +diff -u -r -U5 --no-dereference vifm-0.8/configure vifm-0.8.aarch64/configure +--- vifm-0.8/configure 2015-07-09 12:01:49.000000000 -0400 ++++ vifm-0.8.aarch64/configure 2015-07-20 19:13:41.541062392 -0400 +@@ -6313,10 +6313,27 @@ + + fi done @@ -84,11 +61,14 @@ index f7ae7d5..3cfc647 100755 ac_fn_c_check_type "$LINENO" "uid_t" "ac_cv_type_uid_t" "$ac_includes_default" if test "x$ac_cv_type_uid_t" = xyes; then : -diff --git a/configure.ac b/configure.ac -index ee0200b..a81afc6 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -74,6 +74,17 @@ AC_CHECK_HEADER([wchar.h], [], [AC_MSG_ERROR([wchar.h header not found.])]) + + fi +diff -u -r -U5 --no-dereference vifm-0.8/configure.ac vifm-0.8.aarch64/configure.ac +--- vifm-0.8/configure.ac 2015-07-09 12:00:42.000000000 -0400 ++++ vifm-0.8.aarch64/configure.ac 2015-07-20 19:13:41.542062401 -0400 +@@ -72,10 +72,21 @@ + AC_CHECK_HEADER([unistd.h], [], [AC_MSG_ERROR([unistd.h header not found.])]) + AC_CHECK_HEADER([wchar.h], [], [AC_MSG_ERROR([wchar.h header not found.])]) AC_CHECK_HEADER([wctype.h], [], [AC_MSG_ERROR([wctype.h header not found.])]) dnl Headers required for breaking too long command-lines. AC_CHECK_HEADERS([sys/user.h linux/binfmts.h]) @@ -106,11 +86,14 @@ index ee0200b..a81afc6 100644 dnl Check for various system types. AC_CHECK_TYPE([uid_t]) -diff --git a/src/utils/utils_nix.c b/src/utils/utils_nix.c -index 31efc0f..1d6a33d 100644 ---- a/src/utils/utils_nix.c -+++ b/src/utils/utils_nix.c -@@ -20,7 +20,8 @@ + AC_CHECK_TYPE([gid_t]) + AC_CHECK_TYPE([mode_t]) +diff -u -r -U5 --no-dereference vifm-0.8/src/utils/utils_nix.c vifm-0.8.aarch64/src/utils/utils_nix.c +--- vifm-0.8/src/utils/utils_nix.c 2015-07-09 12:00:42.000000000 -0400 ++++ vifm-0.8.aarch64/src/utils/utils_nix.c 2015-07-20 19:13:41.542062401 -0400 +@@ -18,11 +18,12 @@ + */ + #include "utils_nix.h" #include "utils_int.h" @@ -120,7 +103,11 @@ index 31efc0f..1d6a33d 100644 #include #include #endif -@@ -261,7 +262,7 @@ run_from_fork(int pipe[2], int err_only, char cmd[]) + + #include /* select() FD_SET FD_ZERO */ +@@ -258,11 +259,11 @@ + } + char ** make_execv_array(char shell[], char cmd[]) { @@ -128,5 +115,21 @@ index 31efc0f..1d6a33d 100644 +#ifdef HAVE_MAX_ARG_STRLEN /* Don't use maximum length, leave some room or commands fail to run. */ const size_t safe_arg_len = MIN(MAX_ARG_STRLEN, MAX_ARG_STRLEN - 4096U); - const size_t npieces = DIV_ROUND_UP(strlen(cmd 100 4114 0 4114 0 0 6979 0 --:--:-- --:--:-- --:--:-- 6972 -), safe_arg_len); + const size_t npieces = DIV_ROUND_UP(strlen(cmd), safe_arg_len); + #else + /* Actual value doesn't matter in this case. */ +diff -u -r -U5 --no-dereference vifm-0.8/THANKS vifm-0.8.aarch64/THANKS +--- vifm-0.8/THANKS 2015-07-09 12:00:42.000000000 -0400 ++++ vifm-0.8.aarch64/THANKS 2015-07-20 19:13:41.539062375 -0400 +@@ -51,10 +51,11 @@ + Larry Hynes (larryhynes) + lcj + Lomov Vladimir (lomov_vl) + lyuts + MadMaverick9 ++Marcin Juszkiewicz (hrw) + Martin Fischer + Marton Balazs (balmar) + Merovius + Michael Kopp + Michael Maddern (madders) diff --git a/vifm.spec b/vifm.spec index e29c9d7..a609056 100644 --- a/vifm.spec +++ b/vifm.spec @@ -12,6 +12,7 @@ License: GPLv2+ URL: http://vifm.info/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 # https://github.com/vifm/vifm/commit/be821157bb9c22ac1928c2f0e9b189880ce77505 (issue #103) +# Patch respun for conflicts. Patch0: vifm-0.8-aarch64.patch BuildRequires: autoconf From 046271c844075165af5b9de9e71742a82d32df33 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Mon, 20 Jul 2015 19:21:24 -0400 Subject: [PATCH 32/82] add automake BR --- vifm.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/vifm.spec b/vifm.spec index a609056..099dd3c 100644 --- a/vifm.spec +++ b/vifm.spec @@ -16,6 +16,7 @@ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar. Patch0: vifm-0.8-aarch64.patch BuildRequires: autoconf +BuildRequires: automake %if %{with gtk} BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gtk+-2.0) From 93e489e26f6a73ab9836bef44c3697c109fac06f Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Sun, 2 Aug 2015 12:31:31 -0400 Subject: [PATCH 33/82] use %make_install --- vifm.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vifm.spec b/vifm.spec index 099dd3c..5bf527c 100644 --- a/vifm.spec +++ b/vifm.spec @@ -63,7 +63,7 @@ make %{?_smp_mflags} %install -make install DESTDIR=%{buildroot} INSTALL="install -p" +%make_install INSTALL="install -p" desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop From 9629a608c46adf1e8f2e939d74c23757eedcdfb8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 5 Feb 2016 02:41:45 +0000 Subject: [PATCH 34/82] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- vifm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vifm.spec b/vifm.spec index 5bf527c..72fdc8b 100644 --- a/vifm.spec +++ b/vifm.spec @@ -4,7 +4,7 @@ Name: vifm Version: 0.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Lightweight file manager with vi like key-bindings Group: Applications/File @@ -82,6 +82,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop %changelog +* Fri Feb 05 2016 Fedora Release Engineering - 0.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Sun Jul 19 2015 Ben Boeckel - 0.8-1 - Update to 0.8 From b1911388c07fa35708a7c08bae6973bbf722f6c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= Date: Wed, 30 Mar 2016 20:23:38 -0400 Subject: [PATCH 35/82] Let vifm install documentation files --- vifm.spec | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/vifm.spec b/vifm.spec index 72fdc8b..7d65b52 100644 --- a/vifm.spec +++ b/vifm.spec @@ -4,7 +4,7 @@ Name: vifm Version: 0.8 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Lightweight file manager with vi like key-bindings Group: Applications/File @@ -65,12 +65,14 @@ make %{?_smp_mflags} %install %make_install INSTALL="install -p" -desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop +rm %{buildroot}%{_pkgdocdir}/COPYING + +desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop %files -%defattr(-,root,root,-) -%doc AUTHORS BUGS ChangeLog COPYING README TODO +%license COPYING +%{_pkgdocdir}/ %{_bindir}/%{name} %{_bindir}/vifm-convert-dircolors %{_bindir}/vifm-pause @@ -82,6 +84,11 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop %changelog +* Wed Mar 23 2016 Ralf Corsépius - 0.8-3 +- Install docs directly into %%{_pkgdocdir} (F24FTBFS, RHBZ#1308228). +- Add %%license. +- Modernize spec. + * Fri Feb 05 2016 Fedora Release Engineering - 0.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From b693ab13b1ae970a285a9b5a991aecfcc8d2ea4d Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Sat, 23 Apr 2016 20:40:20 -0400 Subject: [PATCH 36/82] update to 0.8.1a --- .gitignore | 1 + sources | 2 +- vifm-0.8-aarch64.patch | 135 ----------------------------------------- vifm.spec | 11 ++-- 4 files changed, 7 insertions(+), 142 deletions(-) delete mode 100644 vifm-0.8-aarch64.patch diff --git a/.gitignore b/.gitignore index bd8adff..5398de2 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ vifm-0.5.tar.bz2 /vifm-0.7.6.tar.bz2 /vifm-0.7.8.tar.bz2 /vifm-0.8.tar.bz2 +/vifm-0.8.1a.tar.bz2 diff --git a/sources b/sources index 259fa3c..07c8f20 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e28258ba36e062a2852ea06bd5bfa0cb vifm-0.8.tar.bz2 +5f7b57d4c83fe84f3f86b59d3cea489d vifm-0.8.1a.tar.bz2 diff --git a/vifm-0.8-aarch64.patch b/vifm-0.8-aarch64.patch deleted file mode 100644 index 6a05e5e..0000000 --- a/vifm-0.8-aarch64.patch +++ /dev/null @@ -1,135 +0,0 @@ -diff -u -r -U5 --no-dereference vifm-0.8/ChangeLog vifm-0.8.aarch64/ChangeLog ---- vifm-0.8/ChangeLog 2015-07-09 12:00:42.000000000 -0400 -+++ vifm-0.8.aarch64/ChangeLog 2015-07-20 19:14:11.292314611 -0400 -@@ -94,10 +94,13 @@ - Fixed crash/leak on processing of background jobs. Thanks to Christian - Fillion (a.k.a. cfillion). - - Fixed several memory access errors and leaks. - -+ Work around compilation on systems where MAX_ARG_STRLEN is defined, but -+ unusable. Thanks to Marcin Juszkiewicz (a.k.a. hrw). -+ - 0.7.8 to 0.8-beta - - Removed per-view last search pattern. Don't worry, you probably won't - even notice it: this doesn't affect regular use case, rather more exotic - one, which is hard to notice. -diff -u -r -U5 --no-dereference vifm-0.8/config.h.in vifm-0.8.aarch64/config.h.in ---- vifm-0.8/config.h.in 2015-07-09 12:01:49.000000000 -0400 -+++ vifm-0.8.aarch64/config.h.in 2015-07-20 19:13:41.539062375 -0400 -@@ -41,10 +41,13 @@ - #undef HAVE_LINUX_BINFMTS_H - - /* malloc.h header is available. */ - #undef HAVE_MALLOC_H - -+/* MAX_ARG_STRLEN is available. */ -+#undef HAVE_MAX_ARG_STRLEN -+ - /* Define to 1 if you have the header file. */ - #undef HAVE_MEMORY_H - - /* Define to 1 if you have the header file. */ - #undef HAVE_MNTENT_H -diff -u -r -U5 --no-dereference vifm-0.8/configure vifm-0.8.aarch64/configure ---- vifm-0.8/configure 2015-07-09 12:01:49.000000000 -0400 -+++ vifm-0.8.aarch64/configure 2015-07-20 19:13:41.541062392 -0400 -@@ -6313,10 +6313,27 @@ - - fi - - done - -+if test "$ac_cv_header_sys_user_h" = yes -a "$ac_cv_header_linux_binfmts_h" = yes; then -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+ #include -+ #include -+ int main() { (void)MAX_ARG_STRLEN; return 0; } -+ -+ -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ -+$as_echo "#define HAVE_MAX_ARG_STRLEN 1" >>confdefs.h -+ -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi - - ac_fn_c_check_type "$LINENO" "uid_t" "ac_cv_type_uid_t" "$ac_includes_default" - if test "x$ac_cv_type_uid_t" = xyes; then : - - fi -diff -u -r -U5 --no-dereference vifm-0.8/configure.ac vifm-0.8.aarch64/configure.ac ---- vifm-0.8/configure.ac 2015-07-09 12:00:42.000000000 -0400 -+++ vifm-0.8.aarch64/configure.ac 2015-07-20 19:13:41.542062401 -0400 -@@ -72,10 +72,21 @@ - AC_CHECK_HEADER([unistd.h], [], [AC_MSG_ERROR([unistd.h header not found.])]) - AC_CHECK_HEADER([wchar.h], [], [AC_MSG_ERROR([wchar.h header not found.])]) - AC_CHECK_HEADER([wctype.h], [], [AC_MSG_ERROR([wctype.h header not found.])]) - dnl Headers required for breaking too long command-lines. - AC_CHECK_HEADERS([sys/user.h linux/binfmts.h]) -+if test "$ac_cv_header_sys_user_h" = yes -a "$ac_cv_header_linux_binfmts_h" = yes; then -+ AC_COMPILE_IFELSE( -+ AC_LANG_SOURCE( -+ [[ -+ #include -+ #include -+ int main() { (void)MAX_ARG_STRLEN; return 0; } -+ ]] -+ ), -+ [AC_DEFINE([HAVE_MAX_ARG_STRLEN], [1], [MAX_ARG_STRLEN is available.])]) -+fi - - dnl Check for various system types. - AC_CHECK_TYPE([uid_t]) - AC_CHECK_TYPE([gid_t]) - AC_CHECK_TYPE([mode_t]) -diff -u -r -U5 --no-dereference vifm-0.8/src/utils/utils_nix.c vifm-0.8.aarch64/src/utils/utils_nix.c ---- vifm-0.8/src/utils/utils_nix.c 2015-07-09 12:00:42.000000000 -0400 -+++ vifm-0.8.aarch64/src/utils/utils_nix.c 2015-07-20 19:13:41.542062401 -0400 -@@ -18,11 +18,12 @@ - */ - - #include "utils_nix.h" - #include "utils_int.h" - --#if defined (HAVE_LINUX_BINFMTS_H) && defined (HAVE_SYS_USER_H) -+#ifdef HAVE_MAX_ARG_STRLEN -+/* MAX_ARG_STRLEN is the only reason we need these headers. */ - #include - #include - #endif - - #include /* select() FD_SET FD_ZERO */ -@@ -258,11 +259,11 @@ - } - - char ** - make_execv_array(char shell[], char cmd[]) - { --#ifdef MAX_ARG_STRLEN -+#ifdef HAVE_MAX_ARG_STRLEN - /* Don't use maximum length, leave some room or commands fail to run. */ - const size_t safe_arg_len = MIN(MAX_ARG_STRLEN, MAX_ARG_STRLEN - 4096U); - const size_t npieces = DIV_ROUND_UP(strlen(cmd), safe_arg_len); - #else - /* Actual value doesn't matter in this case. */ -diff -u -r -U5 --no-dereference vifm-0.8/THANKS vifm-0.8.aarch64/THANKS ---- vifm-0.8/THANKS 2015-07-09 12:00:42.000000000 -0400 -+++ vifm-0.8.aarch64/THANKS 2015-07-20 19:13:41.539062375 -0400 -@@ -51,10 +51,11 @@ - Larry Hynes (larryhynes) - lcj - Lomov Vladimir (lomov_vl) - lyuts - MadMaverick9 -+Marcin Juszkiewicz (hrw) - Martin Fischer - Marton Balazs (balmar) - Merovius - Michael Kopp - Michael Maddern (madders) diff --git a/vifm.spec b/vifm.spec index 7d65b52..66c8ce1 100644 --- a/vifm.spec +++ b/vifm.spec @@ -3,17 +3,14 @@ %bcond_with x11 Name: vifm -Version: 0.8 -Release: 3%{?dist} +Version: 0.8.1a +Release: 1%{?dist} Summary: Lightweight file manager with vi like key-bindings Group: Applications/File License: GPLv2+ URL: http://vifm.info/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 -# https://github.com/vifm/vifm/commit/be821157bb9c22ac1928c2f0e9b189880ce77505 (issue #103) -# Patch respun for conflicts. -Patch0: vifm-0.8-aarch64.patch BuildRequires: autoconf BuildRequires: automake @@ -36,7 +33,6 @@ A ncurses based CLI file manager with vi like key-bindings %prep %setup -q -%patch0 -p1 -b .aarch64 %build @@ -84,6 +80,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop %changelog +* Sat Apr 23 2016 Ben Boeckel - 0.8.1a-1 +- update to 0.8.1a + * Wed Mar 23 2016 Ralf Corsépius - 0.8-3 - Install docs directly into %%{_pkgdocdir} (F24FTBFS, RHBZ#1308228). - Add %%license. From 71551fec85c5e0c0efca9adf00c3477364ba29ae Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Sat, 23 Apr 2016 20:45:41 -0400 Subject: [PATCH 37/82] remove vifmrc-converter --- vifm.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/vifm.spec b/vifm.spec index 66c8ce1..18f864c 100644 --- a/vifm.spec +++ b/vifm.spec @@ -72,7 +72,6 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop %{_bindir}/%{name} %{_bindir}/vifm-convert-dircolors %{_bindir}/vifm-pause -%{_bindir}/vifmrc-converter %{_mandir}/man1/*.1.gz %{_datadir}/applications/%{name}.desktop %{_datadir}/pixmaps/%{name}.png From ba77d3f1d9128d9d763686ba26099410eaccdea4 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Sat, 23 Apr 2016 20:51:37 -0400 Subject: [PATCH 38/82] package vifm-screen-split --- vifm.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/vifm.spec b/vifm.spec index 18f864c..c4c9f9e 100644 --- a/vifm.spec +++ b/vifm.spec @@ -72,6 +72,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop %{_bindir}/%{name} %{_bindir}/vifm-convert-dircolors %{_bindir}/vifm-pause +%{_bindir}/vifm-screen-split %{_mandir}/man1/*.1.gz %{_datadir}/applications/%{name}.desktop %{_datadir}/pixmaps/%{name}.png From fa07e4ad0fe46f90b826917fb2a4db41b830d213 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Fri, 24 Jun 2016 09:38:56 +0200 Subject: [PATCH 39/82] Mandatory Perl build-requires added --- vifm.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/vifm.spec b/vifm.spec index c4c9f9e..28ae2da 100644 --- a/vifm.spec +++ b/vifm.spec @@ -14,6 +14,7 @@ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar. BuildRequires: autoconf BuildRequires: automake +BuildRequires: perl-generators %if %{with gtk} BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gtk+-2.0) From ec299ea1a9d1290d636ed53ce748fd70185d4c4f Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Sat, 23 Jul 2016 23:05:06 -0400 Subject: [PATCH 40/82] update to 0.8.2 --- .gitignore | 1 + sources | 2 +- vifm.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 5398de2..e26e0c5 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ vifm-0.5.tar.bz2 /vifm-0.7.8.tar.bz2 /vifm-0.8.tar.bz2 /vifm-0.8.1a.tar.bz2 +/vifm-0.8.2.tar.bz2 diff --git a/sources b/sources index 07c8f20..79a5beb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5f7b57d4c83fe84f3f86b59d3cea489d vifm-0.8.1a.tar.bz2 +925fa713a9694be6fb5ff6f7c3c0b101 vifm-0.8.2.tar.bz2 diff --git a/vifm.spec b/vifm.spec index 28ae2da..2705717 100644 --- a/vifm.spec +++ b/vifm.spec @@ -3,7 +3,7 @@ %bcond_with x11 Name: vifm -Version: 0.8.1a +Version: 0.8.2 Release: 1%{?dist} Summary: Lightweight file manager with vi like key-bindings @@ -81,6 +81,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop %changelog +* Sat Jul 23 2016 Ben Boeckel - 0.8.2-1 +- update to 0.8.2 + * Sat Apr 23 2016 Ben Boeckel - 0.8.1a-1 - update to 0.8.1a From e86b0bbe6fb7ebb8dcc1099e8c4df62a8dce0a9b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 17:04:12 +0000 Subject: [PATCH 41/82] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- vifm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vifm.spec b/vifm.spec index 2705717..0d87908 100644 --- a/vifm.spec +++ b/vifm.spec @@ -4,7 +4,7 @@ Name: vifm Version: 0.8.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Lightweight file manager with vi like key-bindings Group: Applications/File @@ -81,6 +81,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 0.8.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Sat Jul 23 2016 Ben Boeckel - 0.8.2-1 - update to 0.8.2 From b794a8853c420ab2c01aae7e1c3d5a7d68a213f2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 21:18:12 +0000 Subject: [PATCH 42/82] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- vifm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vifm.spec b/vifm.spec index 0d87908..399d43f 100644 --- a/vifm.spec +++ b/vifm.spec @@ -4,7 +4,7 @@ Name: vifm Version: 0.8.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Lightweight file manager with vi like key-bindings Group: Applications/File @@ -81,6 +81,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 0.8.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Sat Feb 11 2017 Fedora Release Engineering - 0.8.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 03ab1dcb28059fa82084377c0dced7947ee64fce Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 10:03:31 +0000 Subject: [PATCH 43/82] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- vifm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vifm.spec b/vifm.spec index 399d43f..3e9fb8b 100644 --- a/vifm.spec +++ b/vifm.spec @@ -4,7 +4,7 @@ Name: vifm Version: 0.8.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Lightweight file manager with vi like key-bindings Group: Applications/File @@ -81,6 +81,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 0.8.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 0.8.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From b0a3ed197389cd3c0a121276ed486ecc2f6fb3ae Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 20:29:42 +0000 Subject: [PATCH 44/82] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vifm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vifm.spec b/vifm.spec index 3e9fb8b..d976549 100644 --- a/vifm.spec +++ b/vifm.spec @@ -4,7 +4,7 @@ Name: vifm Version: 0.8.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Lightweight file manager with vi like key-bindings Group: Applications/File @@ -81,6 +81,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 0.8.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Aug 03 2017 Fedora Release Engineering - 0.8.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From 90c023633782717e1ac5a6bbe758a17d8646f602 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 9 Jul 2018 19:06:53 +0200 Subject: [PATCH 45/82] add BuildRequires: gcc Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot --- vifm.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/vifm.spec b/vifm.spec index d976549..ed8dc66 100644 --- a/vifm.spec +++ b/vifm.spec @@ -12,6 +12,7 @@ License: GPLv2+ URL: http://vifm.info/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 +BuildRequires: gcc BuildRequires: autoconf BuildRequires: automake BuildRequires: perl-generators From be284ad2c1fb31954cb54142cd52939ffbf017bd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 08:31:53 +0000 Subject: [PATCH 46/82] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vifm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vifm.spec b/vifm.spec index ed8dc66..db319f0 100644 --- a/vifm.spec +++ b/vifm.spec @@ -4,7 +4,7 @@ Name: vifm Version: 0.8.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Lightweight file manager with vi like key-bindings Group: Applications/File @@ -82,6 +82,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 0.8.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Fri Feb 09 2018 Fedora Release Engineering - 0.8.2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From e4182528544f8fc2eda8eba62f7f0331fca9d1a5 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:18:29 +0100 Subject: [PATCH 47/82] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- vifm.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/vifm.spec b/vifm.spec index db319f0..4ee8c50 100644 --- a/vifm.spec +++ b/vifm.spec @@ -7,7 +7,6 @@ Version: 0.8.2 Release: 6%{?dist} Summary: Lightweight file manager with vi like key-bindings -Group: Applications/File License: GPLv2+ URL: http://vifm.info/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 From d402e158442d8dab158c6acc90148ab951876de8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 11:16:10 +0000 Subject: [PATCH 48/82] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vifm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vifm.spec b/vifm.spec index 4ee8c50..96d8305 100644 --- a/vifm.spec +++ b/vifm.spec @@ -4,7 +4,7 @@ Name: vifm Version: 0.8.2 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Lightweight file manager with vi like key-bindings License: GPLv2+ @@ -81,6 +81,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 0.8.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sat Jul 14 2018 Fedora Release Engineering - 0.8.2-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 44d81dc91610b1dc5d42cb8ff16efc8f475af02c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Thu, 11 Jul 2019 15:04:31 +0200 Subject: [PATCH 49/82] Fix building with glibc 2.25 --- ...nally-display-device-ID-in-file-info.patch | 64 +++++++++++++++++++ vifm.spec | 8 ++- 2 files changed, 71 insertions(+), 1 deletion(-) create mode 100644 vifm-0.8.2-Conditionally-display-device-ID-in-file-info.patch diff --git a/vifm-0.8.2-Conditionally-display-device-ID-in-file-info.patch b/vifm-0.8.2-Conditionally-display-device-ID-in-file-info.patch new file mode 100644 index 0000000..1d935c8 --- /dev/null +++ b/vifm-0.8.2-Conditionally-display-device-ID-in-file-info.patch @@ -0,0 +1,64 @@ +From fdc939f21c5e3c28bb529417de0e20ee3d94c2d8 Mon Sep 17 00:00:00 2001 +From: xaizek +Date: Fri, 7 Jul 2017 20:25:54 +0300 +Subject: [PATCH] Conditionally display device ID in file info +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Check whether major and minor macros are available, they aren't +defined in POSIX. + +Thanks to Robert Sarkozi. + +Petr Písař: Ported from df383c6adab6342cbb2177527917caed7400b207 to +0.8.2. + +Signed-off-by: Petr Písař +--- + src/modes/file_info.c | 22 +++++++++++++--------- + 1 file changed, 13 insertions(+), 9 deletions(-) + +diff --git a/src/modes/file_info.c b/src/modes/file_info.c +index a541255..b1a9b29 100644 +--- a/src/modes/file_info.c ++++ b/src/modes/file_info.c +@@ -316,22 +316,26 @@ show_file_type(FileView *view, int curr_y) + const char *const type = (entry->type == FT_CHAR_DEV) + ? "Character Device" + : "Block Device"; +- char full_path[PATH_MAX]; +- struct stat st; + + mvwaddstr(menu_win, curr_y, 8, type); + +- get_current_full_path(view, sizeof(full_path), full_path); +- if(os_stat(full_path, &st) == 0) ++#if defined(major) && defined(minor) + { +- char info[64]; ++ char full_path[PATH_MAX]; ++ struct stat st; ++ get_current_full_path(view, sizeof(full_path), full_path); ++ if(os_stat(full_path, &st) == 0) ++ { ++ char info[64]; + +- snprintf(info, sizeof(info), "Device Id: 0x%x:0x%x", major(st.st_rdev), +- minor(st.st_rdev)); ++ snprintf(info, sizeof(info), "Device Id: 0x%x:0x%x", major(st.st_rdev), ++ minor(st.st_rdev)); + +- curr_y += 2; +- mvwaddstr(menu_win, curr_y, 2, info); ++ curr_y += 2; ++ mvwaddstr(menu_win, curr_y, 2, info); ++ } + } ++#endif + } + else if(entry->type == FT_SOCK) + { +-- +2.20.1 + diff --git a/vifm.spec b/vifm.spec index 96d8305..3fd10e3 100644 --- a/vifm.spec +++ b/vifm.spec @@ -4,12 +4,14 @@ Name: vifm Version: 0.8.2 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Lightweight file manager with vi like key-bindings License: GPLv2+ URL: http://vifm.info/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 +# Fix building with glibc 2.25, bug #1606644, in upstream after 0.9 +Patch0: vifm-0.8.2-Conditionally-display-device-ID-in-file-info.patch BuildRequires: gcc BuildRequires: autoconf @@ -34,6 +36,7 @@ A ncurses based CLI file manager with vi like key-bindings %prep %setup -q +%patch0 -p1 %build @@ -81,6 +84,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop %changelog +* Thu Jul 11 2019 Petr Pisar - 0.8.2-8 +- Fix building with glibc 2.25 (bug #1606644) + * Sun Feb 03 2019 Fedora Release Engineering - 0.8.2-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 2c70cc0d49e6fad8c771a2ec5bb527064dbd4def Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 02:58:21 +0000 Subject: [PATCH 50/82] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vifm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vifm.spec b/vifm.spec index 3fd10e3..3c1d650 100644 --- a/vifm.spec +++ b/vifm.spec @@ -4,7 +4,7 @@ Name: vifm Version: 0.8.2 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Lightweight file manager with vi like key-bindings License: GPLv2+ @@ -84,6 +84,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 0.8.2-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Thu Jul 11 2019 Petr Pisar - 0.8.2-8 - Fix building with glibc 2.25 (bug #1606644) From 80355d39072182e3d363b862684069c4d1f7bfa4 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Tue, 29 Oct 2019 23:12:49 -0400 Subject: [PATCH 51/82] Update to 0.10.1 (rhbz#1462578) --- .gitignore | 1 + sources | 2 +- ...nally-display-device-ID-in-file-info.patch | 64 ------------------- vifm.spec | 15 ++--- 4 files changed, 8 insertions(+), 74 deletions(-) delete mode 100644 vifm-0.8.2-Conditionally-display-device-ID-in-file-info.patch diff --git a/.gitignore b/.gitignore index e26e0c5..d52a14e 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ vifm-0.5.tar.bz2 /vifm-0.8.tar.bz2 /vifm-0.8.1a.tar.bz2 /vifm-0.8.2.tar.bz2 +/vifm-0.10.1.tar.bz2 diff --git a/sources b/sources index 79a5beb..59825a5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -925fa713a9694be6fb5ff6f7c3c0b101 vifm-0.8.2.tar.bz2 +SHA512 (vifm-0.10.1.tar.bz2) = 8116c4c31b01a9453684a90b26b87a33e5ec2cd2930162869507f673319d231f44e464d1056239f647531c3be5bc9bcf92045c79e5d545f9c75be11c7fe03ea2 diff --git a/vifm-0.8.2-Conditionally-display-device-ID-in-file-info.patch b/vifm-0.8.2-Conditionally-display-device-ID-in-file-info.patch deleted file mode 100644 index 1d935c8..0000000 --- a/vifm-0.8.2-Conditionally-display-device-ID-in-file-info.patch +++ /dev/null @@ -1,64 +0,0 @@ -From fdc939f21c5e3c28bb529417de0e20ee3d94c2d8 Mon Sep 17 00:00:00 2001 -From: xaizek -Date: Fri, 7 Jul 2017 20:25:54 +0300 -Subject: [PATCH] Conditionally display device ID in file info -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Check whether major and minor macros are available, they aren't -defined in POSIX. - -Thanks to Robert Sarkozi. - -Petr Písař: Ported from df383c6adab6342cbb2177527917caed7400b207 to -0.8.2. - -Signed-off-by: Petr Písař ---- - src/modes/file_info.c | 22 +++++++++++++--------- - 1 file changed, 13 insertions(+), 9 deletions(-) - -diff --git a/src/modes/file_info.c b/src/modes/file_info.c -index a541255..b1a9b29 100644 ---- a/src/modes/file_info.c -+++ b/src/modes/file_info.c -@@ -316,22 +316,26 @@ show_file_type(FileView *view, int curr_y) - const char *const type = (entry->type == FT_CHAR_DEV) - ? "Character Device" - : "Block Device"; -- char full_path[PATH_MAX]; -- struct stat st; - - mvwaddstr(menu_win, curr_y, 8, type); - -- get_current_full_path(view, sizeof(full_path), full_path); -- if(os_stat(full_path, &st) == 0) -+#if defined(major) && defined(minor) - { -- char info[64]; -+ char full_path[PATH_MAX]; -+ struct stat st; -+ get_current_full_path(view, sizeof(full_path), full_path); -+ if(os_stat(full_path, &st) == 0) -+ { -+ char info[64]; - -- snprintf(info, sizeof(info), "Device Id: 0x%x:0x%x", major(st.st_rdev), -- minor(st.st_rdev)); -+ snprintf(info, sizeof(info), "Device Id: 0x%x:0x%x", major(st.st_rdev), -+ minor(st.st_rdev)); - -- curr_y += 2; -- mvwaddstr(menu_win, curr_y, 2, info); -+ curr_y += 2; -+ mvwaddstr(menu_win, curr_y, 2, info); -+ } - } -+#endif - } - else if(entry->type == FT_SOCK) - { --- -2.20.1 - diff --git a/vifm.spec b/vifm.spec index 3c1d650..9316af1 100644 --- a/vifm.spec +++ b/vifm.spec @@ -3,15 +3,13 @@ %bcond_with x11 Name: vifm -Version: 0.8.2 -Release: 9%{?dist} +Version: 0.10.1 +Release: 1%{?dist} Summary: Lightweight file manager with vi like key-bindings License: GPLv2+ URL: http://vifm.info/ -Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 -# Fix building with glibc 2.25, bug #1606644, in upstream after 0.9 -Patch0: vifm-0.8.2-Conditionally-display-device-ID-in-file-info.patch +Source0: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.bz2 BuildRequires: gcc BuildRequires: autoconf @@ -36,13 +34,9 @@ A ncurses based CLI file manager with vi like key-bindings %prep %setup -q -%patch0 -p1 %build -# autoreconf for Patch0 -autoreconf -if - %configure \ %if %{with gtk} --with-gtk=yes \ @@ -84,6 +78,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop %changelog +* Tue Oct 29 2019 Ben Boeckel - 0.10.1-1 +- Update to 0.10.1 (rhbz#1462578) + * Sat Jul 27 2019 Fedora Release Engineering - 0.8.2-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From f978ab9a1c4c72a874e4e5d1e5d2929d50442f21 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Tue, 29 Oct 2019 23:18:54 -0400 Subject: [PATCH 52/82] Remove vifm-media-osx script --- vifm.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/vifm.spec b/vifm.spec index 9316af1..25c4d8c 100644 --- a/vifm.spec +++ b/vifm.spec @@ -60,6 +60,7 @@ make %{?_smp_mflags} %make_install INSTALL="install -p" rm %{buildroot}%{_pkgdocdir}/COPYING +rm %{buildroot}%{_datadir}/%{name}/vifm-media-osx desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop @@ -80,6 +81,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop %changelog * Tue Oct 29 2019 Ben Boeckel - 0.10.1-1 - Update to 0.10.1 (rhbz#1462578) +- Remove vifm-media-osx script * Sat Jul 27 2019 Fedora Release Engineering - 0.8.2-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From fba181a3614085bf3bf62de3c8e780d347374935 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 03:08:01 +0000 Subject: [PATCH 53/82] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vifm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vifm.spec b/vifm.spec index 25c4d8c..16d9ef5 100644 --- a/vifm.spec +++ b/vifm.spec @@ -4,7 +4,7 @@ Name: vifm Version: 0.10.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Lightweight file manager with vi like key-bindings License: GPLv2+ @@ -79,6 +79,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 0.10.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Tue Oct 29 2019 Ben Boeckel - 0.10.1-1 - Update to 0.10.1 (rhbz#1462578) - Remove vifm-media-osx script From 0f14b14fcccb48dc6c39434323e6416ac518acbf Mon Sep 17 00:00:00 2001 From: Artem Polishchuk Date: Mon, 6 Apr 2020 22:14:07 +0300 Subject: [PATCH 54/82] Update package and fix FTBFS | RHBZ#1800234 --- vifm.spec | 65 ++++++++++++++++++++++++++++++++++++------------------- 1 file changed, 43 insertions(+), 22 deletions(-) diff --git a/vifm.spec b/vifm.spec index 16d9ef5..7595afd 100644 --- a/vifm.spec +++ b/vifm.spec @@ -1,19 +1,26 @@ -%bcond_with gtk -%bcond_without libmagic -%bcond_with x11 +# Workaround for GCC 10 +# * https://gcc.gnu.org/gcc-10/porting_to.html#common +# * TODO: file a bug or pull upstream +%global _legacy_common_support 1 + +%bcond_with gtk +%bcond_without libmagic +%bcond_with x11 Name: vifm Version: 0.10.1 -Release: 2%{?dist} -Summary: Lightweight file manager with vi like key-bindings +Release: 3%{?dist} +Summary: File manager with curses interface, which provides Vi[m]-like environment License: GPLv2+ URL: http://vifm.info/ Source0: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.bz2 -BuildRequires: gcc BuildRequires: autoconf BuildRequires: automake +BuildRequires: desktop-file-utils +BuildRequires: gcc +BuildRequires: ncurses-devel BuildRequires: perl-generators %if %{with gtk} BuildRequires: pkgconfig(glib-2.0) @@ -25,15 +32,22 @@ BuildRequires: file-devel %if %{with x11} BuildRequires: libX11-devel %endif -BuildRequires: ncurses-devel -BuildRequires: desktop-file-utils %description -A ncurses based CLI file manager with vi like key-bindings +Vifm is a curses based vi[m] like file manager extended with some useful ideas +from mutt. If you use vi[m], vifm gives you complete keyboard control over your +files without having to learn a new set of commands. It goes not just about +vi[m] like keybindings, but also about modes, options, registers, commands and +other things you might already like in vi[m]. + +Just like vi[m], vifm tries to adhere to the Unix philosophy. So instead of +working solutions which are set in stone user is provided with a set of means +for customization of vifm to one's likings. Though builtin functionality should +be enough for most of use cases. %prep -%setup -q +%autosetup -p1 %build @@ -53,32 +67,39 @@ A ncurses based CLI file manager with vi like key-bindings %else --with-X11=no %endif -make %{?_smp_mflags} +%make_build %install -%make_install INSTALL="install -p" +%make_install -rm %{buildroot}%{_pkgdocdir}/COPYING -rm %{buildroot}%{_datadir}/%{name}/vifm-media-osx +rm %{buildroot}%{_pkgdocdir}/COPYING \ + %{buildroot}%{_datadir}/%{name}/vifm-media-osx -desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop + +%check +desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop %files %license COPYING -%{_pkgdocdir}/ %{_bindir}/%{name} -%{_bindir}/vifm-convert-dircolors -%{_bindir}/vifm-pause -%{_bindir}/vifm-screen-split -%{_mandir}/man1/*.1.gz -%{_datadir}/applications/%{name}.desktop -%{_datadir}/pixmaps/%{name}.png +%{_bindir}/%{name}-convert-dircolors +%{_bindir}/%{name}-pause +%{_bindir}/%{name}-screen-split %{_datadir}/%{name}/ +%{_datadir}/applications/*.desktop +%{_datadir}/bash-completion/completions/%{name} +%{_datadir}/pixmaps/%{name}.png +%{_datadir}/zsh/site-functions/_%{name} +%{_mandir}/man1/* +%{_pkgdocdir}/ %changelog +* Mon Apr 06 2020 Artem Polishchuk - 0.10.1-3 +- Update package and fix FTBFS | RHBZ#1800234 + * Fri Jan 31 2020 Fedora Release Engineering - 0.10.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 52153694b90088b42f633b39a3bbcfd7ae75982d Mon Sep 17 00:00:00 2001 From: Artem Polishchuk Date: Mon, 6 Apr 2020 22:55:00 +0300 Subject: [PATCH 55/82] Add upstream bug report link for GCC 10 bug --- vifm.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vifm.spec b/vifm.spec index 7595afd..41828e2 100644 --- a/vifm.spec +++ b/vifm.spec @@ -1,6 +1,6 @@ # Workaround for GCC 10 # * https://gcc.gnu.org/gcc-10/porting_to.html#common -# * TODO: file a bug or pull upstream +# * https://github.com/vifm/vifm/issues/534 %global _legacy_common_support 1 %bcond_with gtk From 2926c941d189e6834aa0f9e108fd15201ae02707 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 13:41:48 +0000 Subject: [PATCH 56/82] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vifm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vifm.spec b/vifm.spec index 41828e2..33edbef 100644 --- a/vifm.spec +++ b/vifm.spec @@ -9,7 +9,7 @@ Name: vifm Version: 0.10.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: File manager with curses interface, which provides Vi[m]-like environment License: GPLv2+ @@ -97,6 +97,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 0.10.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Apr 06 2020 Artem Polishchuk - 0.10.1-3 - Update package and fix FTBFS | RHBZ#1800234 From 0a0f4ddf42dbc447ef10568249fc80d59fce581b Mon Sep 17 00:00:00 2001 From: Artem Polishchuk Date: Thu, 24 Sep 2020 19:02:35 +0300 Subject: [PATCH 57/82] Update to 0.11 --- .gitignore | 1 + sources | 2 +- vifm.spec | 28 +++++++++++++--------------- 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index d52a14e..dc8c7e2 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ vifm-0.5.tar.bz2 /vifm-0.8.1a.tar.bz2 /vifm-0.8.2.tar.bz2 /vifm-0.10.1.tar.bz2 +/vifm-0.11.tar.bz2 diff --git a/sources b/sources index 59825a5..f87bc4b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vifm-0.10.1.tar.bz2) = 8116c4c31b01a9453684a90b26b87a33e5ec2cd2930162869507f673319d231f44e464d1056239f647531c3be5bc9bcf92045c79e5d545f9c75be11c7fe03ea2 +SHA512 (vifm-0.11.tar.bz2) = 569fe886a3103f6f81dae84a5c77e1e77121c4691348e5764a3ce4890a0c013709e6a20138a1ae69ebe0791fb5cbee351111b39c36f0d96dda6af2d89afac5f0 diff --git a/vifm.spec b/vifm.spec index 33edbef..a41941b 100644 --- a/vifm.spec +++ b/vifm.spec @@ -1,15 +1,10 @@ -# Workaround for GCC 10 -# * https://gcc.gnu.org/gcc-10/porting_to.html#common -# * https://github.com/vifm/vifm/issues/534 -%global _legacy_common_support 1 - %bcond_with gtk %bcond_without libmagic %bcond_with x11 Name: vifm -Version: 0.10.1 -Release: 4%{?dist} +Version: 0.11 +Release: 1%{?dist} Summary: File manager with curses interface, which provides Vi[m]-like environment License: GPLv2+ @@ -35,15 +30,15 @@ BuildRequires: libX11-devel %description Vifm is a curses based vi[m] like file manager extended with some useful ideas -from mutt. If you use vi[m], vifm gives you complete keyboard control over your -files without having to learn a new set of commands. It goes not just about -vi[m] like keybindings, but also about modes, options, registers, commands and -other things you might already like in vi[m]. +from mutt. If you use vi[m], vifm gives you complete keyboard control over +your files without having to learn a new set of commands. It goes not just +about vi[m] like keybindings, but also about modes, options, registers, +commands and other things you might already like in vi[m]. Just like vi[m], vifm tries to adhere to the Unix philosophy. So instead of working solutions which are set in stone user is provided with a set of means -for customization of vifm to one's likings. Though builtin functionality should -be enough for most of use cases. +for customization of vifm to one's likings. Though builtin functionality +should be enough for most of use cases. %prep @@ -73,8 +68,7 @@ be enough for most of use cases. %install %make_install -rm %{buildroot}%{_pkgdocdir}/COPYING \ - %{buildroot}%{_datadir}/%{name}/vifm-media-osx +rm %{buildroot}%{_pkgdocdir}/COPYING %check @@ -94,9 +88,13 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop %{_datadir}/zsh/site-functions/_%{name} %{_mandir}/man1/* %{_pkgdocdir}/ +%{_sysconfdir}/%{name}/ %changelog +* Thu Sep 24 2020 Artem Polishchuk - 0.11-1 +- Update to 0.11 + * Wed Jul 29 2020 Fedora Release Engineering - 0.10.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 7ae1964facd282c7ef32bb537c970c11157f194e Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 9 Jan 2021 00:41:43 +0000 Subject: [PATCH 58/82] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- vifm.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/vifm.spec b/vifm.spec index a41941b..467e4ff 100644 --- a/vifm.spec +++ b/vifm.spec @@ -11,6 +11,7 @@ License: GPLv2+ URL: http://vifm.info/ Source0: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.bz2 +BuildRequires: make BuildRequires: autoconf BuildRequires: automake BuildRequires: desktop-file-utils From 7443ead08dd6b1363096d5acebb82891404970f3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 23:02:57 +0000 Subject: [PATCH 59/82] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vifm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vifm.spec b/vifm.spec index 467e4ff..7f04a0f 100644 --- a/vifm.spec +++ b/vifm.spec @@ -4,7 +4,7 @@ Name: vifm Version: 0.11 -Release: 1%{?dist} +Release: 2%{?dist} Summary: File manager with curses interface, which provides Vi[m]-like environment License: GPLv2+ @@ -93,6 +93,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 0.11-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Thu Sep 24 2020 Artem Polishchuk - 0.11-1 - Update to 0.11 From e3bc00e23e2d3971e5becc0a8b615cf31cc939d9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 20:26:56 +0000 Subject: [PATCH 60/82] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vifm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vifm.spec b/vifm.spec index 7f04a0f..f0222a0 100644 --- a/vifm.spec +++ b/vifm.spec @@ -4,7 +4,7 @@ Name: vifm Version: 0.11 -Release: 2%{?dist} +Release: 3%{?dist} Summary: File manager with curses interface, which provides Vi[m]-like environment License: GPLv2+ @@ -93,6 +93,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 0.11-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Wed Jan 27 2021 Fedora Release Engineering - 0.11-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From df0878ca4adcf0ca2bdb616532d109769e0d2adf Mon Sep 17 00:00:00 2001 From: Artem Polishchuk Date: Wed, 29 Sep 2021 17:45:33 +0300 Subject: [PATCH 61/82] build(update): 0.12 --- .gitignore | 1 + sources | 2 +- vifm.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index dc8c7e2..d49a367 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ vifm-0.5.tar.bz2 /vifm-0.8.2.tar.bz2 /vifm-0.10.1.tar.bz2 /vifm-0.11.tar.bz2 +/vifm-0.12.tar.bz2 diff --git a/sources b/sources index f87bc4b..871896a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vifm-0.11.tar.bz2) = 569fe886a3103f6f81dae84a5c77e1e77121c4691348e5764a3ce4890a0c013709e6a20138a1ae69ebe0791fb5cbee351111b39c36f0d96dda6af2d89afac5f0 +SHA512 (vifm-0.12.tar.bz2) = 9944c8928303af112fc968eab444304755f8a806b680ec1cd4e767c01121856fbd08990df6706f66bcd561e7ab9a937db96713fc36b9e25e3b8ed89c068e69de diff --git a/vifm.spec b/vifm.spec index f0222a0..4b9282d 100644 --- a/vifm.spec +++ b/vifm.spec @@ -3,8 +3,8 @@ %bcond_with x11 Name: vifm -Version: 0.11 -Release: 3%{?dist} +Version: 0.12 +Release: 1%{?dist} Summary: File manager with curses interface, which provides Vi[m]-like environment License: GPLv2+ @@ -93,6 +93,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop %changelog +* Wed Sep 29 2021 Artem Polishchuk - 0.12-1 +- build(update): 0.12 + * Fri Jul 23 2021 Fedora Release Engineering - 0.11-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From ba3c97329fb36b0ade98bc7675cda83447f75e97 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 03:57:06 +0000 Subject: [PATCH 62/82] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vifm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vifm.spec b/vifm.spec index 4b9282d..6efdc35 100644 --- a/vifm.spec +++ b/vifm.spec @@ -4,7 +4,7 @@ Name: vifm Version: 0.12 -Release: 1%{?dist} +Release: 2%{?dist} Summary: File manager with curses interface, which provides Vi[m]-like environment License: GPLv2+ @@ -93,6 +93,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 0.12-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Wed Sep 29 2021 Artem Polishchuk - 0.12-1 - build(update): 0.12 From ddec707a1d669ad719485801463d3cde3f37a052 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 11:51:27 +0000 Subject: [PATCH 63/82] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vifm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vifm.spec b/vifm.spec index 6efdc35..5f7e2a2 100644 --- a/vifm.spec +++ b/vifm.spec @@ -4,7 +4,7 @@ Name: vifm Version: 0.12 -Release: 2%{?dist} +Release: 3%{?dist} Summary: File manager with curses interface, which provides Vi[m]-like environment License: GPLv2+ @@ -93,6 +93,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 0.12-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Jan 22 2022 Fedora Release Engineering - 0.12-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From ebaba6cf254b08566e74603449f05ed1faa1b8d4 Mon Sep 17 00:00:00 2001 From: Artem Polishchuk Date: Wed, 21 Sep 2022 21:53:19 +0300 Subject: [PATCH 64/82] Convert to rpmautospec --- changelog | 134 ++++++++++++++++++++++++++++++++++++++++++++++++++++ vifm.spec | 137 +----------------------------------------------------- 2 files changed, 136 insertions(+), 135 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..de821fe --- /dev/null +++ b/changelog @@ -0,0 +1,134 @@ +* Sat Jul 23 2022 Fedora Release Engineering - 0.12-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Jan 22 2022 Fedora Release Engineering - 0.12-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Wed Sep 29 2021 Artem Polishchuk - 0.12-1 +- build(update): 0.12 + +* Fri Jul 23 2021 Fedora Release Engineering - 0.11-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Jan 27 2021 Fedora Release Engineering - 0.11-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Thu Sep 24 2020 Artem Polishchuk - 0.11-1 +- Update to 0.11 + +* Wed Jul 29 2020 Fedora Release Engineering - 0.10.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Apr 06 2020 Artem Polishchuk - 0.10.1-3 +- Update package and fix FTBFS | RHBZ#1800234 + +* Fri Jan 31 2020 Fedora Release Engineering - 0.10.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Tue Oct 29 2019 Ben Boeckel - 0.10.1-1 +- Update to 0.10.1 (rhbz#1462578) +- Remove vifm-media-osx script + +* Sat Jul 27 2019 Fedora Release Engineering - 0.8.2-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Thu Jul 11 2019 Petr Pisar - 0.8.2-8 +- Fix building with glibc 2.25 (bug #1606644) + +* Sun Feb 03 2019 Fedora Release Engineering - 0.8.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Jul 14 2018 Fedora Release Engineering - 0.8.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Feb 09 2018 Fedora Release Engineering - 0.8.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Aug 03 2017 Fedora Release Engineering - 0.8.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 0.8.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 0.8.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Sat Jul 23 2016 Ben Boeckel - 0.8.2-1 +- update to 0.8.2 + +* Sat Apr 23 2016 Ben Boeckel - 0.8.1a-1 +- update to 0.8.1a + +* Wed Mar 23 2016 Ralf Corsépius - 0.8-3 +- Install docs directly into %%{_pkgdocdir} (F24FTBFS, RHBZ#1308228). +- Add %%license. +- Modernize spec. + +* Fri Feb 05 2016 Fedora Release Engineering - 0.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Sun Jul 19 2015 Ben Boeckel - 0.8-1 +- Update to 0.8 + +* Fri Jun 19 2015 Fedora Release Engineering - 0.7.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Wed Dec 10 2014 Ben Boeckel - 0.7.8-1 +- Update to 0.7.8 + +* Mon Aug 18 2014 Fedora Release Engineering - 0.7.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Fri Aug 08 2014 Yaakov Selkowitz - 0.7.6-3 +- Fix %%files for 0.7.6 (#1107084) + +* Sun Jun 08 2014 Fedora Release Engineering - 0.7.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Wed Nov 20 2013 Ben Boeckel - 0.7.6-1 +- Update to 0.7.6 + +* Sun Aug 04 2013 Fedora Release Engineering - 0.7.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Thu May 30 2013 Ben Boeckel - 0.7.5-1 +- Update to 0.7.5 + +* Fri Feb 15 2013 Fedora Release Engineering - 0.7.4a-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Sun Nov 04 2012 Ben Boeckel - 0.7.4a-1 +- Update to 0.7.4a + +* Mon Jul 23 2012 Ben Boeckel - 0.7.3a-1 +- Update to 0.7.3a + +* Sun Jul 22 2012 Fedora Release Engineering - 0.6.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sat Jan 14 2012 Fedora Release Engineering - 0.6.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Fri Jun 24 2011 Ben Boeckel - 0.6.2-1 +- Update to 0.6.2 +- Remove deletion patch (unable to reproduce original bug with new version) + +* Mon Feb 07 2011 Fedora Release Engineering - 0.5-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Sat Jun 19 2010 Pierre Dorbais 0.5-4 +- Add patch to fix crash when deleting four or more files (Bug #592725) + +* Tue Apr 13 2010 Pierre Dorbais 0.5-3 +- Add dir macro to fix files listed twice +- Add blank lines between changelog entries + +* Mon Apr 12 2010 Pierre Dorbais 0.5-2 +- Add INSTALL variable to make +- Add patch Patch0 +- Add missing path to files macro +- Remove INSTALL doc file +- Remove BuildRoot tag + +* Mon Feb 08 2010 Pierre Dorbais 0.5-1 +- Initial RPM release diff --git a/vifm.spec b/vifm.spec index 5f7e2a2..4bdde3a 100644 --- a/vifm.spec +++ b/vifm.spec @@ -4,7 +4,7 @@ Name: vifm Version: 0.12 -Release: 3%{?dist} +Release: %autorelease Summary: File manager with curses interface, which provides Vi[m]-like environment License: GPLv2+ @@ -93,137 +93,4 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop %changelog -* Sat Jul 23 2022 Fedora Release Engineering - 0.12-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Jan 22 2022 Fedora Release Engineering - 0.12-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Wed Sep 29 2021 Artem Polishchuk - 0.12-1 -- build(update): 0.12 - -* Fri Jul 23 2021 Fedora Release Engineering - 0.11-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Jan 27 2021 Fedora Release Engineering - 0.11-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Thu Sep 24 2020 Artem Polishchuk - 0.11-1 -- Update to 0.11 - -* Wed Jul 29 2020 Fedora Release Engineering - 0.10.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Mon Apr 06 2020 Artem Polishchuk - 0.10.1-3 -- Update package and fix FTBFS | RHBZ#1800234 - -* Fri Jan 31 2020 Fedora Release Engineering - 0.10.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Tue Oct 29 2019 Ben Boeckel - 0.10.1-1 -- Update to 0.10.1 (rhbz#1462578) -- Remove vifm-media-osx script - -* Sat Jul 27 2019 Fedora Release Engineering - 0.8.2-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Thu Jul 11 2019 Petr Pisar - 0.8.2-8 -- Fix building with glibc 2.25 (bug #1606644) - -* Sun Feb 03 2019 Fedora Release Engineering - 0.8.2-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Jul 14 2018 Fedora Release Engineering - 0.8.2-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Feb 09 2018 Fedora Release Engineering - 0.8.2-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Aug 03 2017 Fedora Release Engineering - 0.8.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 0.8.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 0.8.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Sat Jul 23 2016 Ben Boeckel - 0.8.2-1 -- update to 0.8.2 - -* Sat Apr 23 2016 Ben Boeckel - 0.8.1a-1 -- update to 0.8.1a - -* Wed Mar 23 2016 Ralf Corsépius - 0.8-3 -- Install docs directly into %%{_pkgdocdir} (F24FTBFS, RHBZ#1308228). -- Add %%license. -- Modernize spec. - -* Fri Feb 05 2016 Fedora Release Engineering - 0.8-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Sun Jul 19 2015 Ben Boeckel - 0.8-1 -- Update to 0.8 - -* Fri Jun 19 2015 Fedora Release Engineering - 0.7.8-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Wed Dec 10 2014 Ben Boeckel - 0.7.8-1 -- Update to 0.7.8 - -* Mon Aug 18 2014 Fedora Release Engineering - 0.7.6-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Fri Aug 08 2014 Yaakov Selkowitz - 0.7.6-3 -- Fix %%files for 0.7.6 (#1107084) - -* Sun Jun 08 2014 Fedora Release Engineering - 0.7.6-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Wed Nov 20 2013 Ben Boeckel - 0.7.6-1 -- Update to 0.7.6 - -* Sun Aug 04 2013 Fedora Release Engineering - 0.7.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Thu May 30 2013 Ben Boeckel - 0.7.5-1 -- Update to 0.7.5 - -* Fri Feb 15 2013 Fedora Release Engineering - 0.7.4a-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Sun Nov 04 2012 Ben Boeckel - 0.7.4a-1 -- Update to 0.7.4a - -* Mon Jul 23 2012 Ben Boeckel - 0.7.3a-1 -- Update to 0.7.3a - -* Sun Jul 22 2012 Fedora Release Engineering - 0.6.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sat Jan 14 2012 Fedora Release Engineering - 0.6.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Fri Jun 24 2011 Ben Boeckel - 0.6.2-1 -- Update to 0.6.2 -- Remove deletion patch (unable to reproduce original bug with new version) - -* Mon Feb 07 2011 Fedora Release Engineering - 0.5-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Sat Jun 19 2010 Pierre Dorbais 0.5-4 -- Add patch to fix crash when deleting four or more files (Bug #592725) - -* Tue Apr 13 2010 Pierre Dorbais 0.5-3 -- Add dir macro to fix files listed twice -- Add blank lines between changelog entries - -* Mon Apr 12 2010 Pierre Dorbais 0.5-2 -- Add INSTALL variable to make -- Add patch Patch0 -- Add missing path to files macro -- Remove INSTALL doc file -- Remove BuildRoot tag - -* Mon Feb 08 2010 Pierre Dorbais 0.5-1 -- Initial RPM release +%autochangelog From bf72977c8b489b9a21e639a781c8e11edd3cd8a5 Mon Sep 17 00:00:00 2001 From: Artem Polishchuk Date: Wed, 21 Sep 2022 22:10:24 +0300 Subject: [PATCH 65/82] chore(update): 0.12.1 --- .gitignore | 1 + sources | 2 +- vifm.spec | 23 ++++++++++++----------- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index d49a367..863567a 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ vifm-0.5.tar.bz2 /vifm-0.10.1.tar.bz2 /vifm-0.11.tar.bz2 /vifm-0.12.tar.bz2 +/vifm-0.12.1.tar.bz2 diff --git a/sources b/sources index 871896a..fc48149 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vifm-0.12.tar.bz2) = 9944c8928303af112fc968eab444304755f8a806b680ec1cd4e767c01121856fbd08990df6706f66bcd561e7ab9a937db96713fc36b9e25e3b8ed89c068e69de +SHA512 (vifm-0.12.1.tar.bz2) = 583e40622a996cf1a2a439c61fb95bea5692bdd4fef6521b3ba17f05f711622449b370a4bd9b71da4426ec475667130bb81c394cb0ccdd55a932a22371e8db1c diff --git a/vifm.spec b/vifm.spec index 4bdde3a..9a55c7c 100644 --- a/vifm.spec +++ b/vifm.spec @@ -3,19 +3,19 @@ %bcond_with x11 Name: vifm -Version: 0.12 +Version: 0.12.1 Release: %autorelease -Summary: File manager with curses interface, which provides Vi[m]-like environment +Summary: Vifm is a file manager with curses interface License: GPLv2+ URL: http://vifm.info/ Source0: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.bz2 -BuildRequires: make BuildRequires: autoconf BuildRequires: automake BuildRequires: desktop-file-utils BuildRequires: gcc +BuildRequires: make BuildRequires: ncurses-devel BuildRequires: perl-generators %if %{with gtk} @@ -30,20 +30,20 @@ BuildRequires: libX11-devel %endif %description -Vifm is a curses based vi[m] like file manager extended with some useful ideas -from mutt. If you use vi[m], vifm gives you complete keyboard control over -your files without having to learn a new set of commands. It goes not just -about vi[m] like keybindings, but also about modes, options, registers, -commands and other things you might already like in vi[m]. +Vifm is a curses based Vim-like file manager extended with some useful ideas +from mutt. If you use Vim, Vifm gives you complete keyboard control over your +files without having to learn a new set of commands. It goes not just about +Vim-like keybindings, but also about modes, options, registers, commands and +other things you might already like in Vim. -Just like vi[m], vifm tries to adhere to the Unix philosophy. So instead of +Just like Vim, Vifm tries to adhere to the Unix philosophy. So instead of working solutions which are set in stone user is provided with a set of means -for customization of vifm to one's likings. Though builtin functionality +for customization of Vifm to one's likings. Though builtin functionality should be enough for most of use cases. %prep -%autosetup -p1 +%autosetup %build @@ -85,6 +85,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop %{_datadir}/%{name}/ %{_datadir}/applications/*.desktop %{_datadir}/bash-completion/completions/%{name} +%{_datadir}/fish/vendor_completions.d/%{name}.fish %{_datadir}/pixmaps/%{name}.png %{_datadir}/zsh/site-functions/_%{name} %{_mandir}/man1/* From 73a770a9a088e450abf8c2122090bf73377c1742 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 06:16:28 +0000 Subject: [PATCH 66/82] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 0e89bb2492623c5cd0916b3a631fd854e1b85e8c Mon Sep 17 00:00:00 2001 From: Artem Polishchuk Date: Sat, 18 Mar 2023 03:04:40 +0200 Subject: [PATCH 67/82] build: Update to 0.13-beta --- .gitignore | 1 + sources | 2 +- vifm.spec | 13 ++++++++++--- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 863567a..fa547ac 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ vifm-0.5.tar.bz2 /vifm-0.11.tar.bz2 /vifm-0.12.tar.bz2 /vifm-0.12.1.tar.bz2 +/vifm-0.13-beta.tar.bz2 diff --git a/sources b/sources index fc48149..7ba4d83 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vifm-0.12.1.tar.bz2) = 583e40622a996cf1a2a439c61fb95bea5692bdd4fef6521b3ba17f05f711622449b370a4bd9b71da4426ec475667130bb81c394cb0ccdd55a932a22371e8db1c +SHA512 (vifm-0.13-beta.tar.bz2) = 3839a6be234cbb72b2823f34f0e595b0f7bf0f0e520ed0a17864167955f80fad19feef9ecaea9d33477c978424db5db4675d0af68d72d6ad9e9ea743ce7cda5c diff --git a/vifm.spec b/vifm.spec index 9a55c7c..8b61a8a 100644 --- a/vifm.spec +++ b/vifm.spec @@ -2,14 +2,16 @@ %bcond_without libmagic %bcond_with x11 +%global tarball_version %%(echo %{version} | tr '~' '-') + Name: vifm -Version: 0.12.1 +Version: 0.13~beta Release: %autorelease Summary: Vifm is a file manager with curses interface License: GPLv2+ URL: http://vifm.info/ -Source0: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.bz2 +Source0: https://github.com/%{name}/%{name}/releases/download/v%{tarball_version}/%{name}-%{tarball_version}.tar.bz2 BuildRequires: autoconf BuildRequires: automake @@ -29,6 +31,8 @@ BuildRequires: file-devel BuildRequires: libX11-devel %endif +Requires: hicolor-icon-theme + %description Vifm is a curses based Vim-like file manager extended with some useful ideas from mutt. If you use Vim, Vifm gives you complete keyboard control over your @@ -43,7 +47,7 @@ should be enough for most of use cases. %prep -%autosetup +%autosetup -n %{name}-%{tarball_version} %build @@ -69,6 +73,7 @@ should be enough for most of use cases. %install %make_install +# Handle license file via regular RPM macros rm %{buildroot}%{_pkgdocdir}/COPYING @@ -86,6 +91,8 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop %{_datadir}/applications/*.desktop %{_datadir}/bash-completion/completions/%{name} %{_datadir}/fish/vendor_completions.d/%{name}.fish +%{_datadir}/icons/hicolor/*/*/*.png +%{_datadir}/icons/hicolor/scalable/*/*.svg %{_datadir}/pixmaps/%{name}.png %{_datadir}/zsh/site-functions/_%{name} %{_mandir}/man1/* From 47e0b41ac36cb0f97968d385c7459aa74eccb83e Mon Sep 17 00:00:00 2001 From: Artem Polishchuk Date: Wed, 5 Apr 2023 12:47:02 +0300 Subject: [PATCH 68/82] build: Update to 0.13 --- .gitignore | 1 + sources | 2 +- vifm.spec | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index fa547ac..b7db677 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ vifm-0.5.tar.bz2 /vifm-0.12.tar.bz2 /vifm-0.12.1.tar.bz2 /vifm-0.13-beta.tar.bz2 +/vifm-0.13.tar.bz2 diff --git a/sources b/sources index 7ba4d83..780be82 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vifm-0.13-beta.tar.bz2) = 3839a6be234cbb72b2823f34f0e595b0f7bf0f0e520ed0a17864167955f80fad19feef9ecaea9d33477c978424db5db4675d0af68d72d6ad9e9ea743ce7cda5c +SHA512 (vifm-0.13.tar.bz2) = a0185400ca20c6f67d41cb0b7696ce85e5e6f823a7c87f8bfe48494131e9463f7bd4798c06e6820e2588ee3b7563dad9a4887874c6bc43b2bf3520a2b4a55e9d diff --git a/vifm.spec b/vifm.spec index 8b61a8a..281fa86 100644 --- a/vifm.spec +++ b/vifm.spec @@ -5,7 +5,7 @@ %global tarball_version %%(echo %{version} | tr '~' '-') Name: vifm -Version: 0.13~beta +Version: 0.13 Release: %autorelease Summary: Vifm is a file manager with curses interface From ca0ceae685f7ec3d744c59f8214753009e44f5e6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 17:36:50 +0000 Subject: [PATCH 69/82] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering From eca81c0a3ad4f6d2228d90dbf01eaa1e15c15f3c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 07:43:42 +0000 Subject: [PATCH 70/82] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 68715e705b5bcc246bca07112c57118f4ff9e70e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 08:45:30 +0000 Subject: [PATCH 71/82] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 7c558da5cdcd11a01b145dd0af936b3ccc0afb42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Fri, 26 Jul 2024 03:35:12 +0200 Subject: [PATCH 72/82] convert GPLv2+ license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- vifm.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/vifm.spec b/vifm.spec index 281fa86..73b1fea 100644 --- a/vifm.spec +++ b/vifm.spec @@ -9,7 +9,8 @@ Version: 0.13 Release: %autorelease Summary: Vifm is a file manager with curses interface -License: GPLv2+ +# Automatically converted from old format: GPLv2+ - review is highly recommended. +License: GPL-2.0-or-later URL: http://vifm.info/ Source0: https://github.com/%{name}/%{name}/releases/download/v%{tarball_version}/%{name}-%{tarball_version}.tar.bz2 From d6e05d32e4c26034c73c953e5b02a86b58b10e5d Mon Sep 17 00:00:00 2001 From: Artem Polishchuk Date: Mon, 6 Jan 2025 21:46:31 +0200 Subject: [PATCH 73/82] build: Use https for URL Signed-off-by: Artem Polishchuk --- vifm.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vifm.spec b/vifm.spec index 73b1fea..8c70cdf 100644 --- a/vifm.spec +++ b/vifm.spec @@ -11,7 +11,7 @@ Summary: Vifm is a file manager with curses interface # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later -URL: http://vifm.info/ +URL: https://vifm.info Source0: https://github.com/%{name}/%{name}/releases/download/v%{tarball_version}/%{name}-%{tarball_version}.tar.bz2 BuildRequires: autoconf From 1f945ff5cf653049419b15c414581194485d0709 Mon Sep 17 00:00:00 2001 From: Artem Polishchuk Date: Mon, 6 Jan 2025 22:12:47 +0200 Subject: [PATCH 74/82] build: Install AppData manifest #rhbz2335613 Signed-off-by: Artem Polishchuk --- vifm.appdata.xml | 2037 ++++++++++++++++++++++++++++++++++++++++++++++ vifm.spec | 7 + 2 files changed, 2044 insertions(+) create mode 100644 vifm.appdata.xml diff --git a/vifm.appdata.xml b/vifm.appdata.xml new file mode 100644 index 0000000..d5bc700 --- /dev/null +++ b/vifm.appdata.xml @@ -0,0 +1,2037 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + vifm/data/vifm.appdata.xml at master · vifm/vifm · GitHub + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + +
+ Skip to content + + + + + + + + + + + + +
+
+ + + + + + + + + + + + + + +
+ +
+ + + + + + + + +
+ + + + + +
+ + + + + + + + + +
+
+
+ + + + + + + + + + + + +
+ +
+ +
+ +
+ + + + / + + vifm + + + Public +
+ + +
+ +
+ + +
+
+ +
+
+ + + + +
+ + + + + + +
+ + + + + + + + + + + + + + + + + + +

Latest commit

 

History

History
29 lines (24 loc) · 1.31 KB

vifm.appdata.xml

File metadata and controls

29 lines (24 loc) · 1.31 KB
+
+ + + + +
+ +
+ +
+
+ +
+ +
+

Footer

+ + + + +
+
+ + + + + © 2025 GitHub, Inc. + +
+ + +
+
+ + + + + + + + + + + + + + + + + + + +
+ +
+
+ + + diff --git a/vifm.spec b/vifm.spec index 8c70cdf..72d6a68 100644 --- a/vifm.spec +++ b/vifm.spec @@ -13,11 +13,14 @@ Summary: Vifm is a file manager with curses interface License: GPL-2.0-or-later URL: https://vifm.info Source0: https://github.com/%{name}/%{name}/releases/download/v%{tarball_version}/%{name}-%{tarball_version}.tar.bz2 +# AppData manifest (rhbz#2335613) +Source1: https://github.com/%{name}/%{name}/blob/master/data/%{name}.appdata.xml BuildRequires: autoconf BuildRequires: automake BuildRequires: desktop-file-utils BuildRequires: gcc +BuildRequires: libappstream-glib BuildRequires: make BuildRequires: ncurses-devel BuildRequires: perl-generators @@ -73,6 +76,7 @@ should be enough for most of use cases. %install %make_install +install -D -p -m 0644 %{SOURCE1} %{buildroot}%{_metainfodir}/%{name}.appdata.xml # Handle license file via regular RPM macros rm %{buildroot}%{_pkgdocdir}/COPYING @@ -80,6 +84,8 @@ rm %{buildroot}%{_pkgdocdir}/COPYING %check desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop +# https://github.com/vifm/vifm/issues/1046 +%dnl appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.xml %files @@ -97,6 +103,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop %{_datadir}/pixmaps/%{name}.png %{_datadir}/zsh/site-functions/_%{name} %{_mandir}/man1/* +%{_metainfodir}/%{name}.appdata.xml %{_pkgdocdir}/ %{_sysconfdir}/%{name}/ From 48cc5c12a41cabbec5734c09ff4ad53af8a808a7 Mon Sep 17 00:00:00 2001 From: Artem Polishchuk Date: Tue, 7 Jan 2025 01:50:38 +0200 Subject: [PATCH 75/82] fix: AppData Signed-off-by: Artem Polishchuk --- vifm.appdata.xml | 2066 +--------------------------------------------- vifm.spec | 5 +- 2 files changed, 31 insertions(+), 2040 deletions(-) diff --git a/vifm.appdata.xml b/vifm.appdata.xml index d5bc700..917db5a 100644 --- a/vifm.appdata.xml +++ b/vifm.appdata.xml @@ -1,2037 +1,29 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - vifm/data/vifm.appdata.xml at master · vifm/vifm · GitHub - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - -
- Skip to content - - - - - - - - - - - - -
-
- - - - - - - - - - - - - - -
- -
- - - - - - - - -
- - - - - -
- - - - - - - - - -
-
-
- - - - - - - - - - - - -
- -
- -
- -
- - - - / - - vifm - - - Public -
- - -
- -
- - -
-
- -
-
- - - - -
- - - - - - -
- - - - - - - - - - - - - - - - - - -

Latest commit

 

History

History
29 lines (24 loc) · 1.31 KB

vifm.appdata.xml

File metadata and controls

29 lines (24 loc) · 1.31 KB
-
- - - - -
- -
- -
-
- -
- -
-

Footer

- - - - -
-
- - - - - © 2025 GitHub, Inc. - -
- - -
-
- - - - - - - - - - - - - - - - - - - -
- -
-
- - - + + + info.vifm + CC0-1.0 + GPL-2.0-or-later + Vifm + Vifm - Vim-like file manager + + +

Vifm is a curses based Vim-like file manager extended with some useful ideas from mutt. If you use Vim, Vifm gives you complete keyboard control over your files without having to learn a new set of commands. It goes not just about Vim like keybindings, but also about modes, options, registers, commands and other things you might already like in Vim.

+

Just like Vim, Vifm tries to adhere to the Unix philosophy. So instead of working solutions which are set in stone user is provided with a set of means for customization of Vifm to one's likings. Though builtin functionality should be enough for most of use cases.

+
+ + vifm.desktop + + + + https://raw.githubusercontent.com/vifm/vifm/master/data/graphics/screenshot.png + + + + https://vifm.info/ + xaizek@posteo.net + xaizek + + + vifm.desktop + +
diff --git a/vifm.spec b/vifm.spec index 72d6a68..3ca66ab 100644 --- a/vifm.spec +++ b/vifm.spec @@ -14,7 +14,7 @@ License: GPL-2.0-or-later URL: https://vifm.info Source0: https://github.com/%{name}/%{name}/releases/download/v%{tarball_version}/%{name}-%{tarball_version}.tar.bz2 # AppData manifest (rhbz#2335613) -Source1: https://github.com/%{name}/%{name}/blob/master/data/%{name}.appdata.xml +Source1: https://raw.githubusercontent.com/%{name}/%{name}/refs/heads/master/data/%{name}.appdata.xml BuildRequires: autoconf BuildRequires: automake @@ -84,8 +84,7 @@ rm %{buildroot}%{_pkgdocdir}/COPYING %check desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop -# https://github.com/vifm/vifm/issues/1046 -%dnl appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.xml +appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.xml %files From 142519de55469de36ad4283abb65fe1cc5104e45 Mon Sep 17 00:00:00 2001 From: Artem Polishchuk Date: Wed, 8 Jan 2025 16:48:00 +0200 Subject: [PATCH 76/82] build: Update AppData Signed-off-by: Artem Polishchuk --- vifm.appdata.xml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/vifm.appdata.xml b/vifm.appdata.xml index 917db5a..70374a5 100644 --- a/vifm.appdata.xml +++ b/vifm.appdata.xml @@ -1,6 +1,6 @@ - info.vifm + info.vifm.vifm CC0-1.0 GPL-2.0-or-later Vifm @@ -13,11 +13,13 @@ vifm.desktop - - - https://raw.githubusercontent.com/vifm/vifm/master/data/graphics/screenshot.png - - + + + + https://raw.githubusercontent.com/vifm/vifm/master/data/graphics/screenshot.png + + + https://vifm.info/ xaizek@posteo.net From a1e2fca9f65fadbf780c644ec0a0f6ea6722f6b4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 14:19:26 +0000 Subject: [PATCH 77/82] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 03f67ee834032fb3043e56c9710a025dd98076a2 Mon Sep 17 00:00:00 2001 From: Artem Polishchuk Date: Sat, 8 Feb 2025 21:45:52 +0200 Subject: [PATCH 78/82] chore: Update to 0.14 Signed-off-by: Artem Polishchuk --- .gitignore | 1 + sources | 2 +- vifm.spec | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index b7db677..f084117 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ vifm-0.5.tar.bz2 /vifm-0.12.1.tar.bz2 /vifm-0.13-beta.tar.bz2 /vifm-0.13.tar.bz2 +/vifm-0.14.tar.bz2 diff --git a/sources b/sources index 780be82..1c0a306 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vifm-0.13.tar.bz2) = a0185400ca20c6f67d41cb0b7696ce85e5e6f823a7c87f8bfe48494131e9463f7bd4798c06e6820e2588ee3b7563dad9a4887874c6bc43b2bf3520a2b4a55e9d +SHA512 (vifm-0.14.tar.bz2) = da0ae483cefdbfb192a83eb2bdf17471bf2f72e8a84b15a65f01bb2086344a9b508ccd268b527ed9d7bbd6493bc28d8d60c552354adf8d36b260d11f814eff7f diff --git a/vifm.spec b/vifm.spec index 3ca66ab..5f4152b 100644 --- a/vifm.spec +++ b/vifm.spec @@ -5,7 +5,7 @@ %global tarball_version %%(echo %{version} | tr '~' '-') Name: vifm -Version: 0.13 +Version: 0.14 Release: %autorelease Summary: Vifm is a file manager with curses interface From 546b8b332da68ad951c81f2d3b81a67096b80fd2 Mon Sep 17 00:00:00 2001 From: Artem Polishchuk Date: Thu, 12 Jun 2025 18:20:21 +0300 Subject: [PATCH 79/82] chore: Update to 0.14.3 Signed-off-by: Artem Polishchuk --- .gitignore | 1 + sources | 2 +- vifm.spec | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index f084117..9532ccd 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ vifm-0.5.tar.bz2 /vifm-0.13-beta.tar.bz2 /vifm-0.13.tar.bz2 /vifm-0.14.tar.bz2 +/vifm-0.14.3.tar.bz2 diff --git a/sources b/sources index 1c0a306..93b76c3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vifm-0.14.tar.bz2) = da0ae483cefdbfb192a83eb2bdf17471bf2f72e8a84b15a65f01bb2086344a9b508ccd268b527ed9d7bbd6493bc28d8d60c552354adf8d36b260d11f814eff7f +SHA512 (vifm-0.14.3.tar.bz2) = 850d29a1c50e7579d53fcd519e3108f7edd1d5046ca473217f397b6394017dff95644ae92928a611fc6a75fb02c1cee62d4b858669c61b5c2764805dd64b303c diff --git a/vifm.spec b/vifm.spec index 5f4152b..4cac8a2 100644 --- a/vifm.spec +++ b/vifm.spec @@ -5,7 +5,7 @@ %global tarball_version %%(echo %{version} | tr '~' '-') Name: vifm -Version: 0.14 +Version: 0.14.3 Release: %autorelease Summary: Vifm is a file manager with curses interface From 72d8e47615ddfde3896b10d1c3358af55b77ff84 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:04:47 +0000 Subject: [PATCH 80/82] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From e95559b28c60f3cd40d3701e97f987a77ef0f007 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 19:54:06 +0000 Subject: [PATCH 81/82] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From 79eb204c21bd8479b9dc9bbaaa9328dbac1b7645 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 08:28:43 +0000 Subject: [PATCH 82/82] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild