- up to 1.7.0.4

[packages/git-core.git] / git-core.spec

diff --git a/git-core.spec b/git-core.spec
index 6b9aa9363021b012754d28126c6d4f567246ea7f..0580a68525189a2f241ec44b76094fb16c563fc0 100644 (file)
--- a/git-core.spec
+++ b/git-core.spec
@@ -8,17 +8,18 @@
 Summary:       The stupid content tracker
 Summary(pl.UTF-8):     Prymitywne narzędzie do śledzenia treści
 Name:          git-core
-Version:       1.7.0.1
+Version:       1.7.0.4
 Release:       1
 License:       GPL v2
 Group:         Development/Tools
 Source0:       http://www.kernel.org/pub/software/scm/git/git-%{version}.tar.bz2
-# Source0-md5: c4315200efc90ea0f243cf0e86cda1f1
+# Source0-md5: 1cc8b2aea57e5e999ccac18ae355f760
 Source1:       %{name}-gitweb.conf
 Source2:       %{name}-gitweb-httpd.conf
 Source3:       %{name}.sysconfig
 Source4:       %{name}.inet
 Source5:       %{name}.init
+Patch0:                %{name}-tests.patch
 URL:           http://git-scm.com/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -349,6 +350,7 @@ Ta wtyczka dostarcza podświetlanie składni dla treści commitów gita.
 
 %prep
 %setup -q -n git-%{version}
+%patch0 -p1
 
 %build
 %{__aclocal}
@@ -356,8 +358,9 @@ Ta wtyczka dostarcza podświetlanie składni dla treści commitów gita.
 %configure \
        --with-openssl
 
+echo "BLK_SHA1=1" >> config.mak
+
 %{__make} \
-       BLK_SHA1=1 \
        INSTALLDIRS=vendor \
        GITWEB_CONFIG="%{webappdir}/gitweb.conf" \
        GITWEB_PROJECTROOT="/var/lib/git" \
@@ -370,7 +373,7 @@ Ta wtyczka dostarcza podświetlanie składni dla treści commitów gita.
 
 %if %{with tests}
 %if %{without tests_cvs}
-rm t/t*cvs*.sh
+rm t/t*cvs*.sh || :
 %endif
 %{__make} test
 %endif
@@ -391,10 +394,10 @@ install -d $RPM_BUILD_ROOT/etc/{sysconfig/rc-inetd,rc.d/init.d}
 %endif
 
 # header files and lib
-install *.h $RPM_BUILD_ROOT%{_includedir}/%{name}
-install xdiff/*.h $RPM_BUILD_ROOT%{_includedir}/%{name}/xdiff
-install libgit.a $RPM_BUILD_ROOT%{_libdir}
-install xdiff/lib.a $RPM_BUILD_ROOT%{_libdir}/libgit_xdiff.a
+cp -a *.h $RPM_BUILD_ROOT%{_includedir}/%{name}
+cp -a xdiff/*.h $RPM_BUILD_ROOT%{_includedir}/%{name}/xdiff
+cp -a libgit.a $RPM_BUILD_ROOT%{_libdir}
+cp -a xdiff/lib.a $RPM_BUILD_ROOT%{_libdir}/libgit_xdiff.a
 
 # bash completion
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
@@ -444,6 +447,7 @@ ln -f $RPM_BUILD_ROOT{%{_libdir}/%{name},%{_bindir}}/git-upload-pack
 # remove unneeded files
 rm $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod
 rm $RPM_BUILD_ROOT%{perl_vendorarch}/auto/Git/.packlist
+%py_postclean
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -482,7 +486,10 @@ fi
 %defattr(644,root,root,755)
 %doc README contrib
 %attr(755,root,root) %{_bindir}/git
-%attr(755,root,root) %{_bindir}/git-*
+%attr(755,root,root) %{_bindir}/git-receive-pack
+%attr(755,root,root) %{_bindir}/git-shell
+%attr(755,root,root) %{_bindir}/git-upload-archive
+%attr(755,root,root) %{_bindir}/git-upload-pack
 
 %if %{with doc}
 %{_mandir}/man1/git-*.1*
@@ -602,6 +609,7 @@ fi
 
 %files cvs
 %defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/git-cvsserver
 %attr(755,root,root) %{_libdir}/%{name}/git-cvs*
 %if %{with doc}
 %{_mandir}/man1/git-cvs*.1*