SPECS: svgalib.spec - added no-asm-segment patch - less noise if b...

qboosh qboosh at pld-linux.org
Mon Jan 9 11:30:00 CET 2006


Author: qboosh                       Date: Mon Jan  9 10:30:00 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- added no-asm-segment patch
- less noise if building without kernel and kernel headers are not installed

---- Files affected:
SPECS:
   svgalib.spec (1.151 -> 1.152) 

---- Diffs:

================================================================
Index: SPECS/svgalib.spec
diff -u SPECS/svgalib.spec:1.151 SPECS/svgalib.spec:1.152
--- SPECS/svgalib.spec:1.151	Mon Jan  9 11:05:22 2006
+++ SPECS/svgalib.spec	Mon Jan  9 11:29:55 2006
@@ -7,6 +7,7 @@
 %bcond_without	smp		# don't build smp module
 %bcond_without	userspace	# don't build userspace packages
 #
+%if %{with kernel}
 %if %{with kernel24}
 %define		_kernelsrcdir	/usr/src/linux-2.4
 %endif
@@ -19,6 +20,11 @@
 %else
 %define	k24	24
 %endif
+%else
+%define	kernel26 1
+%define	k24	%{nil}
+%undefine	with_dist_kernel
+%endif
 Summary:	Library for full screen [S]VGA graphics
 Summary(de):	Library für Vollbildschirm-[S]VGA-Grafiken
 Summary(es):	Biblioteca para gráficos en pantalla llena [S]VGA
@@ -49,6 +55,7 @@
 Patch10:	%{name}-ppc_memset.patch
 Patch11:	%{name}-no-sys-io.patch
 Patch12:	%{name}-linux-2.4.patch
+Patch13:	%{name}-no-asm-segment.patch
 URL:		http://www.arava.co.il/matan/svgalib/
 %if %{with kernel} && %{with dist_kernel}
 %if %{kernel26}
@@ -280,6 +287,7 @@
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
+%patch13 -p1
 
 # remove backup of svgalib.7 - we don't want it in package
 rm -f doc/man7/svgalib.7?*
@@ -333,8 +341,6 @@
 install -d include/asm
 [ ! -d %{_kernelsrcdir}/include/asm-powerpc ] || ln -sf %{_kernelsrcdir}/include/asm-powerpc/* include/asm
 [ ! -d %{_kernelsrcdir}/include/asm-%{_target_base_arch} ] || ln -snf %{_kernelsrcdir}/include/asm-%{_target_base_arch}/* include/asm
-# no longer exists in 2.6.14.x
-touch include/asm/segment.h
 %else
 ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm
 %endif
@@ -493,6 +499,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.152  2006/01/09 10:29:55  qboosh
+- added no-asm-segment patch
+- less noise if building without kernel and kernel headers are not installed
+
 Revision 1.151  2006/01/09 10:05:22  qboosh
 - build only UP module for kernel 2.6 on sparc(32)
 
================================================================

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



More information about the pld-cvs-commit mailing list