[sxiv] Respect RPM_OPT_FLAGS again (#720162)

[Petr Sabata]

commit 4018f0fcd94812ceb073bf3b32085df0c326ae2f
Author: Petr Sabata <contyk at redhat.com>
Date:   Mon Jul 11 09:46:55 2011 +0200

    Respect RPM_OPT_FLAGS again (#720162)

 sxiv-0.8.2-optflags.patch |   11 +++++++++++
 sxiv.spec                 |    7 ++++++-
 2 files changed, 17 insertions(+), 1 deletions(-)
---
diff --git a/sxiv-0.8.2-optflags.patch b/sxiv-0.8.2-optflags.patch
new file mode 100644
index 0000000..2033008
--- /dev/null
+++ b/sxiv-0.8.2-optflags.patch
@@ -0,0 +1,11 @@
+diff -up sxiv-0.8.2/Makefile~ sxiv-0.8.2/Makefile
+--- sxiv-0.8.2/Makefile~	2011-07-10 16:14:00.627661581 +0300
++++ sxiv-0.8.2/Makefile	2011-07-10 16:16:01.261017906 +0300
+@@ -5,7 +5,7 @@ VERSION = 0.8.2
+ CC = gcc
+ DESTDIR =
+ PREFIX = /usr/local
+-CFLAGS = -Wall -pedantic -DVERSION=\"$(VERSION)\"
++CFLAGS += -Wall -pedantic -DVERSION=\"$(VERSION)\"
+ LDFLAGS =
+ LIBS = -lX11 -lImlib2
diff --git a/sxiv.spec b/sxiv.spec
index b764428..22b1b5e 100644
--- a/sxiv.spec
+++ b/sxiv.spec
@@ -1,6 +1,6 @@
 Name:           sxiv
 Version:        0.8.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Simple (or small or suckless) X Image Viewer
 Group:          Applications/Multimedia
 License:        GPLv2+
@@ -10,6 +10,7 @@ Source1:        %{name}.desktop
 # Do not change sxiv binary ownership to root:root
 # Allows rpm-building the package by regular users
 Patch0:         sxiv-0.8.2-do-not-change-ownership.patch
+Patch1:         sxiv-0.8.2-optflags.patch
 BuildRequires:  libX11-devel
 BuildRequires:  imlib2-devel
 BuildRequires:  desktop-file-utils
@@ -25,6 +26,7 @@ customize it for your needs.
 %prep
 %setup -q
 %patch0 -p1 -b .do-not-change-ownership
+%patch1 -p1 -b .optflags
 
 %build
 export CFLAGS="%{optflags}"
@@ -41,6 +43,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}
 %{_datadir}/applications
 
 %changelog
+* Mon Jul 11 2011 Petr Sabata <contyk at redhat.com> - 0.8.2-2
+- Respect RPM_OPT_FLAGS again (#720162)
+
 * Thu Jul 07 2011 Petr Sabata <contyk at redhat.com> - 0.8.2-1
 - 0.8.2 bump