git 1.8.4.4-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@8070 ec354946-7b23-47d6-9f5a-488ba84defc7

g/git/git-vl.spec

@@ -3,7 +3,7 @@
 
 # Pass --without docs to rpmbuild if you don't want the documentation
 Name: 		git
-Version: 	1.8.1.3
+Version: 	1.8.4.4
 Release:        1%{?_dist_release}
 Summary:  	Core git tools
 Summary(ja):	Core git ツール
@@ -62,6 +62,7 @@ Requires:	gitk = %{version}-%{release}
 Requires:	git-gui = %{version}-%{release}
 Requires:	perl-Git = %{version}-%{release}
 Requires:	emacs-git = %{version}-%{release}
+Requires:	git-contrib = %{version}-%{release}
 Obsoletes:	git <= 1.5.4.3
 
 %description all
@@ -106,6 +107,13 @@ Requires:       git = %{version}-%{release}, cvs, cvsps
 %description cvs
 Git tools for importing CVS repositories.
 
+%package contrib
+Summary:        Git contrib tools
+Group:          Development/Tools
+Requires:       git = %{version}-%{release}
+%description contrib
+Git contrib tools
+
 %if "%{?_dist_release}" != "vl4"
 %package arch
 Summary:        Git tools for importing Arch repositories
@@ -175,6 +183,7 @@ Header files for git-core.
 %prep
 %setup -q
 %patch0 -p1
+%__mv contrib/diff-highlight/README contrib/diff-highlight/README.diff-highlight
 
 %build
 make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \
@@ -248,6 +257,8 @@ mkdir -p $RPM_BUILD_ROOT/srv/git
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
 install -m 644 -T contrib/completion/git-completion.bash $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/git
 
+install -m 755 contrib/diff-highlight/diff-highlight $RPM_BUILD_ROOT%{_bindir}/
+
 # header files and lib
 install -d $RPM_BUILD_ROOT%{_includedir}/%{name}/xdiff
 install *.h $RPM_BUILD_ROOT%{_includedir}/%{name}
@@ -313,6 +324,11 @@ fi
 %{!?_without_docs: %{_mandir}/man1/*cvs*.1*}
 %{!?_without_docs: %doc Documentation/*git-cvs*.html }
 
+%files contrib
+%defattr(-,root,root)
+%doc diff-highlight/README.diff-highlight
+%{_bindir}/diff-highlight
+
 %if "%{?_dist_release}" != "vl4"
 %files arch
 %defattr(-,root,root)
@@ -383,6 +399,10 @@ fi
 # No files for you!
 
 %changelog
+* Thu Nov 28 2013 IWAI, Masaharu <iwaim.sub@gmail.com> 1.8.4.4-1
+- update to 1.8.4.4-1
+- new sub package: contrib
+
 * Fri Feb  8 2013 IWAI, Masaharu <iwai@alib.jp> 1.8.1.3-1
 - new upstream release