Changeset 67758 in vbox for trunk/src/VBox/Installer/linux

Timestamp:

Jul 3, 2017 2:06:11 PM (8 years ago)

Author:

vboxsync

Message:

rpm: don't depend on deprecated net-tools for newer rpm distributions anymore, rather depend on iproute (/sbin/ip)

Location:

trunk/src/VBox/Installer/linux/rpm

Files:

• VirtualBox.tmpl.spec (modified) (1 diff)
• rules (modified) (1 diff)

trunk/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec

@@ -31 +31 @@
 Vendor:    Oracle Corporation
 BuildRoot: %BUILDROOT%
-Requires:  %INITSCRIPTS% %LIBASOUND% net-tools
+Requires:  %INITSCRIPTS% %LIBASOUND% %NETTOOLS%
 
 %if %{?rpm_suse:1}%{!?rpm_suse:0}

trunk/src/VBox/Installer/linux/rpm/rules

@@ -230 +230 @@
             -e 's|%INITSCRIPTS%|$(if $(filter fedora,$(rpmspec)),initscripts,)|g' \
             -e "s|%WEBSVC%|$(if $(NOWEBSVC),false,true)|g" \
+            -e 's|%NETTOOLS%|$(if $(filter fedora18 fedora19 fedora20 fedora21 el5 openSUSE110 openSUSE111 openSUSE112 openSUSE113 openSUSE114,$(rpmspec)),net-tools,iproute)|g" \
             rpm/VirtualBox.tmpl.spec > $(archdir)/VirtualBox.spec
         mv rpm/VirtualBox-$(ver) rpm/$(rpmname)