OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 21-Jul-2005 14:09:51
Branch: HEAD Handle: 2005072113095100
Modified files:
openpkg-src/bacula bacula.spec
Log:
re-add 'odoc' support, although it perhaps is still not in its final
shape
Summary:
Revision Changes Path
1.6 +12 -3 openpkg-src/bacula/bacula.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/bacula/bacula.spec
============================================================================
$ cvs diff -u -r1.5 -r1.6 bacula.spec
--- openpkg-src/bacula/bacula.spec 20 Jul 2005 20:02:01 -0000 1.5
+++ openpkg-src/bacula/bacula.spec 21 Jul 2005 12:09:51 -0000 1.6
@@ -22,7 +22,7 @@
## SUCH DAMAGE.
##
-# FIXME: rse: re-add "odoc" once its issues are resolved, too.
+# FIXME: rse: "odoc" support still not in final shape
# package component versions
%define V_bacula 1.37.30
@@ -39,7 +39,7 @@
Group: System
License: GPL
Version: %{V_bacula}
-Release: 20050720
+Release: 20050721
# package options
%option with_server yes
@@ -61,7 +61,7 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20040712, gcc
+BuildPreReq: OpenPKG, openpkg >= 20040712, gcc, odoc
PreReq: OpenPKG, openpkg >= 20040712
BuildPreReq: readline, zlib
PreReq: readline, zlib
@@ -199,6 +199,14 @@
-e 's,/usr/share/doc/bacula-<version>,%{l_prefix}/doc/bacula,' \
scripts/bacula.man $RPM_BUILD_ROOT%{l_prefix}/man/man8/bacula.8
+ # install documentation
+ if %{l_odoc} -F; then
+ echo "WARNING: will not package auxiliary documentation" 1>&2
+ else
+ mv ../bacula-doc-%{V_doc}/* $RPM_BUILD_ROOT%{l_docdir}/bacula/
+ %{l_odoc} -ame %{_specdir}/bacula.spec
+ fi
+
# determine installation files
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%{l_files_std} \
@@ -211,6 +219,7 @@
'%config %{l_prefix}/etc/bacula/bacula-dir.conf'
%files -f files
+ %docdir %{l_docdir}
%clean
rm -rf $RPM_BUILD_ROOT
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
