--- rpms/ppp-kmod/sme7/ppp-kmod.spec	2009/12/01 15:41:56	1.25
+++ rpms/ppp-kmod/sme7/ppp-kmod.spec	2010/06/01 16:33:47	1.27
@@ -1,15 +1,15 @@
-# $Id: ppp-kmod.spec,v 1.24 2009/10/28 18:42:41 slords Exp $
+# $Id: ppp-kmod.spec,v 1.26 2010/04/21 16:05:33 slords Exp $
 
 # Define the kmod package name here.
 %define  kmod_name ppp
 
 # hint: this can he overridden with "--define kversion foo" on the rpmbuild command line, e.g.
 # --define "kversion 2.6.16-1.2096_FC5"
-%{!?kversion: %define kversion 2.6.9-89.0.16.EL}
+%{!?kversion: %define kversion 2.6.9-89.0.20.EL}
 
 Name:    %{kmod_name}-kmod
 Version: 1.0.2
-Release: 6%{?dist}
+Release: 8%{?dist}
 Group:   System Environment/Kernel
 License: GPL
 Summary: %{kmod_name} kernel modules
@@ -91,16 +91,32 @@ for kvariant in %{kvariants} ; do
     make -C ${ksrc} SUBDIRS=`pwd` INSTALL_MOD_PATH=$RPM_BUILD_ROOT modinst_dir='$(MODLIB)/extra/'%{kmod_name} modules_install
     # make TOPDIR=${ksrc} INSTALL_MOD_PATH=$RPM_BUILD_ROOT INSTALL_MOD_DIR=extra/%{kmod_name}/ modules_install %{?_smp_mflags}
     cd ..
+
+    mkdir -p ${INSTALL_MOD_PATH}/usr/share/doc/kmod-%{kmod_name}/%{kversion}/
+    find ${INSTALL_MOD_PATH}/lib/modules/"%{kversion}${kvariant:+$kvariant}"/ -type f -name \*.ko | sed "s,${INSTALL_MOD_PATH},," \
+        > ${INSTALL_MOD_PATH}/usr/share/doc/kmod-%{kmod_name}/%{kversion}/"modules${kvariant:+-$kvariant}"
 done
 
 # Strip the module(s).
 find ${INSTALL_MOD_PATH} -type f -name \*.ko -exec strip --strip-debug \{\} \;
-#
+
+# Override where module comes from.
+mkdir -p ${INSTALL_MOD_PATH}/etc/depmod.d/
+find ${INSTALL_MOD_PATH}/lib/modules/ -type f -name \*.ko -printf '%f\n' \
+    | sed 's,\.ko,,' | sort -u | xargs -ri echo "override {} * weak-updates/%{kmod_name}" \
+    >> ${INSTALL_MOD_PATH}/etc/depmod.d/%{kmod_name}.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Jun 01 2010 Shad L. Lords <slords@mail.com> 1.0.2-8.sme
+- Make weak-updates default for pulling module [SME: 5982]
+- Fix previous script to not error on uninstall [SME: 5448]
+
+* Wed Apr 21 2010 Shad L. Lords <slords@mail.com> 1.0.2-7.sme
+- Update scriptlets to not call rpm [SME: 5448]
+
 * Tue Dec 1 2009 Shad L. Lords <slords@mail.com> 1.0.2-6.sme
 - Update kmod to fix buffer too small errors [SME: 5628]