[git] remove git-bzr - replaced by git-remote-bzr from separated package

pstodulk pstodulk at fedoraproject.org
Fri Nov 28 15:05:28 UTC 2014


commit f907d9b7b4964d9336b10c8615b2a6154063954e
Author: Petr Stodulka <pstodulk at redhat.com>
Date:   Fri Nov 28 16:05:03 2014 +0100

    remove git-bzr - replaced by git-remote-bzr from separated package

 git.spec |   27 ++++++++-------------------
 1 files changed, 8 insertions(+), 19 deletions(-)
---
diff --git a/git.spec b/git.spec
index 3805aba..909a9b5 100644
--- a/git.spec
+++ b/git.spec
@@ -44,7 +44,7 @@
 
 Name:           git
 Version:        2.2.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Fast Version Control System
 License:        GPLv2
 Group:          Development/Tools
@@ -141,18 +141,6 @@ and full access to internals.
 
 This is a dummy package which brings in all subpackages.
 
-%package bzr
-Summary:        Git tools for working with bzr repositories
-Group:          Development/Tools
-%if %{noarch_sub}
-BuildArch:      noarch
-%endif
-Requires:       git = %{version}-%{release}
-Requires:       bzr
-
-%description bzr
-%{summary}.
-
 %package daemon
 Summary:        Git protocol dæmon
 Group:          Development/Tools
@@ -473,8 +461,9 @@ perl -p \
     %{SOURCE3} > %{buildroot}%{_sysconfdir}/xinetd.d/git
 %endif
 
-# Install bzr and hg remote helpers from contrib
-install -pm 755 contrib/remote-helpers/git-remote-{bzr,hg} %{buildroot}%{gitcoredir}
+# Install hg remote helpers from contrib
+# git-bzr removed - it's replaced by git-remote-bzr from separated package
+install -pm 755 contrib/remote-helpers/git-remote-hg %{buildroot}%{gitcoredir}
 
 # Setup bash completion
 mkdir -p %{buildroot}%{_sysconfdir}/bash_completion.d
@@ -539,10 +528,6 @@ rm -rf %{buildroot}
 %{!?_without_docs: %doc Documentation/howto Documentation/technical}
 %{_sysconfdir}/bash_completion.d
 
-%files bzr
-%defattr(-,root,root)
-%{gitcoredir}/git-remote-bzr
-
 %files hg
 %defattr(-,root,root)
 %{gitcoredir}/git-remote-hg
@@ -642,6 +627,10 @@ rm -rf %{buildroot}
 # No files for you!
 
 %changelog
+* Fri Nov 28 2014 Petr Stodulka <pstodulk at redhat.com> - 2.2.0-2
+- removed git-bzr which is replaced by git-remote-bzr from
+  separated package
+
 * Fri Nov 28 2014 Petr Stodulka <pstodulk at redhat.com> - 2.2.0-1
 - 2.2.0
 


More information about the scm-commits mailing list