OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 17-Oct-2009 22:48:28
Branch: HEAD Handle: 2009101721482800
Modified files:
openpkg-src/git git.spec
Log:
fix git manual page installation
Summary:
Revision Changes Path
1.157 +17 -3 openpkg-src/git/git.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/git/git.spec
============================================================================
$ cvs diff -u -r1.156 -r1.157 git.spec
--- openpkg-src/git/git.spec 17 Oct 2009 19:01:41 -0000 1.156
+++ openpkg-src/git/git.spec 17 Oct 2009 20:48:28 -0000 1.157
@@ -43,12 +43,12 @@
Release: 20091017
# package options
+%option with_doc yes
%option with_cogito no
%option with_stgit no
%option with_guilt no
%option with_tig no
%option with_gcutils no
-%option with_doc no
# list of sources
Source0: http://www.kernel.org/pub/software/scm/git/git-%{V_git}.tar.gz
@@ -75,7 +75,7 @@
BuildPreReq: gzip
%endif
%if "%{with_doc}" == "yes"
-BuildPreReq: asciidoc, docbook2x
+BuildPreReq: asciidoc, xmlto
%endif
AutoReq: no
AutoReqProv: no
@@ -161,7 +161,7 @@
--disable-pthreads
%{l_make} %{l_mflags}
%if "%{with_doc}" == "yes"
- %{l_make} %{l_mflags} doc
+ ( cd Documentation; %{l_make} %{l_mflags} man ) || exit $?
%endif
) || exit $?
@@ -213,6 +213,20 @@
( cd git-%{V_git}
%{l_make} %{l_mflags} install \
DESTDIR=$RPM_BUILD_ROOT
+%if "%{with_doc}" == "yes"
+ ( cd Documentation
+ %{l_shtool} mkdir -f -p -m 755 \
+ $RPM_BUILD_ROOT%{l_prefix}/man/man1 \
+ $RPM_BUILD_ROOT%{l_prefix}/man/man5 \
+ $RPM_BUILD_ROOT%{l_prefix}/man/man7
+ %{l_shtool} install -c -m 644 \
+ *.1 $RPM_BUILD_ROOT%{l_prefix}/man/man1/
+ %{l_shtool} install -c -m 644 \
+ *.5 $RPM_BUILD_ROOT%{l_prefix}/man/man5/
+ %{l_shtool} install -c -m 644 \
+ *.7 $RPM_BUILD_ROOT%{l_prefix}/man/man7/
+ ) || exit $?
+%endif
) || exit $?
# install GIT web interface
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
