X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=git-core.spec;h=f2ba365a2d4e694ed6ffaa6ebbfa94216ce6df40;hb=e21aea75770b4674983b6e58c90788f767133a06;hp=f770f1a621a2f7edc9fd8d91023ca4f2c3fd8898;hpb=3ed82b6880f928c5532090f30d0631e4a9329787;p=packages%2Fgit-core.git

diff --git a/git-core.spec b/git-core.spec
index f770f1a..f2ba365 100644
--- a/git-core.spec
+++ b/git-core.spec
@@ -5,15 +5,15 @@
 %bcond_without	doc		# skip building/packaging docs/manuals (takes some time)
 #
 %include	/usr/lib/rpm/macros.perl
-Summary:	The stupid content tracker
-Summary(pl.UTF-8):	Prymitywne narzędzie do śledzenia treści
+Summary:	Distributed version control system focused on speed, effectivity and usability
+Summary(pl.UTF-8):	Rozproszony system śledzenia treści skupiony na szybkości, wydajności i użyteczności
 Name:		git-core
-Version:	1.7.4
 Release:	1
+Version:	1.7.5.3
 License:	GPL v2
 Group:		Development/Tools
 Source0:	http://www.kernel.org/pub/software/scm/git/git-%{version}.tar.bz2
-# Source0-md5:	fa24dc1ef0b663327ea0fe1981365b39
+# Source0-md5:	5b5a5e6c1c5c05db6b8dd33e6f3acea4
 Source1:	%{name}-gitweb.conf
 Source2:	%{name}-gitweb-httpd.conf
 Source3:	%{name}-gitweb-lighttpd.conf
@@ -21,6 +21,8 @@ Source4:	%{name}.sysconfig
 Source5:	%{name}.inet
 Source6:	%{name}.init
 Patch0:		%{name}-tests.patch
+Patch1:		%{name}-key-bindings.patch
+Patch2:		%{name}-sysconfdir.patch
 URL:		http://git-scm.com/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -368,11 +370,14 @@ Ta wtyczka dostarcza podświetlanie składni dla treści commitów gita.
 %prep
 %setup -q -n git-%{version}
 %patch0 -p1
+%patch1 -p0
+%patch2 -p1
 
 %build
 %{__aclocal}
 %{__autoconf}
 %configure \
+	--sysconfdir=%{_sysconfdir}/git-core \
 	--with-openssl
 
 echo "BLK_SHA1=1" >> config.mak
@@ -401,6 +406,11 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_includedir}/%{name}/xdiff,%{_localstatedir}/lib/git}
 install -d $RPM_BUILD_ROOT{%{appdir},%{cgibindir},%{webappdir}}
 install -d $RPM_BUILD_ROOT/etc/{sysconfig/rc-inetd,rc.d/init.d}
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/git-core
+cat << EOF > $RPM_BUILD_ROOT%{_sysconfdir}/git-core/gitconfig
+[init]
+	templatedir = /etc/git-core/templates
+EOF
 
 %{__make} install \
 	INSTALLDIRS=vendor \
@@ -411,6 +421,10 @@ install -d $RPM_BUILD_ROOT/etc/{sysconfig/rc-inetd,rc.d/init.d}
 	DESTDIR=$RPM_BUILD_ROOT
 %endif
 
+# copy templates except sample hooks
+cp -a $RPM_BUILD_ROOT%{_datadir}/%{name}/templates $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
+%{__rm} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/templates/hooks/*.sample
+
 # header files and lib
 cp -a *.h $RPM_BUILD_ROOT%{_includedir}/%{name}
 cp -a compat $RPM_BUILD_ROOT%{_includedir}/%{name}
@@ -439,7 +453,7 @@ autocmd BufNewFile,BufRead *.git/**
 EOF
 
 # gitweb
-install -p gitweb/gitweb.cgi $RPM_BUILD_ROOT%{cgibindir}
+mv $RPM_BUILD_ROOT{%{appdir},%{cgibindir}}/gitweb.cgi
 cp -a %{SOURCE1} $RPM_BUILD_ROOT%{webappdir}/gitweb.conf
 cp -a %{SOURCE2} $RPM_BUILD_ROOT%{webappdir}/apache.conf
 cp -a %{SOURCE2} $RPM_BUILD_ROOT%{webappdir}/httpd.conf
@@ -515,6 +529,7 @@ fi
 %attr(755,root,root) %{_bindir}/git-shell
 %attr(755,root,root) %{_bindir}/git-upload-archive
 %attr(755,root,root) %{_bindir}/git-upload-pack
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/git-core
 
 %if %{with doc}
 %{_mandir}/man1/git-*.1*
@@ -624,9 +639,10 @@ fi
 %lang(it) %{_datadir}/git-gui/lib/msgs/it.msg
 %lang(ja) %{_datadir}/git-gui/lib/msgs/ja.msg
 %lang(nb) %{_datadir}/git-gui/lib/msgs/nb.msg
+%lang(pt_br) %{_datadir}/git-gui/lib/msgs/pt_br.msg
 %lang(ru) %{_datadir}/git-gui/lib/msgs/ru.msg
 %lang(sv) %{_datadir}/git-gui/lib/msgs/sv.msg
-%lang(zh_cn) %{_datadir}/git-gui/lib/msgs/zh_cn.msg
+%lang(zh_CN) %{_datadir}/git-gui/lib/msgs/zh_cn.msg
 
 %files svn
 %defattr(644,root,root,755)