7 changed files with 37 additions and 253 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-/syntastic-*.tar.gz
+/syntastic-3.9.0.tar.gz
--- a/36
+++ b/36
@ -1,36 +0,0 @@
-#! /bin/sh
-
-# Prepare master branch, review the list of branches below and then execute this
-# script.
-
-branches='master f29 f30 f31'
-
-exit_handler ()
-{
-    git checkout master
-}
-
-trap exit_handler EXIT
-
-set -e
-set -x
-
-koji hello
-
-tasks=
-for branch in $branches; do
-    if test $branch != master; then
-        git checkout "$branch"
-        git merge master
-    fi
-    git push
-    tasks="${tasks}`fedpkg build --nowait | grep 'Created task' | cut -d: -f2`"
-done
-
-koji watch-task $tasks
-
-for branch in $branches; do
-    test $branch != master || continue
-    git checkout $branch
-    fedpkg update
-done
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (syntastic-3.10.0.tar.gz) = c19f2f7b709bbd9aab30da0f493e773e3e56d97efa0e558af7a97fcda1bb2f091355e06d24971f1bde5b321e027b6fc279b1d473599b77db0e996bf7a247fcd8
+SHA512 (syntastic-3.9.0.tar.gz) = 04cee939226940bb95935434b7aba42a3419b8b7b73d5fa9052a6aaccec5d0724c4e3634edd56573d0080b31baf49c1a00811c6f88e4fbbdea7e761e5707dcb5
--- a/vim-syntastic-3.10.0-5-rvim.patch
+++ b/vim-syntastic-3.10.0-5-rvim.patch
@ -1,43 +0,0 @@
-# Upstream version bump removed
-commit 39b35b23b952d620b8ec7cabb13110f586663837
-Author: LCD 47 <lcd047@gmail.com>
-Date:   Wed Nov 20 10:00:33 2019 +0200
-
-    Sanity check: syntastic can't run in rvim.
-
-diff --git a/autoload/syntastic/util.vim b/autoload/syntastic/util.vim
-index 8a17fe64..41b40e6a 100644
--- a/autoload/syntastic/util.vim
-+++ b/autoload/syntastic/util.vim
-@@ -42,6 +42,11 @@ function! syntastic#util#system(command) abort " {{{2
-     try
-         let out = system(a:command)
-     catch
-+        if v:exception =~# '\m^Vim\%((\a\+)\)\=:\%(E145\|E484\|E684\)'
-+            " XXX re-throwing unmodified v:exception triggers E608
-+            throw substitute(v:exception, '.*:\(E145\|E484\|E684\).*', '\1', '')
-+        endif
-+
-         let crashed = 1
-         call syntastic#log#error('exception running system(' . string(a:command) . '): ' . v:exception)
-         if syntastic#util#isRunningWindows()
-diff --git a/plugin/syntastic.vim b/plugin/syntastic.vim
-index d48a8d12..4a113eee 100644
--- a/plugin/syntastic.vim
-+++ b/plugin/syntastic.vim
-@@ -57,10 +57,13 @@ if s:_running_windows
- elseif executable('uname')
-     try
-         let g:_SYNTASTIC_UNAME = split(syntastic#util#system('uname'), "\n")[0]
-    catch /\m^Vim\%((\a\+)\)\=:E484/
-+    catch /\m^E145$/
-+        call syntastic#log#error("can't run in rvim")
-+        finish
-+    catch /\m^E484$/
-         call syntastic#log#error("can't run external programs (misconfigured shell options?)")
-         finish
-    catch /\m^Vim\%((\a\+)\)\=:E684/
-+    catch /\m^E684$/
-         let g:_SYNTASTIC_UNAME = 'Unknown'
-     endtry
- else
--- a/vim-syntastic-3.10.0-yamllint-default.patch
+++ b/vim-syntastic-3.10.0-yamllint-default.patch
@ -1,13 +0,0 @@
-diff --git a/plugin/syntastic/registry.vim b/plugin/syntastic/registry.vim
-index 4640bf7..c912307 100644
--- a/plugin/syntastic/registry.vim
-+++ b/plugin/syntastic/registry.vim
-@@ -111,7 +111,7 @@ let s:_DEFAULT_CHECKERS = {
-         \ 'xslt':          ['xmllint'],
-         \ 'xquery':        ['basex'],
-         \ 'yacc':          ['bison'],
-        \ 'yaml':          ['jsyaml'],
-+        \ 'yaml':          ['yamllint'],
-         \ 'yang':          ['pyang'],
-         \ 'yara':          ['yarac'],
-         \ 'z80':           ['z80syntaxchecker'],
--- a/vim-syntastic-3.9.0-python3-shebang.patch
+++ b/vim-syntastic-3.9.0-python3-shebang.patch
@ -1,20 +0,0 @@
-diff --git a/syntax_checkers/python/codec.py b/syntax_checkers/python/codec.py
-index 6e980c7..850df25 100755
--- a/syntax_checkers/python/codec.py
-+++ b/syntax_checkers/python/codec.py
-@@ -1,4 +1,4 @@
-#!/usr/bin/env python
-+#!/usr/bin/python3
- 
- from __future__ import print_function
- from sys import argv, exit
-diff --git a/syntax_checkers/python/compile.py b/syntax_checkers/python/compile.py
-index 32f1413..2171563 100755
--- a/syntax_checkers/python/compile.py
-+++ b/syntax_checkers/python/compile.py
-@@ -1,4 +1,4 @@
-#!/usr/bin/env python
-+#!/usr/bin/python3
- 
- from __future__ import print_function
- from sys import argv, exit
--- a/vim-syntastic.spec
+++ b/vim-syntastic.spec
@ -2,11 +2,11 @@
 %global         upstream_name   syntastic

 %global         appdata_dir %{_datadir}/appdata
-%global         python python3
+%global         python python2

 Name:           vim-%{upstream_name}
-Version:        3.10.0
-Release:        28%{?dist}
+Version:        3.9.0
+Release:        1%{?dist}
 Summary:        A vim plugins to check syntax for programming languages
 Summary(fr):    Une extension de vim vérifiant la syntaxe pour les langages de programmation

@ -15,12 +15,7 @@ URL:            https://github.com/scrooloose/syntastic
 Source0:        https://github.com/scrooloose/syntastic/archive/%{version}/%{upstream_name}-%{version}.tar.gz
 Source1:        vim-syntastic.metainfo.xml

-Patch0:         vim-syntastic-3.9.0-python3-shebang.patch
-Patch1:         vim-syntastic-3.10.0-5-rvim.patch
-Patch2:         vim-syntastic-3.10.0-yamllint-default.patch
-
 BuildArch:      noarch
-ExclusiveArch:  %{java_arches} noarch
 Requires:       vim
 BuildRequires:  glibc-common
 # Needed for AppData check.
@ -32,10 +27,7 @@ Obsoletes:      %upstream_name < 3.7.0-6
 # (temporarily?) dropped subpackages
 Obsoletes:      %name-d < %version-%release
 Obsoletes:      %name-lisp < %version-%release
-Obsoletes:      %name-rnc < %version-%release
-Obsoletes:      %name-go < %version-%release
-Obsoletes:      %name-coffee < %version-%release
-Obsoletes:      %name-scala < %version-%release
+

 %description
 Syntastic is a syntax checking plugin that runs files through external syntax
@ -85,10 +77,9 @@ Permet de vérifier les fichiers sources écrit en %{-n*}.
 %{vimfiles}/autoload/syntastic/c.vim
 %add_subpackage -n c gcc
 %add_subpackage -n cabal cabal-install
-# cofee-script has been retired
-#%%add_subpackage -n coffee coffee-script
+%add_subpackage -n coffee coffee-script
 %add_subpackage -n coq coq
-%add_subpackage -n cpp gcc-c++ vim-syntastic-c
+%add_subpackage -n cpp gcc-c++
 %add_subpackage -n cs mono-core
 %add_subpackage -n css csslint
 %add_subpackage -n cucumber rubygem-cucumber
@ -100,12 +91,13 @@ Permet de vérifier les fichiers sources écrit en %{-n*}.
 %add_subpackage -n eruby ruby
 %add_subpackage -n fortran gcc-gfortran
 %add_subpackage -n glsl mesa-libGLU
-%add_subpackage -n go golang-bin
+%add_subpackage -n go gcc-go
 %add_subpackage -n haml rubygem-haml
 %add_subpackage -n help proselint
 %add_subpackage -n haskell ghc
 %add_subpackage -n html sed curl tidy
 %add_subpackage -n java java-devel
+%add_subpackage -n javascript jsl
 %add_subpackage -n json %{python}-demjson
 %add_subpackage -n julia julia
 %add_subpackage -n less nodejs
@ -125,15 +117,13 @@ Permet de vérifier les fichiers sources écrit en %{-n*}.
 %add_subpackage -n po gettext
 %add_subpackage -n pod perl-interpreter
 %add_subpackage -n puppet puppet
-%add_subpackage -n python pylint /usr/bin/pyflakes
+%add_subpackage -n python pylint pyflakes
 %add_subpackage -n qml /usr/bin/qmllint
-#rnv has been retired
-#%%add_subpackage -n rnc rnv
+%add_subpackage -n rnc rnv
 %add_subpackage -n rst %{python}-docutils %name-text %name-xml %name-docbk
 %add_subpackage -n ruby ruby
 %add_subpackage -n sass rubygem-sass
-#Scala has been removed as of F42
-#%%add_subpackage -n scala scala
+%add_subpackage -n scala scala
 %add_subpackage -n scss rubygem-sass
 %add_subpackage -n sh bash
 %add_subpackage -n spec rpmlint
@ -145,12 +135,13 @@ Permet de vérifier les fichiers sources écrit en %{-n*}.
 %add_subpackage -n turtle raptor2
 %add_subpackage -n vala vala
 %add_subpackage -n verilog iverilog
+%add_subpackage -n vhdl freehdl
 %add_subpackage -n vim vim
 %add_subpackage -n xhtml tidy
 %add_subpackage -n xml /usr/bin/xmllint
 %add_subpackage -n xslt /usr/bin/xmllint
 %add_subpackage -n yacc byacc
-%add_subpackage -n yaml yamllint perl-YAML-LibYAML
+%add_subpackage -n yaml nodejs-js-yaml perl-YAML-LibYAML
 %add_subpackage -n yara yara
 %add_subpackage -n z80 z80asm
 %add_subpackage -n zsh zsh
@ -164,7 +155,7 @@ Permet de vérifier les fichiers sources écrit en %{-n*}.


 %prep
-%autosetup -n %upstream_name-%version -p1
+%setup -q -n %upstream_name-%version
 # Use a free D compiler ldc
 sed -i "s/dmd/ldc2/g" syntax_checkers/d/dmd.vim
 # Use executable script from bindir
@ -185,8 +176,6 @@ rm -r syntax_checkers/chef
 rm -r syntax_checkers/cmake
 rm -r syntax_checkers/co
 rm -r syntax_checkers/cobol
-# coffee-script has been removed from fedora as of f39
-rm -r syntax_checkers/coffee
 rm -r syntax_checkers/cuda
 # https://pagure.io/packaging-committee/issue/312
 rm -r syntax_checkers/d
@ -199,8 +188,6 @@ rm -r syntax_checkers/handlebars
 rm -r syntax_checkers/haxe
 rm -r syntax_checkers/hss
 rm -r syntax_checkers/jade
-# rhbz#1912817
-rm -r syntax_checkers/javascript
 rm -r syntax_checkers/limbo
 # https://pagure.io/packaging-committee/issue/312
 rm -r syntax_checkers/lisp
@ -214,24 +201,17 @@ rm -r syntax_checkers/r
 rm -r syntax_checkers/racket
 # mock -r fedora-rawhide-x86_64 --install '/*/lintr'
 rm -r syntax_checkers/rmd
-rm -r syntax_checkers/rnc
-# rhbz#2311476
-rm -r syntax_checkers/scala
 rm -r syntax_checkers/slim
 rm -r syntax_checkers/sml
 # mock -r fedora-rawhide-x86_64 --install '/*/solc'
 rm -r syntax_checkers/solidity
 rm -r syntax_checkers/sql
 rm -r syntax_checkers/stylus
-# removed since nobody needs that, patches welcome!
-rm -r syntax_checkers/svg
 # Doesn't install binary:
 # mock -r fedora-rawhide-x86_64 --install '/*/ttl'
 rm -r syntax_checkers/turtle/ttl.vim
 rm -r syntax_checkers/twig
 rm -r syntax_checkers/typescript
-# https://bugzilla.redhat.com/show_bug.cgi?id=1832470
-rm -r syntax_checkers/vhdl
 # dunno what to do with this
 rm -r syntax_checkers/vue
 # mock -r fedora-rawhide-x86_64 --install '/*/basex'
@ -245,9 +225,10 @@ rm -r syntax_checkers/zpt
 %install
 mkdir -p %{buildroot}%{_bindir}
 mkdir -p %{buildroot}%{vimfiles}/autoload
+mkdir -p %{buildroot}%{vimfiles}/doc

 cp      -rp       autoload/*                            %{buildroot}%{vimfiles}/autoload/
-install -Dpm0644  doc/syntastic.txt                     %{buildroot}%{vimfiles}/doc/syntastic.txt
+install -p -m0644 doc/syntastic.txt                     %{buildroot}%{vimfiles}/doc/syntastic.txt
 cp      -rp       plugin/                               %{buildroot}%{vimfiles}/plugin
 cp      -rp       syntax_checkers/                      %{buildroot}%{vimfiles}/syntax_checkers

@ -264,14 +245,31 @@ cp      -rp       syntax_checkers/                      %{buildroot}%{vimfiles}/
 # zpt.vim            -> no zptlint executable in repo

 # Install AppData.
-install -Dpm0644 %{SOURCE1} %{buildroot}%{appdata_dir}/vim-syntastic.metainfo.xml
+mkdir -p %{buildroot}%{appdata_dir}
+install -m 644 %{SOURCE1} %{buildroot}%{appdata_dir}


 %check
 # Check the AppData add-on to comply with guidelines.
-appstream-util validate-relax --nonet %{buildroot}%{appdata_dir}/vim-syntastic.metainfo.xml
+appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.metainfo.xml


+%post
+umask 022
+cd %{vimfiles}/doc
+vim -u NONE -esX -c "helptags ." -c quit
+exit 0
+
+
+%postun
+if [ $1 -eq 0 ]; then
+umask 022
+cd %{vimfiles}/doc
+>tags
+vim -u NONE -esX -c "helptags ." -c quit
+fi
+exit 0
+
 %files
 %license LICENCE
 %doc _assets/screenshot_1.png README.markdown
@ -291,108 +289,6 @@ appstream-util validate-relax --nonet %{buildroot}%{appdata_dir}/vim-syntastic.m


 %changelog
-* Fri Aug 08 2025 Martin Jackson <orion@nwra.com> - 3.10.0-28
- Add dependency for -cpp to also install -c. Fixes bz#1830768
-
-* Thu Aug 07 2025 Orion Poplawski <orion@nwra.com> - 3.10.0-27
- Rebuild for Octave 10.2
-
-* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.10.0-26
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.10.0-25
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Thu Sep 12 2024 Martin Jackson <mhjacks@swbell.net> - 3.10.0-24
- scala has retired, so stop building it. bz#2311476
-
-* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.10.0-23
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.10.0-22
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.10.0-21
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Fri Apr 7 2023 Martin Jackson <mhjacks@swbell.net> - 3.10.0-20
- cofee-script has retired, so stop building it. bz#2184502
-
-* Thu Feb 23 2023 Martin Jackson <mhjacks@swbell.net> - 3.10.0-19
- Perl6 has come back! Thanks topazus.
-
-* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.10.0-18
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Wed Jan 11 2023 Martin Jackson <mhjacks@swbell.net> - 3.10.0-17
- Remove perl6 dependencies for BZ#2159997. Rakudo etc have been retired for f38
-
-* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.10.0-16
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Fri Jul 08 2022 Jiri Vanek <jvanek@redhat.com> - 3.10.0-15
- Rebuilt for Drop i686 JDKs
-
-* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.10.0-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Tue Oct 12 2021 Martin Jackson <mhjacks@swbell.net> - 3.10.0-13
- Change go dep to golang-bin from gcc-go. Obsolete earlier go subpackages
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.10.0-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Wed Jul  7 2021 Martin Jackson <mhjacks@swbell.net> - 3.10.0-11
- Obsolete rnc subpackage as well, and remove the rnc dir from package.
- Handle commented macro.
-
-* Wed Jul  7 2021 Martin Jackson <mhjacks@swbell.net> - 3.10.0-10
- Stop building rnc subpackage due to rnv's retirement. (rhbz#1955850)
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.10.0-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Tue Jan 05 2021 Pavel Raiskup <praiskup@redhat.com> - 3.10.0-8
- drop javascript subpackage, javascript is going away from Fedora
-  apparently
- this is probably the last update of vim-syntastic package, I plan to orphan it
-  and start maintaining vim-ale instead:
-  https://copr.fedorainfracloud.org/coprs/praiskup/vim-ale/
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.10.0-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue Jul 07 2020 Pavel Raiskup <praiskup@redhat.com> - 3.10.0-6
- switch the default YAML checker to yamllint (rhbz#1852240)
-
-* Wed May 06 2020 Pavel Raiskup <praiskup@redhat.com> - 3.10.0-5
- disable vhdl subpackage
-
-* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.10.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Wed Nov 20 2019 Markus Linnala <markus.linnala@gmail.com> - 3.10.0-3
- Add upstream patch vim-syntastic-3.10.0-5-rvim.patch to fix bz#1773723
-
-* Wed Nov 20 2019 Markus Linnala <markus.linnala@gmail.com> - 3.10.0-2
- Simplify install/mkdir using install -D
-
-* Thu Oct 03 2019 Pavel Raiskup <praiskup@redhat.com> - 3.10.0-1
- new upstream release (rhbz#1758038)
-
-* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.9.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Tue Feb 12 2019 Pavel Raiskup <praiskup@redhat.com> - 3.9.0-4
- drop scriptlets, it is handled by vim-common's filetriggers
- use python3 shebangs (rhbz#1676190)
-
-* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.9.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.9.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
 * Mon Apr 23 2018 Pavel Raiskup <praiskup@redhat.com> - 3.9.0-1
 - new upstream release, per release notes:
  https://github.com/vim-syntastic/syntastic/releases/tag/3.9.0