X-Git-Url: http://git.pld-linux.org/?p=packages%2Fgit-core.git;a=blobdiff_plain;f=git-core.spec;h=c328b3a9f46fbd7e574bfdc392811a7aa780e744;hp=775d686ae471066bb4ef21e0aecfe219a1977514;hb=608f9f2826ef22c5053ec544b77a1e1af734c184;hpb=cecb5b672ae378c4526083c7a714e314ffa1785c

diff --git a/git-core.spec b/git-core.spec
index 775d686..c328b3a 100644
--- a/git-core.spec
+++ b/git-core.spec
@@ -7,16 +7,18 @@
 %bcond_without	pcre		# perl-compatible regexes support
 %bcond_without	gnome_keyring	# build without gnome keyring support
 
+# for AC: --without doc --without gnome_keyring --without tests
+
 %include	/usr/lib/rpm/macros.perl
 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.9.0
-Release:	3
+Version:	2.0.3
+Release:	1
 License:	GPL v2
 Group:		Development/Tools
-Source0:	http://git-core.googlecode.com/files/git-%{version}.tar.gz
-# Source0-md5:	e16c14b27c644b8e0dd72bdb5ff77450
+Source0:	http://www.kernel.org/pub/software/scm/git/git-%{version}.tar.gz
+# Source0-md5:	c549f5df737c0a559df0e911c8e1b7e5
 Source1:	%{name}-gitweb.conf
 Source2:	%{name}-gitweb-httpd.conf
 Source3:	%{name}-gitweb-lighttpd.conf
@@ -63,10 +65,10 @@ BuildRequires:	cvs-gnu-client >= 1.12
 %{?with_tests_svn:BuildRequires:  subversion}
 Conflicts:	pdksh < 5.2.14-46
 %endif
-Requires:	coreutils
-Requires:	diffutils
-Requires:	findutils
+# git-sh-setup: sane_grep
 Requires:	grep
+# git-pull: printf
+Requires:	coreutils
 Requires:	openssh-clients
 Requires:	perl-Error
 Requires:	perl-Git = %{version}-%{release}
@@ -88,6 +90,7 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define		webappdir	%{_sysconfdir}/webapps/%{webapp}
 %define		appdir		%{_datadir}/%{webapp}
 %define		cgibindir	%{_prefix}/lib/cgi-bin
+%define		gitcoredir	%{_libdir}/%{name}
 
 %description
 "git" can mean anything, depending on your mood.
@@ -406,16 +409,23 @@ wykonania przy użyciu ogólnego interfejsu poleceń.
 Summary:	GNOME Keyring authentication provider for Git
 Summary(pl.UTF-8):	Moduł uwierzytelniający GNOME Keyring dla Git
 Group:		X11/Applications
+URL:		http://git-scm.com/docs/gitcredentials.html
 Requires:	%{name} = %{version}-%{release}
 
 %description -n gnome-keyring-git-core
 Authentication provider module for Git which allows git client to
 authenticate using GNOME Keyring.
 
+You need to register it with:
+- git config --global credential.helper gnome-keyring
+
 %description -n gnome-keyring-git-core -l pl.UTF-8
 Moduł uwierzytelniający dla Subversion pozwalający klientom git
 uwierzytelniać się przy użyciu mechanizmu GNOME Keyring.
 
+Moduł trzeba zarejestrować poleceniem:
+- git config --global credential.helper gnome-keyring
+
 %prep
 %setup -q -n git-%{version}
 %patch0 -p1
@@ -499,7 +509,7 @@ cp -p xdiff/lib.a $RPM_BUILD_ROOT%{_libdir}/libgit_xdiff.a
 cp -p {Makefile,config.mak,config.mak.autogen,config.mak.uname} $RPM_BUILD_ROOT%{_includedir}/%{name}
 
 %{__make} -C contrib/subtree install \
