rpms/libflaim/devel libflaim-gcc43.patch, NONE, 1.1 libflaim-permissions.patch, 1.1, 1.2 libflaim.spec, 1.7, 1.8

[Christopher Brown (snecker)]

Author: snecker

Update of /cvs/pkgs/rpms/libflaim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5398

Modified Files:
	libflaim-permissions.patch libflaim.spec 
Added Files:
	libflaim-gcc43.patch 
Log Message:
Add patch for gcc 4.3 against x86_64

libflaim-gcc43.patch:

--- NEW FILE libflaim-gcc43.patch ---
--- src/kybuild.cpp	2008-02-15 20:02:22.000000000 +0000
+++ src/kybuild.cpp	2008-02-15 20:02:50.000000000 +0000
@@ -533,8 +533,8 @@
 				if (pIxd->uiFlags & IXD_OFFLINE)
 				{
 					if (uiContainerNum > pIxd->uiLastContainerIndexed ||
-						 uiContainerNum == pIxd->uiLastContainerIndexed &&
-						 uiDrn > pIxd->uiLastDrnIndexed)
+					    (uiContainerNum == pIxd->uiLastContainerIndexed &&
+					    uiDrn > pIxd->uiLastDrnIndexed))
 					{
 						continue;
 					}
--- ftk/src/ftk.h	2006-10-12 23:56:32.000000000 +0100
+++ ftk/src/ftk.h	2008-02-15 21:00:17.000000000 +0000
@@ -3687,7 +3687,7 @@
 	} F_TMSTAMP;
 
 	#define f_timeIsLeapYear(year) \
-		((((year) & 0x03) == 0) && (((year) % 100) != 0) || (((year) % 400) == 0))
+(((((year) & 0x03) == 0) && (((year) % 100) != 0)) || (((year) % 400) == 0))
 
 	void f_timeGetSeconds(
 		FLMUINT	*		puiSeconds);

libflaim-permissions.patch:

Index: libflaim-permissions.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libflaim/devel/libflaim-permissions.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libflaim-permissions.patch	7 Sep 2007 23:05:14 -0000	1.1
+++ libflaim-permissions.patch	15 Feb 2008 21:32:04 -0000	1.2
@@ -1,4 +1,4 @@
---- libflaim-4.9.1046/Makefile	2007-03-29 15:09:57.000000000 +0100
+--- Makefile	2007-03-29 15:09:57.000000000 +0100
 +++ Makefile	2007-09-06 14:57:19.000000000 +0100
 @@ -1888,7 +1888,7 @@
  	$(ec)$(gprintf) "Installing ...\n"


Index: libflaim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libflaim/devel/libflaim.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libflaim.spec	15 Feb 2008 17:17:40 -0000	1.7
+++ libflaim.spec	15 Feb 2008 21:32:04 -0000	1.8
@@ -20,6 +20,7 @@
 Group:		System Environment/Libraries
 Source:		http://forgeftp.novell.com/flaim/development/flaim/downloads/source/%{name}-4.9.989.tar.gz
 Patch0:		%{name}-permissions.patch
+Patch1:		%{name}-gcc43.patch
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 %description
@@ -43,7 +44,8 @@
 
 %prep
 %setup -q
-%patch -p1
+%patch0 -p0
+%patch1 -p0
 
 %build
 make CXXFLAGS="$RPM_OPT_FLAGS" lib_dir_name=%{_lib} libs