[dkms/el5: 2/3] Fix #1002551.

Simone Caronni slaanesh at fedoraproject.org
Thu Aug 29 13:35:18 UTC 2013


commit cfa7fecbf42f25bcd8d62f6d01a5eb56fd257049
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Thu Aug 29 15:33:30 2013 +0200

    Fix #1002551.

 dkms-fix-mkrpm.patch |   12 ++++++++++++
 dkms.spec            |    7 ++++++-
 2 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/dkms-fix-mkrpm.patch b/dkms-fix-mkrpm.patch
new file mode 100644
index 0000000..1b3a573
--- /dev/null
+++ b/dkms-fix-mkrpm.patch
@@ -0,0 +1,12 @@
+diff -Naur dkms.old/template-dkms-mkrpm.spec dkms/template-dkms-mkrpm.spec
+--- dkms.old/template-dkms-mkrpm.spec	2013-08-29 15:30:10.120598818 +0200
++++ dkms/template-dkms-mkrpm.spec	2013-08-29 15:31:00.768140170 +0200
+@@ -52,7 +52,7 @@
+ fi
+ 
+ %post
+-for POSTINST in %{_libdir}/dkms/common.postinst %{_datarootdir}/%{module_name}/postinst; do
++for POSTINST in %{_dkmsdir}/dkms/common.postinst %{_datarootdir}/%{module_name}/postinst; do
+         if [ -f $POSTINST ]; then
+                 $POSTINST %{module_name} %{version} %{_datarootdir}/%{module_name}
+                 exit $?
diff --git a/dkms.spec b/dkms.spec
index 03753cb..c78da8a 100644
--- a/dkms.spec
+++ b/dkms.spec
@@ -5,7 +5,7 @@
 Summary:        Dynamic Kernel Module Support Framework
 Name:           dkms
 Version:        2.2.0.3
-Release:        15%{dist}
+Release:        16%{dist}
 License:        GPLv2+
 Group:          System Environment/Base
 BuildArch:      noarch
@@ -18,6 +18,7 @@ Source2:        %{name}_autoinstaller.init
 Patch0:         %{name}-git.patch
 Patch1:         %{name}-fix-variables.patch
 Patch2:         %{name}-force-tarball.patch
+Patch3:         %{name}-fix-mkrpm.patch
 
 Requires:       coreutils
 Requires:       cpio
@@ -56,6 +57,7 @@ method for installing module RPMS as originally developed by Dell.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 
@@ -135,6 +137,9 @@ fi
 %{_sysconfdir}/bash_completion.d/%{name}
 
 %changelog
+* Thu Aug 29 2013 Simone Caronni <negativo17 at gmail.com> - 2.2.0.3-16
+- Add patch to fix mkrpm spec file template in #1002551.
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.0.3-15
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 


More information about the scm-commits mailing list