dmach/osc-fork
1
0
Fork 0
forked from pool/osc
Code Pull Requests Activity

Accepting request 695702 from home:mstrigl:branches:openSUSE:Tools

Browse Source 
- 0.165.0
    * full python3 compatibility (bsc#1125243)
        fixes bsc#1131512, bsc#1129889, bsc#1129757
    * removed following patches (now upstream):
        001_helper.patch
        002_man_page_building.patch
        003_setup.patch 
        004_babysitter.patch
        005_oscssl.patch
        006_build.patch
        007_core.patch
        008_commandline.patch
        009_fetch.patch
        010_fix-decoding_in_canonname.patch
        011_repodata.patch
        012_packagequery.patch
- spec file modifications:
    * noarch only on non-SUSE distros and newer SUSE Versions > 11
    * disable testsuite on older SUSE Versions (unittest module too old)

- moved Recommends for diffstat to suse specific section. 

- added Buildrequires and Requires for python-chardet
    * needed for determining the encoding of objects (Requires)
    * needed also for testing in %check section (BuildRequires) 

- activate tests for osc
- add Buildrequires and Recommends for diffstat
    osc prdiff --diffstat needs it
    The testsuite needs it (Therefore the BuildRequires

OBS-URL: https://build.opensuse.org/request/show/695702
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/osc?expand=0&rev=281
This commit is contained in:
Marco Strigl 2019-04-22 12:19:59 +00:00 committed by Git OBS Bridge
parent 296235fe64
commit d8822885e7
7 changed files with 185 additions and 33 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=0.164.2
pkgver=0.165.0
pkgrel=0
pkgdesc="Open Build Service client"
arch=('i686' 'x86_64')

4
_service
View File

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

3
osc-0.164.2.tar.gz
View File

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

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

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

119
osc.changes
View File

@ -1,3 +1,122 @@
-------------------------------------------------------------------
Thu Apr 18 12:45:04 UTC 2019 - Marco Strigl <marco.strigl@suse.com>
- 0.165.0
* full python3 compatibility (bsc#1125243)
fixes bsc#1131512, bsc#1129889, bsc#1129757
* removed following patches (now upstream):
001_helper.patch
002_man_page_building.patch
003_setup.patch
004_babysitter.patch
005_oscssl.patch
006_build.patch
007_core.patch
008_commandline.patch
009_fetch.patch
010_fix-decoding_in_canonname.patch
011_repodata.patch
012_packagequery.patch
- spec file modifications:
* noarch only on non-SUSE distros and newer SUSE Versions > 11
* disable testsuite on older SUSE Versions (unittest module too old)
-------------------------------------------------------------------
Tue Apr 9 15:04:19 UTC 2019 - Marco Strigl <marco.strigl@suse.com>
- moved Recommends for diffstat to suse specific section.
-------------------------------------------------------------------
Tue Apr 9 13:32:17 UTC 2019 - Marco Strigl <marco.strigl@suse.com>
- added Buildrequires and Requires for python-chardet
* needed for determining the encoding of objects (Requires)
* needed also for testing in %check section (BuildRequires)
-------------------------------------------------------------------
Sun Apr 7 19:49:25 UTC 2019 - Marco Strigl <marco.strigl@suse.com>
- activate tests for osc
- add Buildrequires and Recommends for diffstat
osc prdiff --diffstat needs it
The testsuite needs it (Therefore the BuildRequires
-------------------------------------------------------------------
Tue Mar 5 13:22:08 UTC 2019 - marco.strigl@suse.com
- modified patch 008_commandline.patch
* fix broken sorted call on osc my sr when sorting
the submit requests by reqid. (gh#519)
- modified patch 007_core.patch
* fix slowdown of rbl with readline(bufsize) function.
(bsc#1127932)
-------------------------------------------------------------------
Wed Feb 20 09:32:01 UTC 2019 - marco.strigl@suse.com
- fix for bsc#1126055 (osc build -p <dir> fails with TypeError):
* add 011_repodata.patch
* add 012_packagequery.patch
* modified 006_build.patch, 010_fix-decoding_in_canonname.patch
- fix for bsc#1126058 (osc buildinfo -p <dir> fails with TypeError):
* modified 008_commandline.patch
-------------------------------------------------------------------
Thu Feb 14 12:42:29 UTC 2019 - marco.strigl@suse.com
- add 010_fix-decoding_in_canonname.patch
RpmQuery.canonname returns broken filename due to missing
decoding.
-------------------------------------------------------------------
Wed Feb 13 10:34:59 UTC 2019 - marco.strigl@suse.com
- osc is now noarch for all
- fixed %license
-------------------------------------------------------------------
Tue Feb 12 15:46:00 UTC 2019 - marco.strigl@suse.com
- use %bcond_with(out) python3 to simplify spec file
- add and apply patches only in python3 case
- replace shebang in osc-wrapper.py depending on python version
-------------------------------------------------------------------
Tue Feb 12 14:21:39 UTC 2019 - marco.strigl@suse.com
- rewrite 009_fetch.patch
some versions of python do not support rb'some_text'
- overwrite python_sitelib on Tumbleweed and SLE >= 15
- swich to python3-rpm on Tumbleweed and SLE >= 15. Otherwise
python2 will be installed
-------------------------------------------------------------------
Tue Feb 12 13:49:32 UTC 2019 - marco.strigl@suse.com
- use python3 on Tumbleweed and SLE >= 15
-------------------------------------------------------------------
Tue Feb 12 13:12:17 UTC 2019 - marco.strigl@suse.com
- cpio download of needed packages during build is not
possible, because cpio.py has now a bytes only api and
the decoding needs to be done in the fetch module instead.
added: 009_fetch.patch
-------------------------------------------------------------------
Tue Feb 12 10:46:11 UTC 2019 - marco.strigl@suse.com
- added patches to support python3 until the PR are merged
upstream (bsc#1125243):
- 001_helper.patch
- 002_man_page_building.patch
- 003_setup.patch
- 004_babysitter.patch
- 005_oscssl.patch
- 006_build.patch
- 007_core.patch
- 008_commandline.patch
-------------------------------------------------------------------
Tue Feb 12 08:14:30 UTC 2019 - marco.strigl@suse.com

4
osc.dsc
View File

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

83
osc.spec
View File

@ -16,12 +16,23 @@
#
%define version_unconverted 0.164.2
%if 0%{?suse_version} >= 1500 || 0%{?fedora_version} >= 29
%bcond_without python3
%else
%bcond_with python3
%endif
%if %{with python3}
%define use_python python3
%else
%define use_python python
%endif
%define version_unconverted 0.165.0
%define osc_plugin_dir %{_prefix}/lib/osc-plugins
%define macros_file macros.osc
Name: osc
Version: 0.164.2
Version: 0.165.0
Release: 0
Summary: Open Build Service Commander
License: GPL-2.0-or-later
@ -29,34 +40,35 @@ Group: Development/Tools/Other
Url: https://github.com/openSUSE/osc
Source: %{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: python-devel
BuildRequires: %{use_python}-devel
BuildRequires: %{use_python}-setuptools
BuildRequires: diffstat
%if 0%{?mandriva_version} || 0%{?mageia}
BuildRequires: python-rpm
Requires: python-rpm
%else
%if 0%{?suse_version} >= 1500
BuildRequires: %{use_python}-rpm
Requires: %{use_python}-rpm
%else
BuildRequires: rpm-python
Requires: rpm-python
%endif
#
%endif
%if 0%{?suse_version}
%if 0%{?suse_version} >= 1500
Requires: python2
Recommends: python2-progressbar
%else
Requires: python
Recommends: python-progressbar
%endif
%if 0%{?suse_version} < 1020
BuildRequires: python-elementtree
Requires: python-elementtree
%else
BuildRequires: python-xml
Requires: python-xml
%endif
%if 0%{?suse_version} >= 1120
BuildArch: noarch
%endif
Requires: %{use_python}
Recommends: %{use_python}-progressbar
BuildRequires: %{use_python}-xml
Requires: %{use_python}-xml
%if !%{with python3} && 0%{?suse_version} < 1020
BuildRequires: python-elementtree
Requires: python-elementtree
%endif
%if 0%{?suse_version} > 1000
Recommends: diffstat
Recommends: build >= 2010.05.04
Recommends: sudo
Recommends: powerpc32
@ -72,7 +84,6 @@ Recommends: obs-service-format_spec_file
Recommends: obs-service-source_validator
%endif
%else
# non-suse
BuildArch: noarch
%endif
# needed for storing credentials in kwallet/gnome-keyring
@ -88,14 +99,24 @@ BuildRequires: python-elementtree
Requires: python-elementtree
%endif
%if 0%{?suse_version} || 0%{?mandriva_version} || 0%{?mageia}
BuildRequires: python-m2crypto
Requires: python-m2crypto > 0.19
%if 0%{?suse_version} >= 1500
BuildRequires: %{use_python}-M2Crypto > 0.19
BuildRequires: %{use_python}-chardet
Requires: %{use_python}-M2Crypto > 0.19
Requires: %{use_python}-chardet
%else
BuildRequires: m2crypto
BuildRequires: python-m2crypto > 0.19
Requires: python-m2crypto > 0.19
%endif
%else
BuildRequires: m2crypto > 0.19
Requires: m2crypto > 0.19
%endif
%if %{with python3}
%define python_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")
%else
%{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%endif
%description
Commandline client for the Open Build Service.
@ -111,7 +132,7 @@ introduction.
# is a symlink to /usr/bin and /bin precedes /usr/bin in PATH
# => a "wrong" interpreter line ("#!/bin/python") is constructed
# ("wrong", because no package provides "/bin/python").
PATH="/usr/bin:$PATH" CFLAGS="%{optflags}" python setup.py build
PATH="/usr/bin:$PATH" CFLAGS="%{optflags}" %{use_python} setup.py build
cat << eom > %{macros_file}
%%osc_plugin_dir %{osc_plugin_dir}
@ -119,7 +140,8 @@ eom
echo >> %{macros_file}
%install
python setup.py install --prefix=%{_prefix} --root=%{buildroot}
%{use_python} setup.py install --prefix=%{_prefix} --root=%{buildroot}
perl -p -i -e 's{#!.*python}{#!%{_bindir}/%{use_python}}' osc-wrapper.py
ln -s osc-wrapper.py %{buildroot}/%{_bindir}/osc
mkdir -p %{buildroot}%{osc_plugin_dir}
mkdir -p %{buildroot}%{_localstatedir}/lib/osc-plugins
@ -137,12 +159,23 @@ install -Dm0755 dist/osc.complete %{buildroot}%{_libdir}/osc/complete
install -m644 %{macros_file} -D %{buildroot}%{_sysconfdir}/rpm/%{macros_file}
%if 0%{?suse_version} >= 1500
%check
cd tests
%{use_python} suite.py
%endif
%clean
rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
%if 0%{?suse_version} >= 1500
%license COPYING
%doc AUTHORS README TODO NEWS
%else
%doc AUTHORS README TODO NEWS COPYING
%endif
%{_bindir}/osc*
%{python_sitelib}/*
%config %{_sysconfdir}/profile.d/osc.csh