OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Matthias Kurz
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 08-Jan-2006 21:57:45
Branch: HEAD Handle: 2006010820574500
Modified files:
openpkg-src/bacula bacula.spec
Log:
- upgraded docs
- removed support for wx-console and traymonitor (they add more problems
than value)
- at least under SuSE 10.0.42 libtermcap is under /usr/lib/termcap
Summary:
Revision Changes Path
1.20 +11 -27 openpkg-src/bacula/bacula.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/bacula/bacula.spec
============================================================================
$ cvs diff -u -r1.19 -r1.20 bacula.spec
--- openpkg-src/bacula/bacula.spec 1 Jan 2006 13:12:12 -0000 1.19
+++ openpkg-src/bacula/bacula.spec 8 Jan 2006 20:57:45 -0000 1.20
@@ -26,7 +26,7 @@
# package component versions
%define V_bacula 1.38.3
-%define V_doc 20050823
+%define V_doc 1.38.3
# package information
Name: bacula
@@ -39,7 +39,7 @@
Group: System
License: GPL
Version: %{V_bacula}
-Release: 20051213
+Release: 20060108
# package options
%option with_server yes
@@ -48,8 +48,6 @@
%option with_dvd no
%option with_mtx no
%option with_python no
-%option with_wxconsole no
-%option with_traymonitor no
%option with_db_sqlite no
%option with_db_pgsql no
%option with_db_mysql no
@@ -61,8 +59,8 @@
%endif
# list of sources
-Source0: http://osdn.dl.sourceforge.net/bacula/bacula-%{version}.tar.gz
-Source1:
ftp://ftp.openpkg.org/sources/CPY/VERSIONED/bacula/bacula-doc-%{V_doc}.tar.gz
+Source0: http://osdn.dl.sourceforge.net/bacula/bacula-%{V_bacula}.tar.gz
+Source1:
ftp://ftp.openpkg.org/sources/CPY/VERSIONED/bacula/bacula-doc-%{V_doc}.t.bz2
Source2: rc.bacula
Source3: bexec.sh
Patch0: bacula.patch
@@ -106,14 +104,6 @@
BuildPreReq: python
PreReq: python
%endif
-%if "%{with_wxconsole}" == "yes"
-BuildPreReq: wx
-PreReq: wx
-%endif
-%if "%{with_traymonitor}" == "yes"
-BuildPreReq: gtk2
-PreReq: gtk2
-%endif
AutoReq: no
AutoReqProv: no
@@ -161,10 +151,14 @@
configure
# configure
+ LIBS=
+ case "%{l_platform -t}" in
+ *-linux*) LIBS="-L/usr/lib/termcap";;
+ esac
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
CPPFLAGS="%{l_cppflags}" \
- LDFLAGS="%{l_ldflags}" \
+ LDFLAGS="%{l_ldflags} $LIBS" \
./configure \
--prefix=%{l_prefix} \
--with-dir-user=%{l_rusr} \
@@ -197,9 +191,7 @@
%if "%{with_python}" == "yes" || "%{with_dvd}" == "yes"
--with-python=%{l_prefix} \
%endif
-%if "%{with_wxconsole}" == "yes"
- --enable-wx-console=yes \
-%endif
+ --enable-wx-console=no \
--sysconfdir=%{l_prefix}/etc/bacula \
--mandir=%{l_prefix}/man \
--with-scriptdir=%{l_prefix}/libexec/bacula \
@@ -294,15 +286,7 @@
'%attr(640,-,%{l_rgrp}) %{l_prefix}/etc/bacula/bacula-sd.conf' \
'%attr(640,-,-) %{l_prefix}/etc/bacula/bacula-fd.conf' \
'%attr(640,-,%{l_rgrp}) %{l_prefix}/etc/bacula/bacula-dir.conf' \
- '%attr(640,-,-) %{l_prefix}/etc/bacula/bconsole.conf' \
-%if "%{with_wxconsole}" == "yes"
- '%config(noreplace) %{l_prefix}/etc/bacula/wx-console.conf' \
- '%attr(640,-,-) %{l_prefix}/etc/bacula/wx-console.conf' \
-%endif
-%if "%{with_traymonitor}" == "yes"
- '%config(noreplace) %{l_prefix}/etc/bacula/tray-monitor.conf' \
- '%attr(640,-,-) %{l_prefix}/etc/bacula/tray-monitor.conf'
-%endif
+ '%attr(640,-,-) %{l_prefix}/etc/bacula/bconsole.conf'
%files -f files
%docdir %{l_docdir}
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
