--- rpms/appletalk-kmod/sme7/appletalk-kmod.spec 2009/05/26 17:12:40 1.23 +++ rpms/appletalk-kmod/sme7/appletalk-kmod.spec 2010/04/21 16:05:43 1.25 @@ -1,15 +1,15 @@ -# $Id: appletalk-kmod.spec,v 1.22 2009/05/02 10:09:04 bytegw Exp $ +# $Id: appletalk-kmod.spec,v 1.24 2009/10/28 18:42:31 slords Exp $ # Define the kmod package name here. %define kmod_name appletalk # 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.15.EL} Name: %{kmod_name}-kmod Version: 1.0 -Release: 4%{?dist} +Release: 6%{?dist} Group: System Environment/Kernel License: GPL Summary: %{kmod_name} kernel modules @@ -80,6 +80,10 @@ 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). @@ -90,6 +94,12 @@ find ${INSTALL_MOD_PATH} -type f -name \ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Apr 21 2010 Shad L. Lords 1.0-6.sme +- Update scriptlets to not call rpm [SME: 5448] + +* Tue Oct 26 2009 Shad L. Lords 1.0-5.sme +- Make preuninstall script not fail on upgrade + * Tue May 26 2009 Shad L. Lords 1.0-4.sme - Initial build of the kABI-tracking version from 1.0. - Modified spec and kmodtool(-appletalk)