[packages/bacula] adapterized

jajcus jajcus at pld-linux.org
Wed Dec 4 21:11:40 CET 2013


commit 82139dcc545cce1c5a97df7daf7804cdd3109a5d
Author: Jacek Konieczny <jajcus at jajcus.net>
Date:   Wed Dec 4 21:09:15 2013 +0100

    adapterized

 bacula.spec | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/bacula.spec b/bacula.spec
index fba4860..41745d1 100644
--- a/bacula.spec
+++ b/bacula.spec
@@ -91,8 +91,8 @@ BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.644
 BuildRequires:	sed >= 4.0
 %{?with_sqlite3:BuildRequires:	sqlite3-devel}
-Requires:	systemd-units >= 38
 BuildRequires:	which
+Requires:	systemd-units >= 38
 %if %{with wx}
 BuildRequires:	wxGTK2-unicode-devel >= 2.4.0
 %endif
@@ -264,14 +264,14 @@ Group:		Networking/Utilities
 Requires(post):	sed >= 4.0
 Requires:	%{name}-common = %{version}-%{release}
 Requires:	QtCore >= %{qtver}
-Obsoletes:	%{name}-console-qt4 < %{version}-%{release}
+Obsoletes:	bacula-console-qt4 < %{version}-%{release}
 
 %description console-qt
 Bacula - It comes by night and sucks the vital essence from your
 computers.
 
-bat is short for Bacula Administration Tool. It is a GUI form of bconsole, but
-with many additional features.
+bat is short for Bacula Administration Tool. It is a GUI form of
+bconsole, but with many additional features.
 
 %description console-qt -l pl.UTF-8
 Bacula - przychodzi nocą i wysysa żywotny ekstrakt z komputerów.
@@ -336,8 +336,8 @@ Summary(pl.UTF-8):	Usługi Bacula Storage
 Group:		Networking/Utilities
 Requires(post):	sed >= 4.0
 Requires:	%{name}-common = %{version}-%{release}
+Suggests:	mtx
 Conflicts:	dvd+rw-tools <= 5.21.4.10.8-1
-Suggests:   mtx
 
 %description sd
 Bacula - It comes by night and sucks the vital essence from your
@@ -452,8 +452,8 @@ Requires:	nagios-common
 %description -n nagios-plugin-check_bacula
 Nagios plugin to check bacula.
 
-# provided by various db libraries as a symlink
 %define	_noautoreq	libbaccats-%{version}.so
+# provided by various db libraries as a symlink
 
 %prep
 %setup -q -a 1
@@ -501,7 +501,7 @@ QMAKE=%{_bindir}/qmake-qt4 \
 	--with-smtp-host=localhost \
 	--with-pid-dir=/var/run \
 	--with-subsys-dir=/var/lock/subsys \
-	--with-systemd=/lib/systemd/system \
+	--with-systemd=%{systemdunitdir} \
 	--enable-batch-insert \
 	%{?with_pgsql:--with-postgresql} \
 	%{?with_mysql:--with-mysql} \
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/bacula.git/commitdiff/22ac31cb66b80957241a2b5d5976e0959d273849



More information about the pld-cvs-commit mailing list