rpm/git
SHA256
1
0
Fork 0
forked from pool/git
Code Pull Requests Activity

Accepting request 611896 from devel:tools:scm

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/611896
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/git?expand=0&rev=219
This commit is contained in:
Dominique Leuenberger 2018-05-25 19:37:43 +00:00 committed by Git OBS Bridge
parent 26c472cc4e
commit f7bc847ca0
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
git.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu May 24 12:05:33 UTC 2018 - tchvatal@suse.com
- Fix docless build to not fail on find/chmod not having any files
- Require just python3-base not full python for build
------------------------------------------------------------------- -------------------------------------------------------------------
Sat May 19 20:37:48 UTC 2018 - schwab@linux-m68k.org Sat May 19 20:37:48 UTC 2018 - schwab@linux-m68k.org

8
git.spec
View File

@ -88,7 +88,7 @@ BuildRequires: libsha1detectcoll-devel
BuildRequires: pcre2-devel BuildRequires: pcre2-devel
BuildRequires: perl-Error BuildRequires: perl-Error
BuildRequires: perl-MailTools BuildRequires: perl-MailTools
BuildRequires: python3 BuildRequires: python3-base
BuildRequires: sgml-skel BuildRequires: sgml-skel
BuildRequires: systemd-rpm-macros BuildRequires: systemd-rpm-macros
BuildRequires: tcsh BuildRequires: tcsh
@ -320,7 +320,9 @@ EOF
# #
chmod 755 .make chmod 755 .make
./.make all %{?_smp_mflags} ./.make all %{?_smp_mflags}
%{!?_without_docs: ./.make doc} %if %{with docs}
./.make doc %{?_smp_mflags}
%endif
%if %{with git_gnome_keyring} %if %{with git_gnome_keyring}
./.make -C contrib/credential/gnome-keyring ./.make -C contrib/credential/gnome-keyring
@ -355,7 +357,9 @@ install -m 644 %{S:6} %{buildroot}/%{_fwdefdir}/git-daemon
(find %{buildroot}%{gitexecdir} ! -type d | grep -vE "archimport|p4|svn|cvs|email|gitk|git-daemon|gui" | sed -e s@^%{buildroot}@@) >> bin-man-doc-files (find %{buildroot}%{gitexecdir} ! -type d | grep -vE "archimport|p4|svn|cvs|email|gitk|git-daemon|gui" | sed -e s@^%{buildroot}@@) >> bin-man-doc-files
(find %{buildroot}%{_mandir} -type f | grep -vE "archimport|p4|svn|git-cvs|email|gitk|git-daemon|gui" | sed -e s@^%{buildroot}@@ -e 's/$/*/' ) >> bin-man-doc-files (find %{buildroot}%{_mandir} -type f | grep -vE "archimport|p4|svn|git-cvs|email|gitk|git-daemon|gui" | sed -e s@^%{buildroot}@@ -e 's/$/*/' ) >> bin-man-doc-files
%perl_process_packlist %perl_process_packlist
%if %{with docs}
find %{buildroot}/%_mandir -type f -print0 | xargs -0 chmod 644 find %{buildroot}/%_mandir -type f -print0 | xargs -0 chmod 644
%endif
install -m 644 -D contrib/completion/git-completion.bash %{buildroot}/etc/bash_completion.d/git.sh install -m 644 -D contrib/completion/git-completion.bash %{buildroot}/etc/bash_completion.d/git.sh
install -m 644 -D contrib/completion/git-prompt.sh %{buildroot}/etc/bash_completion.d/git-prompt.sh install -m 644 -D contrib/completion/git-prompt.sh %{buildroot}/etc/bash_completion.d/git-prompt.sh
# contrib/credential # contrib/credential