SPECS: kernel-vanilla.spec - {build, source} symlinks as ghost and ...

[glen]

Author: glen                         Date: Mon Feb 11 22:47:06 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- {build,source} symlinks as ghost and package to main package (parent dir and uninstall ordering)
- symlinks really are created in module-build trigger

---- Files affected:
SPECS:
   kernel-vanilla.spec (1.122 -> 1.123) 

---- Diffs:

================================================================
Index: SPECS/kernel-vanilla.spec
diff -u SPECS/kernel-vanilla.spec:1.122 SPECS/kernel-vanilla.spec:1.123
--- SPECS/kernel-vanilla.spec:1.122	Mon Feb 11 20:53:22 2008
+++ SPECS/kernel-vanilla.spec	Mon Feb 11 23:47:01 2008
@@ -539,8 +539,7 @@
 cp -a$l %{srcdir}/* $RPM_BUILD_ROOT%{_kernelsrcdir}
 
 install -d $RPM_BUILD_ROOT/lib/modules/%{kernel_release}
-ln -s %{_kernelsrcdir} $RPM_BUILD_ROOT/lib/modules/%{kernel_release}/build
-ln -s %{_kernelsrcdir} $RPM_BUILD_ROOT/lib/modules/%{kernel_release}/source
+touch $RPM_BUILD_ROOT/lib/modules/%{kernel_release}/{build,source}
 cp -a %{SOURCE6} $RPM_BUILD_ROOT%{_kernelsrcdir}/include/linux/config.h
 %endif # arch independant
 
@@ -634,6 +633,10 @@
 	fi
 fi
 
+%triggerin -n %{pname}-module-build -- %{pname} = %{epoch}:%{version}-%{release}
+ln -sfn %{_kernelsrcdir} /lib/modules/%{kernel_release}/build
+ln -sfn %{_kernelsrcdir} /lib/modules/%{kernel_release}/source
+
 %if %{without noarch}
 %files
 %defattr(644,root,root,755)
@@ -677,6 +680,8 @@
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/usb/host/sl811_cs.ko*
 %endif
 %ghost /lib/modules/%{kernel_release}/modules.*
+%ghost /lib/modules/%{kernel_release}/build
+%ghost /lib/modules/%{kernel_release}/source
 
 %dir %{_sysconfdir}/modprobe.d/%{kernel_release}
 
@@ -759,8 +764,6 @@
 %{_kernelsrcdir}/scripts/*.c
 %{_kernelsrcdir}/scripts/*.sh
 %{_kernelsrcdir}/scripts/kconfig/*
-/lib/modules/%{kernel_release}/build
-/lib/modules/%{kernel_release}/source
 
 %files -n %{pname}-doc
 %defattr(644,root,root,755)
@@ -809,6 +812,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.123  2008-02-11 22:47:01  glen
+- {build,source} symlinks as ghost and package to main package (parent dir and uninstall ordering)
+- symlinks really are created in module-build trigger
+
 Revision 1.122  2008-02-11 19:53:22  glen
 - build source in second run as noarch (plus builder hacks)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel-vanilla.spec?r1=1.122&r2=1.123&f=u