Author: arekm Date: Sat Nov 24 18:16:50 2007 GMT
Module: SPECS Tag: HEAD
---- Log message:
- rel 2; switch to mysql (it's recommended for serious tasks); fix
mysql/wxwidgets detection; enable batch-insert
---- Files affected:
SPECS:
bacula.spec (1.76 -> 1.77)
---- Diffs:
================================================================
Index: SPECS/bacula.spec
diff -u SPECS/bacula.spec:1.76 SPECS/bacula.spec:1.77
--- SPECS/bacula.spec:1.76 Wed Nov 14 23:07:17 2007
+++ SPECS/bacula.spec Sat Nov 24 19:16:45 2007
@@ -7,9 +7,9 @@
# Conditional build:
%bcond_without console_wx # wx-console program
%bcond_without gnome # gnome-console program
-%bcond_without sqlite # use sqlite
+%bcond_with sqlite # use sqlite
%bcond_without bat # bat Qt4 GUI
-%bcond_with mysql # use mysql
+%bcond_without mysql # use mysql
%bcond_with pgsql # use PostgreSQL
%bcond_with python
%bcond_with rescue
@@ -42,7 +42,7 @@
Summary(pl.UTF-8): Bacula - rozwiązanie do wykonywania kopii zapasowych po
sieci
Name: bacula
Version: 2.2.6
-Release: 1
+Release: 2
Epoch: 0
License: extended GPL v2
Group: Networking/Utilities
@@ -61,9 +61,8 @@
Source16: %{name}-sd.sysconfig
Patch0: %{name}-dvd-handler_path.patch
Patch1: %{name}-link.patch
-Patch2: %{name}-compile.patch
-Patch3: %{name}-wx28.patch
-Patch4: %{name}-sqlite3_init_query.patch
+Patch2: %{name}-mysql.patch
+Patch3: %{name}-tinfo-readline.patch
URL: http://www.bacula.org/
BuildRequires: acl-static
BuildRequires: automake
@@ -435,13 +434,11 @@
%patch0 -p1
%patch1 -p1
-#%patch2 -p1
-#%patch3 -p1
-#%patch4 -p1
+%patch2 -p1
+%patch3 -p1
tar -xf %{SOURCE2} && ln -s bacula-rescue-* rescue
-sed -i -e 's#wx-config#wx-gtk2-unicode-config#g' configure*
-sed -i -e 's#-lreadline -lhistory -ltermcap#-lreadline -lhistory#g' configure*
+
sed -i -e 's#bindir=.*#bindir=%{_bindir}#g' \
src/cats/create_* src/cats/delete_* src/cats/drop_* \
src/cats/grant_* src/cats/make_* src/cats/update_*
@@ -449,7 +446,11 @@
%build
cp -f %{_datadir}/automake/config.sub autoconf
+cd autoconf && %{__aclocal} -I bacula-macros -I gettext-macros && cd ..
+%{__autoconf} --prepend-include=$(pwd)/autoconf autoconf/configure.in >
configure
+
CPPFLAGS="-I/usr/include/ncurses -I%{_includedir}/readline"
+WXCONFIG=%{_bindir}/wx-gtk2-unicode-config \
%configure \
--with-scriptdir=%{_libexecdir}/%{name} \
--%{!?with_gnome:dis}%{?with_gnome:en}able-gnome \
@@ -467,6 +468,7 @@
--with-smtp-host=localhost \
--with-pid-dir=/var/run \
--with-subsys-dir=/var/lock/subsys \
+ --enable-batch-insert \
--with-%{_database} \
%{?with_sqlite3_sync_off:--enable-extra-sqlite3-init="pragma
synchronous=0;"} \
--with-dir-password="#FAKE-dir-password#" \
@@ -931,6 +933,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.77 2007-11-24 18:16:45 arekm
+- rel 2; switch to mysql (it's recommended for serious tasks); fix
mysql/wxwidgets detection; enable batch-insert
+
Revision 1.76 2007-11-14 22:07:17 areq
- BR qt4-build
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/bacula.spec?r1=1.76&r2=1.77&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
