[gimp-normalmap] Patched Makefile and spec to use optflags

Patrick Uiterwijk puiterwijk at fedoraproject.org
Thu Feb 7 06:53:43 UTC 2013


commit 0e27f2bd378d2cc145f33cbf75090b5c703586b3
Author: Patrick Uiterwijk <puiterwijk at gmail.com>
Date:   Thu Feb 7 07:53:06 2013 +0100

    Patched Makefile and spec to use optflags

 gimp-normalmap-fixlibs.patch |   12 ------------
 gimp-normalmap-fixmake.patch |   19 +++++++++++++++++++
 gimp-normalmap.spec          |    9 ++++++---
 3 files changed, 25 insertions(+), 15 deletions(-)
---
diff --git a/gimp-normalmap-fixmake.patch b/gimp-normalmap-fixmake.patch
new file mode 100644
index 0000000..91609b0
--- /dev/null
+++ b/gimp-normalmap-fixmake.patch
@@ -0,0 +1,19 @@
+--- Makefile.linux.orig	2013-02-07 07:39:30.380425051 +0100
++++ Makefile.linux	2013-02-07 07:43:17.606086768 +0100
+@@ -2,14 +2,14 @@
+ GIMPTOOL=gimptool-2.0
+ 
+ CC=gcc
+-CFLAGS=-O3 -Wall `pkg-config --cflags gtk+-2.0 gtkglext-1.0 gimp-2.0`
++override CFLAGS+=-O3 -Wall `pkg-config --cflags gtk+-2.0 gtkglext-1.0 gimp-2.0` 
+ 
+ TARGET=normalmap
+ 
+ OBJS=normalmap.o preview3d.o scale.o
+ 
+ LIBS=`pkg-config --libs gtk+-2.0 gtkglext-1.0 gimp-2.0 gimpui-2.0` \
+--L/usr/X11R6/lib -lGLEW
++-L/usr/X11R6/lib -lGLEW -lm
+ 
+ all: $(TARGET)
+ 
diff --git a/gimp-normalmap.spec b/gimp-normalmap.spec
index bd56fb6..1370c0a 100644
--- a/gimp-normalmap.spec
+++ b/gimp-normalmap.spec
@@ -1,12 +1,12 @@
 Name:           gimp-normalmap
 Version:        1.2.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Plugin that enabled the creation of normal maps
 
 License:        GPLv2+
 URL:            http://code.google.com/p/gimp-normalmap/
 Source0:        http://%{name}.googlecode.com/files/%{name}-%{version}.tar.bz2
-Patch0:         %{name}-fixlibs.patch
+Patch0:         %{name}-fixmake.patch
 
 BuildRequires:  gimp-devel
 BuildRequires:  gtkglext-devel
@@ -22,7 +22,7 @@ that you can use to achieve a number of lighting effects in pixel-based artwork.
 %patch0
 
 %build
-make %{?_smp_mflags}
+make %{?_smp_mflags} CFLAGS="%{optflags}"
 
 
 %install
@@ -35,6 +35,9 @@ install -m 755 normalmap %{buildroot}%{_libdir}/gimp/2.0/plug-ins/
 
 
 %changelog
+* Thu Feb 07 2013 Patrick Uiterwijk <puiterwijk at gmail.com> - 1.2.3-3
+- Patched Makefile and spec to use optflags
+
 * Fri Feb 01 2013 Patrick Uiterwijk <puiterwijk at gmail.com> - 1.2.3-2
 - Requires Gimp added
 


More information about the scm-commits mailing list