rpms/dkms/F-9 dkms-modprobe.d.patch, NONE, 1.1 .cvsignore, 1.14, 1.15 dkms.spec, 1.18, 1.19 sources, 1.14, 1.15

[Matt Domsch]

Author: mdomsch

Update of /cvs/extras/rpms/dkms/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19409

Modified Files:
	.cvsignore dkms.spec sources 
Added Files:
	dkms-modprobe.d.patch 
Log Message:
update to 2.0.21.1 plus patch, add Requires: lsb

dkms-modprobe.d.patch:

--- NEW FILE dkms-modprobe.d.patch ---
>From b2721fad5e830cc4c689ecfd37cdd1ab3768daf3 Mon Sep 17 00:00:00 2001
From: Mario Limonciello <Mario_Limonciello at Dell.com>
Date: Thu, 5 Mar 2009 11:06:50 -0600
Subject: [PATCH] merge in a few changes from Keybuk to alter behaviors on Ubuntu a little bit

---

diff --git a/dkms b/dkms
index eccd84e..a8b1d58 100755
--- a/dkms
+++ b/dkms
@@ -705,6 +705,7 @@ function moduleconfig_add ()
 
     local temp_dir_name=`mktemp -d $tmp_location/dkms.XXXXXX`
     modconfig_files=""
+    [ -e /etc/modprobe.d/dkms.conf ] && modconfig_files="/etc/modprobe.d/dkms.conf"
     [ -e /etc/modprobe.d/dkms ] && modconfig_files="/etc/modprobe.d/dkms"
     [ -e /etc/modules.conf ] && modconfig_files="$modconfig_files /etc/modules.conf"
     [ -e /etc/modprobe.conf ] && modconfig_files="$modconfig_files /etc/modprobe.conf"
-- 
1.6.0.6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dkms/F-9/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	30 May 2008 19:43:53 -0000	1.14
+++ .cvsignore	15 Apr 2009 12:56:00 -0000	1.15
@@ -1 +1 @@
-dkms-2.0.19.1.tar.gz
+dkms-2.0.21.1.tar.gz


Index: dkms.spec
===================================================================
RCS file: /cvs/extras/rpms/dkms/F-9/dkms.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- dkms.spec	30 May 2008 19:43:53 -0000	1.18
+++ dkms.spec	15 Apr 2009 12:56:00 -0000	1.19
@@ -1,19 +1,22 @@
 Summary: Dynamic Kernel Module Support Framework
 Name: dkms
-Version: 2.0.19.1
-Release: 1%{?dist}
+Version: 2.0.21.1
+Release: 2%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 BuildArch: noarch
 Requires: sed gawk findutils modutils tar cpio gzip grep mktemp
-Requires: bash > 1.99
+Requires: bash > 1.99, lsb
 # because Mandriva calls this package dkms-minimal
 Provides: dkms-minimal = %{version}
 URL: http://linux.dell.com/dkms
 Source0: http://linux.dell.com/dkms/permalink/dkms-%{version}.tar.gz
+Patch0: dkms-modprobe.d.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# when building for Fedora, uncomment this Requires
+
+%if 0%{?fedora}
 Requires: kernel-devel
+%endif
 
 %description
 This package contains the framework for the Dynamic
@@ -23,6 +26,8 @@
 %prep
 
 %setup -q
+%patch0 -p1
+
 %build
 
 %triggerpostun -- %{name} < 1.90.00-1
@@ -100,6 +105,16 @@
 %{_sysconfdir}/kernel/prerm.d/%{name}
 %{_sysconfdir}/bash_completion.d/%{name}
 
+%if 0%{?suse_version}
+# suse doesnt yet support /etc/kernel/{prerm.d,postinst.d}, but will fail build
+# with unowned dirs if we dont own them ourselves
+# when opensuse *does* add this support, we will need to BuildRequires kernel
+%dir %{_sysconfdir}/kernel
+%dir %{_sysconfdir}/kernel/postinst.d
+%dir %{_sysconfdir}/kernel/prerm.d
+%endif
+
+
 %post
 [ -e /sbin/dkms ] && mv -f /sbin/dkms /sbin/dkms.old 2>/dev/null
 # enable on initial install
@@ -110,6 +125,15 @@
 [ $1 -lt 1 ] && /sbin/chkconfig dkms_autoinstaller off ||:
 
 %changelog
+* Wed Apr 15 2009 Matt Domsch <Matt_Domsch at dell.com> - 2.0.21.1-2
+- add Requires: lsb
+
+* Tue Apr 14 2009 Matt Domsch <Matt_Domsch at dell.com> 2.0.21.1-1
+- update to latest upstream
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.19.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Wed May 28 2008 Matt Domsch <Matt_Domsch at dell.com> 2.0.19.1
 - depmod on uninstall before mkinitrd, depmod fix & cleanups
 - find_module_from_ko() could incorrectly return multiple values


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dkms/F-9/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	30 May 2008 19:43:53 -0000	1.14
+++ sources	15 Apr 2009 12:56:00 -0000	1.15
@@ -1 +1 @@
-d51bb4a0679dcd6152dfa0c37c3b716b  dkms-2.0.19.1.tar.gz
+539113eabf49356b9659c85512927519  dkms-2.0.21.1.tar.gz