- don't use RPM_OPT_FLAGS directly

Changed files:
    libpng-opt.patch -> 1.4
    libpng-pngminus.patch -> 1.2

diff --git a/libpng-opt.patch b/libpng-opt.patch
index e12c4f487ff51111bde59cdef37ff4afb6509316..61452059f80746da8657f93dcef10cc3f0ff7050 100644 (file)
--- a/libpng-opt.patch
+++ b/libpng-opt.patch
@@ -18,7 +18,7 @@ diff -Nru libpng-1.0.5/scripts/makefile.linux libpng-1.0.5.new/scripts/makefile.
  
 -CFLAGS=-I$(ZLIBINC) -Wall -O3 -funroll-loops \
 -      $(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5
-+CFLAGS=-I$(ZLIBINC) -Wall $(RPM_OPT_FLAGS) -funroll-loops \
++CFLAGS=-I$(ZLIBINC) -Wall $(OPT_FLAGS) -funroll-loops \
 +      $(ALIGN) # $(WARNMORE) -DPNG_DEBUG=5
  LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng -lz -lm
  
@@ -42,7 +42,7 @@ diff -Nru libpng-1.0.5/scripts/makefile.linux libpng-1.0.5.new/scripts/makefile.
  
 -CFLAGS=-DPNG_USE_PNGGCCRD -I$(ZLIBINC) -Wall -O3 $(ALIGN) -funroll-loops \
 -        -fomit-frame-pointer  # $(WARNMORE) -g -DPNG_DEBUG=5
-+CFLAGS=-DPNG_USE_PNGGCCRD -I$(ZLIBINC) -Wall $(RPM_OPT_FLAGS) $(ALIGN) -funroll-loops 
++CFLAGS=-DPNG_USE_PNGGCCRD -I$(ZLIBINC) -Wall $(OPT_FLAGS) $(ALIGN) -funroll-loops 
  LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng -lz -lm
  
  RANLIB=ranlib

diff --git a/libpng-pngminus.patch b/libpng-pngminus.patch
index a5c26b63d1c28273e2de82fc21528af0436bab81..15b4b428166709ef3fd83108fc08f192805cb01f 100644 (file)
--- a/libpng-pngminus.patch
+++ b/libpng-pngminus.patch
@@ -19,7 +19,7 @@
  
 -CCFLAGS=-I$(PNGINC) -I$(ZINC)
 -LDFLAGS=-L$(PNGLIB) -L$(ZLIB)
-+CCFLAGS=$(RPM_OPT_FLAGS) -I$(PNGINC)
++CCFLAGS=$(OPT_FLAGS) -I$(PNGINC)
 +LDFLAGS= -s -L$(PNGLIB)
  C=.c
  O=.o