Makefile: don't install obsolete installs: flash*, sun-java, win32codecs, ..
This commit is contained in:
parent
a53f4bbb6d
commit
699e8b24ef
7
Makefile
7
Makefile
@ -12,12 +12,11 @@ pck_srpms = b43-firmware
|
|||||||
else
|
else
|
||||||
ifeq ($(ARCH), x86_64)
|
ifeq ($(ARCH), x86_64)
|
||||||
SRPMSVERSIONSFILE = SRPMSVERSIONS
|
SRPMSVERSIONSFILE = SRPMSVERSIONS
|
||||||
pck_srpms = flashplugin msttcorefonts win32codecs skype b43-firmware virtualbox-extension-pack \
|
pck_srpms = msttcorefonts skype b43-firmware virtualbox-extension-pack \
|
||||||
sun-java spotify chromium-pepper-flash chromium-widevine
|
chromium-widevine
|
||||||
else
|
else
|
||||||
SRPMSVERSIONSFILE = SRPMSVERSIONS
|
SRPMSVERSIONSFILE = SRPMSVERSIONS
|
||||||
pck_srpms = flashplugin msttcorefonts win32codecs skype b43-firmware virtualbox-extension-pack \
|
pck_srpms = msttcorefonts skype b43-firmware virtualbox-extension-pack
|
||||||
sun-java spotify chromium-pepper-flash
|
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
PACKAGE = desktop-base-openmamba
|
PACKAGE = desktop-base-openmamba
|
||||||
|
@ -23,7 +23,7 @@ fi
|
|||||||
SRPMRELEASE["spotify"]=1mamba
|
SRPMRELEASE["spotify"]=1mamba
|
||||||
# sun-java
|
# sun-java
|
||||||
if [ ! "$SRPMCHECK" -o "$SRPMCHECK" = "sun-java8" -o "$SRPMCHECK" = "sun-java" ]; then
|
if [ ! "$SRPMCHECK" -o "$SRPMCHECK" = "sun-java8" -o "$SRPMCHECK" = "sun-java" ]; then
|
||||||
SRPMVERSION["sun-java"]="`curl --max-time 20 -sL https://www.oracle.com/technetwork/java/javase/downloads/jdk12-downloads-5295953.html|grep "linux-x64_bin.tar.gz"|tail -n1|sed "s|.*/java/jdk/\([.a-zA-Z0-9-]*\).*/jdk-.*|\1|;s|-|_|" 2>/dev/null`"
|
SRPMVERSION["sun-java"]="`curl --max-time 20 -sL https://www.oracle.com/technetwork/java/javase/downloads/jdk12-downloads-5295953.html|grep "linux-x64_bin.tar.gz"|tail -n1|sed "s|.*jdk-\([.0-9-]*\).*|\1|;s|-|_|" 2>/dev/null`"
|
||||||
SRPMRELEASE["sun-java"]=1mamba
|
SRPMRELEASE["sun-java"]=1mamba
|
||||||
fi
|
fi
|
||||||
# virtualbox-extension-pack
|
# virtualbox-extension-pack
|
||||||
|
Loading…
Reference in New Issue
Block a user