X-Git-Url: http://git.pld-linux.org/?p=packages%2Fgit-core.git;a=blobdiff_plain;f=git-core.spec;h=95be78de7c7666752048983c4673df9ef36b8a96;hp=b3b882c3f742820976ceb596557aa92e306237b4;hb=dab2f9ca8476af8455b309e6fb3027c239042c51;hpb=6fa8665e091db026960c52733e728824073123c9

diff --git a/git-core.spec b/git-core.spec
index b3b882c..95be78d 100644
--- a/git-core.spec
+++ b/git-core.spec
@@ -1,12 +1,13 @@
 #
 # Conditional build:
-%bcond_without	tests		# don't perform make test
-%bcond_with	tests_cvs	# perform tests which use CVS
-%bcond_without	tests_svn	# perform tests which use subversion
-%bcond_without	doc		# skip building/packaging docs/manuals (takes some time)
+%bcond_without	tests		# test suite
+%bcond_with	tests_cvs	# tests which use CVS
+%bcond_without	tests_svn	# tests which use subversion
+%bcond_without	doc		# building/packaging docs/manuals (takes some time)
 %bcond_without	pcre		# perl-compatible regexes support
-%bcond_without	gnome_keyring	# build without gnome keyring support
-%bcond_without	tk		# build without the Tcl/Tk interface
+%bcond_without	gnome_keyring	# gnome keyring credentials support
+%bcond_without	libsecret	# libsecret credentials support
+%bcond_without	tk		# Tcl/Tk interface
 
 # for AC: --without doc --without gnome_keyring --without tests
 
@@ -14,12 +15,12 @@
 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:	2.17.0
+Version:	2.22.0
 Release:	1
 License:	GPL v2
 Group:		Development/Tools
 Source0:	http://www.kernel.org/pub/software/scm/git/git-%{version}.tar.xz
-# Source0-md5:	371985891f467969802fe1c7584a45bf
+# Source0-md5:	fcaf01506175c56fe88d887f1ff02ce8
 Source1:	%{name}-gitweb.conf
 Source2:	%{name}-gitweb-httpd.conf
 Source3:	%{name}-gitweb-lighttpd.conf
@@ -40,14 +41,23 @@ BuildRequires:	gettext-devel
 %else
 BuildRequires:	gettext-tools
 %endif
+%if %{with gnome_keyring} || %{with libsecret}
+BuildRequires:	glib2-devel >= 2.0
+%endif
 %if %{with gnome_keyring}
 BuildRequires:	libgnome-keyring-devel
-BuildRequires:	pkgconfig
+%endif
+%if %{with libsecret}
+BuildRequires:	libsecret-devel
 %endif
 BuildRequires:	openssl-devel
 %{?with_pcre:BuildRequires:	pcre2-8-devel}
 BuildRequires:	perl-Error > 0.15
+BuildRequires:	perl-MailTools
 BuildRequires:	perl-base
+%if %{with gnome_keyring} || %{with libsecret}
+BuildRequires:	pkgconfig
+%endif
 BuildRequires:	python-devel
 BuildRequires:	rpm-perlprov >= 4.1-13
 BuildRequires:	rpm-pythonprov
@@ -362,6 +372,8 @@ Summary:	Git tools for sending email
 Summary(pl.UTF-8):	Narzędzia Gita do wysyłania poczty
 Group:		Development/Tools
 Requires:	%{name} = %{version}-%{release}
+Requires:	perl-Error
+Requires:	perl-MailTools
 Suggests:	perl-Net-SMTP-SSL
 
 %description email
@@ -411,7 +423,7 @@ wykonania przy użyciu ogólnego interfejsu poleceń.
 
 %package -n gnome-keyring-git-core
 Summary:	GNOME Keyring authentication provider for Git
-Summary(pl.UTF-8):	Moduł uwierzytelniający GNOME Keyring dla Git
+Summary(pl.UTF-8):	Moduł uwierzytelniający GNOME Keyring dla Gita
 Group:		X11/Applications
 URL:		http://git-scm.com/docs/gitcredentials.html
 Requires:	%{name} = %{version}-%{release}
@@ -424,19 +436,40 @@ 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
+Moduł uwierzytelniający dla Gita pozwalający klientom git
 uwierzytelniać się przy użyciu mechanizmu GNOME Keyring.
 
 Moduł trzeba zarejestrować poleceniem:
 - git config --global credential.helper gnome-keyring
 
+%package credential-libsecret
+Summary:	GNOME authentication provider for Git using libsecret
+Summary(pl.UTF-8):	Moduł uwierzytelniający GNOME dla Gita wykorzystujący libsecret
+Group:		X11/Applications
+URL:		http://git-scm.com/docs/gitcredentials.html
+Requires:	%{name} = %{version}-%{release}
+
+%description credential-libsecret
+Authentication provider module for Git which allows git client to
+authenticate using GNOME libsecret.
+
+You need to register it with:
+- git config --global credential.helper libsecret
+
+%description credential-libsecret -l pl.UTF-8
+Moduł uwierzytelniający dla Gita pozwalający klientom git
+uwierzytelniać się przy użyciu mechanizmu GNOME libsecret.
+
+Moduł trzeba zarejestrować poleceniem:
+- git config --global credential.helper libsecret
+
 %prep
 %setup -q -n git-%{version}
 %patch0 -p0
 %patch1 -p1
 %patch2 -p1
 
