Add check to BuildRequires to ensure version of libstdc++-devel matches gcc.

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@3119 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/platforms/mandrake/bacula.spec.in b/bacula/platforms/mandrake/bacula.spec.in
index cb092ce1a1b77113c997ff99be70bd47bf833dbc..82df176de487f4a7004dbd734e694f041139f605 100644 (file)
--- a/bacula/platforms/mandrake/bacula.spec.in
+++ b/bacula/platforms/mandrake/bacula.spec.in
@@ -201,9 +201,12 @@ Distribution: %{_dist}
 %define python 0
 %{?build_python:%define python 1}
 
+%{expand: %%define gccver %(rpm -q gcc | cut -d - -f 2)}
+%{expand: %%define gccrel %(rpm -q gcc | cut -d - -f 3)}
+
 BuildRequires: gcc, gcc-c++, make, autoconf
 BuildRequires: atk-devel, ncurses-devel, pango-devel, perl
-BuildRequires: libstdc++-devel, libxml2-devel, zlib-devel
+BuildRequires: libstdc++-devel = %{gccver}-%{gccrel}, libxml2-devel, zlib-devel
 BuildRequires: openssl-devel
 %if %{python}
 BuildRequires: python, python-devel
@@ -793,7 +796,7 @@ export LDFLAGS="${LDFLAGS} -L/usr/lib64/mysql"
 %endif
 # this MAY be necessary for python support - waiting for feedback to enable
 #%if %{python} && %{x86_64}
-#export LDFLAGS="${LDFLAGS} -L/usr/lib64/python-%{pyver}"
+#export LDFLAGS="${LDFLAGS} -L/usr/lib64/python%{pyver}"
 #%endif
 
 %configure \
@@ -1529,6 +1532,8 @@ fi
 %endif
 
 %changelog
+* Tue Jul 04 2006 D. Scott Barninger <barninger@fairfieldcomputers.com>
+- add check to buildrequires to make sure libstdc++ version matches gcc
 * Mon Jul 03 2006 D. Scott Barninger <barninger@fairfieldcomputers.com>
 - add python build support
 - fix LDFLAGS declarations

diff --git a/bacula/platforms/redhat/bacula.spec.in b/bacula/platforms/redhat/bacula.spec.in
index cb092ce1a1b77113c997ff99be70bd47bf833dbc..82df176de487f4a7004dbd734e694f041139f605 100644 (file)
--- a/bacula/platforms/redhat/bacula.spec.in
+++ b/bacula/platforms/redhat/bacula.spec.in
@@ -201,9 +201,12 @@ Distribution: %{_dist}
 %define python 0
 %{?build_python:%define python 1}
 
+%{expand: %%define gccver %(rpm -q gcc | cut -d - -f 2)}
+%{expand: %%define gccrel %(rpm -q gcc | cut -d - -f 3)}
+
 BuildRequires: gcc, gcc-c++, make, autoconf
 BuildRequires: atk-devel, ncurses-devel, pango-devel, perl
-BuildRequires: libstdc++-devel, libxml2-devel, zlib-devel
+BuildRequires: libstdc++-devel = %{gccver}-%{gccrel}, libxml2-devel, zlib-devel
 BuildRequires: openssl-devel
 %if %{python}
 BuildRequires: python, python-devel
@@ -793,7 +796,7 @@ export LDFLAGS="${LDFLAGS} -L/usr/lib64/mysql"
 %endif
 # this MAY be necessary for python support - waiting for feedback to enable
 #%if %{python} && %{x86_64}
-#export LDFLAGS="${LDFLAGS} -L/usr/lib64/python-%{pyver}"
+#export LDFLAGS="${LDFLAGS} -L/usr/lib64/python%{pyver}"
 #%endif
 
 %configure \
@@ -1529,6 +1532,8 @@ fi
 %endif
 
 %changelog
+* Tue Jul 04 2006 D. Scott Barninger <barninger@fairfieldcomputers.com>
+- add check to buildrequires to make sure libstdc++ version matches gcc
 * Mon Jul 03 2006 D. Scott Barninger <barninger@fairfieldcomputers.com>
 - add python build support
 - fix LDFLAGS declarations

diff --git a/bacula/platforms/suse/bacula.spec.in b/bacula/platforms/suse/bacula.spec.in
index cb092ce1a1b77113c997ff99be70bd47bf833dbc..82df176de487f4a7004dbd734e694f041139f605 100644 (file)
--- a/bacula/platforms/suse/bacula.spec.in
+++ b/bacula/platforms/suse/bacula.spec.in
@@ -201,9 +201,12 @@ Distribution: %{_dist}
 %define python 0
 %{?build_python:%define python 1}
 
+%{expand: %%define gccver %(rpm -q gcc | cut -d - -f 2)}
+%{expand: %%define gccrel %(rpm -q gcc | cut -d - -f 3)}
+
 BuildRequires: gcc, gcc-c++, make, autoconf
 BuildRequires: atk-devel, ncurses-devel, pango-devel, perl
-BuildRequires: libstdc++-devel, libxml2-devel, zlib-devel
+BuildRequires: libstdc++-devel = %{gccver}-%{gccrel}, libxml2-devel, zlib-devel
 BuildRequires: openssl-devel
 %if %{python}
 BuildRequires: python, python-devel
@@ -793,7 +796,7 @@ export LDFLAGS="${LDFLAGS} -L/usr/lib64/mysql"
 %endif
 # this MAY be necessary for python support - waiting for feedback to enable
 #%if %{python} && %{x86_64}
-#export LDFLAGS="${LDFLAGS} -L/usr/lib64/python-%{pyver}"
+#export LDFLAGS="${LDFLAGS} -L/usr/lib64/python%{pyver}"
 #%endif
 
 %configure \
@@ -1529,6 +1532,8 @@ fi
 %endif
 
 %changelog
+* Tue Jul 04 2006 D. Scott Barninger <barninger@fairfieldcomputers.com>
+- add check to buildrequires to make sure libstdc++ version matches gcc
 * Mon Jul 03 2006 D. Scott Barninger <barninger@fairfieldcomputers.com>
 - add python build support
 - fix LDFLAGS declarations