X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=bzr.spec;h=8558412a06ae56a8c8044a38ad3816053f56c104;hb=a62031b14b96df23f16eaa32598ad39bd06ed07e;hp=509138d878f32be5c76b66a077e2ef913df717eb;hpb=9aeb6edb70fdd316d0546d28ec2859ffc032506f;p=packages%2Fbzr.git diff --git a/bzr.spec b/bzr.spec index 509138d..8558412 100644 --- a/bzr.spec +++ b/bzr.spec @@ -1,27 +1,27 @@ +# TODO: python3 when supported upstream (currently it uses cobjects, whith don't exist in python 3.2+) + Summary: Bazaar - a distributed revision control system Summary(pl.UTF-8): Bazaar - rozproszony system kontroli wersji Name: bzr -Version: 2.2.1 -Release: 3 -License: GPL v2 +Version: 2.7.0 +Release: 1 +License: GPL v2+ Group: Development/Version Control -Source0: http://launchpad.net/bzr/2.2/%{version}/+download/%{name}-%{version}.tar.gz -# Source0-md5: 8a6abd8f888fb3e0845e2044d41a24bc -# from https://bugs.launchpad.net/bzr/+bug/612096 -Patch0: py27.patch +#Source0Download: https://launchpad.net/bzr/+download +Source0: https://launchpad.net/bzr/2.7/%{version}/+download/%{name}-%{version}.tar.gz +# Source0-md5: 8e5020502efd54f5925a14a456b88b89 +Patch0: locale-path.patch +Patch1: ca-certificates.patch URL: http://bazaar.canonical.com/ -BuildRequires: python >= 1:2.4 -BuildRequires: python-devel +BuildRequires: python >= 1:2.6 +BuildRequires: python-devel >= 1:2.6 BuildRequires: rpm-pythonprov -BuildRequires: rpmbuild(macros) >= 1.219 +BuildRequires: rpmbuild(macros) >= 1.714 BuildRequires: zlib-devel -%pyrequires_eq python -Requires: python-cElementTree -# pdb module required by bzr -Requires: python-devel-tools -Requires: python-paramiko -Requires: python-pycurl +Requires: python >= 1:2.6 +Requires: python-bzr = %{version}-%{release} Obsoletes: bazaar +Conflicts: qbzr < 0.22 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -65,31 +65,62 @@ Dodatkowe możliwości takie jak: cherry picking, obsługa innych systemów kontroli wersji, GUI są dostępne poprzez dodatkowe pakiety rozszerzeń. +%package -n python-bzr +Summary: Bazaar library for Python 2 +Summary(pl.UTF-8): Biblioteka Bazaar dla Pythona 2 +Group: Libraries/Python +# pdb module required by bzr +Requires: python-devel-tools >= 1:2.6 +Requires: python-paramiko +Requires: python-pycurl + +%description -n python-bzr +Bazaar is a friendly distributed version control system. + +This package contains Python 2 library. + +%description -n python-bzr -l pl.UTF-8 +Bazaar to przyjazny, rozproszony system kontroli wersji. + +Ten pakiet zawiera bibliotekę Pythona 2. + %package -n bash-completion-%{name} Summary: bash-completion for bzr Group: Applications/Shells Requires: %{name} = %{version}-%{release} Requires: bash-completion +%if "%{_rpmversion}" >= "5" +BuildArch: noarch +%endif %description -n bash-completion-%{name} This package provides bash-completion for bzr. %prep %setup -q -%patch0 -p0 +%patch0 -p1 +%patch1 -p1 # move out of contrib, as we package contrib as doc -mv contrib/bash/bzr bash_completion.sh +%{__mv} contrib/bash/bzr bash_completion.sh %build -%{__python} setup.py build +%py_build + +%if 0 +%py3_build +%endif %install rm -rf $RPM_BUILD_ROOT -%{__python} setup.py install \ - --optimize=2 \ - --install-data %{_datadir} \ - --root=$RPM_BUILD_ROOT + +%if 0 +%py3_install \ + --install-data %{_datadir} +%endif + +%py_install \ + --install-data %{_datadir} %py_postclean @@ -98,25 +129,57 @@ install -d $RPM_BUILD_ROOT/etc/bash_completion.d install -p bash_completion.sh $RPM_BUILD_ROOT/etc/bash_completion.d/%{name} # don't package tests -rm -rf $RPM_BUILD_ROOT%{py_sitedir}/bzrlib/plugins/bash_completion/tests -rm -rf $RPM_BUILD_ROOT%{py_sitedir}/bzrlib/plugins/launchpad/test_*.py* -rm -rf $RPM_BUILD_ROOT%{py_sitedir}/bzrlib/plugins/netrc_credential_store/tests -rm -rf $RPM_BUILD_ROOT%{py_sitedir}/bzrlib/plugins/news_merge/tests -rm -rf $RPM_BUILD_ROOT%{py_sitedir}/bzrlib/tests -rm -rf $RPM_BUILD_ROOT%{py_sitedir}/bzrlib/util/tests +%{__rm} -r $RPM_BUILD_ROOT%{py_sitedir}/bzrlib/plugins/bash_completion/tests +%{__rm} -r $RPM_BUILD_ROOT%{py_sitedir}/bzrlib/plugins/launchpad/test_*.py* +%{__rm} -r $RPM_BUILD_ROOT%{py_sitedir}/bzrlib/plugins/netrc_credential_store/tests +%{__rm} -r $RPM_BUILD_ROOT%{py_sitedir}/bzrlib/plugins/news_merge/tests +%{__rm} -r $RPM_BUILD_ROOT%{py_sitedir}/bzrlib/tests +%{__rm} -r $RPM_BUILD_ROOT%{py_sitedir}/bzrlib/util/tests + +%if 0 +%{__rm} -r $RPM_BUILD_ROOT%{py3_sitedir}/bzrlib/plugins/bash_completion/tests +%{__rm} -r $RPM_BUILD_ROOT%{py3_sitedir}/bzrlib/plugins/launchpad/test_*.py* +%{__rm} -r $RPM_BUILD_ROOT%{py3_sitedir}/bzrlib/plugins/netrc_credential_store/tests +%{__rm} -r $RPM_BUILD_ROOT%{py3_sitedir}/bzrlib/plugins/news_merge/tests +%{__rm} -r $RPM_BUILD_ROOT%{py3_sitedir}/bzrlib/tests +%{__rm} -r $RPM_BUILD_ROOT%{py3_sitedir}/bzrlib/util/tests +%endif + +# sco locale is not supported by glibc +%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/sco + +%find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT -%files +%files -f %{name}.lang %defattr(644,root,root,755) %doc doc/*.txt NEWS README TODO contrib %attr(755,root,root) %{_bindir}/bzr %{_mandir}/man1/bzr.1* -%{py_sitedir}/bzrlib -%if "%{py_ver}" > "2.4" -%{py_sitedir}/*.egg-info -%endif + +%files -n python-bzr +%defattr(644,root,root,755) +%dir %{py_sitedir}/bzrlib +%{py_sitedir}/bzrlib/*.py[co] +%attr(755,root,root) %{py_sitedir}/bzrlib/_*.so +%{py_sitedir}/bzrlib/bundle +%{py_sitedir}/bzrlib/branchfmt +%{py_sitedir}/bzrlib/doc +%{py_sitedir}/bzrlib/doc_generate +%{py_sitedir}/bzrlib/export +%{py_sitedir}/bzrlib/filters +%{py_sitedir}/bzrlib/help_topics +%{py_sitedir}/bzrlib/plugins +%{py_sitedir}/bzrlib/repofmt +%{py_sitedir}/bzrlib/smart +%{py_sitedir}/bzrlib/store +%{py_sitedir}/bzrlib/transport +%{py_sitedir}/bzrlib/ui +%{py_sitedir}/bzrlib/util +%{py_sitedir}/bzrlib/version_info_formats +%{py_sitedir}/bzr-%{version}-py*.egg-info %files -n bash-completion-%{name} %defattr(644,root,root,755)