[packages/vcsh: 3/5] Resolve merge conflict

[caleb]

commit 479325856de849cc472b0750b0e39e6c230a260d
Merge: a78d9e8 cadd862
Author: Caleb Maclennan <caleb at pld-linux.org>
Date:   Wed May 22 21:26:26 2013 +0300

    Resolve merge conflict

 vcsh-makefile.patch | 13 +++++++++++++
 vcsh.spec           | 18 ++++++++++++++++--
 2 files changed, 29 insertions(+), 2 deletions(-)
---
diff --cc vcsh.spec
index a8590d5,fa1b4db..6e2d682
--- a/vcsh.spec
+++ b/vcsh.spec
@@@ -1,11 -1,13 +1,12 @@@
 -%define		dotversion	3
  Summary:	home directory config manager based on git
  Name:		vcsh
 -Version:	1.2
 -Release:	0.3
 +Version:	1.2.3
 +Release:	0.2
  License:	GPL v2
  Group:		Applications/Console
 -Source0:	https://github.com/RichiH/vcsh/archive/v%{version}-%{dotversion}.tar.gz
 +Source0:	https://github.com/alerque/vcsh/archive/v%{version}.tar.gz
  # Source0-md5:	67ee98eb5db9a4b112966cc8aac41c11
+ Patch0:		%{name}-makefile.patch
  URL:		https://github.com/RichiH/vcsh
  Requires:	mr
  BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@@ -17,8 -19,17 +18,17 @@@ turn, means you can have one repositor
  etc), picking and choosing which configs you want to use on which
  machine.
  
+ %package zsh-completions
+ Summary:	zsh shell completion routines for %{name}
+ Group:		Applications/Console
+ Requires:	zsh
+ 
+ %description zsh-completions
+ Tab completion routines for %{name} in zsh.
+ 
  %prep
 -%setup -q -n %{name}-%{version}-%{dotversion}
 +%setup -q -n %{name}-%{version}
+ %patch0 -p0
  
  %build
  %{__make}
@@@ -34,6 -45,10 +44,10 @@@ rm -rf $RPM_BUILD_ROO
  
  %files
  %defattr(644,root,root,755)
 -#%doc AUTHORS CREDITS ChangeLog NEWS README THANKS TODO
 +%doc README.md
- %attr(755,root,root) %{_bindir}/*
+ %attr(755,root,root) %{_bindir}/%{name}
  %{_mandir}/man1/%{name}.1*
+ 
+ %files zsh-completions
+ %defattr(644,root,root,755)
+ %{_datadir}/zsh/site-functions/_%{name}
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/vcsh.git/commitdiff/d493de648a04e7a328b01b4daf03efae1d3926f8