packages: bacula/bacula.spec - disable bat for ac (needs newer qt than avai...
glen
glen at pld-linux.org
Fri Dec 9 14:42:28 CET 2011
Author: glen Date: Fri Dec 9 13:42:28 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- disable bat for ac (needs newer qt than available)
---- Files affected:
packages/bacula:
bacula.spec (1.191 -> 1.192)
---- Diffs:
================================================================
Index: packages/bacula/bacula.spec
diff -u packages/bacula/bacula.spec:1.191 packages/bacula/bacula.spec:1.192
--- packages/bacula/bacula.spec:1.191 Fri Dec 9 12:41:03 2011
+++ packages/bacula/bacula.spec Fri Dec 9 14:42:23 2011
@@ -7,7 +7,11 @@
#
# Conditional build:
%bcond_without console_wx # wx-console program
+%if "%{pld_release}" == "ac"
+%bcond_with bat # bat Qt4 GUI
+%else
%bcond_without bat # bat Qt4 GUI
+%endif
%bcond_without mysql # use MySQL
%bcond_without pgsql # use PostgreSQL
%bcond_without sqlite3 # use SQLite3
@@ -75,6 +79,7 @@
%{?with_mysql:BuildRequires: mysql-devel}
%{?with_pgsql:BuildRequires: postgresql-devel}
BuildRequires: readline-devel
+BuildRequires: rpm >= 4.4.9-56
BuildRequires: rpm-pythonprov
BuildRequires: rpmbuild(macros) >= 1.268
BuildRequires: sed >= 4.0
@@ -245,8 +250,8 @@
Summary(pl.UTF-8): Konsola Baculi oparta na Qt4
Group: Networking/Utilities
Requires(post): sed >= 4.0
-Requires: QtCore >= %{qtver}
Requires: %{name}-common = %{version}-%{release}
+Requires: QtCore >= %{qtver}
%description console-qt4
Bacula - It comes by night and sucks the vital essence from your
@@ -988,6 +993,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.192 2011/12/09 13:42:23 glen
+- disable bat for ac (needs newer qt than available)
+
Revision 1.191 2011/12/09 11:41:03 glen
- warn on disk space on upgrade
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/bacula/bacula.spec?r1=1.191&r2=1.192&f=u
More information about the pld-cvs-commit
mailing list