From ac3a4a94afbe120c1aeb1ec42695137d62ff55e2dd7af11928ab18d6481d1e93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Sat, 6 Feb 2010 11:38:47 +0000 Subject: [PATCH 1/7] Accepting request 30750 from home:llunak:branches:openSUSE:Tools Copy from home:llunak:branches:openSUSE:Tools/osc via accept of submit request 30750 revision 3. Request was accepted with message: Reviewed ok OBS-URL: https://build.opensuse.org/request/show/30750 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/osc?expand=0&rev=39 --- debian.changelog | 15 ++++++++++----- debian.tar.gz | 4 ++-- osc.dsc | 2 +- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/debian.changelog b/debian.changelog index fce7f05..fe8b958 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,12 +1,17 @@ -osc (0.125.4-1) unstable; urgency=high -- Updated to 0.125.4 +osc (0.125.4-2) unstable; urgency=low + - Fix build and install --- Adrian Schroeter Wed, 27 Jan 2010 10:00:00 +0200 + -- Lubos Lunak Thu, 28 Jan 2010 16:39:57 +0100 + +osc (0.125.4-1) unstable; urgency=high + - Updated to 0.125.4 + + -- Adrian Schroeter Wed, 27 Jan 2010 10:00:00 +0200 osc (0.125.1-1) unstable; urgency=high -- Updated to 0.125.1 + - Updated to 0.125.1 --- Adrian Schroeter Fr, 15 Jan 2010 10:00:00 +0200 + -- Adrian Schroeter Fr, 15 Jan 2010 10:00:00 +0200 osc (0.123-1) unstable; urgency=high - Updated to 0.123 diff --git a/debian.tar.gz b/debian.tar.gz index 540e2cc..3f3dc6a 100644 --- a/debian.tar.gz +++ b/debian.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1f375d152c760441df8215c6a009b96d56d833ad70be844b1ca1fc5780b8cbf4 -size 2131 +oid sha256:82d16afaa81c40865f76d0c97ec91a3092566382145ab7f88cd05fcd7205c3d1 +size 2185 diff --git a/osc.dsc b/osc.dsc index fca082c..768efa1 100644 --- a/osc.dsc +++ b/osc.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: osc -Version: 0.125.4-1 +Version: 0.125.4-2 Binary: osc Maintainer: Adrian Schroeter Architecture: any From 946b3392bb70e71bb72111c9c397afe57ad14fb6440bc02833ea6ed9654499a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Mon, 8 Feb 2010 12:17:18 +0000 Subject: [PATCH 2/7] Accepting request 31765 from openSUSE:Tools:Unstable Copy from openSUSE:Tools:Unstable/osc via accept of submit request 31765 revision 86. Request was accepted with message: OBS-URL: https://build.opensuse.org/request/show/31765 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/osc?expand=0&rev=40 --- osc-0.125.4.tar.gz | 3 --- osc-0.125.5.tar.gz | 3 +++ osc.changes | 8 ++++++++ osc.dsc | 2 +- osc.spec | 2 +- 5 files changed, 13 insertions(+), 5 deletions(-) delete mode 100644 osc-0.125.4.tar.gz create mode 100644 osc-0.125.5.tar.gz diff --git a/osc-0.125.4.tar.gz b/osc-0.125.4.tar.gz deleted file mode 100644 index 9a0c2d1..0000000 --- a/osc-0.125.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f2a2535e8a6d373e2c16b5e4d18aad5fc3697b8fa3b8a4651771146e081c3884 -size 159894 diff --git a/osc-0.125.5.tar.gz b/osc-0.125.5.tar.gz new file mode 100644 index 0000000..4ea8805 --- /dev/null +++ b/osc-0.125.5.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7e88fd37831f6b154e3ae2b9c35cfcf714d4f2a1e0a520e26b7e2cd48dcc9e77 +size 159631 diff --git a/osc.changes b/osc.changes index cc8d595..2f8c83c 100644 --- a/osc.changes +++ b/osc.changes @@ -1,3 +1,11 @@ +Mon Feb 1 09:16:17 UTC 2010 - adrian@suse.de + +- update to version 0.125.5 + - rdiff happens against baserev now + - fixed "osc build --local-package + - detect a kiwi file on build + - improved _service file handling + ------------------------------------------------------------------- Wed Jan 27 12:18:34 UTC 2010 - adrian@suse.de diff --git a/osc.dsc b/osc.dsc index 768efa1..cfc7f0a 100644 --- a/osc.dsc +++ b/osc.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: osc -Version: 0.125.4-2 +Version: 0.125.5-1 Binary: osc Maintainer: Adrian Schroeter Architecture: any diff --git a/osc.spec b/osc.spec index e295c64..decac76 100644 --- a/osc.spec +++ b/osc.spec @@ -26,7 +26,7 @@ Requires: python-m2crypto > 0.19 BuildRequires: m2crypto Requires: m2crypto > 0.19 %endif -Version: 0.125.4 +Version: 0.125.5 Release: 1 Group: Development/Tools/Other License: GPLv2+ From 7906895804389cb7c967c7d47fdd37c42a9eeb8b254a1b473d1cfbef7f0cdeb5 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Fri, 5 Mar 2010 15:04:38 +0000 Subject: [PATCH 3/7] Accepting request 34119 from openSUSE:Tools checked in (request 34119) OBS-URL: https://build.opensuse.org/request/show/34119 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/osc?expand=0&rev=41 --- debian.changelog | 13 ++++--------- debian.tar.gz | 4 ++-- osc-0.125.4.tar.gz | 3 +++ osc-0.125.5.tar.gz | 3 --- osc.changes | 8 -------- osc.dsc | 2 +- osc.spec | 2 +- 7 files changed, 11 insertions(+), 24 deletions(-) create mode 100644 osc-0.125.4.tar.gz delete mode 100644 osc-0.125.5.tar.gz diff --git a/debian.changelog b/debian.changelog index fe8b958..fce7f05 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,17 +1,12 @@ -osc (0.125.4-2) unstable; urgency=low - - Fix build and install - - -- Lubos Lunak Thu, 28 Jan 2010 16:39:57 +0100 - osc (0.125.4-1) unstable; urgency=high - - Updated to 0.125.4 +- Updated to 0.125.4 - -- Adrian Schroeter Wed, 27 Jan 2010 10:00:00 +0200 +-- Adrian Schroeter Wed, 27 Jan 2010 10:00:00 +0200 osc (0.125.1-1) unstable; urgency=high - - Updated to 0.125.1 +- Updated to 0.125.1 - -- Adrian Schroeter Fr, 15 Jan 2010 10:00:00 +0200 +-- Adrian Schroeter Fr, 15 Jan 2010 10:00:00 +0200 osc (0.123-1) unstable; urgency=high - Updated to 0.123 diff --git a/debian.tar.gz b/debian.tar.gz index 3f3dc6a..540e2cc 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:1f375d152c760441df8215c6a009b96d56d833ad70be844b1ca1fc5780b8cbf4 +size 2131 diff --git a/osc-0.125.4.tar.gz b/osc-0.125.4.tar.gz new file mode 100644 index 0000000..9a0c2d1 --- /dev/null +++ b/osc-0.125.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f2a2535e8a6d373e2c16b5e4d18aad5fc3697b8fa3b8a4651771146e081c3884 +size 159894 diff --git a/osc-0.125.5.tar.gz b/osc-0.125.5.tar.gz deleted file mode 100644 index 4ea8805..0000000 --- a/osc-0.125.5.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7e88fd37831f6b154e3ae2b9c35cfcf714d4f2a1e0a520e26b7e2cd48dcc9e77 -size 159631 diff --git a/osc.changes b/osc.changes index 2f8c83c..cc8d595 100644 --- a/osc.changes +++ b/osc.changes @@ -1,11 +1,3 @@ -Mon Feb 1 09:16:17 UTC 2010 - adrian@suse.de - -- update to version 0.125.5 - - rdiff happens against baserev now - - fixed "osc build --local-package - - detect a kiwi file on build - - improved _service file handling - ------------------------------------------------------------------- Wed Jan 27 12:18:34 UTC 2010 - adrian@suse.de diff --git a/osc.dsc b/osc.dsc index cfc7f0a..fca082c 100644 --- a/osc.dsc +++ b/osc.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: osc -Version: 0.125.5-1 +Version: 0.125.4-1 Binary: osc Maintainer: Adrian Schroeter Architecture: any diff --git a/osc.spec b/osc.spec index decac76..e295c64 100644 --- a/osc.spec +++ b/osc.spec @@ -26,7 +26,7 @@ Requires: python-m2crypto > 0.19 BuildRequires: m2crypto Requires: m2crypto > 0.19 %endif -Version: 0.125.5 +Version: 0.125.4 Release: 1 Group: Development/Tools/Other License: GPLv2+ From bfb8f1d21e50f519ef05a56c5f3484453fe99a4046a198b891099e11d90a575b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcus=20H=C3=BCwe?= Date: Thu, 22 Apr 2010 16:21:53 +0000 Subject: [PATCH 4/7] Accepting request 38531 from openSUSE:Tools:Unstable Copy from openSUSE:Tools:Unstable/osc via accept of submit request 38531 revision 95. Request was accepted with message: - accepted OBS-URL: https://build.opensuse.org/request/show/38531 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/osc?expand=0&rev=42 --- debian.changelog | 15 ++++++--- debian.tar.gz | 4 +-- osc-0.125.4.tar.gz | 3 -- osc-0.126.tar.gz | 3 ++ osc.changes | 83 ++++++++++++++++++++++++++++++++++++++++++++++ osc.dsc | 4 +-- osc.spec | 67 ++++++++++++++++++------------------- ready | 0 8 files changed, 132 insertions(+), 47 deletions(-) delete mode 100644 osc-0.125.4.tar.gz create mode 100644 osc-0.126.tar.gz delete mode 100644 ready diff --git a/debian.changelog b/debian.changelog index fce7f05..fe8b958 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,12 +1,17 @@ -osc (0.125.4-1) unstable; urgency=high -- Updated to 0.125.4 +osc (0.125.4-2) unstable; urgency=low + - Fix build and install --- Adrian Schroeter Wed, 27 Jan 2010 10:00:00 +0200 + -- Lubos Lunak Thu, 28 Jan 2010 16:39:57 +0100 + +osc (0.125.4-1) unstable; urgency=high + - Updated to 0.125.4 + + -- Adrian Schroeter Wed, 27 Jan 2010 10:00:00 +0200 osc (0.125.1-1) unstable; urgency=high -- Updated to 0.125.1 + - Updated to 0.125.1 --- Adrian Schroeter Fr, 15 Jan 2010 10:00:00 +0200 + -- Adrian Schroeter Fr, 15 Jan 2010 10:00:00 +0200 osc (0.123-1) unstable; urgency=high - Updated to 0.123 diff --git a/debian.tar.gz b/debian.tar.gz index 540e2cc..3f3dc6a 100644 --- a/debian.tar.gz +++ b/debian.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1f375d152c760441df8215c6a009b96d56d833ad70be844b1ca1fc5780b8cbf4 -size 2131 +oid sha256:82d16afaa81c40865f76d0c97ec91a3092566382145ab7f88cd05fcd7205c3d1 +size 2185 diff --git a/osc-0.125.4.tar.gz b/osc-0.125.4.tar.gz deleted file mode 100644 index 9a0c2d1..0000000 --- a/osc-0.125.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f2a2535e8a6d373e2c16b5e4d18aad5fc3697b8fa3b8a4651771146e081c3884 -size 159894 diff --git a/osc-0.126.tar.gz b/osc-0.126.tar.gz new file mode 100644 index 0000000..c65fd32 --- /dev/null +++ b/osc-0.126.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ddc9ea189343ac3b46bf183f135ae35023ca4bbc10c1b1e861ae591b72926cfe +size 171697 diff --git a/osc.changes b/osc.changes index cc8d595..2489701 100644 --- a/osc.changes +++ b/osc.changes @@ -1,3 +1,86 @@ +------------------------------------------------------------------- +Mon Apr 19 15:13:42 UTC 2010 - suse-tux@gmx.de + +- update to 0.126 (final): + - added VM autosetup to osc. This requires appropriate OBS version and build script version. + - enhanced QEMU cross build support with 'armv4l' 'armv5el' 'armv6el' 'armv7el' 'armv8el' 'mips' 'mips64' 'ppc' 'ppc64' 'sh4' arch strings now supported on x86 host + - suggest git, svn, ... if indicated, after oscerr.NoWorkingCopy + - "osc cat" & "osc ls" now auto-expands through link. + - fixed "osc add" after "osc delete". + - fix "osc patchinfo" command (crashed before) + - fixed SSL proxy support + - fixed meta attribute create and set calls + - osc remotebuildlog supports a buildlogurl + - Allow --prefer-pkgs to parse repodata + - new "osc build --no-service" option to skip source service update + - fix linktobranch apiurl usage + - "maintained package" search is telling relevant projects now + * requires OBS 1.7.2 or 2.0 + - added "osc chroot" command + - fixed #547005 ("osc co could show download progress") + - added "--interactive" option to "osc request" + - store commit message so it doesn't get lost on failure + - added "--cpio-bulk-download" and "--download-api-only" options to "osc build" + - added "osc localbuildlog" command + - added "--build-uid uid:gid|caller" option to "osc build" to specify abuild id in chroot + - verify files using rpm bindings and keys supplied by buildservice + - added "--exclude-target-project " option to "osc rq list" + - added "--message" option to "osc branch" + - added "osc config" command to set/get/delete a config option + - added "--binary" and "--baseproject" options to "osc search" + - added "-o/--offline" and "-l/--preload" options to osc build + * osc build -l standard i586 foo.spec (to cache all dependencies) + * osc build -o standard i586 foo.spec (to build without contacting the api) + +------------------------------------------------------------------- +Wed Apr 7 13:55:54 UTC 2010 - suse-tux@gmx.de + +- use rpm macros +- mark files in %%{_sysconfdir}/profile.d/ as %%config + +------------------------------------------------------------------- +Sun Mar 21 22:03:07 UTC 2010 - suse-tux@gmx.de + +- fixed rpmlint warning + +------------------------------------------------------------------- +Sun Mar 21 21:49:19 UTC 2010 - suse-tux@gmx.de + +- -update to version 0.126 (unstable) + - suggest git, svn, ... if indicated, after oscerr.NoWorkingCopy + - "osc cat" & "osc ls" now auto-expands through link. + - fixed "osc add" after "osc delete". + - fix "osc patchinfo" command (crashed before) + - fixed SSL proxy support + - fixed meta attribute create and set calls + - osc remotebuildlog supports a buildlogurl + - Allow --prefer-pkgs to parse repodata + - new "osc build --no-service" option to skip source service update + - fix linktobranch apiurl usage + - "maintained package" search is telling relevant projects now + * requires OBS 1.7.2 or 2.0 + - added "osc chroot" command + - fixed #547005 ("osc co could show download progress") + - added "--interactive" option to "osc request" + - store commit message so it doesn't get lost on failure + - added "--cpio-bulk-download" and "--download-api-only" options to "osc build" + - added "osc localbuildlog" command + - added "--build-uid uid:gid|caller" option to "osc build" to specify abuild id in chroot + - verify files using rpm bindings and keys supplied by buildservice + - added "--exclude-target-project " option to "osc rq list" + - added "--message" option to "osc branch" + - added "osc config" command to set/get/delete a config option + - added "--binary" and "--baseproject" options to "osc search" + +------------------------------------------------------------------- +Mon Feb 1 09:16:17 UTC 2010 - adrian@suse.de + +- update to version 0.125.5 + - rdiff happens against baserev now + - fixed "osc build --local-package + - detect a kiwi file on build + - improved _service file handling + ------------------------------------------------------------------- Wed Jan 27 12:18:34 UTC 2010 - adrian@suse.de diff --git a/osc.dsc b/osc.dsc index fca082c..f59a8b0 100644 --- a/osc.dsc +++ b/osc.dsc @@ -1,8 +1,8 @@ Format: 1.0 Source: osc -Version: 0.125.4-1 +Version: 0.126 Binary: osc Maintainer: Adrian Schroeter Architecture: any Standards-Version: 3.7.1 -Build-Depends: debhelper (>= 4.0.0), python-dev +Build-Depends: debhelper (>= 4.0.0), python-dev, python-urlgrabber diff --git a/osc.spec b/osc.spec index e295c64..780a86a 100644 --- a/osc.spec +++ b/osc.spec @@ -1,5 +1,5 @@ # -# spec file for package osc (Version 0.125.4) +# spec file for package osc (Version 0.126) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -15,26 +15,18 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - Name: osc -BuildRequires: python-devel -%if 0%{?suse_version}%{?mandriva_version} -BuildRequires: python-m2crypto -Requires: python-m2crypto > 0.19 -%else -BuildRequires: m2crypto -Requires: m2crypto > 0.19 -%endif -Version: 0.125.4 -Release: 1 +Version: 0.126 +Release: 0 Group: Development/Tools/Other License: GPLv2+ BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://www.gitorious.org/opensuse/osc Source: osc-%{version}.tar.gz -Summary: OpenSUSE Build Service Commander +Summary: openSUSE Build Service Commander Requires: python-urlgrabber +BuildRequires: python-urlgrabber +BuildRequires: python-devel # %if 0%{?suse_version} %if %suse_version < 1020 @@ -42,23 +34,27 @@ BuildRequires: python-elementtree Requires: python-elementtree %else BuildRequires: python-urlgrabber python-xml -Requires: python-xml python-urlgrabber +Requires: python-xml %endif -%if 0%{?suse_version} > 1110 +%if %suse_version > 1110 BuildArch: noarch %endif -%if 0%{?suse_version} > 1000 +%if %suse_version > 1000 Recommends: build > 2009.06.03 %endif %endif -%if 0%{?mandriva_version} == 0200910 -BuildRequires: python-urlgrabber -Requires: python-urlgrabber -%endif %if 0%{?rhel_version} || 0%{?centos_version} -BuildRequires: python-elementtree python-urlgrabber -Requires: python-elementtree python-urlgrabber +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()")} @@ -79,17 +75,17 @@ CFLAGS="%{optflags}" \ %install %{__python} setup.py install --prefix=%{_prefix} --root %{buildroot} -ln -s osc-wrapper.py %{buildroot}/%{_bindir}/osc -mkdir -p %{buildroot}/var/lib/osc-plugins -mkdir -p %{buildroot}%{_sysconfdir}/profile.d -install -m 0755 dist/complete.csh %{buildroot}%{_sysconfdir}/profile.d/osc.csh -install -m 0755 dist/complete.sh %{buildroot}%{_sysconfdir}/profile.d/osc.sh +%__ln_s osc-wrapper.py %{buildroot}/%{_bindir}/osc +%__mkdir_p %{buildroot}/var/lib/osc-plugins +%__mkdir_p %{buildroot}%{_sysconfdir}/profile.d +%__install -m 0644 dist/complete.csh %{buildroot}%{_sysconfdir}/profile.d/osc.csh +%__install -m 0644 dist/complete.sh %{buildroot}%{_sysconfdir}/profile.d/osc.sh %if 0%{?suse_version} > 1110 -mkdir -p %{buildroot}%{_prefix}/lib/osc -install -m 0755 dist/osc.complete %{buildroot}%{_prefix}/lib/osc/complete +%__mkdir_p %{buildroot}%{_prefix}/lib/osc +%__install -m 0755 dist/osc.complete %{buildroot}%{_prefix}/lib/osc/complete %else -mkdir -p %{buildroot}%{_prefix}/%{_lib}/osc -install -m 0755 dist/osc.complete %{buildroot}%{_prefix}/%{_lib}/osc/complete +%__mkdir_p %{buildroot}%{_prefix}/%{_lib}/osc +%__install -m 0755 dist/osc.complete %{buildroot}%{_prefix}/%{_lib}/osc/complete %endif %clean @@ -99,13 +95,14 @@ install -m 0755 dist/osc.complete %{buildroot}%{_prefix}/%{_lib}/osc/complete %defattr(-,root,root) %{_bindir}/osc* %{python_sitelib}/* -%{_sysconfdir}/profile.d/* +%config %{_sysconfdir}/profile.d/osc.sh +%config %{_sysconfdir}/profile.d/osc.csh %if 0%{?suse_version} > 1110 %dir %{_prefix}/lib/osc -%{_prefix}/lib/osc/* +%{_prefix}/lib/osc/complete %else %dir %{_prefix}/%{_lib}/osc -%{_prefix}/%{_lib}/osc/* +%{_prefix}/%{_lib}/osc/complete %endif %dir /var/lib/osc-plugins %doc AUTHORS README TODO NEWS diff --git a/ready b/ready deleted file mode 100644 index 473a0f4..0000000 From a02082ed09435fbfbb39cce55846cfa8f387d2f199037a657607458a6d14fa43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcus=20H=C3=BCwe?= Date: Thu, 22 Apr 2010 16:57:37 +0000 Subject: [PATCH 5/7] Accepting request 38532 from openSUSE:Tools:Unstable Copy from openSUSE:Tools:Unstable/osc via accept of submit request 38532 revision 97. Request was accepted with message: - accepted OBS-URL: https://build.opensuse.org/request/show/38532 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/osc?expand=0&rev=43 --- osc-0.126.tar.gz | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/osc-0.126.tar.gz b/osc-0.126.tar.gz index c65fd32..f3d73ca 100644 --- a/osc-0.126.tar.gz +++ b/osc-0.126.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ddc9ea189343ac3b46bf183f135ae35023ca4bbc10c1b1e861ae591b72926cfe -size 171697 +oid sha256:3191ecfbede148c0c21982ec7069f72ab81a0a331b3934b1c8c39db743e8b443 +size 171359 From ca18c53316cd8f98dfd8df3d84b55b6d39ca61598a9a9b0d920d2c456d78939b Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Sun, 25 Apr 2010 16:50:29 +0000 Subject: [PATCH 6/7] Accepting request 38631 from openSUSE:Tools checked in (request 38631) OBS-URL: https://build.opensuse.org/request/show/38631 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/osc?expand=0&rev=44 --- osc-0.125.5.tar.gz | 3 ++ osc-0.126.tar.gz | 3 -- osc.changes | 75 ------------------------------------- osc.dsc | 4 +- osc.spec | 93 ++++++++++++++++++++++++---------------------- 5 files changed, 53 insertions(+), 125 deletions(-) create mode 100644 osc-0.125.5.tar.gz delete mode 100644 osc-0.126.tar.gz diff --git a/osc-0.125.5.tar.gz b/osc-0.125.5.tar.gz new file mode 100644 index 0000000..4ea8805 --- /dev/null +++ b/osc-0.125.5.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7e88fd37831f6b154e3ae2b9c35cfcf714d4f2a1e0a520e26b7e2cd48dcc9e77 +size 159631 diff --git a/osc-0.126.tar.gz b/osc-0.126.tar.gz deleted file mode 100644 index f3d73ca..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.changes b/osc.changes index 2489701..2f8c83c 100644 --- a/osc.changes +++ b/osc.changes @@ -1,78 +1,3 @@ -------------------------------------------------------------------- -Mon Apr 19 15:13:42 UTC 2010 - suse-tux@gmx.de - -- update to 0.126 (final): - - added VM autosetup to osc. This requires appropriate OBS version and build script version. - - enhanced QEMU cross build support with 'armv4l' 'armv5el' 'armv6el' 'armv7el' 'armv8el' 'mips' 'mips64' 'ppc' 'ppc64' 'sh4' arch strings now supported on x86 host - - suggest git, svn, ... if indicated, after oscerr.NoWorkingCopy - - "osc cat" & "osc ls" now auto-expands through link. - - fixed "osc add" after "osc delete". - - fix "osc patchinfo" command (crashed before) - - fixed SSL proxy support - - fixed meta attribute create and set calls - - osc remotebuildlog supports a buildlogurl - - Allow --prefer-pkgs to parse repodata - - new "osc build --no-service" option to skip source service update - - fix linktobranch apiurl usage - - "maintained package" search is telling relevant projects now - * requires OBS 1.7.2 or 2.0 - - added "osc chroot" command - - fixed #547005 ("osc co could show download progress") - - added "--interactive" option to "osc request" - - store commit message so it doesn't get lost on failure - - added "--cpio-bulk-download" and "--download-api-only" options to "osc build" - - added "osc localbuildlog" command - - added "--build-uid uid:gid|caller" option to "osc build" to specify abuild id in chroot - - verify files using rpm bindings and keys supplied by buildservice - - added "--exclude-target-project " option to "osc rq list" - - added "--message" option to "osc branch" - - added "osc config" command to set/get/delete a config option - - added "--binary" and "--baseproject" options to "osc search" - - added "-o/--offline" and "-l/--preload" options to osc build - * osc build -l standard i586 foo.spec (to cache all dependencies) - * osc build -o standard i586 foo.spec (to build without contacting the api) - -------------------------------------------------------------------- -Wed Apr 7 13:55:54 UTC 2010 - suse-tux@gmx.de - -- use rpm macros -- mark files in %%{_sysconfdir}/profile.d/ as %%config - -------------------------------------------------------------------- -Sun Mar 21 22:03:07 UTC 2010 - suse-tux@gmx.de - -- fixed rpmlint warning - -------------------------------------------------------------------- -Sun Mar 21 21:49:19 UTC 2010 - suse-tux@gmx.de - -- -update to version 0.126 (unstable) - - suggest git, svn, ... if indicated, after oscerr.NoWorkingCopy - - "osc cat" & "osc ls" now auto-expands through link. - - fixed "osc add" after "osc delete". - - fix "osc patchinfo" command (crashed before) - - fixed SSL proxy support - - fixed meta attribute create and set calls - - osc remotebuildlog supports a buildlogurl - - Allow --prefer-pkgs to parse repodata - - new "osc build --no-service" option to skip source service update - - fix linktobranch apiurl usage - - "maintained package" search is telling relevant projects now - * requires OBS 1.7.2 or 2.0 - - added "osc chroot" command - - fixed #547005 ("osc co could show download progress") - - added "--interactive" option to "osc request" - - store commit message so it doesn't get lost on failure - - added "--cpio-bulk-download" and "--download-api-only" options to "osc build" - - added "osc localbuildlog" command - - added "--build-uid uid:gid|caller" option to "osc build" to specify abuild id in chroot - - verify files using rpm bindings and keys supplied by buildservice - - added "--exclude-target-project " option to "osc rq list" - - added "--message" option to "osc branch" - - added "osc config" command to set/get/delete a config option - - added "--binary" and "--baseproject" options to "osc search" - -------------------------------------------------------------------- Mon Feb 1 09:16:17 UTC 2010 - adrian@suse.de - update to version 0.125.5 diff --git a/osc.dsc b/osc.dsc index f59a8b0..cfc7f0a 100644 --- a/osc.dsc +++ b/osc.dsc @@ -1,8 +1,8 @@ Format: 1.0 Source: osc -Version: 0.126 +Version: 0.125.5-1 Binary: osc Maintainer: Adrian Schroeter Architecture: any Standards-Version: 3.7.1 -Build-Depends: debhelper (>= 4.0.0), python-dev, python-urlgrabber +Build-Depends: debhelper (>= 4.0.0), python-dev diff --git a/osc.spec b/osc.spec index 780a86a..c1abaf5 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.125.5) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -15,38 +15,10 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + + Name: osc -Version: 0.126 -Release: 0 -Group: Development/Tools/Other -License: GPLv2+ -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Url: http://www.gitorious.org/opensuse/osc -Source: osc-%{version}.tar.gz -Summary: openSUSE Build Service Commander -Requires: python-urlgrabber -BuildRequires: python-urlgrabber BuildRequires: python-devel -# -%if 0%{?suse_version} -%if %suse_version < 1020 -BuildRequires: python-elementtree -Requires: python-elementtree -%else -BuildRequires: python-urlgrabber python-xml -Requires: python-xml -%endif -%if %suse_version > 1110 -BuildArch: noarch -%endif -%if %suse_version > 1000 -Recommends: build > 2009.06.03 -%endif -%endif -%if 0%{?rhel_version} || 0%{?centos_version} -BuildRequires: python-elementtree -Requires: python-elementtree -%endif %if 0%{?suse_version}%{?mandriva_version} BuildRequires: python-m2crypto Requires: python-m2crypto > 0.19 @@ -54,7 +26,39 @@ Requires: python-m2crypto > 0.19 BuildRequires: m2crypto Requires: m2crypto > 0.19 %endif - +Version: 0.125.5 +Release: 1 +Group: Development/Tools/Other +License: GPLv2+ +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Url: http://www.gitorious.org/opensuse/osc +Source: osc-%{version}.tar.gz +Summary: OpenSUSE Build Service Commander +Requires: python-urlgrabber +# +%if 0%{?suse_version} +%if %suse_version < 1020 +BuildRequires: python-elementtree +Requires: python-elementtree +%else +BuildRequires: python-urlgrabber python-xml +Requires: python-xml python-urlgrabber +%endif +%if 0%{?suse_version} > 1110 +BuildArch: noarch +%endif +%if 0%{?suse_version} > 1000 +Recommends: build > 2009.06.03 +%endif +%endif +%if 0%{?mandriva_version} == 0200910 +BuildRequires: python-urlgrabber +Requires: python-urlgrabber +%endif +%if 0%{?rhel_version} || 0%{?centos_version} +BuildRequires: python-elementtree python-urlgrabber +Requires: python-elementtree python-urlgrabber +%endif # %{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} @@ -75,17 +79,17 @@ CFLAGS="%{optflags}" \ %install %{__python} setup.py install --prefix=%{_prefix} --root %{buildroot} -%__ln_s osc-wrapper.py %{buildroot}/%{_bindir}/osc -%__mkdir_p %{buildroot}/var/lib/osc-plugins -%__mkdir_p %{buildroot}%{_sysconfdir}/profile.d -%__install -m 0644 dist/complete.csh %{buildroot}%{_sysconfdir}/profile.d/osc.csh -%__install -m 0644 dist/complete.sh %{buildroot}%{_sysconfdir}/profile.d/osc.sh +ln -s osc-wrapper.py %{buildroot}/%{_bindir}/osc +mkdir -p %{buildroot}/var/lib/osc-plugins +mkdir -p %{buildroot}%{_sysconfdir}/profile.d +install -m 0755 dist/complete.csh %{buildroot}%{_sysconfdir}/profile.d/osc.csh +install -m 0755 dist/complete.sh %{buildroot}%{_sysconfdir}/profile.d/osc.sh %if 0%{?suse_version} > 1110 -%__mkdir_p %{buildroot}%{_prefix}/lib/osc -%__install -m 0755 dist/osc.complete %{buildroot}%{_prefix}/lib/osc/complete +mkdir -p %{buildroot}%{_prefix}/lib/osc +install -m 0755 dist/osc.complete %{buildroot}%{_prefix}/lib/osc/complete %else -%__mkdir_p %{buildroot}%{_prefix}/%{_lib}/osc -%__install -m 0755 dist/osc.complete %{buildroot}%{_prefix}/%{_lib}/osc/complete +mkdir -p %{buildroot}%{_prefix}/%{_lib}/osc +install -m 0755 dist/osc.complete %{buildroot}%{_prefix}/%{_lib}/osc/complete %endif %clean @@ -95,14 +99,13 @@ CFLAGS="%{optflags}" \ %defattr(-,root,root) %{_bindir}/osc* %{python_sitelib}/* -%config %{_sysconfdir}/profile.d/osc.sh -%config %{_sysconfdir}/profile.d/osc.csh +%{_sysconfdir}/profile.d/* %if 0%{?suse_version} > 1110 %dir %{_prefix}/lib/osc -%{_prefix}/lib/osc/complete +%{_prefix}/lib/osc/* %else %dir %{_prefix}/%{_lib}/osc -%{_prefix}/%{_lib}/osc/complete +%{_prefix}/%{_lib}/osc/* %endif %dir /var/lib/osc-plugins %doc AUTHORS README TODO NEWS From cd86a057c4a1b3c5dc47ef61694a0999bd0d624399b5809e1bc1523983cf2597 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Sun, 25 Apr 2010 16:50:30 +0000 Subject: [PATCH 7/7] Updating link to change in openSUSE:Factory/osc revision 41.0 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/osc?expand=0&rev=9041d1f5f3fd83486a5587f0270aa8eb --- osc-0.125.5.tar.gz | 3 -- osc-0.126.tar.gz | 3 ++ osc.changes | 75 ++++++++++++++++++++++++++++++++++++++++++++++ osc.dsc | 4 +-- osc.spec | 63 +++++++++++++++++++------------------- 5 files changed, 111 insertions(+), 37 deletions(-) delete mode 100644 osc-0.125.5.tar.gz create mode 100644 osc-0.126.tar.gz diff --git a/osc-0.125.5.tar.gz b/osc-0.125.5.tar.gz deleted file mode 100644 index 4ea8805..0000000 --- a/osc-0.125.5.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7e88fd37831f6b154e3ae2b9c35cfcf714d4f2a1e0a520e26b7e2cd48dcc9e77 -size 159631 diff --git a/osc-0.126.tar.gz b/osc-0.126.tar.gz new file mode 100644 index 0000000..f3d73ca --- /dev/null +++ b/osc-0.126.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3191ecfbede148c0c21982ec7069f72ab81a0a331b3934b1c8c39db743e8b443 +size 171359 diff --git a/osc.changes b/osc.changes index 2f8c83c..2489701 100644 --- a/osc.changes +++ b/osc.changes @@ -1,3 +1,78 @@ +------------------------------------------------------------------- +Mon Apr 19 15:13:42 UTC 2010 - suse-tux@gmx.de + +- update to 0.126 (final): + - added VM autosetup to osc. This requires appropriate OBS version and build script version. + - enhanced QEMU cross build support with 'armv4l' 'armv5el' 'armv6el' 'armv7el' 'armv8el' 'mips' 'mips64' 'ppc' 'ppc64' 'sh4' arch strings now supported on x86 host + - suggest git, svn, ... if indicated, after oscerr.NoWorkingCopy + - "osc cat" & "osc ls" now auto-expands through link. + - fixed "osc add" after "osc delete". + - fix "osc patchinfo" command (crashed before) + - fixed SSL proxy support + - fixed meta attribute create and set calls + - osc remotebuildlog supports a buildlogurl + - Allow --prefer-pkgs to parse repodata + - new "osc build --no-service" option to skip source service update + - fix linktobranch apiurl usage + - "maintained package" search is telling relevant projects now + * requires OBS 1.7.2 or 2.0 + - added "osc chroot" command + - fixed #547005 ("osc co could show download progress") + - added "--interactive" option to "osc request" + - store commit message so it doesn't get lost on failure + - added "--cpio-bulk-download" and "--download-api-only" options to "osc build" + - added "osc localbuildlog" command + - added "--build-uid uid:gid|caller" option to "osc build" to specify abuild id in chroot + - verify files using rpm bindings and keys supplied by buildservice + - added "--exclude-target-project " option to "osc rq list" + - added "--message" option to "osc branch" + - added "osc config" command to set/get/delete a config option + - added "--binary" and "--baseproject" options to "osc search" + - added "-o/--offline" and "-l/--preload" options to osc build + * osc build -l standard i586 foo.spec (to cache all dependencies) + * osc build -o standard i586 foo.spec (to build without contacting the api) + +------------------------------------------------------------------- +Wed Apr 7 13:55:54 UTC 2010 - suse-tux@gmx.de + +- use rpm macros +- mark files in %%{_sysconfdir}/profile.d/ as %%config + +------------------------------------------------------------------- +Sun Mar 21 22:03:07 UTC 2010 - suse-tux@gmx.de + +- fixed rpmlint warning + +------------------------------------------------------------------- +Sun Mar 21 21:49:19 UTC 2010 - suse-tux@gmx.de + +- -update to version 0.126 (unstable) + - suggest git, svn, ... if indicated, after oscerr.NoWorkingCopy + - "osc cat" & "osc ls" now auto-expands through link. + - fixed "osc add" after "osc delete". + - fix "osc patchinfo" command (crashed before) + - fixed SSL proxy support + - fixed meta attribute create and set calls + - osc remotebuildlog supports a buildlogurl + - Allow --prefer-pkgs to parse repodata + - new "osc build --no-service" option to skip source service update + - fix linktobranch apiurl usage + - "maintained package" search is telling relevant projects now + * requires OBS 1.7.2 or 2.0 + - added "osc chroot" command + - fixed #547005 ("osc co could show download progress") + - added "--interactive" option to "osc request" + - store commit message so it doesn't get lost on failure + - added "--cpio-bulk-download" and "--download-api-only" options to "osc build" + - added "osc localbuildlog" command + - added "--build-uid uid:gid|caller" option to "osc build" to specify abuild id in chroot + - verify files using rpm bindings and keys supplied by buildservice + - added "--exclude-target-project " option to "osc rq list" + - added "--message" option to "osc branch" + - added "osc config" command to set/get/delete a config option + - added "--binary" and "--baseproject" options to "osc search" + +------------------------------------------------------------------- Mon Feb 1 09:16:17 UTC 2010 - adrian@suse.de - update to version 0.125.5 diff --git a/osc.dsc b/osc.dsc index cfc7f0a..f59a8b0 100644 --- a/osc.dsc +++ b/osc.dsc @@ -1,8 +1,8 @@ Format: 1.0 Source: osc -Version: 0.125.5-1 +Version: 0.126 Binary: osc Maintainer: Adrian Schroeter Architecture: any Standards-Version: 3.7.1 -Build-Depends: debhelper (>= 4.0.0), python-dev +Build-Depends: debhelper (>= 4.0.0), python-dev, python-urlgrabber diff --git a/osc.spec b/osc.spec index c1abaf5..1245f88 100644 --- a/osc.spec +++ b/osc.spec @@ -1,5 +1,5 @@ # -# spec file for package osc (Version 0.125.5) +# spec file for package osc (Version 0.126) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,23 +18,17 @@ Name: osc -BuildRequires: python-devel -%if 0%{?suse_version}%{?mandriva_version} -BuildRequires: python-m2crypto -Requires: python-m2crypto > 0.19 -%else -BuildRequires: m2crypto -Requires: m2crypto > 0.19 -%endif -Version: 0.125.5 +Version: 0.126 Release: 1 Group: Development/Tools/Other License: GPLv2+ BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://www.gitorious.org/opensuse/osc Source: osc-%{version}.tar.gz -Summary: OpenSUSE Build Service Commander +Summary: openSUSE Build Service Commander Requires: python-urlgrabber +BuildRequires: python-urlgrabber +BuildRequires: python-devel # %if 0%{?suse_version} %if %suse_version < 1020 @@ -42,23 +36,27 @@ BuildRequires: python-elementtree Requires: python-elementtree %else BuildRequires: python-urlgrabber python-xml -Requires: python-xml python-urlgrabber +Requires: python-xml %endif -%if 0%{?suse_version} > 1110 +%if %suse_version > 1110 BuildArch: noarch %endif -%if 0%{?suse_version} > 1000 +%if %suse_version > 1000 Recommends: build > 2009.06.03 %endif %endif -%if 0%{?mandriva_version} == 0200910 -BuildRequires: python-urlgrabber -Requires: python-urlgrabber -%endif %if 0%{?rhel_version} || 0%{?centos_version} -BuildRequires: python-elementtree python-urlgrabber -Requires: python-elementtree python-urlgrabber +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()")} @@ -79,17 +77,17 @@ CFLAGS="%{optflags}" \ %install %{__python} setup.py install --prefix=%{_prefix} --root %{buildroot} -ln -s osc-wrapper.py %{buildroot}/%{_bindir}/osc -mkdir -p %{buildroot}/var/lib/osc-plugins -mkdir -p %{buildroot}%{_sysconfdir}/profile.d -install -m 0755 dist/complete.csh %{buildroot}%{_sysconfdir}/profile.d/osc.csh -install -m 0755 dist/complete.sh %{buildroot}%{_sysconfdir}/profile.d/osc.sh +%__ln_s osc-wrapper.py %{buildroot}/%{_bindir}/osc +%__mkdir_p %{buildroot}/var/lib/osc-plugins +%__mkdir_p %{buildroot}%{_sysconfdir}/profile.d +%__install -m 0644 dist/complete.csh %{buildroot}%{_sysconfdir}/profile.d/osc.csh +%__install -m 0644 dist/complete.sh %{buildroot}%{_sysconfdir}/profile.d/osc.sh %if 0%{?suse_version} > 1110 -mkdir -p %{buildroot}%{_prefix}/lib/osc -install -m 0755 dist/osc.complete %{buildroot}%{_prefix}/lib/osc/complete +%__mkdir_p %{buildroot}%{_prefix}/lib/osc +%__install -m 0755 dist/osc.complete %{buildroot}%{_prefix}/lib/osc/complete %else -mkdir -p %{buildroot}%{_prefix}/%{_lib}/osc -install -m 0755 dist/osc.complete %{buildroot}%{_prefix}/%{_lib}/osc/complete +%__mkdir_p %{buildroot}%{_prefix}/%{_lib}/osc +%__install -m 0755 dist/osc.complete %{buildroot}%{_prefix}/%{_lib}/osc/complete %endif %clean @@ -99,13 +97,14 @@ install -m 0755 dist/osc.complete %{buildroot}%{_prefix}/%{_lib}/osc/complete %defattr(-,root,root) %{_bindir}/osc* %{python_sitelib}/* -%{_sysconfdir}/profile.d/* +%config %{_sysconfdir}/profile.d/osc.sh +%config %{_sysconfdir}/profile.d/osc.csh %if 0%{?suse_version} > 1110 %dir %{_prefix}/lib/osc -%{_prefix}/lib/osc/* +%{_prefix}/lib/osc/complete %else %dir %{_prefix}/%{_lib}/osc -%{_prefix}/%{_lib}/osc/* +%{_prefix}/%{_lib}/osc/complete %endif %dir /var/lib/osc-plugins %doc AUTHORS README TODO NEWS