-%{__rm} {Documentation/technical,contrib/emacs,contrib/credential/gnome-keyring}/.gitignore
+%{__rm} {Documentation/technical,contrib/credential/gnome-keyring}/.gitignore
 
 # we build things in contrib but want to have it clean for doc purporses, too
 cp -a contrib contrib-doc
@@ -464,7 +497,17 @@ echo "BLK_SHA1=1" >> config.mak
 %{__make} -C contrib/subtree
 
 %if %{with gnome_keyring}
-%{__make} -C contrib/credential/gnome-keyring
+%{__make} -C contrib/credential/gnome-keyring \
+	CC="%{__cc}" \
+	CFLAGS="%{rpmcflags} -Wall" \
+	LDFLAGS="%{rpmldflags}"
+%endif
+
+%if %{with libsecret}
+%{__make} -C contrib/credential/libsecret \
+	CC="%{__cc}" \
+	CFLAGS="%{rpmcflags} -Wall" \
+	LDFLAGS="%{rpmldflags}"
 %endif
 
 %if %{with doc}
@@ -477,7 +520,12 @@ echo "BLK_SHA1=1" >> config.mak
 %if %{without tests_cvs}
 %{__rm} t/t*cvs*.sh || :
 %endif
-%{!?with_tests_svn:GIT_SKIP_TESTS='t91??'} %{__make} test
+%if %{without tests_svn}
+GIT_SKIP_TESTS="$GIT_SKIP_TESTS t91??"
+%endif
+export GIT_SKIP_TESTS
+%{__make} test \
+	NO_PERL_CPAN_FALLBACKS=1
 %endif
 
 %install
@@ -528,6 +576,10 @@ cp -p {Makefile,config.mak,config.mak.autogen,config.mak.uname} $RPM_BUILD_ROOT%
 install -p contrib/credential/gnome-keyring/git-credential-gnome-keyring $RPM_BUILD_ROOT%{gitcoredir}
 %endif
 
+%if %{with libsecret}
+install -p contrib/credential/libsecret/git-credential-libsecret $RPM_BUILD_ROOT%{gitcoredir}
+%endif
+
 # bash completion
 install -d $RPM_BUILD_ROOT%{bash_compdir}
 cp -p contrib/completion/git-completion.bash $RPM_BUILD_ROOT%{bash_compdir}/git
@@ -540,7 +592,7 @@ cp -p contrib/completion/git-prompt.sh $RPM_BUILD_ROOT%{_datadir}/%{name}/contri
 install -p contrib/remote-helpers/git-remote-{bzr,hg} $RPM_BUILD_ROOT%{gitcoredir}
 
 # gitweb
-mv $RPM_BUILD_ROOT{%{appdir},%{cgibindir}}/gitweb.cgi
+%{__mv} $RPM_BUILD_ROOT{%{appdir},%{cgibindir}}/gitweb.cgi
 ln -s %{cgibindir}/gitweb.cgi $RPM_BUILD_ROOT%{appdir}/gitweb.cgi
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{webappdir}/gitweb.conf
 cp -p %{SOURCE7} $RPM_BUILD_ROOT%{webappdir}/gitolite.pl
@@ -583,7 +635,7 @@ ln -snf git-remote-http $RPM_BUILD_ROOT%{gitcoredir}/git-remote-ftps
 # remove unneeded files
 %py_postclean
 
-mv $RPM_BUILD_ROOT%{_localedir}/pt{_PT,}
+%{__mv} $RPM_BUILD_ROOT%{_localedir}/pt{_PT,}
 %find_lang git
 
 %clean
@@ -643,7 +695,6 @@ fi
 %exclude %{_mandir}/man1/git-imap-send*.1*
 %exclude %{_mandir}/man1/*email*.1*
 %{_mandir}/man1/git.1*
-%{_mandir}/man1/gitremote-helpers.1*
 %{_mandir}/man5/gitattributes.5*
 %{_mandir}/man5/githooks.5*
 %{_mandir}/man5/gitignore.5*
@@ -656,6 +707,7 @@ fi
 %{_mandir}/man7/giteveryday.7*
 %{_mandir}/man7/gitglossary.7*
 %{_mandir}/man7/gitnamespaces.7*
+%{_mandir}/man7/gitremote-helpers.7*
 %{_mandir}/man7/gitrevisions.7*
 %{_mandir}/man7/gitsubmodules.7*
 %{_mandir}/man7/gittutorial-2.7*
@@ -689,6 +741,9 @@ fi
 %if %{with gnome_keyring}
 %exclude %{gitcoredir}/git-credential-gnome-keyring
 %endif
+%if %{with libsecret}
+%exclude %{gitcoredir}/git-credential-libsecret
+%endif
 
 %if %{with doc}
 %files doc
@@ -853,3 +908,9 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{gitcoredir}/git-credential-gnome-keyring
 %endif
+
+%if %{with libsecret}
+%files credential-libsecret
+%defattr(644,root,root,755)
+%attr(755,root,root) %{gitcoredir}/git-credential-libsecret
+%endif