From 275d7eaf742c9e305f862c11ae16815131086017 Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Wed, 23 May 2012 11:12:06 +0200 Subject: [PATCH] Add python detect workaround in case something goes wrong with detection --- bacula-5.2.6-python-detect.patch | 24 ++++++++++++++++++++++++ bacula.spec | 9 ++++++++- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 bacula-5.2.6-python-detect.patch diff --git a/bacula-5.2.6-python-detect.patch b/bacula-5.2.6-python-detect.patch new file mode 100644 index 0000000..cf883ec --- /dev/null +++ b/bacula-5.2.6-python-detect.patch @@ -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 diff --git a/bacula.spec b/bacula.spec index 6d3a2c2..201e5b7 100644 --- a/bacula.spec +++ b/bacula.spec @@ -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 - 5.2.6-4 +- Added python config workaround for Fedora 16. + * Mon May 21 2012 Simone Caronni - 5.2.6-3 - Removed _install, _mkdir and _make macro. - Added _isa to BuildRequires.