From 1134b712056d9ca2f4b4581ab048e05d1cedb2a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Tue, 6 Dec 2011 08:59:33 +0000 Subject: [PATCH 1/4] first 0.133 attempt OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/osc?expand=0&rev=101 --- osc-0.132.6.tar.gz | 3 --- osc-0.133.tar.gz | 3 +++ osc.changes | 18 ++++++++++++++++++ osc.dsc | 2 +- osc.spec | 2 +- 5 files changed, 23 insertions(+), 5 deletions(-) delete mode 100644 osc-0.132.6.tar.gz create mode 100644 osc-0.133.tar.gz diff --git a/osc-0.132.6.tar.gz b/osc-0.132.6.tar.gz deleted file mode 100644 index 2b3e607..0000000 --- a/osc-0.132.6.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:94a9fc93bb20e9080b9f5e76e08b12d6015a35d5c0c3017633e9ed71513abe0d -size 269454 diff --git a/osc-0.133.tar.gz b/osc-0.133.tar.gz new file mode 100644 index 0000000..02d322d --- /dev/null +++ b/osc-0.133.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:72a3de72027699d6df50cfa8eac68a3bea56f69fd8354685114f2424eaae8f60 +size 269410 diff --git a/osc.changes b/osc.changes index 1cfee37..74e894a 100644 --- a/osc.changes +++ b/osc.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +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 + ------------------------------------------------------------------- Thu Aug 25 09:37:44 UTC 2011 - adrian@suse.de diff --git a/osc.dsc b/osc.dsc index 44a11d7..fe08ba5 100644 --- a/osc.dsc +++ b/osc.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: osc -Version: 0.132.6 +Version: 0.133 Binary: osc Maintainer: Adrian Schroeter Architecture: any diff --git a/osc.spec b/osc.spec index 594c0ef..92878fd 100644 --- a/osc.spec +++ b/osc.spec @@ -18,7 +18,7 @@ Name: osc -Version: 0.132.6 +Version: 0.133 Release: 1 License: GPLv2+ Summary: openSUSE Build Service Commander From f16ff3d797527d2c135c45f90efd6f8e42cafd87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Tue, 6 Dec 2011 12:24:00 +0000 Subject: [PATCH 2/4] fix typo OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/osc?expand=0&rev=102 --- osc-0.133.tar.gz | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/osc-0.133.tar.gz b/osc-0.133.tar.gz index 02d322d..a89d060 100644 --- a/osc-0.133.tar.gz +++ b/osc-0.133.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:72a3de72027699d6df50cfa8eac68a3bea56f69fd8354685114f2424eaae8f60 -size 269410 +oid sha256:c9f91fa2f948d84c19471edf7beb11bcfb7058b607327cf55814fb1811843c66 +size 269413 From 93684e52c78fb738be2e78773d76dc636e8f0cbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Mon, 19 Dec 2011 13:08:00 +0000 Subject: [PATCH 3/4] do the real 0.133 release OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/osc?expand=0&rev=103 --- _service:format_spec_file:osc.spec | 125 +++++++++++++++++++++++++++++ osc-0.133.tar.gz | 4 +- osc.changes | 3 + osc.spec | 7 +- 4 files changed, 133 insertions(+), 6 deletions(-) create mode 100644 _service:format_spec_file:osc.spec diff --git a/_service:format_spec_file:osc.spec b/_service:format_spec_file:osc.spec new file mode 100644 index 0000000..929b5b2 --- /dev/null +++ b/_service:format_spec_file:osc.spec @@ -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 +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 diff --git a/osc-0.133.tar.gz b/osc-0.133.tar.gz index a89d060..8d77b63 100644 --- a/osc-0.133.tar.gz +++ b/osc-0.133.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c9f91fa2f948d84c19471edf7beb11bcfb7058b607327cf55814fb1811843c66 -size 269413 +oid sha256:e6ad09831176e77bd96ca6337fb07369624b2dcee652d6e20913cfadaa5fdbe7 +size 269869 diff --git a/osc.changes b/osc.changes index 74e894a..a2bfcdf 100644 --- a/osc.changes +++ b/osc.changes @@ -15,6 +15,9 @@ Tue Dec 6 08:58:53 UTC 2011 - adrian@suse.de - 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 diff --git a/osc.spec b/osc.spec index 92878fd..e16461e 100644 --- a/osc.spec +++ b/osc.spec @@ -16,14 +16,13 @@ # - Name: osc Version: 0.133 -Release: 1 -License: GPLv2+ +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 From 8d6c965d452bab3605d3dbd5a935c5bb9b54e820 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Tue, 20 Dec 2011 21:59:17 +0000 Subject: [PATCH 4/4] update OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/osc?expand=0&rev=104 --- _service:format_spec_file:osc.spec | 2 +- osc-0.133.1.tar.gz | 3 +++ osc-0.133.tar.gz | 3 --- osc.changes | 6 ++++++ osc.dsc | 2 +- osc.spec | 2 +- 6 files changed, 12 insertions(+), 6 deletions(-) create mode 100644 osc-0.133.1.tar.gz delete mode 100644 osc-0.133.tar.gz diff --git a/_service:format_spec_file:osc.spec b/_service:format_spec_file:osc.spec index 929b5b2..880397c 100644 --- a/_service:format_spec_file:osc.spec +++ b/_service:format_spec_file:osc.spec @@ -18,7 +18,7 @@ Name: osc -Version: 0.133 +Version: 0.133.1 Release: 0 Summary: openSUSE Build Service Commander License: GPL-2.0+ diff --git a/osc-0.133.1.tar.gz b/osc-0.133.1.tar.gz new file mode 100644 index 0000000..28a79e8 --- /dev/null +++ b/osc-0.133.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8812aaea7d3ef22dffb36ac7ce9f63827e216c142d1eb4e8d1b41860ae865e8d +size 269903 diff --git a/osc-0.133.tar.gz b/osc-0.133.tar.gz deleted file mode 100644 index 8d77b63..0000000 --- a/osc-0.133.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e6ad09831176e77bd96ca6337fb07369624b2dcee652d6e20913cfadaa5fdbe7 -size 269869 diff --git a/osc.changes b/osc.changes index a2bfcdf..bcbe705 100644 --- a/osc.changes +++ b/osc.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +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 diff --git a/osc.dsc b/osc.dsc index fe08ba5..f7dcf0e 100644 --- a/osc.dsc +++ b/osc.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: osc -Version: 0.133 +Version: 0.133.1 Binary: osc Maintainer: Adrian Schroeter Architecture: any diff --git a/osc.spec b/osc.spec index e16461e..a958c6a 100644 --- a/osc.spec +++ b/osc.spec @@ -17,7 +17,7 @@ Name: osc -Version: 0.133 +Version: 0.133.1 Release: 0 Summary: openSUSE Build Service Commander License: GPL-2.0+