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

Merge branch 'master' into f17

Browse Source
This commit is contained in:
Simone Caronni 2012-05-23 11:12:19 +02:00
commit d97b275c04
2 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
bacula-5.2.6-python-detect.patch Normal file
View File

@ -0,0 +1,24 @@
diff -Naur bacula-5.2.6.old/autoconf/configure.in bacula-5.2.6/autoconf/configure.in
--- bacula-5.2.6.old/autoconf/configure.in 2012-05-23 10:59:38.211938318 +0200
+++ bacula-5.2.6/autoconf/configure.in 2012-05-23 11:01:39.984396081 +0200
@@ -957,7 +957,7 @@
PYTHON_LIBS=`/usr/bin/python-config --libs`
else
for python_root in /usr /usr/local /usr/sfw; do
- for ver in python2.2 python2.3 python2.4 python2.5 python2.6 python3; do
+ for ver in python2.2 python2.3 python2.4 python2.5 python2.6 python2.7 python3 python3.1 python3.2; do
if test -f $python_root/include/${ver}/Python.h; then
PYTHON_INCDIR=-I$python_root/include/${ver}
if test -d $python_root/lib64/${ver}/config; then
diff -Naur bacula-5.2.6.old/configure bacula-5.2.6/configure
--- bacula-5.2.6.old/configure 2012-05-23 10:59:38.284939794 +0200
+++ bacula-5.2.6/configure 2012-05-23 11:01:34.909293626 +0200
@@ -22387,7 +22387,7 @@
PYTHON_LIBS=`/usr/bin/python-config --libs`
else
for python_root in /usr /usr/local /usr/sfw; do
- for ver in python2.2 python2.3 python2.4 python2.5 python2.6 python3; do
+ for ver in python2.2 python2.3 python2.4 python2.5 python2.6 python2.7 python3 python3.1 python3.2; do
if test -f $python_root/include/${ver}/Python.h; then
PYTHON_INCDIR=-I$python_root/include/${ver}
if test -d $python_root/lib64/${ver}/config; then

9
bacula.spec
View File

@ -3,7 +3,7 @@
Name: bacula
Version: 5.2.6
Release: 3%{?dist}
Release: 4%{?dist}
Summary: Cross platform network backup for Linux, Unix, Mac and Windows
# See LICENSE for details
License: AGPLv3 with exceptions
@ -33,6 +33,9 @@ Patch2: bacula-5.0.2-openssl.patch
Patch3: bacula-5.2.2-queryfile.patch
Patch5: bacula-5.2.4-log-path.patch
Patch6: bacula-5.0.3-sqlite-priv.patch
# Broken python symlink in python-devel, workaround in bacula in case it happens with other versions:
# https://bugzilla.redhat.com/show_bug.cgi?id=824303
Patch7: bacula-5.2.6-python-detect.patch
Patch8: bacula-5.2.2-qt-console-optflags.patch
BuildRequires: perl sed desktop-file-utils
@ -289,6 +292,7 @@ Provides check_bacula support for Nagios.
%patch3 -p1 -b .queryfile
%patch5 -p1 -b .log-path
%patch6 -p0 -b .priv
%patch7 -p1 -b .python-detect
%patch8 -p1 -b .optflags
# Remove execution permissions from files we're packaging as docs later on
@ -829,6 +833,9 @@ fi
%changelog
* Wed May 22 2012 Simone Caronni <negativo17@gmail.com> - 5.2.6-4
- Added python config workaround for Fedora 16.
* Mon May 21 2012 Simone Caronni <negativo17@gmail.com> - 5.2.6-3
- Removed _install, _mkdir and _make macro.
- Added _isa to BuildRequires.