diff --git a/breezy.spec b/breezy.spec index 689fd79..a0f9d19 100644 --- a/breezy.spec +++ b/breezy.spec @@ -7,14 +7,7 @@ %global brzmajor 3.0 %global brzminor .2 #global brzrc b6 -%global baserelease 4 - -# https://fedoraproject.org/wiki/Changes/ReplaceBazaarWithBreezy -%if 0%{?fedora} >= 32 -%bcond_without replace_bzr -%else -%bcond_with replace_bzr -%endif +%global baserelease 5 Name: breezy Version: %{brzmajor}%{?brzminor} @@ -43,13 +36,11 @@ Requires: python3-paramiko # This is the name of the command, note that it is brz, not bzr Provides: brz = %{version}-%{release} -%if %{with replace_bzr} # breezy is a fork of bzr and replaces it Provides: bzr = %{version}-%{release} Obsoletes: bzr < 3 Provides: git-remote-bzr = %{version}-%{release} Obsoletes: git-remote-bzr < 3 -%endif # This is needed for launchpad support Recommends: python3-launchpadlib @@ -125,15 +116,11 @@ mv %{buildroot}%{_prefix}/man %{buildroot}%{_datadir} mv %{buildroot}%{_bindir}/git-remote-bzr %{buildroot}%{_bindir}/git-remote-brz mv %{buildroot}%{_mandir}/man1/git-remote-bzr.1 %{buildroot}%{_mandir}/man1/git-remote-brz.1 -%if %{with replace_bzr} # backwards compatible symbolic links ln -s brz %{buildroot}%{_bindir}/bzr ln -s git-remote-brz %{buildroot}%{_bindir}/git-remote-bzr echo ".so man1/brz.1" > %{buildroot}%{_mandir}/man1/bzr.1 echo ".so man1/git-remote-brz.1" > %{buildroot}%{_mandir}/man1/git-remote-bzr.1 -%endif - - # locales: all the .po files have empty msgstrs, so this doesn't do anything #mv %%{name}/locale %%{buildroot}%%{_datadir} @@ -147,10 +134,8 @@ echo ".so man1/git-remote-brz.1" > %{buildroot}%{_mandir}/man1/git-remote-bzr.1 %{_bindir}/brz %{_bindir}/bzr-*-pack %{_bindir}/git-remote-brz -%if %{with replace_bzr} %{_bindir}/bzr %{_bindir}/git-remote-bzr -%endif %{_mandir}/man1/* %{python3_sitearch}/%{name}/ %{python3_sitearch}/*.egg-info/ @@ -164,6 +149,9 @@ echo ".so man1/git-remote-brz.1" > %{buildroot}%{_mandir}/man1/git-remote-bzr.1 %changelog +* Thu Oct 22 2020 Miro HronĨok - 3.0.2-5 +- Replace bazaar in ELN as well + * Mon Jul 27 2020 Fedora Release Engineering - 3.0.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild