| |
@@ -18,7 +18,7 @@
|
| |
%global bzrmajor 2.7
|
| |
%global bzrminor .0
|
| |
#global bzrrc b6
|
| |
- %global release 22
|
| |
+ %global release 23
|
| |
|
| |
Name: bzr
|
| |
Version: %{bzrmajor}%{?bzrminor}
|
| |
@@ -31,7 +31,7 @@
|
| |
Source1: https://launchpad.net/%{name}/%{bzrmajor}/%{version}%{?bzrrc}/+download/%{name}-%{version}%{?bzrrc}.tar.gz.sig
|
| |
Source2: bzr-icon-64.png
|
| |
|
| |
- BuildRequires: python2-devel zlib-devel bash-completion
|
| |
+ BuildRequires: python2-devel zlib-devel bash-completion gcc
|
| |
# For building documents
|
| |
BuildRequires: python2-sphinx
|
| |
BuildRequires: gettext
|
| |
@@ -39,8 +39,6 @@
|
| |
%if 0%{?fedora} || (0%{?rhel} && 0%{?rhel} <= 6)
|
| |
Requires: python2-paramiko
|
| |
%endif
|
| |
- # Workaround Bug #230223 otherwise this would be a soft dependency
|
| |
- Requires: python2-pycurl
|
| |
# ElementTree is part of python2.5 so only needed for EL-5
|
| |
%if 0%{?rhel} && 0%{?rhel} <= 5
|
| |
BuildRequires: python-elementtree
|
| |
@@ -86,16 +84,16 @@
|
| |
chmod a-x contrib/bash/bzrbashprompt.sh
|
| |
|
| |
# Build documents
|
| |
- make docs-sphinx
|
| |
+ make docs-sphinx PYTHON=%{__python2}
|
| |
|
| |
%install
|
| |
rm -rf $RPM_BUILD_ROOT
|
| |
- %{__python} setup.py install --skip-build --install-data %{_datadir} --root $RPM_BUILD_ROOT
|
| |
+ %{__python2} setup.py install --skip-build --install-data %{_datadir} --root $RPM_BUILD_ROOT
|
| |
chmod -R a+rX contrib
|
| |
chmod 0644 contrib/debian/init.d
|
| |
chmod 0644 contrib/bzr_ssh_path_limiter
|
| |
chmod 0644 contrib/bzr_access
|
| |
- chmod 0755 $RPM_BUILD_ROOT%{python_sitearch}/bzrlib/*.so
|
| |
+ chmod 0755 $RPM_BUILD_ROOT%{python2_sitearch}/bzrlib/*.so
|
| |
|
| |
bashcompdir=$(pkg-config --variable=completionsdir bash-completion)
|
| |
install -Dpm 0644 contrib/bash/bzr $RPM_BUILD_ROOT$bashcompdir/bzr
|
| |
@@ -103,7 +101,7 @@
|
| |
|
| |
|
| |
# Use independently packaged python-elementtree instead
|
| |
- rm -rf $RPM_BUILD_ROOT%{python_sitearch}/bzrlib/util/elementtree/
|
| |
+ rm -rf $RPM_BUILD_ROOT%{python2_sitearch}/bzrlib/util/elementtree/
|
| |
|
| |
# Install documents
|
| |
install -d $RPM_BUILD_ROOT/%{_pkgdocdir}/pdf
|
| |
@@ -153,6 +151,11 @@
|
| |
%exclude %{_pkgdocdir}/contrib/
|
| |
|
| |
%changelog
|
| |
+ * Thu Jan 31 2019 Scott K Logan <logans@cottsay.net> - 2.7.0-23
|
| |
+ - Add BuildRequires: gcc
|
| |
+ - Fix unversioned python ambiguity
|
| |
+ - Remove workaround for upstream bug #230223, which was fixed in 1.6
|
| |
+
|
| |
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.0-22
|
| |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
| |
|
| |
cottsay
commented 5 years ago