SPECS (AC-branch): X11-driver-nvidia.spec, kernel-vanilla.spec - u...

Wed Feb 13 00:07:24 CET 2008

Author: glen                         Date: Tue Feb 12 23:07:24 2008 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- use manually incremented vermagic between main kernel and module pkg deps

---- Files affected:
SPECS:
   X11-driver-nvidia.spec (1.78.2.9.2.32 -> 1.78.2.9.2.33) , kernel-vanilla.spec (1.128 -> 1.129) 

---- Diffs:

================================================================
Index: SPECS/X11-driver-nvidia.spec
diff -u SPECS/X11-driver-nvidia.spec:1.78.2.9.2.32 SPECS/X11-driver-nvidia.spec:1.78.2.9.2.33

--- SPECS/X11-driver-nvidia.spec:1.78.2.9.2.32	Tue Feb 12 12:01:11 2008
+++ SPECS/X11-driver-nvidia.spec	Wed Feb 13 00:07:19 2008
@@ -8,6 +8,7 @@
 %bcond_without	userspace	# don't build userspace programs
 %bcond_with	verbose		# verbose build (V=1)
 %bcond_with	grsec_kernel	# build for kernel-grsecurity
+%bcond_with	kabi	# new kernel deps, see kernel-vanilla.spec at HEAD
 
 %if %{without kernel}
 %undefine	with_dist_kernel
@@ -19,7 +20,7 @@
 %undefine	with_userspace
 %endif
 
-%if "%{alt_kernel}" == "desktop"
+%if "%{alt_kernel}" == "desktop" || "%{alt_kernel}" == "vanilla"
 %undefine	with_smp
 %undefine	with_up
 %define		smp_kernel	1
@@ -27,6 +28,12 @@
 %define		smp_kernel	0
 %endif
 
+%if %{with kabi}
+%define		modrel	%{_rel}
+%else
+%define		modrel	%{_rel}@%{_kernel_ver_str}
+%endif
+
 %define		_nv_ver		100.14.19
 %define		_min_x11	6.7.0
 %define		_rel	61
@@ -138,12 +145,13 @@
 Summary(de):	Das nVidia-Kern-Modul für die nVidia-Architektur-Unterstützung
 Summary(pl):	Modu³ j±dra dla obs³ugi kart graficznych nVidia
 Version:	%{_nv_ver}
-Release:	%{_rel}@%{_kernel_ver_str}
+Release:	%{modrel}
 Group:		Base/Kernel
 Requires(post,postun):	/sbin/depmod
 Requires:	dev >= 2.7.7-10
 %if %{smp_kernel}
-%{?with_dist_kernel:%requires_releq_kernel}
+%{?with_dist_kernel:%{!?with_kabi:%requires_releq_kernel}}
+%{?with_dist_kernel:%{?with_kabi:Requires:	kernel%{_alt_kernel}(vermagic) = %{_kernel_ver}}}
 %else
 %{?with_dist_kernel:%requires_releq_kernel_up}
 %endif
@@ -164,7 +172,7 @@
 Summary:	nVidia kernel module for nVidia Architecture support
 Summary(de):	Das nVidia-Kern-Modul für die nVidia-Architektur-Unterstützung
 Summary(pl):	Modu³ j±dra dla obs³ugi kart graficznych nVidia
-Release:	%{_rel}@%{_kernel_ver_str}
+Release:	%{modrel}
 Group:		Base/Kernel
 Requires(post,postun):	/sbin/depmod
 Requires:	dev >= 2.7.7-10
@@ -216,8 +224,6 @@
 	$RPM_BUILD_ROOT{/usr/include/GL,/usr/%{_lib}/tls,%{_bindir},%{_mandir}/man1} \
 	$RPM_BUILD_ROOT{%{_pixmapsdir},%{_desktopdir},/etc/X11/xinit/xinitrc.d}
 
-ln -sf $RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_prefix}/../lib
-
 install usr/bin/nvidia-settings $RPM_BUILD_ROOT%{_bindir}
 install usr/bin/nvidia-xconfig $RPM_BUILD_ROOT%{_bindir}
 install usr/share/pixmaps/nvidia-settings.png $RPM_BUILD_ROOT%{_pixmapsdir}
@@ -303,7 +309,7 @@
 %endif
 
 %if %{with kernel}
