1
0
forked from pool/osc

Accepting request 97401 from openSUSE:Tools

minor bugfix

OBS-URL: https://build.opensuse.org/request/show/97401
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/osc?expand=0&rev=67
This commit is contained in:
Stephan Kulow 2011-12-21 09:01:44 +00:00 committed by Git OBS Bridge
commit 6c58608a9b
6 changed files with 160 additions and 9 deletions

View File

@ -0,0 +1,125 @@
#
# spec file for package osc
#
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: osc
Version: 0.133.1
Release: 0
Summary: openSUSE Build Service Commander
License: GPL-2.0+
Group: Development/Tools/Other
Url: http://www.gitorious.org/opensuse/osc
Source: %{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?mandriva_version} < 02010
BuildRequires: python-urlgrabber
Requires: python-urlgrabber
%endif
BuildRequires: python-devel
%if 0%{?mandriva_version}
BuildRequires: python-rpm
Requires: python-rpm
%else
BuildRequires: rpm-python
Requires: rpm-python
%endif
#
%if 0%{?suse_version}
%if 0%{?suse_version} < 1020
BuildRequires: python-elementtree
Requires: python-elementtree
%else
BuildRequires: python-xml
Requires: python-xml
%endif
%if 0%{?suse_version} > 1110
BuildArch: noarch
%endif
%if 0%{?suse_version} > 1000
Recommends: build >= 2010.05.04
# These packages are needed for "osc add $URL"
Recommends: obs-service-recompress
Recommends: obs-service-set_version
Recommends: obs-service-tar_scm
Recommends: obs-service-verify_file
Recommends: obs-service-download_files
Recommends: obs-service-format_spec_file
Recommends: obs-service-source_validator
%endif
%endif
%if 0%{?rhel_version} && 0%{?rhel_version} < 600
BuildRequires: python-elementtree
Requires: python-elementtree
%endif
%if 0%{?centos_version} && 0%{?centos_version} < 600
BuildRequires: python-elementtree
Requires: python-elementtree
%endif
%if 0%{?suse_version}%{?mandriva_version}
BuildRequires: python-m2crypto
Requires: python-m2crypto > 0.19
%else
BuildRequires: m2crypto
Requires: m2crypto > 0.19
%endif
%{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%description
Commandline client for the openSUSE Build Service.
See http://en.opensuse.org/openSUSE:OSC , as well as
http://en.opensuse.org/openSUSE:Build_Service_Tutorial for a general
introduction.
%prep
%setup -q
%build
CFLAGS="%{optflags}" python setup.py build
%install
python setup.py install --prefix=%{_prefix} --root=%{buildroot}
ln -s osc-wrapper.py %{buildroot}/%{_bindir}/osc
mkdir -p %{buildroot}%{_localstatedir}/lib/osc-plugins
install -Dm0644 dist/complete.csh %{buildroot}%{_sysconfdir}/profile.d/osc.csh
install -Dm0644 dist/complete.sh %{buildroot}%{_sysconfdir}/profile.d/osc.sh
%if 0%{?suse_version} > 1110
install -Dm0755 dist/osc.complete %{buildroot}%{_prefix}/lib/osc/complete
%else
install -Dm0755 dist/osc.complete %{buildroot}%{_libdir}/osc/complete
%endif
%clean
rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
%doc AUTHORS README TODO NEWS
%{_bindir}/osc*
%{python_sitelib}/*
%config %{_sysconfdir}/profile.d/osc.csh
%config %{_sysconfdir}/profile.d/osc.sh
%dir %{_localstatedir}/lib/osc-plugins
%{_mandir}/man1/osc.*
%if 0%{?suse_version} > 1110
%{_prefix}/lib/osc
%else
%{_libdir}/osc
%endif
%changelog

View File

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

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

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

View File

@ -1,3 +1,30 @@
-------------------------------------------------------------------
Tue Dec 20 21:58:02 UTC 2011 - adrian@suse.de
- update to 0.133.1
- removed debug code lead to warning message (fix by Marcus_H)
-------------------------------------------------------------------
Tue Dec 6 08:58:53 UTC 2011 - adrian@suse.de
- update to 0.133
- add --meta option also to "list", "cat" and "less" commands
- project checkout is skipping packages linking to project local packages by default
- add --keep-link option to copypac command
- source validators are not called by default anymore:
* They can get used via source services now
* Allows different validations based on the code streams
#
# Features which require OBS 2.3
#
- support source services using OBS project or package name
- support updateing _patchinfo file with new issues just by calling "osc patchinfo" again
- branch --add-repositories can be used to add repos from source project to target project
- branch --extend-package-names can be used to do mbranch like branch of a single package
- branch --new-package can be used to do branch from a not yet existing package (to define later submit target)
- show declined requests which created by user
-------------------------------------------------------------------
Thu Aug 25 09:37:44 UTC 2011 - adrian@suse.de

View File

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

View File

@ -16,14 +16,13 @@
#
Name: osc
Version: 0.132.6
Release: 1
License: GPLv2+
Version: 0.133.1
Release: 0
Summary: openSUSE Build Service Commander
Url: http://www.gitorious.org/opensuse/osc
License: GPL-2.0+
Group: Development/Tools/Other
Url: http://www.gitorious.org/opensuse/osc
Source: %{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?mandriva_version} < 02010