From f32a5b45543270cb214f949729a929b4fe584e64 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Fri, 17 Jun 2011 09:48:04 +0000 Subject: [PATCH 1/3] Updating link to change in openSUSE:Factory/osc revision 61.0 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/osc?expand=0&rev=ffc9005a2cc2d20b998d7a6a458f8a53 --- osc.spec | 7 ------- 1 file changed, 7 deletions(-) diff --git a/osc.spec b/osc.spec index 6cf64ec..53a1c41 100644 --- a/osc.spec +++ b/osc.spec @@ -84,7 +84,6 @@ Requires: rpm-python %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. @@ -95,11 +94,9 @@ 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 @@ -112,11 +109,9 @@ install -Dm0755 dist/osc.complete %{buildroot}%{_prefix}/lib/osc/complete install -Dm0755 dist/osc.complete %{buildroot}%{_libdir}/osc/complete %endif - %clean rm -rf %{buildroot} - %files %defattr(-,root,root,-) %doc AUTHORS README TODO NEWS @@ -132,6 +127,4 @@ rm -rf %{buildroot} %{_libdir}/osc %endif - - %changelog From 97c800503066e2b16bdc83b3071e53f8655093d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Thu, 7 Jul 2011 04:46:30 +0000 Subject: [PATCH 2/3] trigger service run OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/osc?expand=0&rev=92 --- _service:format_spec_file:osc.spec | 130 +++++++++++++++++++++++++++++ 1 file changed, 130 insertions(+) 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..53a1c41 --- /dev/null +++ b/_service:format_spec_file:osc.spec @@ -0,0 +1,130 @@ +# +# 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.132.4 +Release: 1 +License: GPLv2+ +Summary: openSUSE Build Service Commander +Url: http://www.gitorious.org/opensuse/osc +Group: Development/Tools/Other +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%{?centos_version} +%if 0%{?rhel_version} < 600 +BuildRequires: python-elementtree +Requires: python-elementtree +%endif +%endif +%if 0%{?suse_version}%{?mandriva_version} +BuildRequires: python-m2crypto +Requires: python-m2crypto > 0.19 +%else +BuildRequires: m2crypto +Requires: m2crypto > 0.19 +%endif +%if 0%{?mandriva_version} +BuildRequires: python-rpm +Requires: python-rpm +%else +BuildRequires: rpm-python +Requires: rpm-python +%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 From 993f4142f2bbe5e12e6d1a0fadcb0512a7bfed7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Thu, 7 Jul 2011 04:52:49 +0000 Subject: [PATCH 3/3] update OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/osc?expand=0&rev=93 --- _service:format_spec_file:osc.spec | 130 ----------------------------- debian.changelog | 5 ++ osc-0.132.4.tar.gz | 3 - osc-0.132.5.tar.gz | 3 + osc.changes | 7 ++ osc.dsc | 2 +- osc.spec | 2 +- 7 files changed, 17 insertions(+), 135 deletions(-) delete mode 100644 _service:format_spec_file:osc.spec delete mode 100644 osc-0.132.4.tar.gz create mode 100644 osc-0.132.5.tar.gz diff --git a/_service:format_spec_file:osc.spec b/_service:format_spec_file:osc.spec deleted file mode 100644 index 53a1c41..0000000 --- a/_service:format_spec_file:osc.spec +++ /dev/null @@ -1,130 +0,0 @@ -# -# 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.132.4 -Release: 1 -License: GPLv2+ -Summary: openSUSE Build Service Commander -Url: http://www.gitorious.org/opensuse/osc -Group: Development/Tools/Other -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%{?centos_version} -%if 0%{?rhel_version} < 600 -BuildRequires: python-elementtree -Requires: python-elementtree -%endif -%endif -%if 0%{?suse_version}%{?mandriva_version} -BuildRequires: python-m2crypto -Requires: python-m2crypto > 0.19 -%else -BuildRequires: m2crypto -Requires: m2crypto > 0.19 -%endif -%if 0%{?mandriva_version} -BuildRequires: python-rpm -Requires: python-rpm -%else -BuildRequires: rpm-python -Requires: rpm-python -%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/debian.changelog b/debian.changelog index 2a6b047..167ce01 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,3 +1,8 @@ +osc (0.132.5-1) unstable; urgency=low + - Update to 0.132.5 + + -- Adrian Schroeter Wed, 07 Jul 2011 10:00:00 +0200 + osc (0.132.4-1) unstable; urgency=low - Update to 0.132.4 diff --git a/osc-0.132.4.tar.gz b/osc-0.132.4.tar.gz deleted file mode 100644 index 116e0eb..0000000 --- a/osc-0.132.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8c2d9445a5b1d735710d71fa507dead4866514e0bb12836527ee48f452d3e42e -size 269202 diff --git a/osc-0.132.5.tar.gz b/osc-0.132.5.tar.gz new file mode 100644 index 0000000..558da8f --- /dev/null +++ b/osc-0.132.5.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:463f9f4ac96fc744ec0fe4dc6a1816dd159eb1f864692935f95cba081107ed27 +size 269264 diff --git a/osc.changes b/osc.changes index e141ebc..14daffb 100644 --- a/osc.changes +++ b/osc.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Jul 7 04:51:09 UTC 2011 - adrian@suse.de + +- update to 0.132.5 + * fix detection of project wide source service only + * crash fix on incident creation + ------------------------------------------------------------------- Thu Jun 16 09:50:55 UTC 2011 - saschpe@suse.de diff --git a/osc.dsc b/osc.dsc index eb9c2df..1fc8d1e 100644 --- a/osc.dsc +++ b/osc.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: osc -Version: 0.132.4 +Version: 0.132.5 Binary: osc Maintainer: Adrian Schroeter Architecture: any diff --git a/osc.spec b/osc.spec index 53a1c41..433cb6a 100644 --- a/osc.spec +++ b/osc.spec @@ -18,7 +18,7 @@ Name: osc -Version: 0.132.4 +Version: 0.132.5 Release: 1 License: GPLv2+ Summary: openSUSE Build Service Commander