Hello community, here is the log from the commit of package flash-player for openSUSE:12.1:Update:Test checked in at 2012-03-06 15:59:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1:Update:Test/flash-player (Old) and /work/SRC/openSUSE:12.1:Update:Test/.flash-player.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "flash-player", Maintainer is "dmuel...@suse.com" Changes: -------- --- /work/SRC/openSUSE:12.1:Update:Test/flash-player/flash-player.changes 2012-02-16 11:04:14.000000000 +0100 +++ /work/SRC/openSUSE:12.1:Update:Test/.flash-player.new/flash-player.changes 2012-03-06 15:59:57.000000000 +0100 @@ -2 +2,9 @@ -Thu Feb 16 08:53:26 UTC 2012 - meiss...@suse.com +Tue Mar 6 08:21:31 UTC 2012 - dmuel...@suse.com + +- Update to 11.1.102.63: (bnc#750614) + http://www.adobe.com/support/security/bulletins/apsb12-05.html + + * CVE-2012-0768, CVE-2012-0769 + +------------------------------------------------------------------- +Thu Feb 16 08:48:11 UTC 2012 - meiss...@suse.com @@ -8,0 +17,25 @@ + +------------------------------------------------------------------- +Fri Jan 27 22:16:20 CET 2012 - dmuel...@suse.de + +- fix provides/obsoletes causing arch-conflict + +------------------------------------------------------------------- +Tue Jan 24 18:03:19 CET 2012 - r...@suse.de + +- fix macros in specfile + +------------------------------------------------------------------- +Mon Jan 16 13:29:25 CET 2012 - dmuel...@suse.de + +- provide/obsolete also libflashsupport for sled11-sp1 +- add compat macros that are necessary after the "spec-cleaner run" + +------------------------------------------------------------------- +Wed Dec 28 20:25:09 UTC 2011 - asterios.dra...@gmail.com + +- Added a patch (kcm_adobe_flash_player.desktop.patch) to make the KCM module + X-KDE-System-Settings-Parent-Category entry compatible with newer KDE + versions in order to not showup in the "Lost and Found" section. +- Spec-file updates: + * Spec file cleanup based also on spec-cleaner run. Old: ---- flashplayer_11.1.102.62_sa.i386.tar.bz2 install_flash_player_11.1.102.62_linux.i386.tar.bz2 install_flash_player_11.1.102.62_linux.x86_64.tar.bz2 New: ---- flashplayer_11.1.102.63_sa.i386.tar.bz2 install_flash_player_11.1.102.63_linux.i386.tar.bz2 install_flash_player_11.1.102.63_linux.x86_64.tar.bz2 kcm_adobe_flash_player.desktop.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ flash-player.spec ++++++ --- /var/tmp/diff_new_pack.Sgmz9l/_old 2012-03-06 15:59:58.000000000 +0100 +++ /var/tmp/diff_new_pack.Sgmz9l/_new 2012-03-06 15:59:58.000000000 +0100 @@ -16,148 +16,178 @@ # +%define build_standalone 1 + Name: flash-player -Summary: Adobe Flash PlugIn and standalone Player +Version: 11.1.102.63 +Release: 0 +Summary: Adobe Flash Plugin and Standalone Player License: NON-OSI-COMPLIANT(royalties) Group: Productivity/Networking/Web/Browsers -Url: http://get.adobe.com/de/flashplayer/ -Provides: netscape-plugins -Obsoletes: netscape-plugins -%if %suse_version > 1110 -#flash 10 does not need libflashsupport and using it can cause device conflicts -#just let flash talk with the default alsa plugin - bnc#539656 -Provides: libflashsupport = 1.2 -Obsoletes: libflashsupport <= 1.2 -Provides: libflashsupport-32bit = 1.2 -Obsoletes: libflashsupport-32bit <= 1.2 -%endif -%if %suse_version > 1030 -BuildRequires: update-desktop-files -%endif -%if %suse_version > 1100 -BuildRequires: kde4-filesystem -%endif -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%ifarch %ix86 -# flash player dynamically opens that one and segfaults if not available (2008-11-12) -Requires: libcurl.so.4 libasound.so.2 -%endif -%ifarch x86_64 -Requires: libcurl.so.4()(64bit) libasound.so.2()(64bit) -%endif -Version: 11.1.102.62 -Release: 0 +Url: http://get.adobe.com/flashplayer/ %ifarch %ix86 Source0: install_flash_player_%{version}_linux.i386.tar.bz2 -# http://fpdownload.macromedia.com/pub/flashplayer/updaters/11/flashplayer_11_sa.i386.tar.gz Source1: flashplayer_%{version}_sa.i386.tar.bz2 %endif %ifarch x86_64 Source0: install_flash_player_%{version}_linux.x86_64.tar.bz2 Source1: flashplayer_11.1.102.55_sa.x86_64.tar.bz2 %endif -Source2: README -Source3: flashplayer.desktop -Source4: flashplayer.png +Source2: LICENSE +Source3: README +Source4: flashplayer.desktop +Source5: flashplayer.png Source99: update.sh NoSource: 99 -Source5: LICENSE -Patch1: desktop.diff -Provides: flash-plugin = %version -%define build_standalone 1 +# PATCH-FIX-OPENSUSE desktop.diff -- Fix desktop file to be GNOME compatible +Patch0: desktop.diff +# PATCH-FIX-OPENSUSE kcm_adobe_flash_player.desktop.patch asterios.dra...@gmail.com -- Make the KCM module X-KDE-System-Settings-Parent-Category entry compatible with newer KDE versions +Patch1: kcm_adobe_flash_player.desktop.patch +%if 0%{?suse_version} > 1100 +BuildRequires: kde4-filesystem +%endif +%if 0%{?suse_version} +BuildRequires: update-desktop-files +%endif +# flash player dynamically opens that one and segfaults if not available (2008-11-12) +%ifarch %ix86 +Requires: libasound.so.2 +Requires: libcurl.so.4 +%endif +%ifarch x86_64 +Requires: libasound.so.2()(64bit) +Requires: libcurl.so.4()(64bit) +%endif +Provides: flash-plugin = %{version} +%if 0%{?suse_version} >= 1110 +# flash 10 does not need libflashsupport and using it can cause device conflicts +# just let flash talk with the default alsa plugin - bnc#539656 +Provides: libflashsupport = 1.2 +Obsoletes: libflashsupport <= 1.2 +%ifarch x86_64 +Provides: libflashsupport-32bit = 1.2 +Obsoletes: libflashsupport-32bit <= 1.2 +%endif +%endif +Provides: netscape-plugins +Obsoletes: netscape-plugins +BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 -# find all the information about flash player / test page here: -# http://www.adobe.com/software/flash/about/ +%if 0%{!?_kde4_libdir:1} +%define _kde4_libdir %{_libdir} +%endif +%if 0%{!?_kde4_datadir:1} +%define _kde4_datadir %{_datadir} +%endif +%if 0%{!?_kde4_sharedir:1} +%define _kde4_sharedir %{_kde4_datadir}/kde4 +%endif +%if 0%{!?_kde4_modulesdir:1} +%define _kde4_modulesdir %{_kde4_libdir}/kde4 +%endif +%if 0%{!?_kde4_servicesdir:1} +%define _kde4_servicesdir %{_kde4_sharedir}/services +%endif %description This package contains Adobe's Flash Plugin for the supported Web browsers in addition to a standalone flash player application. +%if 0%{?suse_version} > 1100 + +%package gnome +Summary: Adobe Flash Plugin and Standalone Player Settings +Group: Productivity/Networking/Web/Browsers +Requires: %{name} = %{version} +Supplements: packageand(gnome-session:flash-player) + +%description gnome +This package contains Adobe's Flash Plugin Settings for the GNOME desktop. + +%package kde4 +Summary: Adobe Flash Plugin and Standalone Player Settings +Group: Productivity/Networking/Web/Browsers +Requires: %{name} = %{version} +Supplements: packageand(kdebase4-session:flash-player) +%kde4_runtime_requires + +%description kde4 +This package contains Adobe's Flash Plugin Settings for the KDE 4 desktop. + +%endif %prep -%setup -c install_flash_player_10_linux -a 0 -b 1 +%setup -q -c %{name}-%{version} -a 0 -b 1 +%patch0 %patch1 cp %{SOURCE2} . -cp %{SOURCE5} . +cp %{SOURCE3} . %build %install -mkdir -p $RPM_BUILD_ROOT/usr/share/icons +install -Dpm 0755 libflashplayer.so %{buildroot}%{_libdir}/browser-plugins/libflashplayer.so + +mkdir -p %{buildroot}%{_datadir}/icons rm -rf usr/share/icons/hicolor/24x24 -%if %suse_version <= 1100 +%if 0%{?suse_version} <= 1100 rm -rf usr/share/icons/hicolor/*/apps/flash-player-properties.png %endif -cp -a usr/share/icons/* $RPM_BUILD_ROOT/usr/share/icons -%if %suse_version > 1100 +cp -a usr/share/icons/* %{buildroot}%{_datadir}/icons + +%if 0%{?suse_version} > 1100 # KDE frontend -install -D -m 755 usr/%_lib/kde4/kcm_adobe_flash_player.so $RPM_BUILD_ROOT/usr/%_lib/kde4/kcm_adobe_flash_player.so -install -D -m 644 usr/share/kde4/services/kcm_adobe_flash_player.desktop $RPM_BUILD_ROOT/usr/share/kde4/services/kcm_adobe_flash_player.desktop +install -Dpm 0755 usr/%{_lib}/kde4/kcm_adobe_flash_player.so %{buildroot}%{_kde4_modulesdir}/kcm_adobe_flash_player.so +install -Dpm 0644 usr/share/kde4/services/kcm_adobe_flash_player.desktop %{buildroot}%{_kde4_servicesdir}/kcm_adobe_flash_player.desktop # GNOME frontend -install -D -m 755 usr/bin/flash-player-properties $RPM_BUILD_ROOT/usr/bin/flash-player-properties -install -D -m 644 usr/share/applications/flash-player-properties.desktop $RPM_BUILD_ROOT/usr/share/applications/flash-player-properties.desktop +install -Dpm 0755 usr/bin/flash-player-properties %{buildroot}%{_bindir}/flash-player-properties +install -Dpm 0644 usr/share/applications/flash-player-properties.desktop %{buildroot}%{_datadir}/applications/flash-player-properties.desktop %endif + %if %build_standalone -%if %suse_version > 1030 +%if 0%{?suse_version} > 1030 %ifarch %ix86 -install -D -m 755 flashplayer $RPM_BUILD_ROOT/usr/bin/flashplayer -install -D -m 644 %{SOURCE3} $RPM_BUILD_ROOT/usr/share/applications/flashplayer.desktop -install -D -m 644 %{SOURCE4} $RPM_BUILD_ROOT/usr/share/pixmaps/flashplayer.png +install -Dpm 0755 flashplayer %{buildroot}%{_bindir}/flashplayer +install -Dpm 0644 %{SOURCE4} %{buildroot}%{_datadir}/applications/flashplayer.desktop +install -Dpm 0644 %{SOURCE5} %{buildroot}%{_datadir}/pixmaps/flashplayer.png %suse_update_desktop_file flashplayer -%suse_update_desktop_file flash-player-properties %endif %endif %endif -install -D -m 755 libflashplayer.so $RPM_BUILD_ROOT/usr/%_lib/browser-plugins/libflashplayer.so - -%if %suse_version > 1100 - -%package kde4 -Summary: Adobe Flash PlugIn and standalone Player -Group: Productivity/Networking/Web/Browsers -Supplements: packageand(kdebase4-session:flash-player) -Requires: flash-player = %version - -%description kde4 -This package contains Adobe's Flash Plugin Settings for the -KDE 4 desktop. - -%files kde4 -%defattr(-,root,root) -/usr/%_lib/kde4/kcm_adobe_flash_player.so -/usr/share/kde4/services/kcm_adobe_flash_player.desktop - -%package gnome -Summary: Adobe Flash PlugIn and standalone Player -Group: Productivity/Networking/Web/Browsers -Supplements: packageand(gnome-session:flash-player) -Requires: flash-player = %version -%description gnome -This package contains Adobe's Flash Plugin Settings for the -GNOME desktop. - -%files gnome -%defattr(-,root,root) -/usr/share/applications/flash-player-properties.desktop -/usr/bin/flash-player-properties +%if 0%{?suse_version} > 1100 +%suse_update_desktop_file flash-player-properties %endif %files -%defattr(-,root,root) +%defattr(-,root,root,-) %doc [Rr][eE][aA][dD][Mm][eE]* LICENSE -/usr/%_lib/browser-plugins/* -%if %suse_version > 1020 -/usr/share/icons/hicolor/*x*/apps/flash-player-properties.png +%{_libdir}/browser-plugins/libflashplayer.so +%if 0%{?suse_version} > 1020 +%{_datadir}/icons/hicolor/*x*/apps/flash-player-properties.png %endif %if %build_standalone -%if %suse_version > 1030 +%if 0%{?suse_version} > 1030 %ifarch %ix86 -/usr/bin/flashplayer -/usr/share/applications/flashplayer.desktop -/usr/share/pixmaps/flashplayer.png +%{_bindir}/flashplayer +%{_datadir}/applications/flashplayer.desktop +%{_datadir}/pixmaps/flashplayer.png +%endif %endif %endif + +%if 0%{?suse_version} > 1100 + +%files gnome +%defattr(-,root,root,-) +%{_bindir}/flash-player-properties +%{_datadir}/applications/flash-player-properties.desktop + +%files kde4 +%defattr(-,root,root,-) +%{_kde4_modulesdir}/kcm_adobe_flash_player.so +%{_kde4_servicesdir}/kcm_adobe_flash_player.desktop + %endif %changelog ++++++ _link ++++++ --- /var/tmp/diff_new_pack.Sgmz9l/_old 2012-03-06 15:59:58.000000000 +0100 +++ /var/tmp/diff_new_pack.Sgmz9l/_new 2012-03-06 15:59:58.000000000 +0100 @@ -1,4 +1,4 @@ -<link project="openSUSE:12.1:Update" package="flash-player" baserev="e71df31fac30c6f517f755ade36a828a"> +<link project="openSUSE:12.1:Update" package="flash-player" baserev="6a82160ee1d525143653f10e145bc2d0"> <patches> <branch/> </patches> ++++++ flashplayer_11.1.102.62_sa.i386.tar.bz2 -> flashplayer_11.1.102.63_sa.i386.tar.bz2 ++++++ Files old/flashplayer and new/flashplayer differ ++++++ install_flash_player_11.1.102.62_linux.i386.tar.bz2 -> install_flash_player_11.1.102.63_linux.i386.tar.bz2 ++++++ /work/SRC/openSUSE:12.1:Update:Test/flash-player/install_flash_player_11.1.102.62_linux.i386.tar.bz2 /work/SRC/openSUSE:12.1:Update:Test/.flash-player.new/install_flash_player_11.1.102.63_linux.i386.tar.bz2 differ: char 11, line 1 ++++++ install_flash_player_11.1.102.62_linux.x86_64.tar.bz2 -> install_flash_player_11.1.102.63_linux.x86_64.tar.bz2 ++++++ /work/SRC/openSUSE:12.1:Update:Test/flash-player/install_flash_player_11.1.102.62_linux.x86_64.tar.bz2 /work/SRC/openSUSE:12.1:Update:Test/.flash-player.new/install_flash_player_11.1.102.63_linux.x86_64.tar.bz2 differ: char 11, line 1 ++++++ kcm_adobe_flash_player.desktop.patch ++++++ --- usr/share/kde4/services/kcm_adobe_flash_player.desktop.orig 2011-08-03 09:35:44.000000000 +0300 +++ usr/share/kde4/services/kcm_adobe_flash_player.desktop 2011-08-27 22:00:25.800000030 +0300 @@ -8,7 +8,7 @@ X-KDE-Library=kcm_adobe_flash_player X-KDE-ParentApp=kcontrol -X-KDE-System-Settings-Parent-Category=personal +X-KDE-System-Settings-Parent-Category=personal-information X-KDE-Weight=10 Name=Adobe Flash Player -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
