rpms/lxsplit/EL-4 lxsplit-0.2.2-build-fixes.diff, NONE, 1.1 lxsplit.spec, 1.1, 1.2

[Rahul Sundaram (sundaram)]

Author: sundaram

Update of /cvs/pkgs/rpms/lxsplit/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17506

Modified Files:
	lxsplit.spec 
Added Files:
	lxsplit-0.2.2-build-fixes.diff 
Log Message:
Apply upstream patch to fix cflags


lxsplit-0.2.2-build-fixes.diff:

--- NEW FILE lxsplit-0.2.2-build-fixes.diff ---
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
 


Index: lxsplit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lxsplit/EL-4/lxsplit.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lxsplit.spec	28 May 2008 01:08:16 -0000	1.1
+++ lxsplit.spec	31 May 2008 10:12:16 -0000	1.2
@@ -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 @@
 %prep
 %setup -q
 
+%patch1 -p1
+
 %build
 %{__make}  CFLAGS="$RPM_OPT_FLAGS" %{?_smp_flags}
 
@@ -38,6 +41,9 @@
 
 %changelog
 
+* Sat May 31 2008 Rahul Sundaram <sundaram at fedoraproject.org> - 0.2.2-4
+- Apply upstream build patch
+
 * Tue May 27 2008 Rahul Sundaram <sundaram at fedoraproject.org> - 0.2.2-3
 - Fixed cflags, attr and added COPYING