pool/osc
4
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Accepting request 781771 from openSUSE:Tools

Browse Source 
- Spec:
    * fix destination of fish completion file to /usr/share/fish/vendor_completions.d 

- 0.168.0
  * MR creation honors orev now (bsc#1160446)
  * allow "osc r --vertical" for projects
  * several typo fixes
  * cleanup old functions and remove python2.6 compat code
  * support zstd arch linux files in local build
  * fix deleterequest for repositories
  * append --norootforbuild as default to build command
  * fix decoding in interactive request mode
  * use signdummy for product builds
  * print release project when creating MR
  * improve SSLError message for TLSv1 validation
  * osc maintained --version prints the version of each maintained package
  * print web url links after creating requests (New general bool option 'print_web_links' must be set in oscrc)
  * fix checkout_no_colon on project level
  * handle empty release number of rpm packages in build.py
  * handle bytes vs. str error when parsing meta
  * custom exception if importing m2crypto fails
  * fix missing oscerr import in util.helper
  * several fixes for keyring handling
  * fix arch zst magic in util.packagequery

- Ship fish completion file.

- Spec:
    * Recommend python3-keyring when using python3

OBS-URL: https://build.opensuse.org/request/show/781771
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/osc?expand=0&rev=145
This commit is contained in:
Dominique Leuenberger 2020-03-05 22:23:01 +00:00 committed by Git OBS Bridge
commit c2c98cb64a
18 changed files with 143 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
PKGBUILD
View File

@ -1,19 +1,24 @@
pkgname=osc
pkgver=0.167.2
pkgver=0.168.0
pkgrel=0
pkgdesc="Open Build Service client"
arch=('i686' 'x86_64')
arch=('x86_64')
url="https://www.github.com/openSUSE/osc"
license=('GPL-2.0+' 'GPL-2.0')
groups=('base-devel')
depends=('python2' 'python2-m2crypto' 'urlgrabber')
depends=('python-m2crypto')
makedepends=('python-setuptools')
source=(osc-${pkgver}.tar.gz)
md5sums=('SKIP')
build() {
cd "${srcdir}"/osc-${pkgver}
python setup.py build
}
package() {
msg "Installing osc ..."
cd "${srcdir}"/osc-${pkgver}
python2 setup.py build
python2 setup.py install --prefix=/usr --root=${pkgdir}
python setup.py install --root="${pkgdir}/" --optimize=1 --prefix=/usr
ln -s osc-wrapper.py ${pkgdir}/usr/bin/osc
}

4
_service
View File

@ -1,7 +1,7 @@
<services>
<service name="tar_scm" mode="disabled">
<param name="version">0.167.2</param>
<param name="revision">0.167.2</param>
<param name="version">0.168.0</param>
<param name="revision">0.168.0</param>
<param name="url">git://github.com/openSUSE/osc.git</param>
<param name="scm">git</param>
</service>

6
debian.changelog
View File

@ -1,7 +1,7 @@
osc (0.167.2) unstable; urgency=low
- Update to 0.161.1
osc (0.168.0) unstable; urgency=low
- Package for Python3
-- Marco Strigl <marco.strigl@suse.com> Thu, 26 Oct 2017 14:42:00 +0200
-- Nick Brown <nick.brown@att.com> Wed, 30 Jan 2020 14:49:30 +0000
osc (0.161.0-0) unstable; urgency=low
- Install bash completion

1
debian.compat Normal file
View File

@ -0,0 +1 @@
9

23
debian.control Normal file
View File

@ -0,0 +1,23 @@
Source: osc
Priority: extra
Maintainer: Adrian Schroeter <adrian@suse.de>, Rene Engelhard <rengelhard@suse.de>
Build-Depends: debhelper (>= 9), dh-python, python3-all, python3-setuptools
Standards-Version: 3.7.1
Section: devel
Package: osc
Section: devel
Architecture: all
Depends: ${shlibs:Depends},
${misc:Depends},
${python3:Depends},
python3,
build | obs-build
Recommends: python3-progressbar,
python3-rpm,
python3-keyring,
python3-m2crypto,
bash-completion
Suggests: sudo
Description: Open Build Service Commander
Commandline client for the Open Build Service.

17
debian.copyright Normal file
View File

@ -0,0 +1,17 @@
This package was debianized by J.H.M. Dassen (Ray) <jdassen@debian.org> on
Fri, 12 May 2006 14:12:04 +0200.
It was downloaded from www.opensuse.org
Upstream Author: Peter Poeml <poeml@suse.de>
Copyright Holder: Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
License:
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
osc itself is GPL, for the full text of the GPL see /usr/share/common-licenses/GPL

3
debian.dirs Normal file
View File

@ -0,0 +1,3 @@
usr/bin
usr/sbin
usr/share/man

2
debian.docs Normal file
View File

@ -0,0 +1,2 @@
README
TODO

5
debian.osc.dirs Normal file
View File

@ -0,0 +1,5 @@
usr/lib
usr/lib/osc
usr/include
etc/bash_completion.d
etc/profile.d

3
debian.osc.install Normal file
View File

@ -0,0 +1,3 @@
usr/lib/osc/complete
etc/profile.d/osc.csh
etc/bash_completion.d/osc.sh

1
debian.osc.links Normal file
View File

@ -0,0 +1 @@
usr/bin/osc-wrapper.py usr/bin/osc

14
debian.rules Normal file
View File

@ -0,0 +1,14 @@
#!/usr/bin/make -f
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
export PYBUILD_NAME=osc
%:
dh $@ --with python3 --buildsystem=pybuild
override_dh_auto_install:
dh_auto_install
install -Dm0644 dist/complete.csh debian/tmp/etc/profile.d/osc.csh
install -Dm0644 dist/complete.sh debian/tmp/etc/bash_completion.d/osc.sh
install -Dm0755 dist/osc.complete debian/tmp/usr/lib/osc/complete

3
debian.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:14f061d4c11db825452064043bafec42b8c5fe8c4a76b8df46e866211f32058d
size 2232

3
osc-0.167.2.tar.gz
View File

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

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

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:017c16c9d83a1440582d0a6698979c8993fe99a1477d7306623a7453dfe13a54
size 364555

42
osc.changes
View File

@ -1,3 +1,45 @@
-------------------------------------------------------------------
Thu Mar 5 08:30:46 UTC 2020 - Marco Strigl <marco.strigl@suse.com>
- Spec:
* fix destination of fish completion file to /usr/share/fish/vendor_completions.d
-------------------------------------------------------------------
Wed Mar 4 09:27:41 UTC 2020 - Marco Strigl <marco.strigl@suse.com>
- 0.168.0
* MR creation honors orev now (bsc#1160446)
* allow "osc r --vertical" for projects
* several typo fixes
* cleanup old functions and remove python2.6 compat code
* support zstd arch linux files in local build
* fix deleterequest for repositories
* append --norootforbuild as default to build command
* fix decoding in interactive request mode
* use signdummy for product builds
* print release project when creating MR
* improve SSLError message for TLSv1 validation
* osc maintained --version prints the version of each maintained package
* print web url links after creating requests (New general bool option 'print_web_links' must be set in oscrc)
* fix checkout_no_colon on project level
* handle empty release number of rpm packages in build.py
* handle bytes vs. str error when parsing meta
* custom exception if importing m2crypto fails
* fix missing oscerr import in util.helper
* several fixes for keyring handling
* fix arch zst magic in util.packagequery
-------------------------------------------------------------------
Fri Feb 28 12:27:27 UTC 2020 - Frederic Crozat <fcrozat@suse.com>
- Ship fish completion file.
-------------------------------------------------------------------
Tue Feb 11 16:39:17 UTC 2020 - Fabian Vogt <fvogt@suse.com>
- Spec:
* Recommend python3-keyring when using python3
-------------------------------------------------------------------
Tue Jan 7 10:54:25 UTC 2020 - Marco Strigl <marco.strigl@suse.com>

4
osc.dsc
View File

@ -1,8 +1,8 @@
Format: 1.0
Source: osc
Version: 0.167.2
Version: 0.168.0
Binary: osc
Maintainer: Adrian Schroeter <adrian@suse.de>
Architecture: any
Standards-Version: 3.7.1
Build-Depends: debhelper (>= 4.0.0), python-dev, python-setuptools
Build-Depends: debhelper (>= 9), dh-python, python3-all, python3-setuptools

14
osc.spec
View File

@ -27,18 +27,21 @@
%define use_python python
%endif
%define version_unconverted 0.167.2
%define version_unconverted 0.168.0
%define osc_plugin_dir %{_prefix}/lib/osc-plugins
%define macros_file macros.osc
Name: osc
Version: 0.167.2
Version: 0.168.0
Release: 0
Summary: Open Build Service Commander
License: GPL-2.0-or-later
Group: Development/Tools/Other
URL: https://github.com/openSUSE/osc
Source: %{name}-%{version}.tar.gz
Source1: debian.dirs
Source2: debian.docs
Source3: debian.osc.links
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: %{use_python}-devel
BuildRequires: %{use_python}-setuptools
@ -90,8 +93,12 @@ Conflicts: build < 20200106
%endif
# needed for storing credentials in kwallet/gnome-keyring
%if 0%{?suse_version} > 1000 || 0%{?mandriva_version} || 0%{?mdkversion}
%if %{with python3}
Recommends: python3-keyring
%else
Recommends: python-keyring
%endif
%endif
%if 0%{?rhel_version} && 0%{?rhel_version} < 600
BuildRequires: python-elementtree
Requires: python-elementtree
@ -167,6 +174,8 @@ install -Dm0755 dist/osc.complete %{buildroot}%{_prefix}/lib/osc/complete
install -Dm0755 dist/osc.complete %{buildroot}%{_libdir}/osc/complete
%endif
install -Dm0755 osc.fish %{buildroot}%{_datadir}/fish/completions/vendor_completions.d/osc.fish
install -m644 %{macros_file} -D %{buildroot}%{_sysconfdir}/rpm/%{macros_file}
%if 0%{?suse_version} >= 1500
@ -202,6 +211,7 @@ rm -rf %{buildroot}
%else
%{_libdir}/osc
%endif
%{_datadir}/fish
%dir %{osc_plugin_dir}
%changelog