SPECS (AC-branch): git-core.spec - merged 1.5.0 from HEAD

[glen]

Author: glen                         Date: Wed Feb 14 22:36:04 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- merged 1.5.0 from HEAD

---- Files affected:
SPECS:
   git-core.spec (1.42 -> 1.42.2.1) 

---- Diffs:

================================================================
Index: SPECS/git-core.spec
diff -u SPECS/git-core.spec:1.42 SPECS/git-core.spec:1.42.2.1
--- SPECS/git-core.spec:1.42	Thu Dec  7 21:43:07 2006
+++ SPECS/git-core.spec	Wed Feb 14 23:35:59 2007
@@ -1,16 +1,22 @@
 # $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
 Name:		git-core
-Version:	1.4.4.2
+Version:	1.5.0
 Release:	1
 License:	GPL v2
 Group:		Development/Tools
 Source0:	http://www.kernel.org/pub/software/scm/git/git-%{version}.tar.bz2
-# Source0-md5:	c4f72d96f62ae97c6e8d5cdb4afd55ca
+# Source0-md5:	5c3e163ac201695c9bfd5a19d730303c
+Patch0:		%{name}-build.patch
 URL:		http://git.or.cz/
 BuildRequires:	asciidoc
+BuildRequires:	autoconf
+BuildRequires:	automake
 BuildRequires:	curl-devel
 BuildRequires:	expat-devel
 BuildRequires:	openssl-devel
@@ -20,6 +26,15 @@
 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
@@ -89,20 +104,16 @@
 
 %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
 
@@ -111,13 +122,10 @@
 install -d $RPM_BUILD_ROOT%{_includedir}/%{name}/xdiff
 
 %{__make} install \
-	prefix=%{_prefix} \
-	CFLAGS="%{rpmcflags}" \
+	INSTALLDIRS=vendor \
 	DESTDIR=$RPM_BUILD_ROOT
 
 %{__make} -C Documentation install \
-	prefix=%{_prefix} \
-	mandir=%{_mandir} \
 	DESTDIR=$RPM_BUILD_ROOT
 
 install *.h $RPM_BUILD_ROOT%{_includedir}/%{name}
@@ -152,6 +160,39 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.42.2.1  2007/02/14 22:35:59  glen
+- merged 1.5.0 from HEAD
+
+Revision 1.52  2007/02/14 20:03:12  arekm
+- up to 1.5.0
+
+Revision 1.51  2007/02/13 07:16:45  glen
+- tabs in preamble
+
+Revision 1.50  2007/02/12 00:48:52  baggins
+- converted to UTF-8
+
+Revision 1.49  2007/02/11 22:30:25  qrczak
+- Fixed language tag.
+
+Revision 1.48  2007/01/08 08:50:56  arekm
+- up to 1.4.4.4
+
+Revision 1.47  2006/12/21 00:08:41  arekm
+- up to 1.4.4.3
+
+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
+
+Revision 1.44  2006/12/08 21:19:28  arekm
+TODO: gitweb subpackage
+
+Revision 1.43  2006/12/08 16:46:14  arekm
+- add missing R:
+
 Revision 1.42  2006/12/07 20:43:07  arekm
 - up to 1.4.4.2
 
================================================================

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