Hello community, here is the log from the commit of package git for openSUSE:Factory checked in at 2017-11-19 11:10:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/git (Old) and /work/SRC/openSUSE:Factory/.git.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "git" Sun Nov 19 11:10:40 2017 rev:208 rq:542209 version:2.15.0 Changes: -------- --- /work/SRC/openSUSE:Factory/git/git.changes 2017-11-14 14:44:30.015960806 +0100 +++ /work/SRC/openSUSE:Factory/.git.new/git.changes 2017-11-19 11:10:45.932756106 +0100 @@ -1,0 +2,8 @@ +Thu Nov 9 18:46:12 UTC 2017 - [email protected] + +- split off p4 to a subpackage (bsc#1067502) +- do not buildrequire asciidoc (dependent on Python 2) when + not building docs +- switch to Python 3 for tests + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ git.spec ++++++ --- /var/tmp/diff_new_pack.W9uQya/_old 2017-11-19 11:10:48.908647600 +0100 +++ /var/tmp/diff_new_pack.W9uQya/_new 2017-11-19 11:10:48.912647454 +0100 @@ -25,6 +25,8 @@ %bcond_with git_gnome_keyring %endif +%bcond_without docs + Name: git Version: 2.15.0 Release: 0 @@ -57,7 +59,9 @@ Patch9: git-gui-tclIndex.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: apache2 +%if %{with docs} BuildRequires: asciidoc +%endif BuildRequires: curl BuildRequires: fdupes BuildRequires: gpg2 @@ -72,7 +76,7 @@ %endif BuildRequires: pcre2-devel BuildRequires: perl-Error -BuildRequires: python +BuildRequires: python3 BuildRequires: sgml-skel BuildRequires: tcsh BuildRequires: update-desktop-files @@ -177,6 +181,16 @@ Tools for importing GNU Arch repositories to the GIT version control system. +%package p4 +Summary: Git tools for importing Perforce repositories +Group: Development/Tools/Version Control +Requires: git-core = %{version} +Requires: python2-base + +%description p4 +Tools for importing Perforce repositories to the GIT version control +system. + %package email Summary: Git tools for sending email Group: Development/Tools/Version Control @@ -265,6 +279,7 @@ %if 0%{?suse_version} > 1320 DC_SHA1_EXTERNAL=YesPlease \ %endif + PYTHON_PATH=%{_bindir}/python3 \ USE_LIBPCRE2=YesPlease \ V=1 \ prefix=%{_prefix} mandir=%{_mandir} \ @@ -305,9 +320,9 @@ ### ./.make -C contrib/subtree install %{!?_without_docs: ./.make -C contrib/subtree install-doc} -(find $RPM_BUILD_ROOT%{_bindir} -type f -o -type l | grep -vE "archimport|svn|cvs|email|gitk|git-daemon|gui" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files -(find $RPM_BUILD_ROOT%{gitexecdir} ! -type d | grep -vE "archimport|svn|cvs|email|gitk|git-daemon|gui" | sed -e s@^$RPM_BUILD_ROOT@@) >> bin-man-doc-files -(find $RPM_BUILD_ROOT%{_mandir} -type f | grep -vE "archimport|svn|git-cvs|email|gitk|git-daemon|gui" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files +(find $RPM_BUILD_ROOT%{_bindir} -type f -o -type l | grep -vE "archimport|p4|svn|cvs|email|gitk|git-daemon|gui" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files +(find $RPM_BUILD_ROOT%{gitexecdir} ! -type d | grep -vE "archimport|p4|svn|cvs|email|gitk|git-daemon|gui" | sed -e s@^$RPM_BUILD_ROOT@@) >> bin-man-doc-files +(find $RPM_BUILD_ROOT%{_mandir} -type f | grep -vE "archimport|p4|svn|git-cvs|email|gitk|git-daemon|gui" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files ( pushd perl perl Makefile.PL make -f perl.mak DESTDIR=%{buildroot} install_vendor @@ -417,6 +432,12 @@ %{gitexecdir}/git-archimport %{!?_without_docs: %{_mandir}/man1/git-archimport.1*} +%files p4 +%defattr(-,root,root) +%{gitexecdir}/git-p4 +%{gitexecdir}/mergetools/p4merge +%{!?_without_docs: %{_mandir}/man1/git-p4.1*} + %files email %defattr(-,root,root) %{gitexecdir}/*email*
