- fixed passing %%rpmcflags

Changed files:
    sysstat-opt.patch -> 1.5
    sysstat.spec -> 1.61

diff --git a/sysstat-opt.patch b/sysstat-opt.patch
index 47448e47a99863de4005d2d41b3077d3fa2ffbca..eb00eda7b589262b65925b2ceda2a786e308ab0c 100644 (file)
--- a/sysstat-opt.patch
+++ b/sysstat-opt.patch
@@ -18,8 +18,8 @@ diff -burN sysstat-5.1.4.orig/Makefile sysstat-5.1.4/Makefile
  # Compiler flags
 -CFLAGS = -Wall -Wstrict-prototypes -pipe -O2 -fno-strength-reduce
 -LFLAGS = -L. -lsyscom -s
-+CFLAGS = -Wall -Wstrict-prototypes -pipe $(OPTFLAGS) -fno-strength-reduce
-+LFLAGS = -L. -lsyscom
++override CFLAGS += -Wall -Wstrict-prototypes -pipe -fno-strength-reduce
++override LFLAGS += -L. -lsyscom
  LSAFLAG = -lsyssa
  SAS_DFLAGS += -DSA_DIR=\"$(SA_DIR)\" -DSADC_PATH=\"$(SADC_PATH)\"
  

diff --git a/sysstat.spec b/sysstat.spec
index 038931cce62d09ff67f1eebc92bf001e051483c1..dd4a981f5eb9c3cc0518d570b8a5f6615d7b2ba1 100644 (file)
--- a/sysstat.spec
+++ b/sysstat.spec
@@ -64,7 +64,7 @@ n" | /bin/sh build/Configure.sh
 
 %{__make} \
        CC="%{__cc}" \
-       OPT_FLAGS="%{rpmcflags}"
+       CFLAGS="%{rpmcflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT