SRPMS/virtualbox-extension-pack: remove additions .iso conflicting with VirtualBox-additions-VBoxGuest

This commit is contained in:
Silvan Calarco 2021-03-02 20:25:23 +01:00
parent bccadba3e5
commit 55826c30b9
2 changed files with 6 additions and 6 deletions

View File

@ -31,8 +31,8 @@ declare -A SRPMVERSION SRPMRELEASE
wget -nv --timeout=10 --tries=2 \ wget -nv --timeout=10 --tries=2 \
${VIRTUALBOX_EXTENSION_PACK_URL}${VIRTUALBOX_EXTENSION_PACK_PCK} -O ${VIRTUALBOX_EXTENSION_PACK_PCK} ${VIRTUALBOX_EXTENSION_PACK_URL}${VIRTUALBOX_EXTENSION_PACK_PCK} -O ${VIRTUALBOX_EXTENSION_PACK_PCK}
wget -nv --timeout=10 --tries=2 \ #wget -nv --timeout=10 --tries=2 \
${VIRTUALBOX_EXTENSION_PACK_URL}${VIRTUALBOX_GUEST_ADDITIONS_PCK} -O ${VIRTUALBOX_GUEST_ADDITIONS_PCK} # ${VIRTUALBOX_EXTENSION_PACK_URL}${VIRTUALBOX_GUEST_ADDITIONS_PCK} -O ${VIRTUALBOX_GUEST_ADDITIONS_PCK}
[ -f ${VIRTUALBOX_EXTENSION_PACK_PCK} ] || exit 1 [ -f ${VIRTUALBOX_EXTENSION_PACK_PCK} ] || exit 1
@ -46,8 +46,8 @@ declare -A SRPMVERSION SRPMRELEASE
install -D -m0644 ${VIRTUALBOX_EXTENSION_PACK_PCK} %{buildroot}%{_libdir}/VirtualBox/extension/${VIRTUALBOX_EXTENSION_PACK_PCK} install -D -m0644 ${VIRTUALBOX_EXTENSION_PACK_PCK} %{buildroot}%{_libdir}/VirtualBox/extension/${VIRTUALBOX_EXTENSION_PACK_PCK}
cp %{S:0} LICENSE cp %{S:0} LICENSE
install -D -m0644 ${VIRTUALBOX_GUEST_ADDITIONS_PCK} %{buildroot}%{_libdir}/VirtualBox/additions/VBoxGuestAdditions.iso #install -D -m0644 ${VIRTUALBOX_GUEST_ADDITIONS_PCK} %{buildroot}%{_libdir}/VirtualBox/additions/VBoxGuestAdditions.iso
cp %{S:0} LICENSE #cp %{S:0} LICENSE
%clean %clean
[ "%{buildroot}" != / ] && rm -rf %{buildroot} [ "%{buildroot}" != / ] && rm -rf %{buildroot}
@ -63,7 +63,7 @@ echo y | VBoxManage extpack install %{_libdir}/VirtualBox/extension/Oracle_VM_Vi
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%{_libdir}/VirtualBox/extension/Oracle_VM_VirtualBox_Extension_Pack-%{pck_majver}%{?pck_minver:%pck_minver}.vbox-extpack %{_libdir}/VirtualBox/extension/Oracle_VM_VirtualBox_Extension_Pack-%{pck_majver}%{?pck_minver:%pck_minver}.vbox-extpack
%{_libdir}/VirtualBox/additions/VBoxGuestAdditions.iso #%{_libdir}/VirtualBox/additions/VBoxGuestAdditions.iso
%doc LICENSE %doc LICENSE
%changelog %changelog

View File

@ -29,7 +29,7 @@ fi
# virtualbox-extension-pack # virtualbox-extension-pack
if [ ! "$SRPMCHECK" -o "$SRPMCHECK" = "virtualbox-extension-pack" ]; then if [ ! "$SRPMCHECK" -o "$SRPMCHECK" = "virtualbox-extension-pack" ]; then
SRPMVERSION["virtualbox-extension-pack"]="`rpm -q VirtualBox 2>/dev/null| cut -d- -f2`" SRPMVERSION["virtualbox-extension-pack"]="`rpm -q VirtualBox 2>/dev/null| cut -d- -f2`"
SRPMRELEASE["virtualbox-extension-pack"]=1mamba SRPMRELEASE["virtualbox-extension-pack"]=2mamba
fi fi
# win32codecs # win32codecs
SRPMVERSION["win32codecs"]=20110131 SRPMVERSION["win32codecs"]=20110131