[bacula] Update to 5.2.11

Simone Caronni slaanesh at fedoraproject.org
Wed Sep 12 11:21:01 UTC 2012


commit b41046967fbc4e58867ef1749d608eab58529f8f
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Wed Sep 12 13:20:53 2012 +0200

    Update to 5.2.11

 .gitignore                   |    1 +
 bacula-5.2.10-bsmtp.patch    |  148 ------------------------------------------
 bacula-5.2.10-log-path.patch |   41 ------------
 bacula.spec                  |   22 +++---
 sources                      |    2 +-
 5 files changed, 13 insertions(+), 201 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b59a177..4405797 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ bacula-docs-5.0.3.tar.bz2
 /bacula-5.2.8.tar.gz
 /bacula-5.2.9.tar.gz
 /bacula-5.2.10.tar.gz
+/bacula-5.2.11.tar.gz
diff --git a/bacula.spec b/bacula.spec
index 31b385e..7a7b911 100644
--- a/bacula.spec
+++ b/bacula.spec
@@ -2,8 +2,8 @@
 %global username bacula
 
 Name:                   bacula
-Version:                5.2.10
-Release:                7%{?dist}
+Version:                5.2.11
+Release:                1%{?dist}
 Summary:                Cross platform network backup for Linux, Unix, Mac and Windows
 # See LICENSE for details
 License:                AGPLv3 with exceptions
@@ -30,10 +30,8 @@ Source19:               bacula-checkconf
 
 Patch1:                 bacula-5.0.2-openssl.patch
 Patch2:                 bacula-5.2.2-queryfile.patch
-Patch3:                 bacula-5.2.10-log-path.patch
-Patch4:                 bacula-5.0.3-sqlite-priv.patch
-Patch5:                 bacula-5.2.7-bat-build.patch
-Patch6:                 bacula-5.2.10-bsmtp.patch
+Patch3:                 bacula-5.0.3-sqlite-priv.patch
+Patch4:                 bacula-5.2.7-bat-build.patch
 
 BuildRequires:          desktop-file-utils
 BuildRequires:          perl
@@ -288,10 +286,8 @@ Provides check_bacula support for Nagios.
 %setup -q
 %patch1 -p2 -b .openssl
 %patch2 -p1 -b .queryfile
-%patch3 -p1 -b .log-path
-%patch4 -p0 -b .priv
-%patch5 -p1 -b .bat-build
-%patch6 -p0 -b .bsmtp
+%patch3 -p0 -b .priv
+%patch4 -p1 -b .bat-build
 
 # Remove execution permissions from files we're packaging as docs later on
 find updatedb -type f | xargs chmod -x
@@ -339,7 +335,7 @@ export CPPFLAGS="$RPM_OPT_FLAGS -I%{_includedir}/ncurses"
 
 %if 0%{?fedora} || 0%{?rhel} >= 6
 export QMAKE=/usr/bin/qmake-qt4
-build --enable-bat --htmldir=%{_datadir}/doc/bacula-console-bat-%{version}
+build --enable-bat --docdir=%{_datadir}/doc/bacula-console-bat-%{version}
 %else
 build --disable-bat
 %endif
@@ -887,6 +883,10 @@ fi
 
 
 %changelog
+* Tue Sep 11 2012 Simone Caronni <negativo17 at gmail.com> - 5.2.11-1
+- Update to 5.2.11.
+- Removed upstreamed patches.
+
 * Tue Sep 11 2012 Simone Caronni <negativo17 at gmail.com> - 5.2.10-7
 - Add Fedora 18 systemd macros.
 - Remove old distribution checks.
diff --git a/sources b/sources
index ab4e474..75b2f2e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-19207d7049cf11a54dee5585689044ec  bacula-5.2.10.tar.gz
+f18d826e2d5375714f71e482f6f98ed5  bacula-5.2.11.tar.gz


More information about the scm-commits mailing list