From 5f9188a67e8cf008f7a171a7391623f65667bb37 Mon Sep 17 00:00:00 2001
From: Rahul Sundaram <sundaram@fedoraproject.org>
Date: May 31 2008 10:04:15 +0000
Subject: Apply upstream patch to fix cflags


---

diff --git a/lxsplit-0.2.2-build-fixes.diff b/lxsplit-0.2.2-build-fixes.diff
new file mode 100644
index 0000000..6c9be11
--- /dev/null
+++ b/lxsplit-0.2.2-build-fixes.diff
@@ -0,0 +1,26 @@
+honor user CFLAGS. honor the CFLAGS when generating uoff_t.h, because
+it may include flags like -m32 or -m64 and the result would be incorrect
+if we ignore them.
+
+diff -urN lxsplit-0.2.2/Makefile lxsplit-0.2.2.1/Makefile
+--- lxsplit-0.2.2/Makefile	2008-03-22 12:32:07.000000000 +0200
++++ lxsplit-0.2.2.1/Makefile	2008-05-31 10:55:25.000000000 +0300
+@@ -13,7 +13,8 @@
+ CC	:=	gcc
+ endif
+ INCPATH :=	.
+-CFLAGS	:=	-Wall -W -O2 -DNO_DEBUG
++CFLAGS	?=	-O2
++CFLAGS	:=	$(CFLAGS) -Wall -W -DNO_DEBUG
+ LDLIBS	:=	
+ LDFLAGS	:=	
+ 
+@@ -54,7 +55,7 @@
+ 	$(CC) $(LDFLAGS) -o $(BINARY) $(OBJECTS) $(LDLIBS)
+ 
+ uoff_t.h: mkuoff_t.c
+-	$(CC) $(FILESIZE_DEFS) -o mkuoff_t mkuoff_t.c
++	$(CC) $(CFLAGS) $(FILESIZE_DEFS) -o mkuoff_t mkuoff_t.c
+ 	@echo "Generating uoff_t.h"
+ 	@./mkuoff_t
+ 
diff --git a/lxsplit.spec b/lxsplit.spec
index cecf304..b04ca6e 100644
--- a/lxsplit.spec
+++ b/lxsplit.spec
@@ -1,12 +1,13 @@
 Name:		lxsplit
 Version:	0.2.2
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	File split / merge utility
 
 Group:		Applications/File
 License:	GPLv2+
 URL:		http://lxsplit.sourceforge.net/
 Source:		http://downloads.sourceforge.net/lxsplit/%{name}-%{version}.tar.gz
+Patch1:		lxsplit-0.2.2-build-fixes.diff
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)	
 
 %description
@@ -20,6 +21,8 @@ HJSplit utility which is available for other operating systems.
 %prep
 %setup -q
 
+%patch1 -p1
+
 %build
 %{__make}  CFLAGS="$RPM_OPT_FLAGS" %{?_smp_flags}
 
@@ -38,6 +41,9 @@ HJSplit utility which is available for other operating systems.
 
 %changelog
 
+* Sat May 31 2008 Rahul Sundaram <sundaram@fedoraproject.org> - 0.2.2-4
+- Apply upstream build patch
+
 * Tue May 27 2008 Rahul Sundaram <sundaram@fedoraproject.org> - 0.2.2-3
 - Fixed cflags, attr and added COPYING