SPECS: svgalib.spec - alt_kernel support, BR: rpm-build-macros >= ...

[hawk]

Author: hawk                         Date: Fri Dec  8 14:51:55 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- alt_kernel support, BR: rpm-build-macros >= 1.308
- workaround for builder automation to allow building against
  kernel-grsecurity (via bcond)
- release 2

---- Files affected:
SPECS:
   svgalib.spec (1.163 -> 1.164) 

---- Diffs:

================================================================
Index: SPECS/svgalib.spec
diff -u SPECS/svgalib.spec:1.163 SPECS/svgalib.spec:1.164
--- SPECS/svgalib.spec:1.163	Wed Sep  6 15:48:33 2006
+++ SPECS/svgalib.spec	Fri Dec  8 15:51:50 2006
@@ -6,6 +6,11 @@
 %bcond_with	kernel24	# force using kernel24 headers
 %bcond_without	smp		# don't build smp module
 %bcond_without	userspace	# don't build userspace packages
+%bcond_with	grsec_kernel	# build for kernel-grsecurity
+#
+%if %{with kernel} && %{with dist_kernel} && %{with grsec_kernel}
+%define	alt_kernel	grsecurity
+%endif
 #
 %if %{with kernel}
 %if %{with kernel24}
@@ -25,7 +30,7 @@
 %define	k24	%{nil}
 %undefine	with_dist_kernel
 %endif
-%define	_rel	1
+%define	_rel	2
 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
@@ -59,12 +64,12 @@
 URL:		http://www.arava.co.il/matan/svgalib/
 %if %{with kernel} && %{with dist_kernel}
 %if %{kernel26}
-BuildRequires:	kernel-module-build >= 3:2.6.0
+BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.0
 %else
 BuildRequires:	kernel24-headers >= 2.4.0
 %endif
 %endif
-BuildRequires:	rpmbuild(macros) >= 1.153
+BuildRequires:	rpmbuild(macros) >= 1.308
 # no sparc64 yet acc. to changelog
 # kernel module requires at least sys32_ioctl translation function
 # (isn't required for 32-bit userland on x86_64 too?)
@@ -233,7 +238,7 @@
 ĐĎ×ÎĎĹËŇÁÎÎĎŔ ÇŇÁĆŚËĎŔ ÎÁ ŇŚÚÎĎÍÁÎŚÔÎÉČ ÁĐÁŇÁÔÎÉČ ĐĚÁÔĆĎŇÍÁČ ÔÁ ÂĹÚ
 ÎĹĎÂČŚÄÎĎÓÔŚ ÚÁĐŐÓËÁÔÉ ÄĚŃ ĂŘĎÇĎ X Window.
 
-%package -n kernel%{k24}-video-svgalib_helper
+%package -n kernel%{k24}%{_alt_kernel}-video-svgalib_helper
 Summary:	svgalib's helper kernel module
 Summary(de):	Svgalibs Helferkernmodul
 Summary(es):	Bibliotecas de desarrollo y archivos de inclusión para gráficos [S]VGA
@@ -246,15 +251,15 @@
 Provides:	svgalib-helper = %{version}-%{release}
 Obsoletes:	svgalib-helper
 
-%description -n kernel%{k24}-video-svgalib_helper
+%description -n kernel%{k24}%{_alt_kernel}-video-svgalib_helper
 This package contains the kernel module necessary to run svgalib-based
 programs.
 
-%description -n kernel%{k24}-video-svgalib_helper -l pl
+%description -n kernel%{k24}%{_alt_kernel}-video-svgalib_helper -l pl
 Ten pakiet zawiera moduł jądra potrzebny do uruchamiania programów
 opartych na svgalib.
 
-%package -n kernel%{k24}-smp-video-svgalib_helper
+%package -n kernel%{k24}%{_alt_kernel}-smp-video-svgalib_helper
 Summary:	svgalib's helper kernel module for SMP
 Summary(pl):	Pomoczniczy moduł jądra svgalib dla SMP
 Release:	%{_rel}@%{_kernel_ver_str}
@@ -264,11 +269,11 @@
 Provides:	svgalib-helper = %{version}-%{release}
 Obsoletes:	svgalib-helper
 
-%description -n kernel%{k24}-smp-video-svgalib_helper
+%description -n kernel%{k24}%{_alt_kernel}-smp-video-svgalib_helper
 This package contains the kernel module necessary to run svgalib-based
 programs.
 
-%description -n kernel%{k24}-smp-video-svgalib_helper -l pl
+%description -n kernel%{k24}%{_alt_kernel}-smp-video-svgalib_helper -l pl
 Ten pakiet zawiera moduł jądra potrzebny do uruchamiania programów
 opartych na svgalib.
 
@@ -434,16 +439,16 @@
 %post	-p /sbin/ldconfig
 %postun	-p /sbin/ldconfig
 
-%post	-n kernel%{k24}-video-svgalib_helper
+%post	-n kernel%{k24}%{_alt_kernel}-video-svgalib_helper
 %depmod %{_kernel_ver}
 
-%postun -n kernel%{k24}-video-svgalib_helper
+%postun -n kernel%{k24}%{_alt_kernel}-video-svgalib_helper
 %depmod %{_kernel_ver}
 
-%post	-n kernel%{k24}-smp-video-svgalib_helper
+%post	-n kernel%{k24}%{_alt_kernel}-smp-video-svgalib_helper
 %depmod %{_kernel_ver}smp
 
-%postun -n kernel%{k24}-smp-video-svgalib_helper
+%postun -n kernel%{k24}%{_alt_kernel}-smp-video-svgalib_helper
 %depmod %{_kernel_ver}smp
 
 %if %{with userspace}
@@ -474,12 +479,12 @@
 %endif
 
 %if %{with kernel}
-%files -n kernel%{k24}-video-svgalib_helper
+%files -n kernel%{k24}%{_alt_kernel}-video-svgalib_helper
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/misc/svgalib_helper.%{kmodext}*
 
 %if %{with dist_kernel} && %{with smp}
-%files -n kernel%{k24}-smp-video-svgalib_helper
+%files -n kernel%{k24}%{_alt_kernel}-smp-video-svgalib_helper
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}smp/misc/svgalib_helper.%{kmodext}*
 %endif
@@ -491,6 +496,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.164  2006/12/08 14:51:50  hawk
+- alt_kernel support, BR: rpm-build-macros >= 1.308
+- workaround for builder automation to allow building against
+  kernel-grsecurity (via bcond)
+- release 2
+
 Revision 1.163  2006/09/06 13:48:33  sparky
 - mass atack: -j1 for make scripts
 
================================================================

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