From ca18c53316cd8f98dfd8df3d84b55b6d39ca61598a9a9b0d920d2c456d78939b Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Sun, 25 Apr 2010 16:50:29 +0000 Subject: [PATCH] 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