pool/git
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 653788 from devel:tools:scm

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/653788
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/git?expand=0&rev=226
This commit is contained in:
Dominique Leuenberger 2018-12-10 11:26:12 +00:00 committed by Git OBS Bridge
parent c1c7775c3f
commit 42cfc11470
2 changed files with 92 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
git.changes
View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Tue Dec 4 08:40:09 UTC 2018 - Jan Engelhardt <jengelh@inai.de>
- Use Requires(pre).
- Do not ignore error returns from useradd.
- Package descriptions need not be wrapped in %if..%endif.
-------------------------------------------------------------------
Fri Nov 30 11:42:53 UTC 2018 - Marketa Calabkova <mcalabkova@suse.com>
- Avoid boo#1082023 - git send-email fails to authenticate with
SMTP server
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Nov 21 19:59:33 UTC 2018 - astieger@suse.com Wed Nov 21 19:59:33 UTC 2018 - astieger@suse.com

154
git.spec
View File

@ -12,44 +12,38 @@
# license that conforms to the Open Source Definition (Version 1.9) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via https://bugs.opensuse.org/
# #
#Compat macro for new _fillupdir macro introduced in Nov 2017 %define gitexecdir %{_libexecdir}/git
%if ! %{defined _fillupdir} %define _fwdefdir %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services
%define _fillupdir /var/adm/fillup-templates
%endif
%define gitexecdir %_libexecdir/git
%define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services
%if 0%{?suse_version} >= 1210 %if 0%{?suse_version} >= 1210
%bcond_without git_gnome_keyring %bcond_without git_gnome_keyring
%else %else
%bcond_with git_gnome_keyring %bcond_with git_gnome_keyring
%endif %endif
#Compat macro for new _fillupdir macro introduced in Nov 2017
%if ! %{defined _fillupdir}
%define _fillupdir %{_localstatedir}/adm/fillup-templates
%endif
%bcond_without git_libsecret %bcond_without git_libsecret
%bcond_without docs %bcond_without docs
Name: git Name: git
Version: 2.19.2 Version: 2.19.2
Release: 0 Release: 0
Summary: Fast, scalable, distributed revision control system Summary: Fast, scalable, distributed revision control system
License: GPL-2.0-only License: GPL-2.0-only
Group: Development/Tools/Version Control Group: Development/Tools/Version Control
Url: http://git-scm.com URL: http://git-scm.com
Source0: https://www.kernel.org/pub/software/scm/git/%{name}-%{version}.tar.xz Source0: https://www.kernel.org/pub/software/scm/git/%{name}-%{version}.tar.xz
Source7: https://www.kernel.org/pub/software/scm/git/%{name}-%{version}.tar.sign
Source1: apache2-gitweb.conf Source1: apache2-gitweb.conf
Source2: sysconfig.git-daemon Source2: sysconfig.git-daemon
Source3: git-daemon.service Source3: git-daemon.service
Source5: usr.share.git-web.gitweb.cgi Source5: usr.share.git-web.gitweb.cgi
Source6: susefirewall-git-daemon Source6: susefirewall-git-daemon
Source8: %name.keyring Source7: https://www.kernel.org/pub/software/scm/git/%{name}-%{version}.tar.sign
Source8: %{name}.keyring
Source9: %{name}-gui.desktop Source9: %{name}-gui.desktop
Source10: %{name}-gui.png Source10: %{name}-gui.png
Patch3: completion-wordbreaks.diff Patch3: completion-wordbreaks.diff
@ -61,28 +55,12 @@ Patch6: git-tcsh-completion-fixes.diff
Patch7: git-zsh-completion-fixes.diff Patch7: git-zsh-completion-fixes.diff
Patch8: git-asciidoc.patch Patch8: git-asciidoc.patch
BuildRequires: apache2 BuildRequires: apache2
%if %{with docs}
%if 0%{?suse_version} > 1320
BuildRequires: rubygem(asciidoctor)
%else
BuildRequires: asciidoc
%endif
%endif
BuildRequires: curl BuildRequires: curl
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: gpg2 BuildRequires: gpg2
BuildRequires: libcurl-devel BuildRequires: libcurl-devel
BuildRequires: libexpat-devel BuildRequires: libexpat-devel
%if %{with git_gnome_keyring}
BuildRequires: libgnome-keyring-devel
%endif
%if %{with git_libsecret}
BuildRequires: libsecret-devel
%endif
BuildRequires: libopenssl-devel BuildRequires: libopenssl-devel
%if 0%{?suse_version} > 1320
BuildRequires: libsha1detectcoll-devel
%endif
BuildRequires: pcre2-devel BuildRequires: pcre2-devel
BuildRequires: perl-Error BuildRequires: perl-Error
BuildRequires: perl-MailTools BuildRequires: perl-MailTools
@ -95,8 +73,29 @@ BuildRequires: xmlto
BuildRequires: xz BuildRequires: xz
BuildRequires: zlib-devel BuildRequires: zlib-devel
Requires: git-core = %{version} Requires: git-core = %{version}
Recommends: git-svn git-cvs git-email gitk git-gui Recommends: git-cvs
Suggests: git-daemon git-web Recommends: git-email
Recommends: git-gui
Recommends: git-svn
Recommends: gitk
Suggests: git-daemon
Suggests: git-web
%if %{with docs}
%if 0%{?suse_version} > 1320
BuildRequires: rubygem(asciidoctor)
%else
BuildRequires: asciidoc
%endif
%endif
%if %{with git_gnome_keyring}
BuildRequires: libgnome-keyring-devel
%endif
%if %{with git_libsecret}
BuildRequires: libsecret-devel
%endif
%if 0%{?suse_version} > 1320
BuildRequires: libsha1detectcoll-devel
%endif
%description %description
Git is a fast, scalable, distributed revision control system with an Git is a fast, scalable, distributed revision control system with an
@ -115,13 +114,13 @@ Group: Development/Tools/Version Control
Requires: less Requires: less
Requires: openssh Requires: openssh
Requires: perl-Error Requires: perl-Error
Requires: rsync
Obsoletes: git-remote-helpers < %{version}
%if 0%{?suse_version} >= 1230 %if 0%{?suse_version} >= 1230
%perl_requires %{perl_requires}
%else %else
Requires: perl-base = %{perl_version} Requires: perl-base = %{perl_version}
%endif %endif
Requires: rsync
Obsoletes: git-remote-helpers < %{version}
%description core %description core
Git is a fast, scalable, distributed revision control system with an Git is a fast, scalable, distributed revision control system with an
@ -149,13 +148,13 @@ text/html formats. (The manpages are in the main package.)
Summary: Git tools for importing Subversion repositories Summary: Git tools for importing Subversion repositories
Group: Development/Tools/Version Control Group: Development/Tools/Version Control
Requires: git-core = %{version} Requires: git-core = %{version}
%if 0%{suse_version} < 1140 Requires: subversion
Requires: subversion-perl
%if 0%{?suse_version} < 1140
Requires: perl-TermReadKey Requires: perl-TermReadKey
%else %else
Requires: perl-Term-ReadKey Requires: perl-Term-ReadKey
%endif %endif
Requires: subversion
Requires: subversion-perl
%description svn %description svn
Tools for importing Subversion repositories to the Git version control Tools for importing Subversion repositories to the Git version control
@ -172,7 +171,6 @@ Requires: perl-DBD-SQLite
%description cvs %description cvs
Tools for importing CVS repositories to the Git version control system. Tools for importing CVS repositories to the Git version control system.
%if %{with git_gnome_keyring}
%package credential-gnome-keyring %package credential-gnome-keyring
Summary: Git credential backend using the GNOME keyring as storage Summary: Git credential backend using the GNOME keyring as storage
Group: Development/Tools/Version Control Group: Development/Tools/Version Control
@ -181,9 +179,7 @@ Requires: gnome-keyring
%description credential-gnome-keyring %description credential-gnome-keyring
A Git credential backend which uses the GNOME keyring as storage. A Git credential backend which uses the GNOME keyring as storage.
%endif
%if %{with git_libsecret}
%package credential-libsecret %package credential-libsecret
Summary: Git credential backend using libsecret to access keyring Summary: Git credential backend using libsecret to access keyring
Group: Development/Tools/Version Control Group: Development/Tools/Version Control
@ -192,7 +188,6 @@ Requires: git-core = %{version}
%description credential-libsecret %description credential-libsecret
A Git credential backend which uses libsecret API to acces keyrings such as A Git credential backend which uses libsecret API to acces keyrings such as
kwallet or GNOME keyring. kwallet or GNOME keyring.
%endif
%package arch %package arch
Summary: Git tools for importing Arch repositories Summary: Git tools for importing Arch repositories
@ -220,7 +215,8 @@ Group: Development/Tools/Version Control
Requires: git-core = %{version} Requires: git-core = %{version}
Requires: perl-MailTools Requires: perl-MailTools
# For sending mails over secure SMTP: # For sending mails over secure SMTP:
Recommends: perl-Net-SMTP-SSL, perl-Authen-SASL Requires: perl-Authen-SASL
Requires: perl-Net-SMTP-SSL
%description email %description email
Email interface for the GIT version control system. Email interface for the GIT version control system.
@ -229,7 +225,9 @@ Email interface for the GIT version control system.
Summary: Simple Server for Git Repositories Summary: Simple Server for Git Repositories
Group: Development/Tools/Version Control Group: Development/Tools/Version Control
Requires: git-core = %{version} Requires: git-core = %{version}
PreReq: /usr/sbin/useradd %fillup_prereq Requires(pre): %fillup_prereq
Requires(pre): %{_sbindir}/useradd
Requires(pre): group(nogroup)
%{?systemd_requires} %{?systemd_requires}
%description daemon %description daemon
@ -292,8 +290,8 @@ directory /git/ that calls the cgi script.
%build %build
cat > .make <<'EOF' cat > .make <<'EOF'
#!/bin/bash #!/bin/bash
make %{_smp_mflags} CFLAGS="%{optflags}" \ make %{?_smp_mflags} CFLAGS="%{optflags}" \
GITWEB_CONFIG="/etc/gitweb.conf" \ GITWEB_CONFIG="%{_sysconfdir}/gitweb.conf" \
GITWEB_PROJECTROOT="/srv/git" \ GITWEB_PROJECTROOT="/srv/git" \
WITH_OWN_SUBPROCESS_PY=YesPlease \ WITH_OWN_SUBPROCESS_PY=YesPlease \
DESTDIR=%{buildroot} \ DESTDIR=%{buildroot} \
@ -336,18 +334,18 @@ chmod 755 .make
cp gitweb/INSTALL INSTALL.gitweb cp gitweb/INSTALL INSTALL.gitweb
cp gitweb/README README.gitweb cp gitweb/README README.gitweb
install -d %{buildroot}%{_datadir}/git-web install -d %{buildroot}%{_datadir}/git-web
install -d %{buildroot}/etc/apache2/conf.d install -d %{buildroot}%{_sysconfdir}/apache2/conf.d
install -m 644 %{SOURCE1} %{buildroot}/etc/apache2/conf.d/gitweb.conf install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/apache2/conf.d/gitweb.conf
### git-daemon ### git-daemon
install -d -m 755 %{buildroot}%{_unitdir} install -d -m 755 %{buildroot}%{_unitdir}
install -m 644 %{SOURCE3} %{buildroot}/%{_unitdir}/git-daemon.service install -m 644 %{SOURCE3} %{buildroot}/%{_unitdir}/git-daemon.service
install -d -m 755 %{buildroot}%{_sbindir} install -d -m 755 %{buildroot}%{_sbindir}
ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcgit-daemon ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcgit-daemon
install -d -m 755 %{buildroot}%{_fillupdir} install -d -m 755 %{buildroot}%{_fillupdir}
install -m 644 %{SOURCE2} %{buildroot}%{_fillupdir}/sysconfig.git-daemon install -m 644 %{SOURCE2} %{buildroot}%{_fillupdir}/sysconfig.git-daemon
install -d -m 755 %{buildroot}/srv/git install -d -m 755 %{buildroot}/srv/git
mkdir -p %{buildroot}/%{_fwdefdir} mkdir -p %{buildroot}/%{_fwdefdir}
install -m 644 %{S:6} %{buildroot}/%{_fwdefdir}/git-daemon install -m 644 %{SOURCE6} %{buildroot}/%{_fwdefdir}/git-daemon
### ###
./.make -C contrib/subtree install ./.make -C contrib/subtree install
%{!?_without_docs: ./.make -C contrib/subtree install-doc} %{!?_without_docs: ./.make -C contrib/subtree install-doc}
@ -356,10 +354,10 @@ install -m 644 %{S:6} %{buildroot}/%{_fwdefdir}/git-daemon
(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} %if %{with docs}
find %{buildroot}/%_mandir -type f -print0 | xargs -0 chmod 644 find %{buildroot}/%{_mandir} -type f -exec chmod 644 "{}" "+"
%endif %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}%{_sysconfdir}/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}%{_sysconfdir}/bash_completion.d/git-prompt.sh
# contrib/credential # contrib/credential
%if %{with git_gnome_keyring} %if %{with git_gnome_keyring}
install -m 755 -D contrib/credential/gnome-keyring/git-credential-gnome-keyring %{buildroot}/%{gitexecdir}/git-credential-gnome-keyring install -m 755 -D contrib/credential/gnome-keyring/git-credential-gnome-keyring %{buildroot}/%{gitexecdir}/git-credential-gnome-keyring
@ -373,15 +371,15 @@ install -m 755 -D contrib/workdir/git-new-workdir %{buildroot}/%{_bindir}
(cd contrib/completion (cd contrib/completion
mkdir -p %{buildroot}%{_datadir}/tcsh mkdir -p %{buildroot}%{_datadir}/tcsh
tcsh ./git-completion.tcsh tcsh ./git-completion.tcsh
install -m 644 -D git.csh %{buildroot}/etc/profile.d/git.csh install -m 644 -D git.csh %{buildroot}%{_sysconfdir}/profile.d/git.csh
) )
# zsh completion # zsh completion
install -m 644 -D contrib/completion/git-completion.zsh %{buildroot}/etc/zsh_completion.d/_git install -m 644 -D contrib/completion/git-completion.zsh %{buildroot}%{_sysconfdir}/zsh_completion.d/_git
# #
# apparmor profile for git-web # apparmor profile for git-web
# #
install -d -m 755 %{buildroot}/etc/apparmor.d install -d -m 755 %{buildroot}%{_sysconfdir}/apparmor.d
install -m 644 %{SOURCE5} %{buildroot}/etc/apparmor.d install -m 644 %{SOURCE5} %{buildroot}%{_sysconfdir}/apparmor.d
# #
# create predictable symlinks to make apparmor profile work # create predictable symlinks to make apparmor profile work
for i in git git-upload-archive git-receive-pack; do for i in git git-upload-archive git-receive-pack; do
@ -393,13 +391,13 @@ if ! test -f %{buildroot}%{gitexecdir}/git-add; then
exit 1 exit 1
fi fi
mkdir -p "%buildroot/%_docdir/git" "%buildroot/%_docdir/git/howto" "%buildroot/%_docdir/git/technical" mkdir -p "%{buildroot}/%{_docdir}/git" "%{buildroot}/%{_docdir}/git/howto" "%{buildroot}/%{_docdir}/git/technical"
cp -a README.md Documentation/*.txt "%buildroot/%_docdir/git/" cp -a README.md Documentation/*.txt "%{buildroot}/%{_docdir}/git/"
cp -a Documentation/howto/*.txt "%buildroot/%_docdir/git/howto/" cp -a Documentation/howto/*.txt "%{buildroot}/%{_docdir}/git/howto/"
cp -a Documentation/technical/*.txt "%buildroot/%_docdir/git/technical/" cp -a Documentation/technical/*.txt "%{buildroot}/%{_docdir}/git/technical/"
%{!?_without_docs: cp -a Documentation/*.html "%buildroot/%_docdir/git/"} %{!?_without_docs: cp -a Documentation/*.html "%{buildroot}/%{_docdir}/git/"}
%{!?_without_docs: cp -a Documentation/howto/*.html "%buildroot/%_docdir/git/howto/"} %{!?_without_docs: cp -a Documentation/howto/*.html "%{buildroot}/%{_docdir}/git/howto/"}
%{!?_without_docs: cp -a Documentation/technical/*.html "%buildroot/%_docdir/git/technical/"} %{!?_without_docs: cp -a Documentation/technical/*.html "%{buildroot}/%{_docdir}/git/technical/"}
install -d -m 755 %{buildroot}%{_datadir}/applications install -d -m 755 %{buildroot}%{_datadir}/applications
install -m 644 %{SOURCE9} %{buildroot}%{_datadir}/applications install -m 644 %{SOURCE9} %{buildroot}%{_datadir}/applications
@ -416,8 +414,8 @@ cat %{name}.lang >>bin-man-doc-files
./.make %{?_smp_mflags} test ./.make %{?_smp_mflags} test
%pre daemon %pre daemon
if ! /usr/bin/getent passwd git-daemon >/dev/null; then if ! %{_bindir}/getent passwd git-daemon >/dev/null; then
/usr/sbin/useradd -r -d /var/lib/empty -s /bin/false -c "git daemon" -g nogroup git-daemon || : %{_sbindir}/useradd -r -d %{_localstatedir}/lib/empty -s /bin/false -c "git daemon" -g nogroup git-daemon
fi fi
%service_add_pre git-daemon.service %service_add_pre git-daemon.service
@ -432,12 +430,12 @@ fi
%service_del_postun git-daemon.service %service_del_postun git-daemon.service
%files %files
%dir %_docdir/%name %dir %{_docdir}/%{name}
%_docdir/%name/README.md %{_docdir}/%{name}/README.md
%files doc %files doc
%_docdir/%name/ %{_docdir}/%{name}/
%exclude %_docdir/%name/README.md %exclude %{_docdir}/%{name}/README.md
%files svn %files svn
%{gitexecdir}/*svn* %{gitexecdir}/*svn*
@ -494,9 +492,9 @@ fi
%files web %files web
%doc README.gitweb INSTALL.gitweb %doc README.gitweb INSTALL.gitweb
%config(noreplace) /etc/apache2/conf.d/gitweb.conf %config(noreplace) %{_sysconfdir}/apache2/conf.d/gitweb.conf
%{_datadir}/gitweb %{_datadir}/gitweb
/etc/apparmor.d %{_sysconfdir}/apparmor.d
%files core -f bin-man-doc-files %files core -f bin-man-doc-files
%{_datadir}/git-core/ %{_datadir}/git-core/
@ -505,13 +503,13 @@ fi
%{gitexecdir}/mergetools/guiffy %{gitexecdir}/mergetools/guiffy
%{_bindir}/git-new-workdir %{_bindir}/git-new-workdir
%if 0%{?suse_version} < 1140 %if 0%{?suse_version} < 1140
/var/adm/perl-modules/%{name} %{_localstatedir}/adm/perl-modules/%{name}
%endif %endif
%attr(-,root,root) %{perl_vendorlib}/* %attr(-,root,root) %{perl_vendorlib}/*
/etc/bash_completion.d/*.sh %{_sysconfdir}/bash_completion.d/*.sh
%{_datadir}/tcsh %{_datadir}/tcsh
/etc/profile.d/*.csh %{_sysconfdir}/profile.d/*.csh
/etc/zsh_completion.d %{_sysconfdir}/zsh_completion.d
%license COPYING %license COPYING
%changelog %changelog