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-0.132.3.tar.gz b/osc-0.132.3.tar.gz deleted file mode 100644 index 6e430e7..0000000 --- a/osc-0.132.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:40795eb851f08008bc81b9c8f3f9450a5fe94200aeb451a6736ecd1ca4107bd8 -size 199448 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..e141ebc 100644 --- a/osc.changes +++ b/osc.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +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 + +- update to 0.132.4 + - fix local package build + ------------------------------------------------------------------- Fri Jun 10 09:49:44 UTC 2011 - adrian@suse.de 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 diff --git a/osc.spec b/osc.spec index fd74b0c..6cf64ec 100644 --- a/osc.spec +++ b/osc.spec @@ -18,47 +18,52 @@ Name: osc -Version: 0.132.3 +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,17 +75,16 @@ 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()")} + %description Commandline client for the openSUSE Build Service. @@ -88,47 +92,46 @@ 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.* + + %changelog