#
# 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
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.15.1
+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: 48f7904c4401864751de7d52949f5de5
+# Source0-md5: fcaf01506175c56fe88d887f1ff02ce8
Source1: %{name}-gitweb.conf
Source2: %{name}-gitweb-httpd.conf
Source3: %{name}-gitweb-lighttpd.conf
%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
Requires: grep
# git-pull: printf
Requires: coreutils
-Requires: perl-Error
-Requires: perl-Git = %{version}-%{release}
Requires: sed
Suggests: git-core-bzr
Suggests: git-core-cvs
Suggests: git-core-svn
Suggests: less
Suggests: openssh-clients
+Suggests: perl-Git = %{version}-%{release}
Suggests: rsync
Obsoletes: git-core-gitview
Obsoletes: python-Git
+Conflicts: perl-Git < %{version}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
# html docs have links to txt files
%define _noautocompressdoc *.txt
+# do not generate perl dependency, git add -p support is optional
+# skip dependency generation from templates
+%define _noautoreqfiles %{_libexecdir}/%{name}/git-add--interactive %{_datadir}/%{name}/templates
+
%define webapp gitweb
%define webappdir %{_sysconfdir}/webapps/%{webapp}
%define appdir %{_datadir}/%{webapp}
%define cgibindir %{_prefix}/lib/cgi-bin
-%define gitcoredir %{_libdir}/%{name}
+%define gitcoredir %{_libexecdir}/%{name}
%description
"git" can mean anything, depending on your mood.
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
%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}
- 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
echo "BLK_SHA1=1" >> config.mak
%{__make} \
- INSTALLDIRS=vendor \
GITWEB_CONFIG="%{webappdir}/gitweb.conf" \
GITWEB_PROJECTROOT="/var/lib/git" \
GITWEB_CSS="/gitweb/gitweb.css" \
GITWEB_LOGO="/gitweb/git-logo.png" \
GITWEB_FAVICON="/gitweb/git-favicon.png" \
+ NO_PERL_CPAN_FALLBACKS=1 \
+ perllibdir=%{perl_vendorlib} \
V=1
%{__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}
-%{__make} -C Documentation \
+%{__make} doc \
MAN_BASE_URL=file://%{_docdir}/%{name}-doc-%{version}/ \
V=1
%endif
%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
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_includedir}/%{name}/xdiff,%{_localstatedir}/lib/git}
+install -d $RPM_BUILD_ROOT{%{_includedir}/%{name}/xdiff,%{_libdir},%{_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}/%{name}
EOF
%{__make} install \
- INSTALLDIRS=vendor \
- DESTDIR=$RPM_BUILD_ROOT
+ DESTDIR=$RPM_BUILD_ROOT \
+ NO_PERL_CPAN_FALLBACKS=1 \
+ perllibdir=%{perl_vendorlib}
%if %{with doc}
-%{__make} -C Documentation install \
+%{__make} install-doc \
DESTDIR=$RPM_BUILD_ROOT
%endif
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
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
ln -snf git-remote-http $RPM_BUILD_ROOT%{gitcoredir}/git-remote-ftps
# remove unneeded files
-%{__rm} $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod
-%{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/auto/Git/.packlist
%py_postclean
-mv $RPM_BUILD_ROOT%{_localedir}/pt{_PT,}
+%{__mv} $RPM_BUILD_ROOT%{_localedir}/pt{_PT,}
%find_lang git
%clean
%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*
%{_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*
%exclude %{gitcoredir}/*email*
%exclude %{gitcoredir}/*p4*
%exclude %{gitcoredir}/git-archimport
+%exclude %{gitcoredir}/git-citool
%exclude %{gitcoredir}/git-cvs*
%exclude %{gitcoredir}/git-gui
%exclude %{gitcoredir}/git-imap-send
%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
%if %{with tk}
%files gui
%defattr(644,root,root,755)
+%attr(755,root,root) %{gitcoredir}/git-citool
%attr(755,root,root) %{gitcoredir}/git-gui
%dir %{_datadir}/git-gui
%dir %{_datadir}/git-gui/lib
%if %{with doc}
%{_mandir}/man1/git-svn.1*
%endif
-%{_mandir}/man3/Git::SVN::Editor.3pm*
-%{_mandir}/man3/Git::SVN::Fetcher.3pm*
-%{_mandir}/man3/Git::SVN::Memoize::YAML.3pm*
-%{_mandir}/man3/Git::SVN::Prompt.3pm*
-%{_mandir}/man3/Git::SVN::Ra.3pm*
-%{_mandir}/man3/Git::SVN::Utils.3pm*
%files email
%defattr(644,root,root,755)
%dir %{perl_vendorlib}/Git
%{perl_vendorlib}/Git/I18N.pm
%{perl_vendorlib}/Git/IndexInfo.pm
+%{perl_vendorlib}/Git/LoadCPAN.pm
+%{perl_vendorlib}/Git/Packet.pm
+%dir %{perl_vendorlib}/Git/LoadCPAN
+%{perl_vendorlib}/Git/LoadCPAN/Error.pm
+%dir %{perl_vendorlib}/Git/LoadCPAN/Mail
+%{perl_vendorlib}/Git/LoadCPAN/Mail/Address.pm
%{_mandir}/man3/Git.3pm*
-%{_mandir}/man3/Git::I18N.3pm*
%if %{with gnome_keyring}
%files -n gnome-keyring-git-core
%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
projects / packages / git-core.git / blobdiff