diff --git a/.gitignore b/.gitignore index 7d6ad01..e61bef0 100644 --- a/.gitignore +++ b/.gitignore @@ -423,3 +423,4 @@ /vim-9.0-963.tar.bz2 /vim-9.0-1006.tar.bz2 /vim-9.0-1054.tar.bz2 +/vim-9.0-1160.tar.bz2 diff --git a/sources b/sources index 62b801a..27dac6f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-9.0-1054.tar.bz2) = fbe6861e4fc7be6880350c4fc467961b8146ff954225ccdd31841145f49719928acf534b9cff9a7b6f2680c9fd01f7e54eb63141aad6978e56049db0b36bc81f +SHA512 (vim-9.0-1160.tar.bz2) = 3d053eef000fc981dc853fb06ac5daaa7519c84b8d401e5694f3ba9ce958c0c8086a48716d5c75cfbf5fff04059ac362c42e6215c9efc22cc235bbbc72cc3cc2 diff --git a/vim-7.4-fstabsyntax.patch b/vim-7.4-fstabsyntax.patch deleted file mode 100644 index f587deb..0000000 --- a/vim-7.4-fstabsyntax.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/runtime/syntax/fstab.vim b/runtime/syntax/fstab.vim -index 6a3c375..9d871a3 100644 ---- a/runtime/syntax/fstab.vim -+++ b/runtime/syntax/fstab.vim -@@ -56,7 +56,7 @@ syn keyword fsMountPointKeyword contained none swap - " Type - syn cluster fsTypeCluster contains=fsTypeKeyword,fsTypeUnknown - syn match fsTypeUnknown /\s\+\zs\w\+/ contained --syn keyword fsTypeKeyword contained adfs ados affs anon_inodefs atfs audiofs auto autofs bdev befs bfs btrfs binfmt_misc cd9660 ceph cfs cgroup cifs coda coherent configfs cpuset cramfs debugfs devfs devpts devtmpfs dlmfs e2compr ecryptfs efivarfs efs erofs exfat ext2 ext2fs ext3 ext4 f2fs fdesc ffs filecore fuse fuseblk fusectl gfs2 hfs hfsplus hpfs hugetlbfs iso9660 jffs jffs2 jfs kernfs lfs linprocfs mfs minix mqueue msdos ncpfs nfs nfs4 nfsd nilfs2 none ntfs ntfs3 null nwfs ocfs2 omfs overlay ovlfs pipefs portal proc procfs pstore ptyfs pvfs2 qnx4 qnx6 reiserfs ramfs romfs securityfs shm smbfs spufs squashfs sockfs sshfs std subfs swap sysfs sysv tcfs tmpfs ubifs udf ufs umap umsdos union usbfs userfs v9fs vfat virtiofs vs3fs vxfs wrapfs wvfs xenfs xenix xfs zisofs zonefs -+syn keyword fsTypeKeyword contained adfs ados affs anon_inodefs atfs audiofs auto autofs bdev befs bfs btrfs binfmt_misc cd9660 ceph cfs cgroup cifs coda coherent configfs cpuset cramfs debugfs devfs devpts devtmpfs dlmfs e2compr ecryptfs efivarfs efs erofs exfat ext2 ext2fs ext3 ext4 f2fs fdesc ffs filecore fuse fuseblk fusectl gfs2 hfs hfsplus hpfs hugetlbfs iso9660 jffs jffs2 jfs kernfs lfs linprocfs mfs minix mqueue msdos ncpfs nfs nfs4 nfsd nilfs2 none ntfs ntfs3 null nwfs ocfs2 omfs overlay ovlfs pipefs portal proc procfs pstore ptyfs pvfs2 qnx4 qnx6 reiserfs ramfs romfs rpc_pipefs securityfs shm smbfs spufs squashfs sockfs sshfs std subfs swap sysfs sysv tcfs tmpfs ubifs udf ufs umap umsdos union usbfs userfs v9fs vfat virtiofs vs3fs vxfs wrapfs wvfs xenfs xenix xfs zisofs zonefs - - " Options - " ------- -@@ -72,7 +72,7 @@ syn keyword fsOptionsYN y n - syn keyword fsOptions01 0 1 - syn cluster fsOptionsCheckCluster contains=fsOptionsExt2Check,fsOptionsFatCheck - syn keyword fsOptionsSize 512 1024 2048 --syn keyword fsOptionsGeneral async atime auto bind current defaults dev devgid devmode devmtime devuid dirsync exec force fstab kudzu loop mand move noatime noauto noclusterr noclusterw nodev nodevmtime nodiratime noexec nomand norelatime nosuid nosymfollow nouser owner rbind rdonly relatime remount ro rq rw suid suiddir supermount sw sync union update user users wxallowed xx nofail failok -+syn keyword fsOptionsGeneral async atime auto bind current defaults dev devgid devmode devmtime devuid dirsync exec force fstab kudzu loop managed mand move noatime noauto noclusterr noclusterw nodev nodevmtime nodiratime noexec nomand norelatime nosuid nosymfollow nouser owner pamconsole rbind rdonly relatime remount ro rq rw suid suiddir supermount sw sync union update user users wxallowed xx nofail failok - syn match fsOptionsGeneral /_netdev/ - - syn match fsOptionsKeywords contained /\<cache=/ nextgroup=fsOptionsCache diff --git a/vim.spec b/vim.spec index 0730765..e369410 100644 --- a/vim.spec +++ b/vim.spec @@ -8,7 +8,7 @@ %bcond_with libsodium_crypt %endif -%define patchlevel 1054 +%define patchlevel 1160 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 @@ -50,7 +50,7 @@ Summary: The VIM editor URL: http://www.vim.org/ Name: vim Version: %{baseversion}.%{patchlevel} -Release: 2%{?dist} +Release: 1%{?dist} Epoch: 2 License: Vim and MIT Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2 @@ -81,17 +81,16 @@ Patch2002: vim-7.0-hunspell.patch BuildRequires: hunspell-devel %endif -Patch3000: vim-7.4-fstabsyntax.patch -Patch3001: vim-7.3-manpage-typo-668894-675480.patch -Patch3002: vim-manpagefixes-948566.patch -Patch3003: vim-7.4-globalsyntax.patch +Patch3000: vim-7.3-manpage-typo-668894-675480.patch +Patch3001: vim-manpagefixes-948566.patch +Patch3002: vim-7.4-globalsyntax.patch # migrate shebangs in script to /usr/bin/python3 and use python2 when necessary -Patch3004: vim-python3-tests.patch +Patch3003: vim-python3-tests.patch # fips warning (Fedora downstream patch) -Patch3005: vim-crypto-warning.patch +Patch3004: vim-crypto-warning.patch # don't ever set mouse (Fedora downstream patch) -Patch3006: vim-8.0-copy-paste.patch -Patch3007: vim-fortify-source.patch +Patch3005: vim-8.0-copy-paste.patch +Patch3006: vim-fortify-source.patch # uses autoconf in spec file @@ -384,14 +383,13 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %{__tar} xjf %{SOURCE100} %endif -%patch3000 -p1 -b .fstabsyntax +%patch3000 -p1 %patch3001 -p1 %patch3002 -p1 -%patch3003 -p1 -%patch3004 -p1 -b .python-tests -%patch3005 -p1 -b .fips-warning -%patch3006 -p1 -b .copypaste -%patch3007 -p1 -b .fortify +%patch3003 -p1 -b .python-tests +%patch3004 -p1 -b .fips-warning +%patch3005 -p1 -b .copypaste +%patch3006 -p1 -b .fortify %build cd src @@ -998,6 +996,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Mon Jan 09 2023 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.0.1160-1 +- patchlevel 1160 + * Mon Jan 09 2023 Zdenek Dohnal <zdohnal@redhat.com> - 2:9.0.1054-2 - FTBFS with new FORTIFY_SOURCE=3 - remove it since Vim wants level 1