From 419e78e94a35012f74df6ec23045e3a7fcf5c7273c5154a3b00c1753d0eafcdd Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Mon, 9 Oct 2023 11:08:20 +0000 Subject: [PATCH] Accepting request 1115564 from home:dmach:branches:openSUSE:Tools - 1.4.0 - Command-line: - Add rootless build support to 'build' command for 'kvm' and 'podman' vm types - Print a hint to clean the build root after a failed build - Avoid adding a newline to prompt in 'wipe' command - Fix 'build' command to pass '--vm-type' option to the underlying build tool - Add '--just-print-buildroot' option to print build root path and exit to 'build' command - Add support for keep_packages_locked on request revoke - Import zsh completition made by Holger Macht and improve it - Use XDG locations in completion - Fix 'search' command to resolve '-B .' to the current project - Add '-M/--multibuild-package' option to 'checkconstraints' command - Allow constraints file with remote request in 'checkconstraints' command - Unify how the 'commit' and 'build' commands work with '--noservice' option - Fix 'request show' command to print superseded_by information - Fix 'service' command to support already documented 'r' abbreviation for 'run' - Configuration: - Implement 'exclude_files' and 'include_files' config options that allow skipping files in the 'checkout' command - Fix api_host_options for custom CAs (cafile and capath options work again) - Switch 'osc.conf.config' from dict to Options class with type checking - Rename conf.Options.build_type to vm_type to be consistent with obs build and osc --vm-type option - Update list of supported vm_type values in conf.Options.vm_type - Remove any duplicated code loading configuration from ENV - Library: - Add 'osc.util.models' module implementing an alternative pydantic-like data validation - Add 'osc.util.xdg' module for handling XDG paths - Fix handling empty vm_type in Store.last_buildroot - Spec: - Install zsh completion - Build and install oscrc man page OBS-URL: https://build.opensuse.org/request/show/1115564 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/osc?expand=0&rev=410 --- PKGBUILD | 2 +- debian.changelog | 2 +- osc-1.3.1.tar.gz | 3 --- osc-1.4.0.tar.gz | 3 +++ osc.changes | 34 ++++++++++++++++++++++++++++++++++ osc.dsc | 2 +- osc.spec | 16 +++++++++++++--- 7 files changed, 53 insertions(+), 9 deletions(-) delete mode 100644 osc-1.3.1.tar.gz create mode 100644 osc-1.4.0.tar.gz diff --git a/PKGBUILD b/PKGBUILD index 1b761a5..e41ca64 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=osc -pkgver=1.3.1 +pkgver=1.4.0 pkgrel=0 pkgdesc="Command-line client for the Open Build Service" arch=('x86_64') diff --git a/debian.changelog b/debian.changelog index e7cdc3e..1d3ae4c 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,4 +1,4 @@ -osc (1.3.1-0) unstable; urgency=low +osc (1.4.0-0) unstable; urgency=low * Placeholder diff --git a/osc-1.3.1.tar.gz b/osc-1.3.1.tar.gz deleted file mode 100644 index a7f977b..0000000 --- a/osc-1.3.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6fb9fee8dfd86276632d6a7a25169f34bec1bc251c79161b5f096a9ebde51cd8 -size 343890 diff --git a/osc-1.4.0.tar.gz b/osc-1.4.0.tar.gz new file mode 100644 index 0000000..dd8d36f --- /dev/null +++ b/osc-1.4.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bc083473d5677ba75e2b9adf867c32fc17bb11adc38d863cf9c7a2d8c1d01287 +size 354269 diff --git a/osc.changes b/osc.changes index 285aab8..97452eb 100644 --- a/osc.changes +++ b/osc.changes @@ -1,3 +1,37 @@ +------------------------------------------------------------------- +Wed Oct 4 10:01:35 UTC 2023 - Daniel Mach + +- 1.4.0 + - Command-line: + - Add rootless build support to 'build' command for 'kvm' and 'podman' vm types + - Print a hint to clean the build root after a failed build + - Avoid adding a newline to prompt in 'wipe' command + - Fix 'build' command to pass '--vm-type' option to the underlying build tool + - Add '--just-print-buildroot' option to print build root path and exit to 'build' command + - Add support for keep_packages_locked on request revoke + - Import zsh completition made by Holger Macht and improve it + - Use XDG locations in completion + - Fix 'search' command to resolve '-B .' to the current project + - Add '-M/--multibuild-package' option to 'checkconstraints' command + - Allow constraints file with remote request in 'checkconstraints' command + - Unify how the 'commit' and 'build' commands work with '--noservice' option + - Fix 'request show' command to print superseded_by information + - Fix 'service' command to support already documented 'r' abbreviation for 'run' + - Configuration: + - Implement 'exclude_files' and 'include_files' config options that allow skipping files in the 'checkout' command + - Fix api_host_options for custom CAs (cafile and capath options work again) + - Switch 'osc.conf.config' from dict to Options class with type checking + - Rename conf.Options.build_type to vm_type to be consistent with obs build and osc --vm-type option + - Update list of supported vm_type values in conf.Options.vm_type + - Remove any duplicated code loading configuration from ENV + - Library: + - Add 'osc.util.models' module implementing an alternative pydantic-like data validation + - Add 'osc.util.xdg' module for handling XDG paths + - Fix handling empty vm_type in Store.last_buildroot + - Spec: + - Install zsh completion + - Build and install oscrc man page + ------------------------------------------------------------------- Mon Aug 28 11:38:33 UTC 2023 - Daniel Mach diff --git a/osc.dsc b/osc.dsc index a7d8288..3fcbab0 100644 --- a/osc.dsc +++ b/osc.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: osc -Version: 1.3.1-0 +Version: 1.4.0-0 Binary: osc Maintainer: Adrian Schroeter Architecture: any diff --git a/osc.spec b/osc.spec index 69aab10..6550e82 100644 --- a/osc.spec +++ b/osc.spec @@ -28,6 +28,7 @@ %define completion_dir_bash %{_datadir}/bash-completion/completions %define completion_dir_csh %{_sysconfdir}/profile.d %define completion_dir_fish %{_datadir}/fish/vendor_completions.d +%define completion_dir_zsh %{_datadir}/zsh/functions/Completion %define osc_plugin_dir %{_prefix}/lib/osc-plugins # need to override python_sitelib because it is not set as we would expect on many distros %define python_sitelib %(RPM_BUILD_ROOT= %{use_python} -Ic "import sysconfig; print(sysconfig.get_path('purelib'))") @@ -44,12 +45,15 @@ %endif %define argparse_manpage_pkg %{use_python_pkg}-argparse-manpage +%define sphinx_pkg %{use_python_pkg}-Sphinx + %if 0%{?fedora} %define argparse_manpage_pkg argparse-manpage +%define sphinx_pkg %{use_python_pkg}-sphinx %endif Name: osc -Version: 1.3.1 +Version: 1.4.0 Release: 0 Summary: Command-line client for the Open Build Service License: GPL-2.0-or-later @@ -68,6 +72,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %{with man} BuildRequires: %{argparse_manpage_pkg} +BuildRequires: %{sphinx_pkg} %endif BuildRequires: %{use_python_pkg}-cryptography BuildRequires: %{use_python_pkg}-devel >= 3.6 @@ -142,7 +147,7 @@ cat << EOF > macros.osc %%osc_plugin_dir %{osc_plugin_dir} EOF -# build man page +# build man pages %if %{with man} PYTHONPATH=. argparse-manpage \ --output=osc.1 \ @@ -154,6 +159,8 @@ PYTHONPATH=. argparse-manpage \ --description="openSUSE Commander" \ --author="Contributors to the osc project. See the project's GIT history for the complete list." \ --url="https://github.com/openSUSE/osc/" + +sphinx-build -b man doc . %endif %install @@ -168,6 +175,7 @@ install -Dm0755 contrib/osc.complete %{buildroot}%{_datadir}/osc/complete install -Dm0644 contrib/complete.csh %{buildroot}%{completion_dir_csh}/osc.csh install -Dm0644 contrib/complete.sh %{buildroot}%{completion_dir_bash}/osc.sh install -Dm0644 contrib/osc.fish %{buildroot}%{completion_dir_fish}/osc.fish +install -Dm0644 contrib/osc.zsh %{buildroot}%{completion_dir_zsh}/osc.zsh # install rpm macros install -Dm0644 macros.osc %{buildroot}%{_rpmmacrodir}/macros.osc @@ -175,6 +183,7 @@ install -Dm0644 macros.osc %{buildroot}%{_rpmmacrodir}/macros.osc # install man page %if %{with man} install -Dm0644 osc.1 %{buildroot}%{_mandir}/man1/osc.1 +install -Dm0644 oscrc.5 %{buildroot}%{_mandir}/man5/oscrc.5 %endif %check @@ -187,7 +196,7 @@ install -Dm0644 osc.1 %{buildroot}%{_mandir}/man1/osc.1 %license COPYING %doc AUTHORS README.md NEWS %if %{with man} -%{_mandir}/man1/osc.* +%{_mandir}/man*/osc* %endif # executables @@ -209,6 +218,7 @@ install -Dm0644 osc.1 %{buildroot}%{_mandir}/man1/osc.1 %{completion_dir_bash}/* %{completion_dir_csh}/* %{completion_dir_fish}/* +%{completion_dir_zsh}/* # osc owns the dirs to avoid the "directories not owned by a package" build error %dir %{_datadir}/fish