Patched configure scripts for 2.7.

This commit is contained in:
Jon Ciesla 2010-07-30 11:32:55 -05:00
parent baba76b807
commit 915c5087a0
2 changed files with 31 additions and 1 deletions

View File

@ -0,0 +1,22 @@
--- configure~ 2010-04-27 14:58:29.000000000 -0500
+++ configure 2010-07-30 11:28:47.494178663 -0500
@@ -26255,7 +26255,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; 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
--- autoconf/configure.in~ 2010-04-27 14:58:29.000000000 -0500
+++ autoconf/configure.in 2010-07-30 11:30:22.837182092 -0500
@@ -963,7 +963,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; 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

View File

@ -8,7 +8,7 @@
Summary: Cross platform network backup for Linux, Unix, Mac and Windows
Name: bacula
Version: 5.0.2
Release: 6%{?dist}
Release: 8%{?dist}
# See LICENSE for details
License: GPLv2 with exceptions
Group: System Environment/Daemons
@ -44,6 +44,7 @@ Patch3: bacula-pamd.patch
Patch14: bacula-5.0.1-dsolink.patch
Patch15: bacula-5.0.2-openssl.patch
Patch16: bacula-5.0.2-config.patch
Patch17: bacula-5.0.2-python27.patch
URL: http://www.bacula.org
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: openssl-devel, atk-devel, ncurses-devel, pango-devel, perl
@ -356,6 +357,7 @@ pushd bacula-%{version}
%patch14 -p2
%patch15 -p2 -b .openssl
%patch16 -p2 -b .config
%patch17 -p0 -b .python27
# Remove execution permissions from files we're packaging as docs later on
find examples -type f | xargs chmod -x
@ -1000,6 +1002,12 @@ fi
%changelog
* Fri Jul 30 2010 Jon Ciesla <limb@jcomserv.net> - 5.0.2-8
- Patched configure scripts for Python 2.7.
* Fri Jul 30 2010 Jon Ciesla <limb@jcomserv.net> - 5.0.2-7
- Rebuild against Python 2.7.
* Wed Jul 14 2010 Dan Horák <dan@danny.cz> - 5.0.2-6
- rebuilt against wxGTK-2.8.11-2