summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2005-07-15 01:24:23 (GMT)
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-15 18:38:24 (GMT)
commit49ce3d0c4e732bbabb7a2bda1d89d80eeb76d5b6 (patch)
tree01157dd768d39ab353b48fbc3eeaa5928d751b1b
parent87a81c834bf48f8cbf8778cae78ed553f3bbd32c (diff)
downloadgit-49ce3d0c4e732bbabb7a2bda1d89d80eeb76d5b6.zip
git-49ce3d0c4e732bbabb7a2bda1d89d80eeb76d5b6.tar.gz
git-49ce3d0c4e732bbabb7a2bda1d89d80eeb76d5b6.tar.bz2
[PATCH] Update the spec file so it can build and install the documentation
If you don't want the documentation simply build with make RPMBUILD="rpmbuild --without docs" Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--git-core.spec.in14
1 files changed, 10 insertions, 4 deletions
diff --git a/git-core.spec.in b/git-core.spec.in
index 0994510..5d1ffa3 100644
--- a/git-core.spec.in
+++ b/git-core.spec.in
@@ -1,3 +1,4 @@
+# Pass --without docs to rpmbuild if you don't want the documetnation
Name: git-core
Version: @@VERSION@@
Release: 1
@@ -7,7 +8,7 @@ License: GPL
Group: Development/Tools
URL: http://kernel.org/pub/software/scm/git/
Source: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz
-BuildRequires: zlib-devel, openssl-devel, curl-devel
+BuildRequires: zlib-devel, openssl-devel, curl-devel %{!?_without_docs:, xmlto, asciidoc > 6.0.3}
BuildRoot: %{_tmppath}/%{name}-%{version}-root
Prereq: sh-utils, diffutils, rsync, rcs, mktemp >= 1.5
@@ -23,11 +24,11 @@ similar to other SCM tools (like CVS, BitKeeper or Monotone).
%build
-make
+make all %{!?_without_docs: doc}
%install
rm -rf $RPM_BUILD_ROOT
-make dest=$RPM_BUILD_ROOT prefix=%{_prefix} install
+make dest=$RPM_BUILD_ROOT prefix=%{_prefix} mandir=%{_mandir} install %{!?_without_docs: install-doc}
%clean
rm -rf $RPM_BUILD_ROOT
@@ -35,8 +36,13 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
%{_bindir}/*
-%doc README COPYING Documentation/*
+%doc README COPYING Documentation/*.txt
+%{!?_without_docs: %doc Documentation/*.html }
+%{!?_without_docs: %{_mandir}/man1/*.1.gz}
+%{!?_without_docs: %{_mandir}/man7/*.7.gz}
%changelog
+* Thu Jul 14 2005 Eric Biederman <ebiederm@xmission.com>
+- Add the man pages, and the --without docs build option
* Wed Jul 7 2005 Chris Wright <chris@osdl.org>
- initial git spec file