From 994f529b566f39e11b9a59558f7382ca2292e26e Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 29 Nov 2022 14:08:44 -0500 Subject: [PATCH 1/8] Update License to SPDX --- vim-editorconfig.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/vim-editorconfig.spec b/vim-editorconfig.spec index 3c559cf..aa4eeec 100644 --- a/vim-editorconfig.spec +++ b/vim-editorconfig.spec @@ -25,11 +25,12 @@ Release: %autorelease %global plugin_tests_commit cb7ae15d16ab3d72a1139f7a629b11cfe16d972f %global plugin_tests_url https://github.com/editorconfig/editorconfig-plugin-tests/ -# The entire source is BSD, except that the following files are (BSD and -# Python) since they are derived from the Python standard library: +# The entire source is BSD-2-Clause, except that the following files are +# (BSD-2-Clause AND PSF-2.0) since they are derived from the Python standard +# library: # - autoload/editorconfig_core/fnmatch.vim # - autoload/editorconfig_core/ini.vim -License: BSD and (BSD and Python) +License: BSD-2-Clause AND (BSD-2-Clause AND PSF-2.0) URL: https://github.com/editorconfig/%{srcname} Source0: %{url}/archive/v%{version}/%{srcname}-%{version}.tar.gz Source1: %{core_tests_url}/archive/v%{core_tests_version}/editorconfig-core-test-%{core_tests_version}.tar.gz From b5237fcf87775ac228f144d62ba936e33f31b4fa Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 06:18:20 +0000 Subject: [PATCH 2/8] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 9e4472b9b3368a3c1402b995ffa44567d1092a4a Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Mon, 29 May 2023 13:05:19 -0400 Subject: [PATCH 3/8] Reduce macro indirection in the spec file [skip changelog] --- vim-editorconfig.spec | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/vim-editorconfig.spec b/vim-editorconfig.spec index aa4eeec..46db5a2 100644 --- a/vim-editorconfig.spec +++ b/vim-editorconfig.spec @@ -1,6 +1,3 @@ -# Upstream project name: -%global srcname editorconfig-vim - # Currently, rubygem(vimrunner) is not packaged so we cannot run the plugin # tests. Some other work may be required to get them running. See also # https://github.com/editorconfig/editorconfig-vim/issues/150. @@ -31,8 +28,8 @@ Release: %autorelease # - autoload/editorconfig_core/fnmatch.vim # - autoload/editorconfig_core/ini.vim License: BSD-2-Clause AND (BSD-2-Clause AND PSF-2.0) -URL: https://github.com/editorconfig/%{srcname} -Source0: %{url}/archive/v%{version}/%{srcname}-%{version}.tar.gz +URL: https://github.com/editorconfig/editorconfig-vim +Source0: %{url}/archive/v%{version}/editorconfig-vim-%{version}.tar.gz Source1: %{core_tests_url}/archive/v%{core_tests_version}/editorconfig-core-test-%{core_tests_version}.tar.gz # Files in this source are licensed CC-BY; however, nothing derived from them # is installed, so this does not affect the License field. @@ -63,16 +60,16 @@ This is an EditorConfig plugin for Vim. %prep -%autosetup -n %{srcname}-%{version} +%autosetup -n editorconfig-vim-%{version} # Copy in the editorconfig core and plugin tests from the respective GitHub # tarballs. rm -rvf tests/core/tests -%setup -q -T -D -b 1 -n %{srcname}-%{version} +%setup -q -T -D -b 1 -n editorconfig-vim-%{version} cp -rp ../editorconfig-core-test-%{core_tests_version} tests/core/tests %if %{with plugin_tests} rm -rvf tests/plugin/spec/plugin_tests -%setup -q -T -D -b 2 -n %{srcname}-%{version} +%setup -q -T -D -b 2 -n editorconfig-vim-%{version} cp -rp ../editorconfig-plugin-tests-%{plugin_tests_commit} \ tests/plugin/spec/plugin_tests %endif From f13d3567179b92e62f2a9c30aadb4a413261e71f Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sun, 18 Jun 2023 11:39:07 -0400 Subject: [PATCH 4/8] Use new (rpm 4.17.1+) bcond style --- vim-editorconfig.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vim-editorconfig.spec b/vim-editorconfig.spec index 46db5a2..4621b23 100644 --- a/vim-editorconfig.spec +++ b/vim-editorconfig.spec @@ -1,7 +1,7 @@ # Currently, rubygem(vimrunner) is not packaged so we cannot run the plugin # tests. Some other work may be required to get them running. See also # https://github.com/editorconfig/editorconfig-vim/issues/150. -%bcond_with plugin_tests +%bcond plugin_tests 0 # In Fedora, vim plugin packages should ideally start with the vim- prefix: Name: vim-editorconfig From ba9a3ab796690fcd3e54ad08941dc4f7c8ff3635 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 17:38:53 +0000 Subject: [PATCH 5/8] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 2f331f2e089db17ccf6c14b1a2bf69bd7083e5b2 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 23 Nov 2023 09:00:56 -0500 Subject: [PATCH 6/8] Update to 1.2.0 (close RHBZ#2250584) --- .gitignore | 2 ++ sources | 4 ++-- vim-editorconfig.spec | 10 +++++----- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index a55b81a..5b5452e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ /editorconfig-core-test-0.13.tar.gz /editorconfig-plugin-tests-cb7ae15d16ab3d72a1139f7a629b11cfe16d972f.tar.gz /editorconfig-vim-1.1.1.tar.gz +/editorconfig-vim-1.2.0.tar.gz +/editorconfig-core-test-5ca0b296dc31124d0303895c163013450bd97958.tar.gz diff --git a/sources b/sources index 0fc9dd7..42d3de5 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (editorconfig-core-test-0.13.tar.gz) = 655da56c688e06ec0fb6fee06c89ad2eeef7be48ec2df861ed5ce20417801b4fe8ddf2df31026a8b2fb35fe1ab96daadedceb34f4d3231f931c30f109a5d894b +SHA512 (editorconfig-vim-1.2.0.tar.gz) = 1101562e71f2a9f356a3773cc32f4f091d5a0b67c85a8d78d70f76a73ec3b709f5ac5b7db7448972409031d37176190922912945be05037b627d1cf766bbb731 +SHA512 (editorconfig-core-test-5ca0b296dc31124d0303895c163013450bd97958.tar.gz) = df5f772cef2f97bb1a4ebc4fec4e51d0e49949a12649e07ff06d1afa45fca2f2f4fd69386a74f04b583e11235a9820392dffd8abd7c480ba7c1b75e944333099 SHA512 (editorconfig-plugin-tests-cb7ae15d16ab3d72a1139f7a629b11cfe16d972f.tar.gz) = 0f003fbe538c03bc18fcda9c2f6f20d4f6c451b22f7957806487792bffe529ab5dd608a2b602f895f61b3c442237b2640918c7052b49f19b68297964d3db227c -SHA512 (editorconfig-vim-1.1.1.tar.gz) = 7b94db4b2f641ecd2d2623bf55bf9b457c007b2b5c8553cba5b7a75bc34823d6995d3c9ed13febe0f59de6f87c52eb0367591213c43c6fcd7c331c529126f4d6 diff --git a/vim-editorconfig.spec b/vim-editorconfig.spec index 4621b23..cf179fe 100644 --- a/vim-editorconfig.spec +++ b/vim-editorconfig.spec @@ -6,7 +6,7 @@ # In Fedora, vim plugin packages should ideally start with the vim- prefix: Name: vim-editorconfig Summary: EditorConfig Vim Plugin -Version: 1.1.1 +Version: 1.2.0 Release: %autorelease # The editorconfig core tests are included as a git submodule do not appear in @@ -14,8 +14,8 @@ Release: %autorelease # for them. We do not treat this as a bundled library because the tests do not # contribute to the installed files in any way. When the package is updated, # the maintainer should check that we still have the correct (latest) version -# of the tests. -%global core_tests_version 0.13 +# or snapshot of the tests. +%global core_tests_commit 5ca0b296dc31124d0303895c163013450bd97958 %global core_tests_url https://github.com/editorconfig/editorconfig-core-test/ # Same for the plugin tests; these do not tag releases, so we reference a # particular commit. @@ -30,7 +30,7 @@ Release: %autorelease License: BSD-2-Clause AND (BSD-2-Clause AND PSF-2.0) URL: https://github.com/editorconfig/editorconfig-vim Source0: %{url}/archive/v%{version}/editorconfig-vim-%{version}.tar.gz -Source1: %{core_tests_url}/archive/v%{core_tests_version}/editorconfig-core-test-%{core_tests_version}.tar.gz +Source1: %{core_tests_url}/archive/%{core_tests_commit}/editorconfig-core-test-%{core_tests_commit}.tar.gz # Files in this source are licensed CC-BY; however, nothing derived from them # is installed, so this does not affect the License field. Source2: %{plugin_tests_url}/archive/%{plugin_tests_commit}/editorconfig-plugin-tests-%{plugin_tests_commit}.tar.gz @@ -66,7 +66,7 @@ This is an EditorConfig plugin for Vim. # tarballs. rm -rvf tests/core/tests %setup -q -T -D -b 1 -n editorconfig-vim-%{version} -cp -rp ../editorconfig-core-test-%{core_tests_version} tests/core/tests +cp -rp ../editorconfig-core-test-%{core_tests_commit} tests/core/tests %if %{with plugin_tests} rm -rvf tests/plugin/spec/plugin_tests %setup -q -T -D -b 2 -n editorconfig-vim-%{version} From 790b890eb2262ff212d5bc590106676d014542a7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 07:47:37 +0000 Subject: [PATCH 7/8] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From eade79dfdd0924c36dd614173d12b1ada3abefe9 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Fri, 21 Jun 2024 11:43:28 -0500 Subject: [PATCH 8/8] Orphaned for 6+ weeks --- .gitignore | 5 -- README.md | 3 -- changelog | 2 - dead.package | 1 + sources | 3 -- vim-editorconfig.spec | 120 ------------------------------------------ 6 files changed, 1 insertion(+), 133 deletions(-) delete mode 100644 .gitignore delete mode 100644 README.md delete mode 100644 changelog create mode 100644 dead.package delete mode 100644 sources delete mode 100644 vim-editorconfig.spec diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 5b5452e..0000000 --- a/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/editorconfig-core-test-0.13.tar.gz -/editorconfig-plugin-tests-cb7ae15d16ab3d72a1139f7a629b11cfe16d972f.tar.gz -/editorconfig-vim-1.1.1.tar.gz -/editorconfig-vim-1.2.0.tar.gz -/editorconfig-core-test-5ca0b296dc31124d0303895c163013450bd97958.tar.gz diff --git a/README.md b/README.md deleted file mode 100644 index 4a857c0..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# vim-editorconfig - -The vim-editorconfig package diff --git a/changelog b/changelog deleted file mode 100644 index 861b17a..0000000 --- a/changelog +++ /dev/null @@ -1,2 +0,0 @@ -* Mon Apr 12 2021 Benjamin A. Beasley - 1.1.1-1 -- Initial package diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..5204a84 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Orphaned for 6+ weeks diff --git a/sources b/sources deleted file mode 100644 index 42d3de5..0000000 --- a/sources +++ /dev/null @@ -1,3 +0,0 @@ -SHA512 (editorconfig-vim-1.2.0.tar.gz) = 1101562e71f2a9f356a3773cc32f4f091d5a0b67c85a8d78d70f76a73ec3b709f5ac5b7db7448972409031d37176190922912945be05037b627d1cf766bbb731 -SHA512 (editorconfig-core-test-5ca0b296dc31124d0303895c163013450bd97958.tar.gz) = df5f772cef2f97bb1a4ebc4fec4e51d0e49949a12649e07ff06d1afa45fca2f2f4fd69386a74f04b583e11235a9820392dffd8abd7c480ba7c1b75e944333099 -SHA512 (editorconfig-plugin-tests-cb7ae15d16ab3d72a1139f7a629b11cfe16d972f.tar.gz) = 0f003fbe538c03bc18fcda9c2f6f20d4f6c451b22f7957806487792bffe529ab5dd608a2b602f895f61b3c442237b2640918c7052b49f19b68297964d3db227c diff --git a/vim-editorconfig.spec b/vim-editorconfig.spec deleted file mode 100644 index cf179fe..0000000 --- a/vim-editorconfig.spec +++ /dev/null @@ -1,120 +0,0 @@ -# Currently, rubygem(vimrunner) is not packaged so we cannot run the plugin -# tests. Some other work may be required to get them running. See also -# https://github.com/editorconfig/editorconfig-vim/issues/150. -%bcond plugin_tests 0 - -# In Fedora, vim plugin packages should ideally start with the vim- prefix: -Name: vim-editorconfig -Summary: EditorConfig Vim Plugin -Version: 1.2.0 -Release: %autorelease - -# The editorconfig core tests are included as a git submodule do not appear in -# the GitHub-generated release tarball, so we need a separate source archive -# for them. We do not treat this as a bundled library because the tests do not -# contribute to the installed files in any way. When the package is updated, -# the maintainer should check that we still have the correct (latest) version -# or snapshot of the tests. -%global core_tests_commit 5ca0b296dc31124d0303895c163013450bd97958 -%global core_tests_url https://github.com/editorconfig/editorconfig-core-test/ -# Same for the plugin tests; these do not tag releases, so we reference a -# particular commit. -%global plugin_tests_commit cb7ae15d16ab3d72a1139f7a629b11cfe16d972f -%global plugin_tests_url https://github.com/editorconfig/editorconfig-plugin-tests/ - -# The entire source is BSD-2-Clause, except that the following files are -# (BSD-2-Clause AND PSF-2.0) since they are derived from the Python standard -# library: -# - autoload/editorconfig_core/fnmatch.vim -# - autoload/editorconfig_core/ini.vim -License: BSD-2-Clause AND (BSD-2-Clause AND PSF-2.0) -URL: https://github.com/editorconfig/editorconfig-vim -Source0: %{url}/archive/v%{version}/editorconfig-vim-%{version}.tar.gz -Source1: %{core_tests_url}/archive/%{core_tests_commit}/editorconfig-core-test-%{core_tests_commit}.tar.gz -# Files in this source are licensed CC-BY; however, nothing derived from them -# is installed, so this does not affect the License field. -Source2: %{plugin_tests_url}/archive/%{plugin_tests_commit}/editorconfig-plugin-tests-%{plugin_tests_commit}.tar.gz - -BuildArch: noarch - -# For all tests: -BuildRequires: editorconfig -BuildRequires: vim-enhanced -# For core tests -BuildRequires: cmake -%if %{with plugin_tests} -# For plugin tests -BuildRequires: xorg-x11-server-Xvfb -BuildRequires: rubygem(rake) -BuildRequires: rubygem(rspec) -# tests/plugin/spec/editorconfig_spec.rb: require 'vimrunner' -BuildRequires: rubygem(vimrunner) -%endif - -Requires: vim-filesystem -# The plugin calls the editorconfig executable. -Requires: editorconfig - -%description -This is an EditorConfig plugin for Vim. - - -%prep -%autosetup -n editorconfig-vim-%{version} - -# Copy in the editorconfig core and plugin tests from the respective GitHub -# tarballs. -rm -rvf tests/core/tests -%setup -q -T -D -b 1 -n editorconfig-vim-%{version} -cp -rp ../editorconfig-core-test-%{core_tests_commit} tests/core/tests -%if %{with plugin_tests} -rm -rvf tests/plugin/spec/plugin_tests -%setup -q -T -D -b 2 -n editorconfig-vim-%{version} -cp -rp ../editorconfig-plugin-tests-%{plugin_tests_commit} \ - tests/plugin/spec/plugin_tests -%endif - -# Fix executable bit on license file -chmod -v a-x LICENSE.PSF - - -%build -pushd tests/core -%cmake -# There is not actually anything to do here: -%cmake_build -popd - - -%install -install -d '%{buildroot}%{_datadir}/vim/vimfiles' -cp -rvp autoload plugin '%{buildroot}%{_datadir}/vim/vimfiles' - - -%check -# Core tests: these could also be executed by “./tests/travis-test.sh core”. -pushd tests/core -%ctest -popd - -%if %{with plugin_tests} -# Plugin tests: -export EDITORCONFIG_VIM_EXTERNAL_CORE='%{_bindir}/editorconfig' -%{_bindir}/xvfb-run -a rspec tests/plugin/spec/editorconfig_spec.rb -%endif - - -%files -%license LICENSE LICENSE.PSF -%doc CONTRIBUTORS -%doc README.md -%doc doc/*.txt - -%{_datadir}/vim/vimfiles/autoload/editorconfig.vim -%{_datadir}/vim/vimfiles/autoload/editorconfig_core.vim -%{_datadir}/vim/vimfiles/autoload/editorconfig_core -%{_datadir}/vim/vimfiles/plugin/editorconfig.vim - - -%changelog -%autochangelog