- release 3

[packages/bacula.git] / bacula.spec

diff --git a/bacula.spec b/bacula.spec
index e0655bbd1fdd07b6c0957bc713e3f4041614d2c6..1057f95d815b7340f89bf0c926d4dbbb71aa08f3 100644 (file)
--- a/bacula.spec
+++ b/bacula.spec
@@ -15,24 +15,24 @@
 %bcond_with    sqlite3                 # use SQLite3 instead of SQLite 2
 %bcond_with    sqlite3_sync_off        # makes SQLite3 backend much faster, but less reliable
 %if %{with sqlite}
-%define                _database       sqlite
+%define                database        sqlite
 %undefine       with_mysql
 %undefine       with_pgsql
 %endif
 %if %{with sqlite3}
-%define                _database       sqlite3
+%define                database        sqlite3
 %undefine       with_sqlite
 %undefine       with_mysql
 %undefine       with_pgsql
 %endif
 %if %{with pgsql}
-%define                _database       postgresql
+%define                database        postgresql
 %undefine       with_sqlite
 %undefine       with_sqlite3
 %undefine       with_mysql
 %endif
 %if %{with mysql}
-%define                _database       mysql
+%define                database        mysql
 %undefine       with_sqlite
 %undefine       with_sqlite3
 %undefine       with_pgsql
@@ -42,17 +42,17 @@
 Summary:       Bacula - The Network Backup Solution
 Summary(pl.UTF-8):     Bacula - rozwiązanie do wykonywania kopii zapasowych po sieci
 Name:          bacula
-Version:       2.2.6
-Release:       4
+Version:       2.4.4
+Release:       3
 Epoch:         0
 License:       extended GPL v2
 Group:         Networking/Utilities
 Source0:       http://dl.sourceforge.net/bacula/%{name}-%{version}.tar.gz
-# Source0-md5: fe964931ab3fc538a8884204d23e8a5a
+# Source0-md5: 4eb6155b45611018af03002d37a2ffde
 Source1:       http://dl.sourceforge.net/bacula/%{name}-docs-%{version}.tar.bz2
-# Source1-md5: a251dc0b5a2c8250b43e2ae372526de2
+# Source1-md5: d9bb3e8ca8c9a4c741b83569c21a4806
 Source2:       http://dl.sourceforge.net/bacula/%{name}-rescue-%{version}.tar.gz
-# Source2-md5: 51bc4b1e5d60593cb9f9aa80d31ad8e4
+# Source2-md5: 320f95575591d285c3192e58912322c4
 Source10:      %{name}-dir.init
 Source11:      %{name}-fd.init
 Source12:      %{name}-sd.init
@@ -66,13 +66,7 @@ Patch2:              %{name}-mysql.patch
 Patch3:                %{name}-tinfo-readline.patch
 Patch4:                %{name}-branding.patch
 Patch5:                %{name}-conf.patch
-Patch10:       2.2.6-add.patch
-Patch11:       2.2.6-dvdwrite_trialfix.patch
-Patch12:       2.2.6-queued-msg.patch
-Patch13:       2.2.6-backup-restore-socket.patch
-Patch14:       2.2.6-mac-build.patch
-Patch15:       2.2.6-status.patch
-
+Patch6:                %{name}-nostatic.patch
 URL:           http://www.bacula.org/
 BuildRequires: acl-static
 BuildRequires: automake
@@ -97,17 +91,17 @@ BuildRequires:      python-static
 %if %{with bat}
 BuildRequires: QtCore-devel
 BuildRequires: QtGui-devel
-BuildRequires: qt4-build
-BuildRequires: qt4-qmake
+BuildRequires: qt4-build >= 4.3.3-3
+BuildRequires: qt4-qmake >= 4.3.3-3
 BuildRequires: qwt-devel >= 5.0.2-2
 %endif
+%{?with_mysql:BuildRequires:   mysql-devel}
+%{?with_pgsql:BuildRequires:   postgresql-devel}
 BuildRequires: readline-devel
 BuildRequires: rpmbuild(macros) >= 1.268
 BuildRequires: sed >= 4.0
 %{?with_sqlite:BuildRequires:  sqlite-devel}
 %{?with_sqlite3:BuildRequires: sqlite3-devel}
