From fe2baf86b3008442d68d33b5e2fcb2c47d995922 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 10 Jun 2011 10:05:22 +0000 Subject: [PATCH 1/4] fix compression OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/osc?expand=0&rev=86 --- osc-0.132.3.tar.gz | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/osc-0.132.3.tar.gz b/osc-0.132.3.tar.gz index 6e430e7..002f988 100644 --- a/osc-0.132.3.tar.gz +++ b/osc-0.132.3.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:40795eb851f08008bc81b9c8f3f9450a5fe94200aeb451a6736ecd1ca4107bd8 -size 199448 +oid sha256:4e6f5471008c4961e427f21130b6bec5e0fc33d1e327f4163e04b53b07e13d82 +size 269204 From 88a298e0c8c4c6aabb65265940e9ab990697dd7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Wed, 15 Jun 2011 12:20:29 +0000 Subject: [PATCH 2/4] update OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/osc?expand=0&rev=88 --- osc-0.132.3.tar.gz | 3 --- osc-0.132.4.tar.gz | 3 +++ osc.changes | 6 ++++++ osc.spec | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) delete mode 100644 osc-0.132.3.tar.gz create mode 100644 osc-0.132.4.tar.gz diff --git a/osc-0.132.3.tar.gz b/osc-0.132.3.tar.gz deleted file mode 100644 index 002f988..0000000 --- a/osc-0.132.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4e6f5471008c4961e427f21130b6bec5e0fc33d1e327f4163e04b53b07e13d82 -size 269204 diff --git a/osc-0.132.4.tar.gz b/osc-0.132.4.tar.gz new file mode 100644 index 0000000..116e0eb --- /dev/null +++ b/osc-0.132.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8c2d9445a5b1d735710d71fa507dead4866514e0bb12836527ee48f452d3e42e +size 269202 diff --git a/osc.changes b/osc.changes index 94b3917..e05a1cf 100644 --- a/osc.changes +++ b/osc.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jun 15 12:20:07 UTC 2011 - adrian@suse.de + +- update to 0.132.4 + - fix local package build + ------------------------------------------------------------------- Fri Jun 10 09:49:44 UTC 2011 - adrian@suse.de diff --git a/osc.spec b/osc.spec index fd1cbfc..5440bb6 100644 --- a/osc.spec +++ b/osc.spec @@ -18,7 +18,7 @@ Name: osc -Version: 0.132.3 +Version: 0.132.4 Release: 1 Group: Development/Tools/Other License: GPLv2+ From d85a5297f3d72cb4de4b64af6114bf2cee038488 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Wed, 15 Jun 2011 12:21:25 +0000 Subject: [PATCH 3/4] update dsc OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/osc?expand=0&rev=89 --- debian.changelog | 5 +++++ osc.dsc | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/debian.changelog b/debian.changelog index 15ce776..2a6b047 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,3 +1,8 @@ +osc (0.132.4-1) unstable; urgency=low + - Update to 0.132.4 + + -- Adrian Schroeter Wed, 15 Jun 2011 10:00:00 +0200 + osc (0.132.3-1) unstable; urgency=low - Update to 0.132.3 diff --git a/osc.dsc b/osc.dsc index 0a37494..eb9c2df 100644 --- a/osc.dsc +++ b/osc.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: osc -Version: 0.132.3 +Version: 0.132.4 Binary: osc Maintainer: Adrian Schroeter Architecture: any From b0a82dbf686f482d883b14add4cacf396a33c36b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 17 Jun 2011 07:57:43 +0000 Subject: [PATCH 4/4] Accepting request 73831 from home:saschpe:branches:openSUSE:Tools Spec file cleaner run, updated recommends. OBS-URL: https://build.opensuse.org/request/show/73831 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/osc?expand=0&rev=90 --- osc.changes | 10 +++++++ osc.spec | 80 +++++++++++++++++++++++++---------------------------- 2 files changed, 48 insertions(+), 42 deletions(-) diff --git a/osc.changes b/osc.changes index e05a1cf..e141ebc 100644 --- a/osc.changes +++ b/osc.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Jun 16 09:50:55 UTC 2011 - saschpe@suse.de + +- spec file cleanup: + * run spec-cleaner + * simplified some shell commands +- recommend obs-service-download_files, + obs-service-format_spec_file, obs-service-source_validator +- remove recommends for osc-source_validator + ------------------------------------------------------------------- Wed Jun 15 12:20:07 UTC 2011 - adrian@suse.de diff --git a/osc.spec b/osc.spec index 5440bb6..6cf64ec 100644 --- a/osc.spec +++ b/osc.spec @@ -20,45 +20,50 @@ Name: osc Version: 0.132.4 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 +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 -Requires: python-urlgrabber BuildRequires: python-urlgrabber +Requires: python-urlgrabber %endif BuildRequires: python-devel -%if 0%{?mandriva_version} -Requires: python-rpm +%if 0%{?mandriva_version} BuildRequires: python-rpm +Requires: python-rpm %else -Requires: rpm-python BuildRequires: rpm-python +Requires: rpm-python %endif # %if 0%{?suse_version} -%if %suse_version < 1020 +%if 0%{?suse_version} < 1020 BuildRequires: python-elementtree Requires: python-elementtree %else BuildRequires: python-xml Requires: python-xml %endif -%if %suse_version > 1110 +%if 0%{?suse_version} > 1110 BuildArch: noarch %endif -%if %suse_version > 1000 -Recommends: osc-source_validator +%if 0%{?suse_version} > 1000 Recommends: build >= 2010.05.04 # These packages are needed for "osc add $URL" -Recommends: obs-service-set_version obs-service-tar_scm obs-service-recompress obs-service-verify_file +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 +%if 0%{?rhel_version} < 600 BuildRequires: python-elementtree Requires: python-elementtree %endif @@ -70,15 +75,13 @@ Requires: python-m2crypto > 0.19 BuildRequires: m2crypto Requires: m2crypto > 0.19 %endif -%if 0%{?mandriva_version} -Requires: python-rpm +%if 0%{?mandriva_version} BuildRequires: python-rpm +Requires: python-rpm %else -Requires: rpm-python 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()")} @@ -89,52 +92,45 @@ 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 +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}/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 +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 -%__mkdir_p %{buildroot}%{_prefix}/lib/osc -%__install -m 0755 dist/osc.complete %{buildroot}%{_prefix}/lib/osc/complete +install -Dm0755 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 +install -Dm0755 dist/osc.complete %{buildroot}%{_libdir}/osc/complete %endif %clean -%{__rm} -rf %{buildroot} +rm -rf %{buildroot} %files -%defattr(-,root,root) +%defattr(-,root,root,-) +%doc AUTHORS README TODO NEWS %{_bindir}/osc* %{python_sitelib}/* -%config %{_sysconfdir}/profile.d/osc.sh %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 -%dir %{_prefix}/lib/osc -%{_prefix}/lib/osc/complete +%{_prefix}/lib/osc %else -%dir %{_prefix}/%{_lib}/osc -%{_prefix}/%{_lib}/osc/complete +%{_libdir}/osc %endif -%dir /var/lib/osc-plugins -%doc AUTHORS README TODO NEWS -%doc %_mandir/man1/osc.*