[mhddfs/f16] Add RPM_OPT_FLAGS proper (#729475).

[Jameson Pugh]

commit 224df0ded12db26112ab7bbedfe7c3dd257fbea0
Author: imntreal <imntreal at gmail.com>
Date:   Mon Aug 15 10:41:13 2011 -0400

    Add RPM_OPT_FLAGS proper (#729475).

 mhddfs-cflags.patch |   13 +++++++++++++
 mhddfs.spec         |   14 +++++++++++++-
 2 files changed, 26 insertions(+), 1 deletions(-)
---
diff --git a/mhddfs-cflags.patch b/mhddfs-cflags.patch
new file mode 100644
index 0000000..922cd96
--- /dev/null
+++ b/mhddfs-cflags.patch
@@ -0,0 +1,13 @@
+diff -Naur mhddfs-0.1.38-orig mhddfs-0.1.38
+diff -Naur mhddfs-0.1.38-orig/Makefile mhddfs-0.1.38/Makefile
+--- mhddfs-0.1.38-orig/Makefile	2011-08-10 08:59:08.000000000 -0400
++++ mhddfs-0.1.38/Makefile	2011-08-10 08:59:25.000000000 -0400
+@@ -22,7 +22,7 @@
+ 
+ TARGET	=	mhddfs
+ 
+-CFLAGS	=	-Wall $(shell pkg-config fuse --cflags) \
++CFLAGS	+=	-Wall $(shell pkg-config fuse --cflags) \
+ 			-DFUSE_USE_VERSION=26 -MMD
+ ifdef WITHOUT_XATTR
+ CFLAGS	+=	-DWITHOUT_XATTR
diff --git a/mhddfs.spec b/mhddfs.spec
index 4d29b89..d44df4b 100644
--- a/mhddfs.spec
+++ b/mhddfs.spec
@@ -1,10 +1,14 @@
 Name:		mhddfs
 Summary:	Fuse-based file system for unifying several mount points into one
 Version:	0.1.38
-Release:	7%{?dist}
+Release:	9%{?dist}
 License:	GPLv3+
 URL:		http://mhddfs.uvw.ru/
 Source:		http://mhddfs.uvw.ru/downloads/%{name}_%{version}.tar.gz
+
+#Make sure it builds with system CFLAGS
+Patch0:		mhddfs-cflags.patch
+
 BuildRequires:	fuse-devel libattr-devel
 Requires:	fuse%{?_isa}
 
@@ -16,8 +20,10 @@ space to create new files on, and can move data transparently between drives.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
+CFLAGS="$RPM_OPT_FLAGS" \
 make %{?_smp_mflags}
 
 %install
@@ -33,6 +39,12 @@ install -m644 %{name}.1 $RPM_BUILD_ROOT/%{_mandir}/man1/%{name}.1
 %{_mandir}/man1/%{name}.1*
 
 %changelog
+* Mon Aug 15 2011 Jameson Pugh <imntreal at gmail.com> - 0.1.38-9
+- Add RPM_OPT_FLAGS proper
+
+* Wed Aug 10 2011 Jameson Pugh <imntreal at gmail.com> - 0.1.38-8
+- Added RPM_OPT_FLAGS to CFLAGS
+
 * Tue Aug 9 2011 Jameson Pugh <imntreal at gmail.com> - 0.1.38-7
 - Left out build flags