-%{?with_mysql:BuildRequires:   mysql-devel}
-%{?with_pgsql:BuildRequires:   postgresql-devel}
 %if %{with console_wx}
 BuildRequires: wxGTK2-unicode-devel >= 2.4.0
 %endif
@@ -205,7 +199,7 @@ maintaining the file indexes and volume databases for all files backed
 up. The Catalog services permit the System Administrator or user to
 quickly locate and restore any desired file, since it maintains a
 record of all Volumes used, all Jobs run, and all Files saved. This
-build requires sqlite%{?with_sqlite3:3} to be installed separately as the catalog
+build requires %{database} to be installed separately as the catalog
 database.
 
 %description dir -l pl.UTF-8
@@ -220,8 +214,8 @@ i bazą danych wolumenów dla wszystkich kopiowanych plików. Usługi
 katalogowe umożliwiają administratorowi lub użytkownikowi szybko
 zlokalizować i odtworzyć dowolny plik, ponieważ utrzymują rekord ze
 wszystkimi używanymi wolumenami, uruchomionymi zadaniami i zapisanymi
-plikami. Pakiet wymaga %{_database} zainstalowanego oddzielnie jako bazy
-danych dla katalogu.
+plikami. Pakiet wymaga %{database} zainstalowanego oddzielnie jako
+bazy danych dla katalogu.
 
 %package console
 Summary:       Bacula Console
@@ -289,8 +283,8 @@ użytkownikowi komunikowanie się z programem Bacula Director. To jest
 interfejs graficzny oparty na GNOME.
 
 %package console-qt4
-Summary:       Bacula QT4 Console
-Summary(pl.UTF-8):     Konsola Baculi oparta na QT4
+Summary:       Bacula Qt4 Console
+Summary(pl.UTF-8):     Konsola Baculi oparta na Qt4
 Group:         Networking/Utilities
 Requires(post):        sed >= 4.0
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
@@ -300,14 +294,14 @@ Bacula - It comes by night and sucks the vital essence from your
 computers.
 
 Bacula Console is the program that allows the administrator or user to
-communicate with the Bacula Director. This is the QT4 GUI interface.
+communicate with the Bacula Director. This is the Qt4 GUI interface.
 
 %description console-qt4 -l pl.UTF-8
 Bacula - przychodzi nocą i wysysa żywotny ekstrakt z komputerów.
 
 Bacula Console to program umożliwiający administratorowi lub
 użytkownikowi komunikowanie się z programem Bacula Director. To jest
-interfejs graficzny oparty na QT4.
+interfejs graficzny oparty na Qt4.
 
 %package tray-monitor
 Summary:       Bacula Tray Monitor
@@ -448,13 +442,7 @@ danego systemu, należy ponownie uruchomić ./getdiskinfo .
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-
-%patch10 -p0
-%patch11 -p0
-%patch12 -p0
-%patch13 -p0
-%patch14 -p0
-%patch15 -p0
+%patch6 -p1
 
 tar -xf %{SOURCE2} && ln -s bacula-rescue-* rescue
 
@@ -488,7 +476,7 @@ WXCONFIG=%{_bindir}/wx-gtk2-unicode-config \
        --with-pid-dir=/var/run \
        --with-subsys-dir=/var/lock/subsys \
        --enable-batch-insert \
-       --with-%{_database} \
+       --with-%{database} \
        %{?with_sqlite3_sync_off:--enable-extra-sqlite3-init="pragma synchronous=0;"} \
        --with-dir-password="#FAKE-dir-password#" \
        --with-fd-password="#FAKE-fd-password#" \
@@ -500,7 +488,7 @@ WXCONFIG=%{_bindir}/wx-gtk2-unicode-config \
 
 %if %{with bat}
 cd src/qt-console
-qt4-qmake bat.pro
+qmake-qt4 bat.pro
 cd ../..
 %endif
 
@@ -628,7 +616,7 @@ else
        echo "Backing up bacula tables"
        echo ".dump" | sqlite%{?with_sqlite3:3} %{_localstatedir}/bacula.db | bzip2 > %{_localstatedir}/bacula_backup.sql.bz2
 
-       db_type="%{_database}"
+       db_type="%{database}"
 
        next_ver=$(($DB_VER + 1))
        # support up to version 30; increase this if needed