rpm/osc
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1116735 from openSUSE:Tools

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/1116735
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/osc?expand=0&rev=182
This commit is contained in:
Ana Guerrero 2023-10-10 19:00:36 +00:00 committed by Git OBS Bridge
commit ea19730c00
7 changed files with 157 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PKGBUILD
View File

@ -1,5 +1,5 @@
pkgname=osc
pkgver=1.3.1
pkgver=1.4.1
pkgrel=0
pkgdesc="Command-line client for the Open Build Service"
arch=('x86_64')

2
debian.changelog
View File

@ -1,4 +1,4 @@
osc (1.3.1-0) unstable; urgency=low
osc (1.4.1-0) unstable; urgency=low
* Placeholder

3
osc-1.3.1.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6fb9fee8dfd86276632d6a7a25169f34bec1bc251c79161b5f096a9ebde51cd8
size 343890

3
osc-1.4.1.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:33d0f33fce7f9d85c07d4dde320dc2a9d2e7de3e23b3810149cb9a821ab6834d
size 354814

61
osc.changes
View File

@ -1,3 +1,56 @@
-------------------------------------------------------------------
Tue Oct 10 18:12:00 UTC 2023 - Daniel Mach <daniel.mach@suse.com>
- 1.4.1
- Configuration:
- Always display apiurl when asking for credentials
- Ask for new credentials when user is missing from an apiurl section in the config file
- Library:
- Fix testing revision for being empty
- Fix core.change_request_state_template() to always return a string
- Tests:
- Replace 'git init -b' with 'git init' and 'git checkout -b'
- Spec:
- Run fdupes after install
- List the python sitelib paths explicitly
- Mark csh completion files as configs
- Own zsh completion dirs to mute rpmlint errors
- Move bash completion from /etc to /usr/share
-------------------------------------------------------------------
Wed Oct 4 10:01:35 UTC 2023 - Daniel Mach <daniel.mach@suse.com>
- 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 <daniel.mach@suse.com>
@ -560,7 +613,6 @@ Thu Dec 2 08:18:20 UTC 2021 - Marco Strigl <marco.strigl@suse.com>
* fix hdmrd5 check of local cached files
* improve logic for conffile mode handling
-------------------------------------------------------------------
Wed Jul 21 08:51:23 UTC 2021 - Marcus Hüwe <suse-tux@gmx.de>
@ -633,9 +685,9 @@ Tue Nov 10 13:42:55 UTC 2020 - Marco Strigl <marco.strigl@suse.com>
* maintainer search: lookup via package name by default and binary as fallback
* fix crash on console resize when downloading files during build
* add proper repourls to osc reporuls
* new command osc releaserequest: This command is used to transfer sources and  
   binaries without rebuilding them.
    It requires defined release targets set to trigger="manual".
* new command osc releaserequest: This command is used to transfer sources and
binaries without rebuilding them.
It requires defined release targets set to trigger="manual".
* some improvements on output of help and error messages
-------------------------------------------------------------------
@ -3328,4 +3380,3 @@ Fri May 12 00:00:00 CEST 2006 - poeml@suse.de
Wed May 10 00:00:00 CEST 2006 - poeml@suse.de
- created package (version 0.2)

2
osc.dsc
View File

@ -1,6 +1,6 @@
Format: 1.0
Source: osc
Version: 1.3.1-0
Version: 1.4.1-0
Binary: osc
Maintainer: Adrian Schroeter <adrian@suse.de>
Architecture: any

42
osc.spec
View File

@ -28,14 +28,11 @@
%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'))")
%if 0%{?is_opensuse}
%define completion_dir_bash %{_sysconfdir}/bash_completion.d
%endif
# generate manpages on distros where argparse-manpage >= 3 is available
%if 0%{?suse_version} > 1500 || 0%{?fedora} >= 37
%bcond_without man
@ -43,13 +40,23 @@
%bcond_with man
%endif
# whether to use fdupes to deduplicate python bytecode
%if 0%{?suse_version} || 0%{?fedora}
%bcond_without fdupes
%else
%bcond_with fdupes
%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.1
Release: 0
Summary: Command-line client for the Open Build Service
License: GPL-2.0-or-later
@ -68,6 +75,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
@ -75,6 +83,9 @@ BuildRequires: %{use_python_pkg}-rpm
BuildRequires: %{use_python_pkg}-setuptools
BuildRequires: %{use_python_pkg}-urllib3
BuildRequires: diffstat
%if %{with fdupes}
BuildRequires: fdupes
%endif
# needed for git scm tests
BuildRequires: git-core
@ -142,7 +153,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 +165,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 +181,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 +189,11 @@ 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
%if %{with fdupes}
%fdupes %buildroot
%endif
%check
@ -187,14 +206,15 @@ 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
%{_bindir}/*
# python modules
%{python_sitelib}/*
%{python_sitelib}/osc
%{python_sitelib}/osc-*-info
# rpm macros
%{_rpmmacrodir}/*
@ -207,8 +227,12 @@ install -Dm0644 osc.1 %{buildroot}%{_mandir}/man1/osc.1
%dir %{_datadir}/osc
%{_datadir}/osc/complete
%{completion_dir_bash}/*
%{completion_dir_csh}/*
%config %{completion_dir_csh}/*
%{completion_dir_fish}/*
%dir %{_datadir}/zsh
%dir %{_datadir}/zsh/functions
%dir %{_datadir}/zsh/functions/Completion
%{completion_dir_zsh}/*
# osc owns the dirs to avoid the "directories not owned by a package" build error
%dir %{_datadir}/fish