diff --git a/osc-1.15.1.tar.gz b/osc-1.15.1.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..71aa3a19da6f368c175c264aa812c86182cd68a3 Binary files /dev/null and b/osc-1.15.1.tar.gz differ diff --git a/osc-1.9.1.tar.gz b/osc-1.9.1.tar.gz deleted file mode 100644 index 7830b4d21445ac0aafba3c37c6bec623f4b0fb42..0000000000000000000000000000000000000000 Binary files a/osc-1.9.1.tar.gz and /dev/null differ diff --git a/osc.spec b/osc.spec index d67cc0480399c725bcc94a1fabcfd06b671b9b5b..7460220b765febe6db076c8c754b8205c6a4e56d 100644 --- a/osc.spec +++ b/osc.spec @@ -3,15 +3,16 @@ %global obs_srcsvc_dir %{obsroot}/service Name: osc -Version: 1.9.1 +Version: 1.15.1 Release: 1 Summary: The Command Line Interface to work with an Open Build Service -License: GPLv2+ +License: GPL-2.0-or-later Url: https://github.com/openSUSE/osc Source: https://github.com/openSUSE/osc/archive/%{version}/%{name}-%{version}.tar.gz BuildArch: noarch BuildRequires: python3-devel python3-distro python3-rpm python3-setuptools diffstat BuildRequires: python3-cryptography python3-urllib3 python3-argparse-manpage +BuildRequires: python3-ruamel-yaml git-core Requires: python3-distro python3-rpm python3-lxml vim Requires: python3-urllib3 python3-progressbar2 Recommends: obs-build @@ -45,21 +46,44 @@ PYTHONPATH=. argparse-manpage \ --output=osc.1 \ --format=single-commands-section \ --module=osc.commandline \ - --function=get_parser \ + --function=argparse_manpage_get_parser \ --project-name=osc \ --prog=osc \ - --description="OpenSUSE Commander" \ + --description="Command-line client for Open Build Service" \ --author="Contributors to the osc project. See the project's GIT history for the complete list." \ --url="https://github.com/openSUSE/osc/" + +PYTHONPATH=. argparse-manpage \ + --output=git-obs.1 \ + --format=single-commands-section \ + --module=osc.commandline_git \ + --function=argparse_manpage_get_parser \ + --project-name=osc \ + --prog=git-obs \ + --description="Git based command-line client for Open Build Service" \ + --author="Contributors to the osc project. See the project's GIT history for the complete list." \ + --url="https://github.com/openSUSE/osc/" + + %install %py3_install mkdir -p %{buildroot}%{_localstatedir}/lib/osc-plugins + install -Dm0644 contrib/complete.csh %{buildroot}%{_sysconfdir}/profile.d/osc.csh +install -Dm0644 contrib/git-obs-complete.zsh %{buildroot}%{_datadir}/zsh/site-functions/git-obs.zsh + install -Dm0644 contrib/complete.sh %{buildroot}%{_datadir}/bash-completion/completions/osc +install -Dm0644 contrib/git-obs-complete.bash %{buildroot}%{_datadir}/bash-completion/completions/git-obs.bash + install -Dm0755 contrib/osc.complete %{buildroot}%{_datadir}/osc/complete + install -Dm0644 contrib/osc.fish %{buildroot}%{_datadir}/fish/vendor_completions.d/osc.fish +install -Dm0644 contrib/git-obs-complete.fish %{buildroot}%{_datadir}/fish/vendor_completions.d/git-obs.fish + +mkdir -p %{buildroot}%{_libexecdir}/git +ln -s %{_bindir}/git-obs %{buildroot}%{_libexecdir}/git/obs mkdir -p %{buildroot}%{obs_srcsvc_dir} @@ -72,6 +96,10 @@ install -Dm0644 macros.osc %{buildroot}%{_rpmmacrodir}/macros.osc # install man page install -Dm0644 osc.1 %{buildroot}%{_mandir}/man1/osc.1 +install -Dm0644 git-obs.1 %{buildroot}%{_mandir}/man1/git-obs.1 + +# inject argcomplete marker to the generated git-obs executable +sed -i '3i # PYTHON_ARGCOMPLETE_OK' %{buildroot}%{_bindir}/git-obs %check python3 setup.py test @@ -80,10 +108,15 @@ python3 setup.py test %doc AUTHORS README.md NEWS %license COPYING %{_bindir}/osc* +%{_bindir}/git-obs +%{_libexecdir}/git/obs %{python3_sitelib}/osc* %{_sysconfdir}/profile.d/osc.csh +%{_datadir}/zsh/site-functions/git-obs.zsh %{_datadir}/bash-completion/completions/osc +%{_datadir}/bash-completion/completions/git-obs.bash %{_datadir}/fish/vendor_completions.d/osc.fish +%{_datadir}/fish/vendor_completions.d/git-obs.fish %dir %{_localstatedir}/lib/osc-plugins %{_datadir}/osc %{_rpmconfigdir}/macros.d/macros.osc @@ -93,8 +126,12 @@ python3 setup.py test %files help %{_mandir}/man1/osc.* +%{_mandir}/man1/git-obs.* %changelog +* Mon May 12 2025 wangkai <13474090681@163.com> - 1.15.1-1 +- Update to 1.15.1 + * Tue Sep 10 2024 wangkai <13474090681@163.com> - 1.9.1-1 - Update to 1.9.1 for fix CVE-2024-22034 diff --git a/osc.yaml b/osc.yaml index af9cbedc5e0bfee4f60e657e0b46f7b5e51cc4aa..777a8e44c2b7e5b220af8fe42de0e7b7e821feee 100644 --- a/osc.yaml +++ b/osc.yaml @@ -1,4 +1,4 @@ version_control: github src_repo: openSUSE/osc -tag_prefix: NA -seperator: . +tag_prefix: ^ +separator: .