-	libexecdir=%{_libdir}/%{name} \
+	libexecdir=%{gitcoredir} \
 	DESTDIR=$RPM_BUILD_ROOT
 
 %if %{with doc}
@@ -508,7 +518,7 @@ cp -p {Makefile,config.mak,config.mak.autogen,config.mak.uname} $RPM_BUILD_ROOT%
 %endif
 
 %if %{with gnome_keyring}
-install -p contrib/credential/gnome-keyring/git-credential-gnome-keyring $RPM_BUILD_ROOT%{_libdir}/%{name}
+install -p contrib/credential/gnome-keyring/git-credential-gnome-keyring $RPM_BUILD_ROOT%{gitcoredir}
 # Remove built binary files, otherwise they will be installed in doc
 %{__make} -C contrib/credential/gnome-keyring clean
 %endif
@@ -522,7 +532,7 @@ install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/contrib/completion
 cp -p contrib/completion/git-prompt.sh $RPM_BUILD_ROOT%{_datadir}/%{name}/contrib/completion
 
 # Install bzr and hg remote helpers from contrib
-install -p contrib/remote-helpers/git-remote-{bzr,hg} $RPM_BUILD_ROOT%{_libdir}/%{name}
+install -p contrib/remote-helpers/git-remote-{bzr,hg} $RPM_BUILD_ROOT%{gitcoredir}
 
 # gitweb
 mv $RPM_BUILD_ROOT{%{appdir},%{cgibindir}}/gitweb.cgi
@@ -548,8 +558,8 @@ sed -e 's,@libdir@,%{_libdir},g' -i $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/git-d
 # hardlink
 ln -f $RPM_BUILD_ROOT%{_bindir}/{git,git-receive-pack}
 ln -f $RPM_BUILD_ROOT%{_bindir}/{git,git-upload-archive}
-ln -f $RPM_BUILD_ROOT{%{_libdir}/%{name},%{_bindir}}/git-shell
-ln -f $RPM_BUILD_ROOT{%{_libdir}/%{name},%{_bindir}}/git-upload-pack
+ln -f $RPM_BUILD_ROOT{%{gitcoredir},%{_bindir}}/git-shell
+ln -f $RPM_BUILD_ROOT{%{gitcoredir},%{_bindir}}/git-upload-pack
 
 # remove unneeded files
 %{__rm} $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod
@@ -634,30 +644,30 @@ fi
 %{_mandir}/man7/gitworkflows.7*
 %endif
 
