--- rpms/ppp-kmod/sme7/ppp-kmod.spec	2009/05/26 17:12:09	1.23
+++ 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.22 2009/05/02 10:09:04 bytegw 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-78.0.22.EL}
+%{!?kversion: %define kversion 2.6.9-89.0.20.EL}
 
 Name:    %{kmod_name}-kmod
 Version: 1.0.2
-Release: 4%{?dist}
+Release: 8%{?dist}
 Group:   System Environment/Kernel
 License: GPL
 Summary: %{kmod_name} kernel modules
@@ -21,6 +21,11 @@ ExclusiveArch: i586 i686 x86_64
 Source0:  kernel_ppp_mppe-%{version}-src.tgz
 Source10: kmodtool-%{kmod_name}
 
+# Patches.
+Patch1: ppp-725ad2a8f1358bff885414f5e91d253c99921ddc.patch
+Patch2: ppp-44315cc76567e2d911d56091665637e305af182d.patch
+Patch3: ppp-kmod-1.0.2-padfix.patch
+
 # Define the variants for each architecture.
 %define upvar ""
 %define smpvar  smp
@@ -47,6 +52,9 @@ Source10: kmodtool-%{kmod_name}
 %setup -q -c
 pushd kernel_ppp_mppe-%{version}
 ./pre_build.sh lib/modules/"%{kversion}${kvariant:+$kvariant}"/build . . %{kversion}${kvariant:+$kvariant}
+%patch1 -p3
+%patch2 -p3
+%patch3
 patch -p1 < patches/linux-2.6.2-pad.patch
 patch -p1 < patches/02-ppp_generic.c.patch
 patch -p1 < patches/03-ppp_mppe_compress.c.patch
@@ -83,17 +91,39 @@ 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 May 26 2009 Shad L. Lords <slords@mail.com> 1.0.4-4.sme
+* 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]
+
+* Tue Oct 26 2009 Shad L. Lords <slords@mail.com> 1.0.2-5.sme
+- Make preuninstall script not fail on upgrade
+
+* Tue May 26 2009 Shad L. Lords <slords@mail.com> 1.0.2-4.sme
 - Initial build of the kABI-tracking version from 1.0.4.
 - Modified spec and kmodtool(-ppp)
 - Note: weak-modules became available as of CentOS-4.7