SPECS: VMware-player.spec - fixed creating %{_sysconfdir}/modprobe...

arvenil arvenil at pld-linux.org
Mon Oct 1 12:06:15 CEST 2007


Author: arvenil                      Date: Mon Oct  1 10:06:15 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fixed creating %{_sysconfdir}/modprobe.d dir in wrong bcond
- consistently use %{_sysconfdir} instead of /etc

---- Files affected:
SPECS:
   VMware-player.spec (1.24 -> 1.25) 

---- Diffs:

================================================================
Index: SPECS/VMware-player.spec
diff -u SPECS/VMware-player.spec:1.24 SPECS/VMware-player.spec:1.25
--- SPECS/VMware-player.spec:1.24	Mon Oct  1 10:23:54 2007
+++ SPECS/VMware-player.spec	Mon Oct  1 12:06:09 2007
@@ -217,7 +217,7 @@
 
 %if %{with userspace}
 install -d \
-	$RPM_BUILD_ROOT%{_sysconfdir}/{modprobe.d,vmware} \
+	$RPM_BUILD_ROOT%{_sysconfdir}/vmware \
 	$RPM_BUILD_ROOT%{_sysconfdir}/vmware/vmnet8/{nat,dhcpd} \
 	$RPM_BUILD_ROOT%{_bindir} \
 	$RPM_BUILD_ROOT%{_libdir}/vmware/{bin,lib,share/pixmaps} \
@@ -230,7 +230,8 @@
 %endif
 
 %if %{with kernel}
-echo "options vmmon vmversion=16" > $RPM_BUILD_ROOT/etc/modprobe.d/%{name}-vmmon.conf
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d
+echo "options vmmon vmversion=16" > $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/%{name}-vmmon.conf
 
 install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/misc
 
@@ -370,7 +371,7 @@
 %if %{with kernel}
 %files -n kernel%{_alt_kernel}-misc-vmmon
 %defattr(644,root,root,755)
-/etc/modprobe.d/%{name}-vmmon.conf
+%{_sysconfdir}/modprobe.d/%{name}-vmmon.conf
 /lib/modules/%{_kernel_ver}/misc/vmmon.ko*
 
 %files -n kernel%{_alt_kernel}-misc-vmnet
@@ -385,6 +386,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.25  2007/10/01 10:06:09  arvenil
+- fixed creating %{_sysconfdir}/modprobe.d dir in wrong bcond
+- consistently use %{_sysconfdir} instead of /etc
+
 Revision 1.24  2007/10/01 08:23:54  arekm
 - fix path
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/VMware-player.spec?r1=1.24&r2=1.25&f=u



More information about the pld-cvs-commit mailing list