X-Git-Url: http://git.pld-linux.org/?p=packages%2Fgit-core.git;a=blobdiff_plain;f=git-core.spec;h=05acd2abb2026d68bdb4fcf57bdcac7985639413;hp=cbeda592ce47b74e61e5e4c62fc18a8705a38127;hb=244b2fbabd4705ed31cd71ce8076d8c8584fa726;hpb=d6b20e686c32c7ffb210f5a2317491578b25eabe

diff --git a/git-core.spec b/git-core.spec
index cbeda59..05acd2a 100644
--- a/git-core.spec
+++ b/git-core.spec
@@ -1,15 +1,21 @@
+# TODO:
+# - gitweb subpackage
+# - gitk subpackage?
 %include	/usr/lib/rpm/macros.perl
 Summary:	The stupid content tracker
 Summary(pl):	Prymitywne narzêdzie do ¶ledzenia tre¶ci
 Name:		git-core
-Version:	1.4.3.5
+Version:	1.4.4.4
 Release:	1
 License:	GPL v2
 Group:		Development/Tools
 Source0:	http://www.kernel.org/pub/software/scm/git/git-%{version}.tar.bz2
-# Source0-md5:	db7c8dad84643b9f6744a0eca22521c7
+# Source0-md5:	970aceba959e7fe92f065d7509e6db51
+Patch0:		%{name}-build.patch
 URL:		http://git.or.cz/
 BuildRequires:	asciidoc
+BuildRequires:	autoconf
+BuildRequires:	automake
 BuildRequires:	curl-devel
 BuildRequires:	expat-devel
 BuildRequires:	openssl-devel
@@ -19,6 +25,15 @@ BuildRequires:	python
 BuildRequires:	rpm-perlprov >= 4.1-13
 BuildRequires:	xmlto
 BuildRequires:	zlib-devel
+Requires:	coreutils
+Requires:	curl
+Requires:	diffutils
+Requires:	findutils
+Requires:	grep
+Requires:	openssh-clients
+Requires:	rcs
+Requires:	sed
+Requires:	tk
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -62,7 +77,7 @@ Group:		Development/Libraries
 %description devel
 Header files for git-core.
 
-%description devel
+%description devel -l pl
 Pliki nag³ówkowe dla git-core.
 
 %package -n perl-Git
@@ -88,20 +103,16 @@ wykonania przy u
 
 %prep
 %setup -q -n git-%{version}
+%patch0 -p1
 
 %build
+%{__aclocal}
+%{__autoconf}
+%configure \
+	--with-openssl
+
 %{__make} \
-	prefix=%{_prefix} \
-	CC="%{__cc}" \
-	CFLAGS="%{rpmcflags}" \
-	LDFLAGS="%{rpmldflags}"
-
-# once again to get perl paths stright
-cd perl
-%{__perl} Makefile.PL \
 	INSTALLDIRS=vendor
-%{__make}
-cd ..
 
 %{__make} -C Documentation
 
@@ -110,13 +121,9 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_includedir}/%{name}/xdiff
 
 %{__make} install \
-	prefix=%{_prefix} \
-	CFLAGS="%{rpmcflags}" \
 	DESTDIR=$RPM_BUILD_ROOT
 
 %{__make} -C Documentation install \
-	prefix=%{_prefix} \
-	mandir=%{_mandir} \
 	DESTDIR=$RPM_BUILD_ROOT
 
 install *.h $RPM_BUILD_ROOT%{_includedir}/%{name}