@@ -1,4 +1,12 @@

 -------------------------------------------------------------------

+Sun Jan 10 01:39:34 UTC 2021 - Alexei Sorokin <sor.alexei@meowr.ru>

+

+- Remove the plug-in from packaging as it no longer works.

+- Remove plash-player-gnome: properties are intended for the

+  plug-in and are packaged with the NPAPI plug-in.

+- Remove flash-player-desktop.patch.

+

+-------------------------------------------------------------------

 Tue Dec  8 19:16:38 UTC 2020 - Luigi Baldoni <aloisio@gmx.com>

 - Update to version 32.0.0.465

​

@@ -1,7 +1,7 @@

 #

 # spec file for package flash-player

 #

-# Copyright (c) 2020 SUSE LLC

+# Copyright (c) 2021 SUSE LLC

 #

 # All modifications and additions to the file contributed by third parties

 # remain the property of their copyright owners, unless otherwise agreed

@@ -19,95 +19,43 @@

 Name:           flash-player

 Version:        32.0.0.465

 Release:        0

-Summary:        Adobe Flash Plugin and Standalone Player

+Summary:        Adobe Flash Standalone Player

 License:        NonFree

 URL:            https://get.adobe.com/flashplayer

-%ifarch %ix86

-Source0:        https://fpdownload.macromedia.com/get/flashplayer/pdc/%{version}/flash_player_ppapi_linux.i386.tar.gz#/flash_player_ppapi_%{version}_linux.i386.tar.gz

-Source1:        https://fpdownload.macromedia.com/get/flashplayer/pdc/%{version}/flash_player_npapi_linux.i386.tar.gz#/flash_player_npapi_%{version}_linux.i386.tar.gz

-Source2:        flash_player_sa_11.2.202.644_linux.i386.tar.gz

+%ifarch %{ix86}

+Source0:        flash_player_sa_11.2.202.644_linux.i386.tar.gz

 %endif

 %ifarch x86_64

-Source0:        https://fpdownload.macromedia.com/get/flashplayer/pdc/%{version}/flash_player_ppapi_linux.x86_64.tar.gz#/flash_player_ppapi_%{version}_linux.x86_64.tar.gz

-Source1:        https://fpdownload.macromedia.com/get/flashplayer/pdc/%{version}/flash_player_npapi_linux.x86_64.tar.gz#/flash_player_npapi_%{version}_linux.x86_64.tar.gz

-Source2:        https://fpdownload.macromedia.com/pub/labs/flashruntimes/flashplayer/linux64/flash_player_sa_linux.x86_64.tar.gz#/flash_player_sa_%{version}_linux.x86_64.tar.gz

+Source0:        https://fpdownload.macromedia.com/pub/labs/flashruntimes/flashplayer/linux64/flash_player_sa_linux.x86_64.tar.gz#/flash_player_sa_%{version}_linux.x86_64.tar.gz

 %endif

-Source3:        flashplayer.desktop

-Source4:        flashplayer.png

-# PATCH-FIX-OPENSUSE flash-player-desktop.patch -- Fix the desktop file to be MATE/GNOME compatible.

-Patch0:         flash-player-desktop.patch

+Source1:        flashplayer.desktop

+Source2:        flashplayer.png

 BuildRequires:  hicolor-icon-theme

 BuildRequires:  update-desktop-files

-# Flash Player and the plugin dynamically opens that one and segfaults if not available (2008-11-12).

+# Flash Player dynamically opens that one and segfaults if not available (2008-11-12).

 Requires:       libasound2%{?_isa}

 Requires:       libcurl4%{?_isa}

-Provides:       flash-plugin = %{version}

 ExclusiveArch:  %ix86 x86_64

 %description

-This package contains Adobe's Flash Plugin for the supported Web

-browsers in addition to a standalone flash player application.

-

-%package ppapi

-Summary:        Adobe Flash PPAPI Plugin

-Provides:       flash-ppapi-plugin = %{version}

-

-%description ppapi

-This package contains Adobe's Flash Plugin for the PPAPI supporting

-Web browsers, like Chromium.

-

-%package gnome

-Summary:        Adobe Flash Plugin and Standalone Player Settings

-Requires:       %{name} = %{version}

-Supplements:    packageand(cinnamon-session:flash-player)

-Supplements:    packageand(gnome-session:flash-player)

-Supplements:    packageand(mate-session-manager:flash-player)

-Provides:       %{name}-mate = %{version}

-

-%description gnome

-This package contains Adobe's Flash Plugin Settings for the MATE

-and GNOME desktops.

+This package contains Adobe's Flash Player application.

 %prep

 %setup -q -c

-%setup -D -T -a 1

-%setup -D -T -a 2

-%patch0 -p1

-cp -f %{SOURCE3} flashplayer.desktop

-cp -f %{SOURCE4} flashplayer.png

+

+cp -f %{SOURCE1} flashplayer.desktop

+cp -f %{SOURCE2} flashplayer.png

 %build

 # Nothing to build.

 %install

