X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=git-core.spec;h=6313a7fc57066f52c02ecfdea69f35535944ddf7;hb=24ff48af50a8f346f3082f2319e7aa8c7b077270;hp=2507d15c6568cf78f3164b49188904cf0d537f2e;hpb=f0f208009b27fded1c8d51cff03d8028aaff7bca;p=packages%2Fgit-core.git diff --git a/git-core.spec b/git-core.spec index 2507d15..6313a7f 100644 --- a/git-core.spec +++ b/git-core.spec @@ -13,12 +13,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.7.3 -Release: 1 +Version: 2.8.0 +Release: 4 License: GPL v2 Group: Development/Tools -Source0: http://www.kernel.org/pub/software/scm/git/git-%{version}.tar.gz -# Source0-md5: cf6ed3510f0d7784da5e9f4e64c6a43e +Source0: http://www.kernel.org/pub/software/scm/git/git-%{version}.tar.xz +# Source0-md5: 01477f0b97ccab20b986f2808f4d7a97 Source1: %{name}-gitweb.conf Source2: %{name}-gitweb-httpd.conf Source3: %{name}-gitweb-lighttpd.conf @@ -427,6 +427,9 @@ Summary: Perl interface to the Git version control system Summary(pl.UTF-8): Perlowy interfejs do systemu kontroli wersji Git Group: Development/Languages/Perl Obsoletes: perl-git-core +%if "%{_rpmversion}" >= "5" +BuildArch: noarch +%endif %description -n perl-Git This module provides Perl scripts easy way to interface the Git @@ -593,11 +596,28 @@ install -p %{SOURCE6} $RPM_BUILD_ROOT/etc/rc.d/init.d/git-daemon sed -e 's,@libdir@/git-core,%{gitcoredir},g' -i $RPM_BUILD_ROOT/etc/rc.d/init.d/git-daemon sed -e 's,@libdir@/git-core,%{gitcoredir},g' -i $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/git-daemon -# hardlink -ln -f $RPM_BUILD_ROOT%{_bindir}/{git,git-receive-pack} -ln -f $RPM_BUILD_ROOT%{_bindir}/{git,git-upload-archive} -ln -f $RPM_BUILD_ROOT{%{gitcoredir},%{_bindir}}/git-shell -ln -f $RPM_BUILD_ROOT{%{gitcoredir},%{_bindir}}/git-upload-pack +# same file, link +ln -sf git $RPM_BUILD_ROOT%{_bindir}/git-receive-pack +ln -sf git $RPM_BUILD_ROOT%{_bindir}/git-upload-archive +ln -sf ../..%{gitcoredir}/git-shell $RPM_BUILD_ROOT%{_bindir}/git-shell +ln -sf ../..%{gitcoredir}/git-upload-pack $RPM_BUILD_ROOT%{_bindir}/git-upload-pack +ln -sf ../..%{gitcoredir}/git $RPM_BUILD_ROOT%{_bindir}/git + +# convert all hardlinks to symlinks, as rpm fails to calculate it properly +# requiring excessive free space when it may not be available +# https://bugs.launchpad.net/pld-linux/+bug/1176337 +find $RPM_BUILD_ROOT%{gitcoredir} -samefile $RPM_BUILD_ROOT%{gitcoredir}/git > files +for f in $(cat files); do + f=${f#$RPM_BUILD_ROOT%{gitcoredir}/} + test $f = git && continue + ln -snf git $RPM_BUILD_ROOT%{gitcoredir}/$f +done + +# few others +ln -snf git-gui $RPM_BUILD_ROOT%{gitcoredir}/git-citool +ln -snf git-remote-http $RPM_BUILD_ROOT%{gitcoredir}/git-remote-https +ln -snf git-remote-http $RPM_BUILD_ROOT%{gitcoredir}/git-remote-ftp +ln -snf git-remote-http $RPM_BUILD_ROOT%{gitcoredir}/git-remote-ftps # remove unneeded files %{__rm} $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod @@ -648,7 +668,7 @@ fi %files -f git.lang %defattr(644,root,root,755) -%doc README contrib-doc +%doc README.md contrib-doc %attr(755,root,root) %{_bindir}/git %attr(755,root,root) %{_bindir}/git-receive-pack %attr(755,root,root) %{_bindir}/git-shell