- release 2

[packages/bacula.git] / bacula.spec

diff --git a/bacula.spec b/bacula.spec
index f30abedf71bd0743a20fa172756a9de1669f4559..b054a1560f9a5fac7e46e96a2653e715e451d028 100644 (file)
--- a/bacula.spec
+++ b/bacula.spec
@@ -27,7 +27,7 @@ Summary:      Bacula - The Network Backup Solution
 Summary(pl.UTF-8):     Bacula - rozwiązanie do wykonywania kopii zapasowych po sieci
 Name:          bacula
 Version:       5.0.2
-Release:       0.1
+Release:       2
 License:       extended GPL v2
 Group:         Networking/Utilities
 Source0:       http://downloads.sourceforge.net/bacula/%{name}-%{version}.tar.gz
@@ -49,7 +49,6 @@ Patch2:               %{name}-tinfo-readline.patch
 Patch3:                %{name}-branding.patch
 Patch4:                %{name}-conf.patch
 Patch5:                %{name}-desktop.patch
-Patch6:                %{name}-64bitbuild_fix.patch
 Patch7:                %{name}-dbi_fixes.patch
 Patch8:                %{name}-dbi_dbcheck.patch
 Patch9:                %{name}-openssl1.patch
@@ -58,6 +57,7 @@ BuildRequires:        acl-devel
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: gettext-devel
+BuildRequires: gtk+2-devel
 BuildRequires: libcap-devel
 %{?with_dbi:BuildRequires:     libdbi-devel >= 0.8.4}
 BuildRequires: libtool
@@ -65,26 +65,28 @@ BuildRequires:      libtool
 BuildRequires: fakeroot
 %endif
 BuildRequires: libwrap-devel
-BuildRequires: mtx
 BuildRequires: ncurses-devel
 BuildRequires: openssl-devel
 BuildRequires: pkgconfig
 %if %{with python}
 BuildRequires: python-devel
+BuildRequires: python-modules
 %endif
 %if %{with bat}
 BuildRequires: QtCore-devel
 BuildRequires: QtGui-devel
 BuildRequires: qt4-build >= 4.3.3-3
 BuildRequires: qt4-qmake >= 4.3.3-3
-BuildRequires: qwt-devel >= 5.0.2-2
+#BuildRequires:        qwt-devel >= 5.0.2-2
 %endif
 %{?with_mysql:BuildRequires:   mysql-devel}
 %{?with_pgsql:BuildRequires:   postgresql-devel}
 BuildRequires: readline-devel
+BuildRequires: rpm-pythonprov
 BuildRequires: rpmbuild(macros) >= 1.268
 BuildRequires: sed >= 4.0
 %{?with_sqlite3:BuildRequires: sqlite3-devel}
+BuildRequires: which
 %if %{with console_wx}
 BuildRequires: wxGTK2-unicode-devel >= 2.4.0
 %endif
@@ -457,11 +459,10 @@ Nagios plugin to check bacula.
 %setup -q -a 1
 %patch0 -p1
 %patch1 -p1
-#%patch2 -p1 CHECKME
+%patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-#%patch6 -p1
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
@@ -493,6 +494,7 @@ CPPFLAGS="-I/usr/include/ncurses -I%{_includedir}/readline"
 # to make sure it is full-featured
 for database in %{databases}; do
        WXCONFIG=%{_bindir}/wx-gtk2-unicode-config \
+       QMAKE=%{_bindir}/qt4-qmake \
        %configure \
                --with-scriptdir=%{_libexecdir}/%{name} \
                %{?with_bat:--enable-bat} \