-install -Dpm 0644 libpepflashplayer.so \

-  %{buildroot}%{_libdir}/chromium/PepperFlash/libpepflashplayer.so

-install -Dpm 0644 manifest.json \

-  %{buildroot}%{_libdir}/chromium/PepperFlash/manifest.json

-

-install -Dpm 0644 libflashplayer.so \

-  %{buildroot}%{_libdir}/mozilla/plugins/libflashplayer.so

-

-mkdir -p %{buildroot}%{_libdir}/browser-plugins/

-ln -s %{_libdir}/mozilla/plugins/libflashplayer.so \

-  %{buildroot}%{_libdir}/browser-plugins/

-

-mkdir -p %{buildroot}%{_datadir}/icons/

-cp -a .%{_datadir}/icons/* %{buildroot}%{_datadir}/icons/

-

-# MATE/GNOME front-end.

-install -Dpm 0755 .%{_bindir}/flash-player-properties \

-  %{buildroot}%{_bindir}/flash-player-properties

-install -Dpm 0644 .%{_datadir}/applications/flash-player-properties.desktop \

-  %{buildroot}%{_datadir}/applications/flash-player-properties.desktop

-

 install -Dpm 0755 flashplayer %{buildroot}%{_bindir}/flashplayer

 install -Dpm 0644 flashplayer.desktop \

   %{buildroot}%{_datadir}/applications/flashplayer.desktop

 install -Dpm 0644 flashplayer.png %{buildroot}%{_datadir}/pixmaps/flashplayer.png

 %suse_update_desktop_file flashplayer

-%suse_update_desktop_file flash-player-properties

 %post

 %ifarch %ix86

@@ -117,50 +65,16 @@

 # crash or install and deliberately break it. The second is done

 # here (boo#856386).

 if ( ! grep -q '^flags.*sse2' /proc/cpuinfo ); then

-    rm -f %{_libdir}/browser-plugins/libflashplayer.so

     rm -f %{_bindir}/flashplayer

     echo "Flash Player requires a CPU with SSE2. It cannot work on your system." >&2

     echo "Please, uninstall it!" >&2

 fi

 %endif

-%post ppapi

-CHROMIUM_CONFIG='%{_sysconfdir}/default/chromium'

-if [ -f "$CHROMIUM_CONFIG" ]; then

-    # Add the PPAPI Flash Player path to the Chromium config file.

-    if [[ $(cat "$CHROMIUM_CONFIG") != *ppapi*path* ]]; then

-        sed -i '/CHROMIUM_FLAGS/s|"$| --ppapi-flash-path=%{_libdir}/chromium/PepperFlash/libpepflashplayer.so"|' "$CHROMIUM_CONFIG"

-    fi

-fi

-

-%postun ppapi

-CHROMIUM_CONFIG='%{_sysconfdir}/default/chromium'

-# Remove the PPAPI Flash Player path from the Chromium config file.

-if [ -f "$CHROMIUM_CONFIG" ]; then

-    sed -i "s| --ppapi-flash-path=%{_libdir}/chromium/PepperFlash/libpepflashplayer.so||" "$CHROMIUM_CONFIG"

-fi

-

 %files

 %license LGPL/ license.pdf

-%doc readme.txt

 %{_bindir}/flashplayer

-%dir %{_libdir}/mozilla/

-%dir %{_libdir}/mozilla/plugins/

-%{_libdir}/mozilla/plugins/libflashplayer.so

-%dir %{_libdir}/browser-plugins/

-%{_libdir}/browser-plugins/libflashplayer.so

 %{_datadir}/applications/flashplayer.desktop

 %{_datadir}/pixmaps/flashplayer.png

-%files ppapi

-%license LGPL/ license.pdf

-%doc readme.txt

-%dir %{_libdir}/chromium/

-%{_libdir}/chromium/PepperFlash/

-

-%files gnome

-%{_bindir}/flash-player-properties

-%{_datadir}/applications/flash-player-properties.desktop

-%{_datadir}/icons/hicolor/*/apps/flash-player-properties.png

-

 %changelog

​

@@ -1,16 +0,0 @@

---- a/usr/share/applications/flash-player-properties.desktop

-+++ b/usr/share/applications/flash-player-properties.desktop

-@@ -1,5 +1,6 @@

- [Desktop Entry]

- Name=Adobe Flash Player

-+GenericName=Adobe Flash Player Settings

- Comment=Preferences for Adobe Flash Player

- Comment[bg]=Настройки за Adobe Flash Player

- Comment[ca]=Preferències quant a la Adobe Flash Player

-@@ -20,5 +21,5 @@ Icon=flash-player-properties

- Terminal=false

- Type=Application

- StartupNotify=true

--Categories=Settings;GNOME;GTK;X-GNOME-PersonalSettings;

-+Categories=GTK;MATE;GNOME;Network;WebBrowser;Settings;X-MATE-PersonalSettings;X-GNOME-PersonalSettings;

- NotShowIn=KDE;

​