Commit f44219efaea3bfd021bfe4efdb3ecedeaa7efeba

Authored by Silvan Calarco
1 parent 76b6dde25f
Exists in master

chromium-pepper-flash: fetch from Adobe site instead of Chrome archive

Showing 4 changed files with 14 additions and 12 deletions Side-by-side Diff

SRPMS/chromium-pepper-flash/chromium-pepper-flash.spec.in
1 1 Name: chromium-pepper-flash
2 2 Version: @SRPMVERSION@
3 3 Release: @SRPMRELEASE@
4   -Epoch: 1
  4 +Epoch: 2
5 5 Summary: Google Chrome's pepper-flash plugin for Chromium
6 6 Group: Applications/Web
7 7 Vendor: @vendor@
8 8  
... ... @@ -37,14 +37,14 @@
37 37 ${CHROMIUM_PEPPER_FLASH_URL}${CHROMIUM_PEPPER_FLASH_PCK} -O ${tmpdir}/${CHROMIUM_PEPPER_FLASH_PCK}
38 38 [ -f ${tmpdir}/${CHROMIUM_PEPPER_FLASH_PCK} ] || exit 1
39 39  
40   -rpm2cpio ${tmpdir}/${CHROMIUM_PEPPER_FLASH_PCK} | cpio -id
  40 +tar xzf ${tmpdir}/${CHROMIUM_PEPPER_FLASH_PCK}
41 41  
42 42 %build -q
43 43  
44 44 %install
45 45 [ "%{buildroot}" != / ] && rm -rf %{buildroot}
46 46 install -d -m0755 %{buildroot}/opt/chromium/PepperFlash
47   -cp -a opt/google/chrome/PepperFlash/* %{buildroot}/opt/chromium/PepperFlash/
  47 +cp -a * %{buildroot}/opt/chromium/PepperFlash/
48 48  
49 49 cp %{S:0} LICENSE
50 50  
51 51  
... ... @@ -60,9 +60,15 @@
60 60 %dir /opt/chromium/PepperFlash
61 61 /opt/chromium/PepperFlash/libpepflashplayer.so
62 62 /opt/chromium/PepperFlash/manifest.json
  63 +/opt/chromium/PepperFlash/README
  64 +%dir /opt/chromium/PepperFlash/LGPL
  65 +/opt/chromium/PepperFlash/LGPL/*
63 66 %doc LICENSE
64 67  
65 68 %changelog
  69 +* Sat Dec 3 2016 Silvan Calarco <silvan.calarco@mambasoft.it> @SRPMVERSION@-@SRPMRELEASE@
  70 +- PPAPI plugin for Chromium
  71 +
66 72 * Fri Sep 19 2014 Silvan Calarco <silvan.calarco@mambasoft.it> 37.0.2062.120-1mamba
67 73 - first build for chromium-pepper-flash
SRPMS/chromium-pepper-flash/distroutils.sysconfig.in
1 1 ## Google Chrome's pepper-flash
2 2  
3 3 # package name (do not modify unless you know what you're doing)
4   -CHROMIUM_PEPPER_FLASH_PCK=google-chrome-stable_current_@arch@.rpm
  4 +CHROMIUM_PEPPER_FLASH_PCK=flash_player_ppapi_linux.@arch@.tar.gz
5 5  
6 6 # package URL (do not modify unless you know what you're doing)
7   -CHROMIUM_PEPPER_FLASH_URL=https://dl.google.com/linux/direct/
  7 +CHROMIUM_PEPPER_FLASH_URL=http://fpdownload.macromedia.com/get/flashplayer/pdc/${SRPMVERSION["chromium-pepper-flash"]}/
... ... @@ -3,7 +3,7 @@
3 3 SRPMRELEASE["b43-firmware"]=1mamba
4 4 # flashplugin
5 5 if [ ! "$SRPMCHECK" -o "$SRPMCHECK" = "flashplugin" ]; then
6   - SRPMVERSION["flashplugin"]="`curl --max-time 20 -sL http://www.adobe.com/software/flash/about/ | grep -A2 "Linux" | tail -n1 | sed -e 's/[[:space:]]*<[^>][^>]*>//g;s/[[:space:]]//' 2>/dev/null`"
  6 + SRPMVERSION["flashplugin"]="`curl --max-time 20 -sL http://www.adobe.com/software/flash/about/ | grep -A10 "Linux" | grep -A1 "NPAPI" | tail -n1 | sed -e 's/[[:space:]]*<[^>][^>]*>//g;s/[[:space:]]//' 2>/dev/null`"
7 7 SRPMRELEASE["flashplugin"]=1mamba
8 8 fi
9 9 # msttcorefonts
... ... @@ -41,11 +41,7 @@
41 41 SRPMRELEASE["win32codecs"]=1mamba
42 42 # chromium-pepper-flash
43 43 if [ ! "$SRPMCHECK" -o "$SRPMCHECK" = "chromium-pepper-flash" ]; then
44   - if [ "`uname -m`" == "x86_64" ]; then
45   - SRPMVERSION["chromium-pepper-flash"]="`curl --max-time 20 -sL "https://googlechromereleases.blogspot.it/" | grep -i -A10 "stable channel" | grep -m1 "[^0-9][0-9]*\.[0-9]*\.[0-9]*\.[0-9]*" | sed "s|.*[^0-9]\([0-9]*\.[0-9]*\.[0-9]*\.[0-9]*\).*|\1|" 2>/dev/null`"
46   - else
47   - SRPMVERSION["chromium-pepper-flash"]=""
48   - fi
  44 + SRPMVERSION["chromium-pepper-flash"]="`curl --max-time 20 -sL http://www.adobe.com/software/flash/about/ | grep -A11 "Linux" | grep -A1 "Chromium" | tail -n1 | sed -e 's/[[:space:]]*<[^>][^>]*>//g;s/[[:space:]]//' 2>/dev/null`"
49 45 SRPMRELEASE["chromium-pepper-flash"]=1mamba
50 46 fi
1   -VERSION = 3.92.1
  1 +VERSION = 3.93.0