[packages/dkms] do not install redhat specific cruft

glen glen at pld-linux.org
Mon Feb 24 12:06:25 CET 2014


commit e579e121307f0465fe5e9b34e2c527b88c51cb15
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Mon Feb 24 13:05:54 2014 +0200

    do not install redhat specific cruft

 dkms.spec | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)
---
diff --git a/dkms.spec b/dkms.spec
index 38d15fb..8d11dc1 100644
--- a/dkms.spec
+++ b/dkms.spec
@@ -2,7 +2,7 @@ Summary:	Dynamic Kernel Module Support Framework
 Summary(pl.UTF-8):	Obsługa dynamicznych modułów jądra
 Name:		dkms
 Version:	2.2.0.3
-Release:	2
+Release:	3
 License:	GPL v2+
 Group:		Base/Kernel
 Source0:	http://linux.dell.com/dkms/permalink/%{name}-%{version}.tar.gz
@@ -20,6 +20,7 @@ Requires:	grep
 Requires:	gzip
 Requires:	kernel-module-build
 Requires:	kmod
+Requires:	lsb-release
 Requires:	sed
 Requires:	tar
 BuildArch:	noarch
@@ -61,12 +62,18 @@ Bashowe uzupełnianie parametrów dla polecenia dkms.
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/etc/modprobe.d
-cp -p %{SOURCE1} $RPM_BUILD_ROOT/etc/modprobe.d/dkms.conf
 
-%{__make} install-redhat \
+%{__make} install \
 	SHELL=/bin/sh \
 	DESTDIR=$RPM_BUILD_ROOT
 
+# not in pld
+%{__rm} $RPM_BUILD_ROOT/etc/kernel/postinst.d/dkms
+%{__rm} $RPM_BUILD_ROOT/etc/kernel/prerm.d/dkms
+%{__rm} $RPM_BUILD_ROOT/usr/lib/dkms/dkms_autoinstaller
+
+cp -p %{SOURCE1} $RPM_BUILD_ROOT/etc/modprobe.d/dkms.conf
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -75,17 +82,11 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS README.dkms TODO sample.spec
 %dir %{_sysconfdir}/%{name}
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/framework.conf
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/template-dkms-mkrpm.spec
 %config(noreplace) %verify(not md5 mtime size) /etc/modprobe.d/dkms.conf
-%attr(754,root,root) /etc/rc.d/init.d/dkms_autoinstaller
 %attr(755,root,root) %{_sbindir}/dkms
 %{_mandir}/man8/dkms.8*
 %dir %{_prefix}/lib/%{name}
 %{_prefix}/lib/%{name}/common.postinst
-%{_prefix}/lib/%{name}/dkms_autoinstaller
-%{_prefix}/lib/%{name}/find-provides
-%{_prefix}/lib/%{name}/lsb_release
-%{_prefix}/lib/%{name}/mkkerneldoth
 %dir %{_localstatedir}/lib/%{name}
 %{_localstatedir}/lib/%{name}/dkms_dbversion
 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/dkms.git/commitdiff/e579e121307f0465fe5e9b34e2c527b88c51cb15



More information about the pld-cvs-commit mailing list