[vxl] Add vxl-0.17.0-gcc5.diff (Work-around GCC-5.0.0 FTBFS RHBZ#1192886).

corsepiu corsepiu at fedoraproject.org
Mon Feb 16 07:11:23 UTC 2015


commit 1764c9386113fe369ef2a26aefe9035711c96c65
Author: Ralf Corsépius <corsepiu at fedoraproject.org>
Date:   Mon Feb 16 05:47:14 2015 +0100

    Add vxl-0.17.0-gcc5.diff (Work-around GCC-5.0.0 FTBFS RHBZ#1192886).
    
    - Fix bogus %changelog date.

 vxl-0.17.0-gcc5.diff |   13 +++++++++++++
 vxl.spec             |   11 ++++++++---
 2 files changed, 21 insertions(+), 3 deletions(-)
---
diff --git a/vxl-0.17.0-gcc5.diff b/vxl-0.17.0-gcc5.diff
new file mode 100644
index 0000000..5fc0270
--- /dev/null
+++ b/vxl-0.17.0-gcc5.diff
@@ -0,0 +1,13 @@
+--- vxl-git4e07960/vcl/vcl_compiler.h~	2012-11-02 12:08:21.000000000 +0100
++++ vxl-git4e07960/vcl/vcl_compiler.h	2015-02-15 13:50:46.376329878 +0100
+@@ -119,6 +119,10 @@
+ #  else
+ #   define VCL_GCC_40
+ #  endif
++# elif (__GNUC__== 5)
++// pretend GCC 5 to be GCC 4
++#  define VCL_GCC_4
++#  define VCL_GCC_41
+ # else
+ #  error "Dunno about this gcc"
+ # endif
diff --git a/vxl.spec b/vxl.spec
index fae9c2b..f6deb42 100644
--- a/vxl.spec
+++ b/vxl.spec
@@ -1,7 +1,6 @@
-
 Name:		vxl	
 Version:	1.17.0	
-Release:	15%{?dist}
+Release:	16%{?dist}
 Summary:	C++ Libraries for Computer Vision Research and Implementation
 Group:		Development/Libraries
 License:	BSD
@@ -38,6 +37,7 @@ Patch24:	0024-Added-missing-sonames-for-mvl2-and-vepl1.patch
 Patch25:	0025-Legacy-def1-r35963.patch
 Patch26:	0026-Legacy-def2-r36001.patch
 
+Patch50:        vxl-0.17.0-gcc5.diff
 
 Patch100:	%{name}-1.17.0-secondary.patch
 
@@ -154,6 +154,7 @@ find contrib/brl/b3p/expatpp -type f ! -name 'CMakeLists.txt' -execdir rm {} +
 %patch24 -p1
 %patch25 -p1
 %patch26 -p1
+%patch50 -p1
 %patch100 -p1 -b .secondary
 
 
@@ -248,6 +249,10 @@ ctest .
 
 
 %changelog
+* Mon Feb 16 2015 Ralf Corsépius <corsepiu at fedoraproject.org> - 0.17.0-16
+- Add vxl-0.17.0-gcc5.diff (Work-around GCC-5.0.0 FTBFS RHBZ#1192886).
+- Fix bogus %%changelog date.
+
 * Mon Aug 25 2014 Devrim Gündüz <devrim at gunduz.org> - 1.17.0-15
 - Rebuilt for libgeotiff 
 
@@ -325,6 +330,6 @@ ctest .
 * Tue Mar 2 2010 Mario Ceresa mrceresa fedoraproject org vxl 1.13.0-2%{?dist}
 - Applied patch from debian distribution to force the generation of versioned lib
 
-* Sat Feb 19 2010 Mario Ceresa mrceresa fedoraproject org vxl 1.13.0-1%{?dist}
+* Fri Feb 19 2010 Mario Ceresa mrceresa fedoraproject org vxl 1.13.0-1%{?dist}
 - Initial RPM Release
 


More information about the scm-commits mailing list