[bacula] Further updates for 5.2.11
Simone Caronni
slaanesh at fedoraproject.org
Wed Sep 12 12:22:00 UTC 2012
commit 9716ec6b1daf1c4bda44435800ddf15ad8646535
Author: Simone Caronni <negativo17 at gmail.com>
Date: Wed Sep 12 14:21:33 2012 +0200
Further updates for 5.2.11
bacula-5.2.11-bat-build.patch | 34 ++++++++++++++++++++++++++++++++++
bacula-5.2.7-bat-build.patch | 27 ---------------------------
bacula.spec | 6 ++++--
3 files changed, 38 insertions(+), 29 deletions(-)
---
diff --git a/bacula-5.2.11-bat-build.patch b/bacula-5.2.11-bat-build.patch
new file mode 100644
index 0000000..24196c5
--- /dev/null
+++ b/bacula-5.2.11-bat-build.patch
@@ -0,0 +1,34 @@
+diff -Naur bacula-5.2.11.old/src/qt-console/bat.pro.in bacula-5.2.11/src/qt-console/bat.pro.in
+--- bacula-5.2.11.old/src/qt-console/bat.pro.in 2012-09-12 14:02:40.954271883 +0200
++++ bacula-5.2.11/src/qt-console/bat.pro.in 2012-09-12 14:03:21.913062191 +0200
+@@ -6,13 +6,13 @@
+ #
+ # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ #
+-CONFIG += qt debug @QWT@
++CONFIG += qt release @QWT@
+
+ bins.path = /$(DESTDIR)@sbindir@
+ bins.files = bat
+ confs.path = /$(DESTDIR)@sysconfdir@
+ confs.commands = ./install_conf_file
+-help.path = /$(DESTDIR)@docdir@
++help.path = /$(DESTDIR)@htmldir@
+ help.files = help/*.html images/status.png images/mail-message-new.png
+
+ TEMPLATE = app
+diff -Naur bacula-5.2.11.old/src/qt-console/main.cpp bacula-5.2.11/src/qt-console/main.cpp
+--- bacula-5.2.11.old/src/qt-console/main.cpp 2012-09-12 14:02:40.940271612 +0200
++++ bacula-5.2.11/src/qt-console/main.cpp 2012-09-12 14:03:04.496726144 +0200
+@@ -40,9 +40,9 @@
+ /*
+ * We need Qt version 4.7.4 or later to be able to comple correctly
+ */
+-#if QT_VERSION < 0x040704
++#if QT_VERSION < 0x040602
+ #error "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+-#error "You need Qt version 4.7.4 or later to build Bat"
++#error "You need Qt version 4.6.2 or later to build Bat"
+ #error "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+ #endif
+
diff --git a/bacula.spec b/bacula.spec
index 7a7b911..0eae4c2 100644
--- a/bacula.spec
+++ b/bacula.spec
@@ -31,7 +31,7 @@ Source19: bacula-checkconf
Patch1: bacula-5.0.2-openssl.patch
Patch2: bacula-5.2.2-queryfile.patch
Patch3: bacula-5.0.3-sqlite-priv.patch
-Patch4: bacula-5.2.7-bat-build.patch
+Patch4: bacula-5.2.11-bat-build.patch
BuildRequires: desktop-file-utils
BuildRequires: perl
@@ -734,7 +734,7 @@ fi
%files common
%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING LICENSE README SUPPORT VERIFYING ReleaseNotes
+%doc AUTHORS ChangeLog LICENSE SUPPORT ReleaseNotes
%doc README.Fedora
%config(noreplace) %{_sysconfdir}/logrotate.d/bacula
%dir %{_sysconfdir}/%{name}
@@ -886,6 +886,8 @@ fi
* Tue Sep 11 2012 Simone Caronni <negativo17 at gmail.com> - 5.2.11-1
- Update to 5.2.11.
- Removed upstreamed patches.
+- Updated bat patch.
+- Removed useless docs.
* Tue Sep 11 2012 Simone Caronni <negativo17 at gmail.com> - 5.2.10-7
- Add Fedora 18 systemd macros.
More information about the scm-commits
mailing list