SPECS: svgalib.spec - added linux-2.4 patch, fixed kernel24 builds

[qboosh]

Author: qboosh                       Date: Fri Dec  9 13:03:32 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- added linux-2.4 patch, fixed kernel24 builds

---- Files affected:
SPECS:
   svgalib.spec (1.147 -> 1.148) 

---- Diffs:

================================================================
Index: SPECS/svgalib.spec
diff -u SPECS/svgalib.spec:1.147 SPECS/svgalib.spec:1.148
--- SPECS/svgalib.spec:1.147	Thu Dec  8 15:19:03 2005
+++ SPECS/svgalib.spec	Fri Dec  9 14:03:26 2005
@@ -45,15 +45,19 @@
 Patch9:		%{name}-depend.patch
 Patch10:	%{name}-ppc_memset.patch
 Patch11:	%{name}-no-sys-io.patch
+Patch12:	%{name}-linux-2.4.patch
 URL:		http://www.arava.co.il/matan/svgalib/
 %if %{with kernel} && %{with dist_kernel}
-BuildRequires:	kernel-headers >= 2.4.0
 %if %{kernel26}
 BuildRequires:	kernel-module-build >= 2.6.0
+%else
+BuildRequires:	kernel24-headers >= 2.4.0
 %endif
 %endif
 BuildRequires:	rpmbuild(macros) >= 1.153
 # no sparc64 yet acc. to changelog
+# kernel module requires at least sys32_ioctl translation function
+# (isnt's required for 32-bit userland on x86_64 too?)
 ExclusiveArch:	%{ix86} %{x8664} alpha arm hppa ia64 m68k mips ppc sparc sparcv9
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -272,6 +276,7 @@
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
+%patch12 -p1
 
 # remove backup of svgalib.7 - we don't want it in package
 rm -f doc/man7/svgalib.7?*
@@ -339,6 +344,9 @@
 %else
 %{__make} -C kernel/svgalib_helper -f Makefile.alt \
 	CC="%{kgcc}" \
+%ifarch sparc64
+	LD="ld -m elf64_sparc" \
+%endif
 	COPT="%{rpmcflags}" \
 	INCLUDEDIR=%{_kernelsrcdir}/include
 %endif
@@ -364,6 +372,9 @@
 %else
 %{__make} -C kernel/svgalib_helper -f Makefile.alt \
 	CC="%{kgcc}" \
+%ifarch sparc64
+	LD="ld -m elf64_sparc" \
+%endif
 	COPT="%{rpmcflags} -D__KERNEL_SMP" \
 	INCLUDEDIR=%{_kernelsrcdir}/include
 %endif
@@ -463,6 +474,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.148  2005/12/09 13:03:26  qboosh
+- added linux-2.4 patch, fixed kernel24 builds
+
 Revision 1.147  2005/12/08 14:19:03  qboosh
 - added no-sys-io patch
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/svgalib.spec?r1=1.147&r2=1.148&f=u