From f69e1fc86c92cfd3f61e86222897b682bdac6751 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Tue, 8 Jun 2010 08:49:44 +0000 Subject: [PATCH 1/9] osc copypac from project:openSUSE:Tools:Unstable package:osc revision:111 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/osc?expand=0&rev=45 --- osc-0.126.tar.gz | 3 --- osc-0.126git.tar.gz | 3 +++ osc.dsc | 2 +- osc.spec | 11 ++++++++++- 4 files changed, 14 insertions(+), 5 deletions(-) delete mode 100644 osc-0.126.tar.gz create mode 100644 osc-0.126git.tar.gz diff --git a/osc-0.126.tar.gz b/osc-0.126.tar.gz deleted file mode 100644 index e2e5929..0000000 --- a/osc-0.126.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3191ecfbede148c0c21982ec7069f72ab81a0a331b3934b1c8c39db743e8b443 -size 171359 diff --git a/osc-0.126git.tar.gz b/osc-0.126git.tar.gz new file mode 100644 index 0000000..4b67e75 --- /dev/null +++ b/osc-0.126git.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2732b63486fdef7a263890fe0e83478559b550bdf113a1e36e6baf4ad2171b3e +size 341068 diff --git a/osc.dsc b/osc.dsc index 1cd219d..ec4122f 100644 --- a/osc.dsc +++ b/osc.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: osc -Version: 0.126 +Version: 0.127 Binary: osc Maintainer: Adrian Schroeter Architecture: any diff --git a/osc.spec b/osc.spec index 8658c59..7083cee 100644 --- a/osc.spec +++ b/osc.spec @@ -18,7 +18,7 @@ Name: osc -Version: 0.126 +Version: 0.126git Release: 1 Group: Development/Tools/Other License: GPLv2+ @@ -43,7 +43,16 @@ BuildArch: noarch %endif %if %suse_version > 1000 Recommends: build > 2009.06.03 +Recommends: obs-service-download_url +Recommends: obs-service-verify_file +Recommends: osc-source_validator %endif +%else +# Better require then no dependency at all (because no Recommend available) +Requires: build > 2009.06.03 +Requires: obs-service-download_url +Requires: obs-service-verify_file +Requires: osc-source_validator %endif %if 0%{?rhel_version} || 0%{?centos_version} BuildRequires: python-elementtree From 4481a7fc30c4cfdc95bb3e29041505c71fe29b5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Tue, 8 Jun 2010 08:55:11 +0000 Subject: [PATCH 2/9] Accepting request 41223 from home:tjhukkan:branches:openSUSE:Tools Copy from home:tjhukkan:branches:openSUSE:Tools/osc via accept of submit request 41223 revision 3. Request was accepted with message: Reviewed ok OBS-URL: https://build.opensuse.org/request/show/41223 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/osc?expand=0&rev=46 --- debian.changelog | 6 ++++++ debian.tar.gz | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/debian.changelog b/debian.changelog index 526d4d9..ac5a857 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,3 +1,9 @@ +osc (0.125.4-3) unstable; urgency=low + + * Fix dependency on python-celementtree, it is included in python2.5. + + -- Teemu Hukkanen Fri, 04 Jun 2010 10:34:55 +0300 + osc (0.125.4-2) unstable; urgency=low - Fix build and install diff --git a/debian.tar.gz b/debian.tar.gz index 9919d1e..b076daa 100644 --- a/debian.tar.gz +++ b/debian.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:82d16afaa81c40865f76d0c97ec91a3092566382145ab7f88cd05fcd7205c3d1 -size 2185 +oid sha256:d375ed3d6a5d4912e9d374578903cf0211ecbe0af9525bcfc433ca37c944ce35 +size 2198 From 295058cca3545e3f0111ee3b128b4b1c7ad46e91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Tue, 8 Jun 2010 10:45:15 +0000 Subject: [PATCH 3/9] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/osc?expand=0&rev=47 --- osc.spec | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/osc.spec b/osc.spec index 7083cee..8658c59 100644 --- a/osc.spec +++ b/osc.spec @@ -18,7 +18,7 @@ Name: osc -Version: 0.126git +Version: 0.126 Release: 1 Group: Development/Tools/Other License: GPLv2+ @@ -43,16 +43,7 @@ BuildArch: noarch %endif %if %suse_version > 1000 Recommends: build > 2009.06.03 -Recommends: obs-service-download_url -Recommends: obs-service-verify_file -Recommends: osc-source_validator %endif -%else -# Better require then no dependency at all (because no Recommend available) -Requires: build > 2009.06.03 -Requires: obs-service-download_url -Requires: obs-service-verify_file -Requires: osc-source_validator %endif %if 0%{?rhel_version} || 0%{?centos_version} BuildRequires: python-elementtree From 90fd10fd327ac38441c0b915595e0c262e1d890c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Wed, 9 Jun 2010 11:07:58 +0000 Subject: [PATCH 4/9] Accepting request 41283 from openSUSE:Tools:Unstable Copy from openSUSE:Tools:Unstable/osc via accept of submit request 41283 revision 114. Request was accepted with message: OBS-URL: https://build.opensuse.org/request/show/41283 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/osc?expand=0&rev=48 --- osc-0.126git.tar.gz | 3 --- osc-0.127.tar.gz | 3 +++ osc.changes | 22 ++++++++++++++++++++++ osc.spec | 2 +- 4 files changed, 26 insertions(+), 4 deletions(-) delete mode 100644 osc-0.126git.tar.gz create mode 100644 osc-0.127.tar.gz diff --git a/osc-0.126git.tar.gz b/osc-0.126git.tar.gz deleted file mode 100644 index 4b67e75..0000000 --- a/osc-0.126git.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2732b63486fdef7a263890fe0e83478559b550bdf113a1e36e6baf4ad2171b3e -size 341068 diff --git a/osc-0.127.tar.gz b/osc-0.127.tar.gz new file mode 100644 index 0000000..a98e9d1 --- /dev/null +++ b/osc-0.127.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:be409a958aa0c11d4517b587595421002faac3bd1075e86a21657c95e143ae7a +size 341089 diff --git a/osc.changes b/osc.changes index 0599cde..d3e87af 100644 --- a/osc.changes +++ b/osc.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Wed Jun 9 10:55:52 UTC 2010 - adrian@suse.de + +- update to 0.127 + - add size limit mode, files can be ignored on checkout or update given a certain size limit. + - --csv/--format options for results command - using format user can explicitly specify what he wants print + - osc branch reads project/package in package directory + - fix creation of package link, when target project has the package via linked project + - add "osc rq approvenew $PROJECT" command to show and accept all request in new state. + This makes sense esp. for projects which work with default reviewers before. + - support external source validator scripts before commiting + - support request creation with multiple actions +# +# Features which require OBS 2.0 server +# + - support "osc add http://...", this uses obs source service for downloading a file and verify it via sha256 verifier service + - add support for CBpreinstall/CBinstall + - support branch --force to override target + - support for "unresolvable" state of OBS 2.0 + - support undelete of project or package + - support for package meta data checkout + ------------------------------------------------------------------- Mon Apr 19 15:13:42 UTC 2010 - suse-tux@gmx.de diff --git a/osc.spec b/osc.spec index 8658c59..bea03b3 100644 --- a/osc.spec +++ b/osc.spec @@ -18,7 +18,7 @@ Name: osc -Version: 0.126 +Version: 0.127 Release: 1 Group: Development/Tools/Other License: GPLv2+ From 1454deeed507f77f5b1b1d1130d61169bb4f975c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Sat, 12 Jun 2010 12:15:53 +0000 Subject: [PATCH 5/9] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/osc?expand=0&rev=49 --- osc.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/osc.spec b/osc.spec index bea03b3..3036451 100644 --- a/osc.spec +++ b/osc.spec @@ -26,8 +26,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://www.gitorious.org/opensuse/osc Source: osc-%{version}.tar.gz Summary: openSUSE Build Service Commander +%if ! 0%mandriva_version = 02010 Requires: python-urlgrabber BuildRequires: python-urlgrabber +%fi BuildRequires: python-devel # %if 0%{?suse_version} From 93470b5f9796b2492ad6b56991223f0f649d8fa8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Mon, 14 Jun 2010 14:34:24 +0000 Subject: [PATCH 6/9] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/osc?expand=0&rev=50 --- osc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osc.spec b/osc.spec index 3036451..3bb75a8 100644 --- a/osc.spec +++ b/osc.spec @@ -29,7 +29,7 @@ Summary: openSUSE Build Service Commander %if ! 0%mandriva_version = 02010 Requires: python-urlgrabber BuildRequires: python-urlgrabber -%fi +%endif BuildRequires: python-devel # %if 0%{?suse_version} From 80abce8dfad85de4165c9562265305174759a8aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Mon, 14 Jun 2010 15:28:05 +0000 Subject: [PATCH 7/9] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/osc?expand=0&rev=51 --- osc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osc.spec b/osc.spec index 3bb75a8..81fa877 100644 --- a/osc.spec +++ b/osc.spec @@ -26,7 +26,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://www.gitorious.org/opensuse/osc Source: osc-%{version}.tar.gz Summary: openSUSE Build Service Commander -%if ! 0%mandriva_version = 02010 +%if ! 0%{?mandriva_version} == 02010 Requires: python-urlgrabber BuildRequires: python-urlgrabber %endif From 66e824897c02698764407e161b00fe4b698e7e7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Thu, 17 Jun 2010 08:05:00 +0000 Subject: [PATCH 8/9] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/osc?expand=0&rev=52 --- osc.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/osc.spec b/osc.spec index 81fa877..b5b0f93 100644 --- a/osc.spec +++ b/osc.spec @@ -26,7 +26,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://www.gitorious.org/opensuse/osc Source: osc-%{version}.tar.gz Summary: openSUSE Build Service Commander -%if ! 0%{?mandriva_version} == 02010 +%if 0%{?mandriva_version} == 02010 +%else Requires: python-urlgrabber BuildRequires: python-urlgrabber %endif @@ -37,7 +38,7 @@ BuildRequires: python-devel BuildRequires: python-elementtree Requires: python-elementtree %else -BuildRequires: python-urlgrabber python-xml +BuildRequires: python-xml Requires: python-xml %endif %if %suse_version > 1110 From 28ba676cee27be26563ddc28481244fe73f6f2bd Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Fri, 18 Jun 2010 04:04:03 +0000 Subject: [PATCH 9/9] Updating link to change in openSUSE:Factory/osc revision 42.0 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/osc?expand=0&rev=a291b7de2f63079fd58b592602c3c13b --- osc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osc.spec b/osc.spec index b5b0f93..2bbf6c1 100644 --- a/osc.spec +++ b/osc.spec @@ -1,5 +1,5 @@ # -# spec file for package osc (Version 0.126) +# spec file for package osc (Version 0.127) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. #