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

hawk hawk at pld-linux.org
Tue Dec 12 11:07:14 CET 2006


Author: hawk                         Date: Tue Dec 12 10:07:14 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:
   em8300.spec (1.47 -> 1.48) 

---- Diffs:

================================================================
Index: SPECS/em8300.spec
diff -u SPECS/em8300.spec:1.47 SPECS/em8300.spec:1.48
--- SPECS/em8300.spec:1.47	Mon Dec  4 19:10:10 2006
+++ SPECS/em8300.spec	Tue Dec 12 11:07:09 2006
@@ -8,7 +8,12 @@
 %bcond_without	smp		# don't build SMP module
 %bcond_without	userspace	# don't build userspace tools
 %bcond_with	verbose		# verbose build (V=1)
-
+%bcond_with	grsec_kernel	# build for kernel-grsecurity
+#
+%if %{with kernel} && %{with dist_kernel} && %{with grsec_kernel}
+%define	alt_kernel	grsecurity
+%endif
+#
 %ifarch sparc
 # kernel modules won't build on sparc32, no I2C in kernel
 %undefine	with_kernel
@@ -22,7 +27,7 @@
 Summary(pl):	Sterowniki dla DXR3 i H+
 Name:		em8300
 Version:	0.16.0
-Release:	1
+Release:	2
 License:	GPL
 Group:		Applications/System
 Source0:	http://dl.sourceforge.net/dxr3/%{name}-%{version}.tar.gz
@@ -38,8 +43,8 @@
 BuildRequires:	pkgconfig
 %endif
 %if %{with kernel}
-%{?with_dist_kernel:BuildRequires:	kernel-module-build >= 3:2.6.14}
-BuildRequires:	rpmbuild(macros) >= 1.286
+%{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.14}
+BuildRequires:	rpmbuild(macros) >= 1.308
 %endif
 Requires(post,preun):	/sbin/chkconfig
 Provides:	dxr3
@@ -85,7 +90,7 @@
 %description gtk -l pl
 Programy użytkowe em8300 używające biblioteki GTK+.
 
-%package -n kernel-video-em8300
+%package -n kernel%{_alt_kernel}-video-em8300
 Summary:	em8300 Linux kernel modules
 Summary(pl):	Moduły jądra Linuksa em8300
 Group:		Base/Kernel
@@ -95,13 +100,13 @@
 Requires(postun):	%releq_kernel_up
 %endif
 
-%description -n kernel-video-em8300
+%description -n kernel%{_alt_kernel}-video-em8300
 em8300 Linux kernel modules.
 
-%description -n kernel-video-em8300 -l pl
+%description -n kernel%{_alt_kernel}-video-em8300 -l pl
 Moduły jądra Linuksa em8300.
 
-%package -n kernel-smp-video-em8300
+%package -n kernel%{_alt_kernel}-smp-video-em8300
 Summary:	em8300 Linux SMP kernel modules
 Summary(pl):	Moduły jądra Linuksa SMP em8300
 Group:		Base/Kernel
@@ -111,10 +116,10 @@
 Requires(postun):	%releq_kernel_smp
 %endif
 
-%description -n kernel-smp-video-em8300
+%description -n kernel%{_alt_kernel}-smp-video-em8300
 em8300 Linux SMP kernel modules.
 
-%description -n kernel-smp-video-em8300 -l pl
+%description -n kernel%{_alt_kernel}-smp-video-em8300 -l pl
 Moduły jądra Linuksa SMP em8300.
 
 %prep
@@ -213,16 +218,16 @@
 	/sbin/chkconfig --del %{name}
 fi
 
-%post	-n kernel-video-em8300
+%post	-n kernel%{_alt_kernel}-video-em8300
 %depmod %{_kernel_ver}
 
-%postun	-n kernel-video-em8300
+%postun	-n kernel%{_alt_kernel}-video-em8300
 %depmod %{_kernel_ver}
 
-%post	-n kernel-smp-video-em8300
+%post	-n kernel%{_alt_kernel}-smp-video-em8300
 %depmod %{_kernel_ver}smp
 
-%postun	-n kernel-smp-video-em8300
+%postun	-n kernel%{_alt_kernel}-smp-video-em8300
 %depmod %{_kernel_ver}smp
 
 %if %{with userspace}
@@ -252,12 +257,12 @@
 %endif
 
 %if %{with kernel}
-%files -n kernel-video-em8300
+%files -n kernel%{_alt_kernel}-video-em8300
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/kernel/drivers/video/*.ko*
 
 %if %{with dist_kernel} && %{with smp}
-%files -n kernel-smp-video-em8300
+%files -n kernel%{_alt_kernel}-smp-video-em8300
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}smp/kernel/drivers/video/*.ko*
 %endif
@@ -269,6 +274,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.48  2006/12/12 10:07:09  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.47  2006/12/04 18:10:10  qboosh
 - updated BRs (uses gtk+2 now)
 - package alsa .conf file
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/em8300.spec?r1=1.47&r2=1.48&f=u



More information about the pld-cvs-commit mailing list