SPECS: git-core.spec - more R/BR; build/install fixes

[arekm]

Author: arekm                        Date: Thu Dec 14 23:36:42 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- more R/BR; build/install fixes

---- Files affected:
SPECS:
   git-core.spec (1.45 -> 1.46) 

---- Diffs:

================================================================
Index: SPECS/git-core.spec
diff -u SPECS/git-core.spec:1.45 SPECS/git-core.spec:1.46
--- SPECS/git-core.spec:1.45	Thu Dec 14 17:25:09 2006
+++ SPECS/git-core.spec	Fri Dec 15 00:36:37 2006
@@ -1,6 +1,7 @@
 # $Revision$, $Date$
 # 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
@@ -13,6 +14,8 @@
 # Source0-md5:	c4f72d96f62ae97c6e8d5cdb4afd55ca
 URL:		http://git.or.cz/
 BuildRequires:	asciidoc
+BuildRequires:	autoconf
+BuildRequires:	automake
 BuildRequires:	curl-devel
 BuildRequires:	expat-devel
 BuildRequires:	openssl-devel
@@ -23,10 +26,14 @@
 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
@@ -98,14 +105,14 @@
 %setup -q -n git-%{version}
 
 %build
-%{__make} \
-	prefix=%{_prefix} \
-	CC="%{__cc}" \
-	CFLAGS="%{rpmcflags}" \
-	LDFLAGS="%{rpmldflags}"
+%{__aclocal}
+%{__autoconf}
+%configure \
+	--with-openssl
 
 # once again to get perl paths stright
 cd perl
+rm -f Makefile
 %{__perl} Makefile.PL \
 	INSTALLDIRS=vendor
 %{__make}
@@ -118,13 +125,9 @@
 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}
@@ -159,6 +162,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.46  2006/12/14 23:36:37  arekm
+- more R/BR; build/install fixes
+
 Revision 1.45  2006/12/14 16:25:09  arekm
 R: rcs for merge binary
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/git-core.spec?r1=1.45&r2=1.46&f=u