- bcond header

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

diff --git a/git-core.spec b/git-core.spec
index b7a88e001b5b8299e49ca18b6cfaaad3ea4132bb..be0f47f6ae392a85de6f7cd58346e0e30208b91a 100644 (file)
--- a/git-core.spec
+++ b/git-core.spec
@@ -1,17 +1,20 @@
 # TODO:
 # - gitweb subpackage
 # - gitk subpackage?
+#
+# Conditional build:
+%bcond_without tests   # don't perform make test
+#
 %include       /usr/lib/rpm/macros.perl
 Summary:       The stupid content tracker
 Summary(pl.UTF-8):     Prymitywne narzędzie do śledzenia treści
 Name:          git-core
-Version:       1.5.0.1
+Version:       1.5.2.1
 Release:       1
 License:       GPL v2
 Group:         Development/Tools
 Source0:       http://www.kernel.org/pub/software/scm/git/git-%{version}.tar.bz2
-# Source0-md5: 7bcc47e3a7b79229e897c9242b7e33e6
-Patch0:                %{name}-build.patch
+# Source0-md5: 0a39e786a12974cbe7b14f2fe92dc163
 URL:           http://git.or.cz/
 BuildRequires: asciidoc
 BuildRequires: autoconf
@@ -31,6 +34,7 @@ Requires:     diffutils
 Requires:      findutils
 Requires:      grep
 Requires:      openssh-clients
+Requires:      perl-Error
 Requires:      rcs
 Requires:      sed
 Requires:      tk
@@ -103,7 +107,6 @@ wykonania przy użyciu ogólnego interfejsu poleceń.
 
 %prep
 %setup -q -n git-%{version}
-%patch0 -p1
 
 %build
 %{__aclocal}
@@ -116,6 +119,8 @@ wykonania przy użyciu ogólnego interfejsu poleceń.
 
 %{__make} -C Documentation
 
+%{?with_tests:%{__make} test}
+
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_includedir}/%{name}/xdiff
@@ -141,8 +146,8 @@ rm -rf $RPM_BUILD_ROOT
 %doc README Documentation/*.html Documentation/howto Documentation/technical
 %attr(755,root,root) %{_bindir}/*
 %{_mandir}/man*/*
-%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/*
+%{_datadir}/%{name}
+%{_datadir}/git-gui
 
 %files devel
 %defattr(644,root,root,755)