-%dir %{_libdir}/%{name}
-%attr(755,root,root) %{_libdir}/%{name}/*-*
-%attr(755,root,root) %{_libdir}/%{name}/git
-%dir %{_libdir}/%{name}/mergetools
-%{_libdir}/%{name}/mergetools/*
+%dir %{gitcoredir}
+%attr(755,root,root) %{gitcoredir}/*-*
+%attr(755,root,root) %{gitcoredir}/git
+%dir %{gitcoredir}/mergetools
+%{gitcoredir}/mergetools/*
 
 %{_datadir}/%{name}
 %{_localstatedir}/lib/git
 
 # subpackages
-%exclude %{_libdir}/%{name}/*email*
-%exclude %{_libdir}/%{name}/*p4*
-%exclude %{_libdir}/%{name}/git-archimport
-%exclude %{_libdir}/%{name}/git-cvs*
-%exclude %{_libdir}/%{name}/git-gui
-%exclude %{_libdir}/%{name}/git-imap-send
-%exclude %{_libdir}/%{name}/git-instaweb
-%exclude %{_libdir}/%{name}/git-remote-bzr
-%exclude %{_libdir}/%{name}/git-remote-hg
-%exclude %{_libdir}/%{name}/git-remote-testsvn
-%exclude %{_libdir}/%{name}/git-svn
-%exclude %{_libdir}/%{name}/mergetools/p4merge
+%exclude %{gitcoredir}/*email*
+%exclude %{gitcoredir}/*p4*
+%exclude %{gitcoredir}/git-archimport
+%exclude %{gitcoredir}/git-cvs*
+%exclude %{gitcoredir}/git-gui
+%exclude %{gitcoredir}/git-imap-send
+%exclude %{gitcoredir}/git-instaweb
+%exclude %{gitcoredir}/git-remote-bzr
+%exclude %{gitcoredir}/git-remote-hg
+%exclude %{gitcoredir}/git-remote-testsvn
+%exclude %{gitcoredir}/git-svn
+%exclude %{gitcoredir}/mergetools/p4merge
 %if %{with gnome_keyring}
-%exclude %{_libdir}/%{name}/git-credential-gnome-keyring
+%exclude %{gitcoredir}/git-credential-gnome-keyring
 %endif
 
 %if %{with doc}
@@ -713,7 +723,7 @@ fi
 %config(noreplace) %verify(not md5 mtime size) %attr(640,root,http) %{webappdir}/gitolite.pl
 %attr(755,root,root) %{cgibindir}/gitweb.cgi
 %{appdir}
-%attr(755,root,root) %{_libdir}/%{name}/git-instaweb
+%attr(755,root,root) %{gitcoredir}/git-instaweb
 %if %{with doc}
 %{_mandir}/man1/gitweb.1*
 %{_mandir}/man5/gitweb.conf.5*
@@ -726,7 +736,7 @@ fi
 
 %files gui
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/%{name}/git-gui
+%attr(755,root,root) %{gitcoredir}/git-gui
 %dir %{_datadir}/git-gui
 %dir %{_datadir}/git-gui/lib
 %dir %{_datadir}/git-gui/lib/msgs
@@ -749,19 +759,19 @@ fi
 
 %files arch
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/%{name}/git-archimport
+%attr(755,root,root) %{gitcoredir}/git-archimport
 %if %{with doc}
 %{_mandir}/man1/git-archimport.1*
 %endif
 
 %files bzr
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/%{name}/git-remote-bzr
+%attr(755,root,root) %{gitcoredir}/git-remote-bzr
 
 %files cvs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/git-cvsserver
-%attr(755,root,root) %{_libdir}/%{name}/git-cvs*
+%attr(755,root,root) %{gitcoredir}/git-cvs*
 %if %{with doc}
 %{_mandir}/man1/git-cvs*.1*
 %{_mandir}/man7/gitcvs-migration.7*
@@ -769,17 +779,17 @@ fi
 
 %files hg
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/%{name}/git-remote-hg
+%attr(755,root,root) %{gitcoredir}/git-remote-hg
 
 %files p4
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/%{name}/git-p4
-%attr(755,root,root) %{_libdir}/%{name}/mergetools/p4merge
+%attr(755,root,root) %{gitcoredir}/git-p4
+%attr(755,root,root) %{gitcoredir}/mergetools/p4merge
 
 %files svn
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/%{name}/git-svn
-%attr(755,root,root) %{_libdir}/%{name}/git-remote-testsvn
+%attr(755,root,root) %{gitcoredir}/git-svn
+%attr(755,root,root) %{gitcoredir}/git-remote-testsvn
 %{perl_vendorlib}/Git/SVN
 %{perl_vendorlib}/Git/SVN.pm
 %if %{with doc}
@@ -788,8 +798,8 @@ fi
 
 %files email
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/%{name}/git-imap-send
-%attr(755,root,root) %{_libdir}/%{name}/*email*
+%attr(755,root,root) %{gitcoredir}/git-imap-send
+%attr(755,root,root) %{gitcoredir}/*email*
 %if %{with doc}
 %{_mandir}/man1/*email*.1*
 %{_mandir}/man1/*imap-send*.1*
@@ -810,5 +820,5 @@ fi
 %if %{with gnome_keyring}
 %files -n gnome-keyring-git-core
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/%{name}/git-credential-gnome-keyring
+%attr(755,root,root) %{gitcoredir}/git-credential-gnome-keyring
 %endif