rpms/bacula
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Further updates for 5.2.11

Browse Source
This commit is contained in:
Simone Caronni 2012-09-12 14:21:33 +02:00
parent b41046967f
commit 9716ec6b1d
3 changed files with 38 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
bacula-5.2.11-bat-build.patch Normal file
View File

@ -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

27
bacula-5.2.7-bat-build.patch
View File

@ -1,27 +0,0 @@
diff -Naur bacula-5.2.7.old/src/qt-console/bat.pro.in bacula-5.2.7/src/qt-console/bat.pro.in
--- bacula-5.2.7.old/src/qt-console/bat.pro.in 2012-06-04 13:45:31.454418944 +0200
+++ bacula-5.2.7/src/qt-console/bat.pro.in 2012-06-04 13:47:37.730768564 +0200
@@ -6,7 +6,7 @@
#
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
#
-CONFIG += qt debug @QWT@
+CONFIG += qt release @QWT@
bins.path = /$(DESTDIR)@sbindir@
bins.files = bat
diff -Naur bacula-5.2.7.old/src/qt-console/main.cpp bacula-5.2.7/src/qt-console/main.cpp
--- bacula-5.2.7.old/src/qt-console/main.cpp 2012-06-04 13:45:31.446418795 +0200
+++ bacula-5.2.7/src/qt-console/main.cpp 2012-06-04 13:46:28.959489349 +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

6
bacula.spec
View File

@ -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@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@gmail.com> - 5.2.10-7
- Add Fedora 18 systemd macros.