-%if %{with up} || %{without up} && %{without smp}
+%if %{with up} || %{smp_kernel}
 %files -n kernel%{_alt_kernel}-video-nvidia
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/misc/*.ko*
@@ -340,6 +346,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.78.2.9.2.33  2008-02-12 23:07:19  glen
+- use manually incremented vermagic between main kernel and module pkg deps
+
 Revision 1.78.2.9.2.32  2008-02-12 11:01:11  glen
 - release 61 (kernel-2.6.16.60-4)
 

================================================================
Index: SPECS/kernel-vanilla.spec
diff -u SPECS/kernel-vanilla.spec:1.128 SPECS/kernel-vanilla.spec:1.129
--- SPECS/kernel-vanilla.spec:1.128	Tue Feb 12 22:28:51 2008
+++ SPECS/kernel-vanilla.spec	Wed Feb 13 00:07:19 2008
@@ -33,6 +33,17 @@
 
 %define		alt_kernel	vanilla
 
+# Our Kernel ABI, increase this when you want out of source modules being rebuilt
+%define		KABI		1
+# Module.symvers: e05892f5d4e6f21d9456f4cdf02e6021
+
+# kernel release (used in filesystem and eventually in uname -r)
+# modules will be looked from /lib/modules/%{kernel_release}
+# _localversion is just that without version for "> localversion"
+%define		_localversion %{KABI}
+%define		kernel_release %{version}_%{alt_kernel}-%{_localversion}
+%define		_kernelsrcdir	/usr/src/linux-%{version}_%{alt_kernel}
+
 %define		_basever	2.6.24
 %define		_postver	.2
 %define		_rel		0.4
@@ -84,6 +95,7 @@
 Requires:	coreutils
 Requires:	geninitrd >= 2.57
 Requires:	module-init-tools >= 0.9.9
+Provides:	%{name}(vermagic) = %{kernel_release}
 Conflicts:	e2fsprogs < 1.29
 Conflicts:	isdn4k-utils < 3.1pre1
 Conflicts:	jfsutils < 1.1.3
@@ -114,13 +126,6 @@
 
 %define		initrd_dir	/boot
 
-# kernel release (used in filesystem and eventually in uname -r)
-# modules will be looked from /lib/modules/%{kernel_release}smp
-# _localversion is just that without version for "> localversion"
-%define		_localversion %{release}smp
-%define		kernel_release %{version}_%{alt_kernel}-%{_localversion}
-%define		_kernelsrcdir	/usr/src/linux-%{version}_%{alt_kernel}
-
 %define		topdir	%{_builddir}/%{name}-%{version}
 %define		srcdir	%{topdir}/linux-%{_basever}
 %define		objdir	%{topdir}/o
@@ -275,6 +280,7 @@
 Summary(de.UTF-8):	Header Dateien fÃ¼r den Linux-Kernel
 Summary(pl.UTF-8):	Pliki nagÅ‚Ã³wkowe jÄ…dra Linuksa
 Group:		Development/Building
+Requires:	%{name}-config = %{epoch}:%{version}-%{release}
 Autoreqprov:	no
 
 %description headers
@@ -296,7 +302,6 @@
 Summary(de.UTF-8):	Development Dateien die beim Kernel Modul kompilationen gebraucht werden
 Summary(pl.UTF-8):	Pliki sÅ‚uÅ¼Ä…ce do budowania moduÅ‚Ã³w jÄ…dra
 Group:		Development/Building
-Requires:	%{name}-config = %{epoch}:%{version}-%{release}
 Requires:	%{name}-headers = %{epoch}:%{version}-%{release}
 Autoreqprov:	no
 
@@ -524,7 +529,7 @@
 # /usr/src/linux
 # maybe package these to -module-build, then -headers could be noarch
 cp -a %{objdir}/Module.symvers $RPM_BUILD_ROOT%{_kernelsrcdir}/Module.symvers-dist
-cp -a %{objdir}/.config $RPM_BUILD_ROOT%{_kernelsrcdir}/config-dist
+cp -aL %{objdir}/.config $RPM_BUILD_ROOT%{_kernelsrcdir}/config-dist
 cp -a %{objdir}/include/linux/autoconf.h $RPM_BUILD_ROOT%{_kernelsrcdir}/include/linux/autoconf-dist.h
 cp -a %{objdir}/include/linux/{utsrelease,version}.h $RPM_BUILD_ROOT%{_kernelsrcdir}/include/linux
 %endif # arch dependant
@@ -819,6 +824,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.129  2008-02-12 23:07:19  glen
+- use manually incremented vermagic between main kernel and module pkg deps
+
 Revision 1.128  2008-02-12 21:28:51  glen
 - package {utsrelease,version}.h
 - rpmbuild macros needed which understand our -config subpackage
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/X11-driver-nvidia.spec?r1=1.78.2.9.2.32&r2=1.78.2.9.2.33&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel-vanilla.spec?r1=1.128&r2=1.129&f=u

