- added opt patch: don't blindly overwrite our optflags, additionally breaking -g...

Changed files:
    pfstools-opt.patch -> 1.1
    pfstools.spec -> 1.6

diff --git a/pfstools-opt.patch b/pfstools-opt.patch
new file mode 100644 (file)
index 0000000..9f24b86
--- /dev/null
+++ b/pfstools-opt.patch
@@ -0,0 +1,18 @@
+--- pfstools-1.8.5/configure.ac.orig   2011-10-27 10:40:19.000000000 +0200
++++ pfstools-1.8.5/configure.ac        2012-02-04 15:06:39.774740606 +0100
+@@ -24,13 +24,12 @@
+ AC_ARG_ENABLE(debug,
+               AS_HELP_STRING([--enable-debug],[Enable debug symbols and asserts]),
+                [if test "$enable_debug" = "yes" ; then
+-                     temp_CXXFLAGS=`echo $CXXFLAGS | sed "s/-O./ /; s/-g//"`
++                     temp_CXXFLAGS=`echo $CXXFLAGS | sed "s/-O[0-9]/ /"`
+                    CXXFLAGS="-g $temp_CXXFLAGS"
+                    AC_DEFINE([DEBUG])
+                 fi],
+                   [enable_debug="no"
+-                     temp_CXXFLAGS=`echo $CXXFLAGS | sed "s/-O./ /; s/-g//"`
+-                   CXXFLAGS="-O3 $temp_CXXFLAGS"
++                   CXXFLAGS="-O3 $CXXFLAGS"
+                      AC_DEFINE(NDEBUG, 1, [Disable assertion checks])
+                   ])
+ 

diff --git a/pfstools.spec b/pfstools.spec
index 4a4c70667e1c93f03f6706d45a5a5cbe107de29f..f15e84f50a8dd5de938902ca33d1a9850fc152b0 100644 (file)
--- a/pfstools.spec
+++ b/pfstools.spec
@@ -12,6 +12,7 @@ License:      LGPL v2.1+
 Group:         Libraries
 Source0:       http://downloads.sourceforge.net/pfstools/%{name}-%{version}.tar.gz
 # Source0-md5: 80dac70bfb6359a6749453477e74b112
+Patch0:                %{name}-opt.patch
 URL:           http://pfstools.sourceforge.net/
 BuildRequires: ImageMagick-c++-devel >= 6.0
 BuildRequires: OpenEXR-devel >= 1.0
@@ -99,6 +100,7 @@ Wiązania języka Octave do pfstools.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %{__libtoolize}