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

Accepting request 1130789 from home:dmach:branches:openSUSE:Tools

Browse Source 
- 1.5.1
  - Library:
    - Avoid using '/public/' API routes
    - Update 'osc.util.models' to avoid including lazy defaults in the rendered man pages
  - Spec:
    - Simplify distro-specific macros
    - Use %{?rhel} macros 

- specfile change : use rhel version macros wherever 'fedora' macro is also used
  + Build manpages on RHEL distros where argparse-manpage is available
    and where python3-sphinx is available and cleanly installable without 
    requiring environment(modules) from EPEL
  + use fdupes to deduplicate python bytecode on RHEL distros which support it

OBS-URL: https://build.opensuse.org/request/show/1130789
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/osc?expand=0&rev=428
This commit is contained in:
Dirk Mueller 2023-12-05 09:43:46 +00:00 committed by Git OBS Bridge
parent 3422efe549
commit 627f3e1f6f
7 changed files with 35 additions and 28 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.5.0
pkgver=1.5.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.5.0-0) unstable; urgency=low
osc (1.5.1-0) unstable; urgency=low
* Placeholder

3
osc-1.5.0.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7d3be5b17338f11767441c451c50137356756b51786d0296e751f2fef1c87e27
size 356611

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

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:17b1268413561b3d1b8564d3d1ed8f025efa34774497df4d54205b6cf0882c28
size 356780

29
osc.changes
View File

@ -1,3 +1,23 @@
-------------------------------------------------------------------
Mon Dec 4 14:09:11 UTC 2023 - Daniel Mach <daniel.mach@suse.com>
- 1.5.1
- Library:
- Avoid using '/public/' API routes
- Update 'osc.util.models' to avoid including lazy defaults in the rendered man pages
- Spec:
- Simplify distro-specific macros
- Use %{?rhel} macros
-------------------------------------------------------------------
Mon Dec 4 14:09:10 UTC 2023 - Magnus Lewis-Smith <m.lewis-smith@warwick.ac.uk>
- specfile change : use rhel version macros wherever 'fedora' macro is also used
+ Build manpages on RHEL distros where argparse-manpage is available
and where python3-sphinx is available and cleanly installable without
requiring environment(modules) from EPEL
+ use fdupes to deduplicate python bytecode on RHEL distros which support it
-------------------------------------------------------------------
Wed Nov 22 07:57:53 UTC 2023 - Daniel Mach <daniel.mach@suse.com>
@ -13,15 +33,6 @@ Wed Nov 22 07:57:53 UTC 2023 - Daniel Mach <daniel.mach@suse.com>
- Spec:
- Recommend 'build' on openSUSE/SLE and 'obs-build' on all other distros
-------------------------------------------------------------------
Mon Nov 6 15:19:42 UTC 2023 - Magnus Lewis-Smith <m.lewis-smith@warwick.ac.uk>
- specfile change : use rhel version macros wherever 'fedora' macro is also used
+ Build manpages on RHEL distros where argparse-manpage is available
and where python3-sphinx is available and cleanly installable without
requiring environment(modules) from EPEL
+ use fdupes to deduplicate python bytecode on RHEL distros which support it
-------------------------------------------------------------------
Thu Nov 2 14:51:36 UTC 2023 - Daniel Mach <daniel.mach@suse.com>

2
osc.dsc
View File

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

22
osc.spec
View File

@ -33,6 +33,7 @@
%define python_sitelib %(RPM_BUILD_ROOT= %{use_python} -Ic "import sysconfig; print(sysconfig.get_path('purelib'))")
# generate manpages on distros where argparse-manpage >= 3 and python3-Sphinx are available
# please note that RHEL build requires packages from CRB and EPEL repositories
%if 0%{?suse_version} > 1500 || 0%{?fedora} >= 37 || 0%{?rhel} >= 9
%bcond_without man
%else
@ -46,21 +47,20 @@
%bcond_with fdupes
%endif
%define argparse_manpage_pkg %{use_python_pkg}-argparse-manpage
%define obs_build_pkg obs-build
%define sphinx_pkg %{use_python_pkg}-Sphinx
%if 0%{?fedora} || 0%{?rhel} >= 9
%define argparse_manpage_pkg argparse-manpage
%define obs_build_pkg obs-build
%define openssh_pkg openssh
%define sphinx_pkg %{use_python_pkg}-sphinx
%endif
%if 0%{?suse_version}
%define argparse_manpage_pkg %{use_python_pkg}-argparse-manpage
%define obs_build_pkg build
%define openssh_pkg openssh-common
%define sphinx_pkg %{use_python_pkg}-Sphinx
%endif
Name: osc
Version: 1.5.0
Version: 1.5.1
Release: 0
Summary: Command-line client for the Open Build Service
License: GPL-2.0-or-later
@ -127,12 +127,8 @@ Recommends: obs-service-source_validator
Recommends: obs-service-tar_scm
Recommends: obs-service-verify_file
%if 0%{?fedora} || 0%{?rhel}
Recommends: openssh
%endif
%if 0%{?suse_version}
Recommends: openssh-common
%endif
# needed for ssh signature auth
Recommends: %{openssh_pkg}
# needed for `osc browse` that calls xdg-open
Recommends: xdg-utils