Hello community, here is the log from the commit of package chromium for openSUSE:Factory checked in at 2016-02-09 13:32:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/chromium (Old) and /work/SRC/openSUSE:Factory/.chromium.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "chromium" Changes: -------- --- /work/SRC/openSUSE:Factory/chromium/chromium.changes 2016-01-28 17:23:08.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.chromium.new/chromium.changes 2016-02-09 13:32:49.000000000 +0100 @@ -1,0 +2,31 @@ +Fri Feb 5 13:12:47 UTC 2016 - [email protected] + +- Update to Chromium 48.0.2954.103 + * No chnagelog available + +------------------------------------------------------------------- +Sun Jan 31 12:24:47 UTC 2016 - [email protected] + +- Build against the in-source libjpeg to prevent graphical issues + +------------------------------------------------------------------- +Sun Jan 31 11:12:18 UTC 2016 - [email protected] + +- Use spec-cleaner +- Remove buildenv check that is moot for the update-alternatives script +- Build against the latest libjpeg rather than jpeg6 +- Use update-alternatives as is required by the specification + +------------------------------------------------------------------- +Thu Jan 28 09:59:57 UTC 2016 - [email protected] + +- Update to Chromium 48.0.2564.97 + * No changelog available + +- Update the desktop-kde package so that on Leap and TW, the kwallet5 + becomes the default. desktop-kde/gnome packages are no longer + recommended as that the default is to automatically detect the + password store. Only for those users that want to change this, + they can select a different setup. + +------------------------------------------------------------------- Old: ---- chromium-48.0.2564.82.tar.xz New: ---- chromium-48.0.2564.103.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ chromium.spec ++++++ --- /var/tmp/diff_new_pack.B931FX/_old 2016-02-09 13:33:02.000000000 +0100 +++ /var/tmp/diff_new_pack.B931FX/_new 2016-02-09 13:33:02.000000000 +0100 @@ -19,9 +19,8 @@ %define chromium_no_dlopen 1 %define chromium_system_libs 1 %bcond_without libva - Name: chromium -Version: 48.0.2564.82 +Version: 48.0.2564.103 Release: 0 Summary: Google's opens source browser project License: BSD-3-Clause and LGPL-2.1+ @@ -40,14 +39,6 @@ Source997: courgette.tar.xz Source998: depot_tools.tar.xz Source999: gn-binaries.tar.xz -Provides: chromium-based-browser = %{version} -Provides: chromium-browser = %{version} -Provides: browser(npapi) -Obsoletes: chromium-browser < %{version} -Conflicts: otherproviders(chromium-browser) -# There is no v8 for ppc and thus chromium won't run on ppc. For aarch64 certain buildrequires are missing (e.g. valgrind) -ExcludeArch: aarch64 ppc ppc64 ppc64le - ## Start Patches # Many changes to the gyp systems so we can use system libraries # PATCH-FIX-OPENSUSE Make the 1-click-install ymp file always download [bnc#836059] @@ -74,16 +65,16 @@ Patch13: chromium-enable-vaapi.patch # PATCH-FIX-OPENSUSE fix_network_api_crash.patch - Fix crash in network API, e.g. when using chromecast extension Patch14: fix_network_api_crash.patch - # archlinux arm enhancement patches Patch100: arm-webrtc-fix.patch Patch101: chromium-arm-r0.patch Patch102: skia.patch - +BuildRequires: SDL-devel BuildRequires: alsa-devel BuildRequires: bison BuildRequires: cups-devel BuildRequires: desktop-file-utils +BuildRequires: dirac-devel >= 1.0.0 BuildRequires: fdupes BuildRequires: flac-devel BuildRequires: flex @@ -93,29 +84,40 @@ BuildRequires: gperf BuildRequires: hicolor-icon-theme BuildRequires: hunspell-devel +BuildRequires: imlib2-devel BuildRequires: krb5 BuildRequires: krb5-devel BuildRequires: libbz2-devel BuildRequires: libcap-devel +BuildRequires: libdc1394 +BuildRequires: libdc1394-devel BuildRequires: libdrm-devel BuildRequires: libelf-devel BuildRequires: libexpat-devel BuildRequires: libgcrypt-devel BuildRequires: libgnome-keyring-devel +BuildRequires: libgsm +BuildRequires: libgsm-devel +BuildRequires: libjack-devel +BuildRequires: libogg-devel +BuildRequires: liboil-devel >= 0.3.15 BuildRequires: libopenssl-devel BuildRequires: libpulse-devel - -%if !0%{?packman_bs} -BuildRequires: ninja -%endif -BuildRequires: libdrm-devel +BuildRequires: libtheora-devel >= 1.1 +BuildRequires: libvdpau-devel +BuildRequires: libvorbis-devel +BuildRequires: libvpx-devel +BuildRequires: ncurses-devel BuildRequires: pam-devel BuildRequires: pciutils-devel BuildRequires: pkg-config BuildRequires: python BuildRequires: python-devel BuildRequires: python-xml +BuildRequires: schroedinger-devel +BuildRequires: slang-devel BuildRequires: sqlite3-devel +BuildRequires: texinfo BuildRequires: update-desktop-files BuildRequires: util-linux BuildRequires: valgrind-devel @@ -128,7 +130,6 @@ BuildRequires: pkgconfig(gtk+-2.0) BuildRequires: pkgconfig(libcrypto) BuildRequires: pkgconfig(libexif) -BuildRequires: pkgconfig(libexif) BuildRequires: pkgconfig(libudev) BuildRequires: pkgconfig(libxslt) BuildRequires: pkgconfig(nspr) >= 4.9.5 @@ -145,12 +146,27 @@ BuildRequires: pkgconfig(xscrnsaver) BuildRequires: pkgconfig(xt) BuildRequires: pkgconfig(xtst) -%if 0%{?chromium_system_libs} -%if 0%{?suse_version} > 1230 -BuildRequires: libjpeg62-devel -%else -BuildRequires: libjpeg-devel +Requires: alsa +Requires: ffmpegsumo +Requires: hicolor-icon-theme +Requires: update-alternatives +Requires: xdg-utils +Requires(pre): permissions +# Recommends the chromium-ffmpeg library (available from packman) +Recommends: chromium-ffmpeg +Conflicts: otherproviders(chromium-browser) +Provides: chromium-based-browser = %{version} +Provides: chromium-browser = %{version} +Provides: browser(npapi) +Obsoletes: %{name}-suid-helper < %{version} +Obsoletes: chromium-browser < %{version} +Provides: %{name}-suid-helper = %{version} +# There is no v8 for ppc and thus chromium won't run on ppc. For aarch64 certain buildrequires are missing (e.g. valgrind) +ExcludeArch: aarch64 ppc ppc64 ppc64le +%if !0%{?packman_bs} +BuildRequires: ninja %endif +%if 0%{?chromium_system_libs} BuildRequires: perl-JSON BuildRequires: usbutils BuildRequires: yasm @@ -164,53 +180,19 @@ BuildRequires: pkgconfig(protobuf) BuildRequires: pkgconfig(speex) %endif - -Requires: alsa -Requires: ffmpegsumo -Requires: hicolor-icon-theme -Requires: update-alternatives -Requires: xdg-utils - -BuildRequires: SDL-devel -BuildRequires: dirac-devel >= 1.0.0 -BuildRequires: imlib2-devel -BuildRequires: libdc1394 -BuildRequires: libdc1394-devel -BuildRequires: libgsm -BuildRequires: libgsm-devel -BuildRequires: libjack-devel -BuildRequires: libogg-devel -BuildRequires: liboil-devel >= 0.3.15 -BuildRequires: libtheora-devel >= 1.1 -BuildRequires: libvdpau-devel -BuildRequires: libvorbis-devel -BuildRequires: libvpx-devel -BuildRequires: ncurses-devel -BuildRequires: schroedinger-devel -BuildRequires: slang-devel -BuildRequires: texinfo #Requirements to build a fully functional ffmpeg # This can only be done on packman OBS %if 0%{?packman_bs} BuildRequires: libfaac-devel >= 1.28 BuildRequires: libmp3lame-devel BuildRequires: libopencore-amr-devel +BuildRequires: libx264-devel +BuildRequires: libxvidcore-devel %if %{with libva} BuildRequires: libva-devel %endif -BuildRequires: libx264-devel -BuildRequires: libxvidcore-devel %endif -Requires(pre): permissions - -Recommends: Chromium-password = %{version} -Obsoletes: %{name}-suid-helper < %{version} -Provides: %{name}-suid-helper = %{version} - -# Recommends the chromium-ffmpeg library (available from packman) -Recommends: chromium-ffmpeg - %description Chromium is the open-source project behind Google Chrome. We invite you to join us in our effort to help build a safer, faster, and more stable way for all Internet users to experience the web, and to create a powerful platform for developing a new generation of web applications. @@ -218,22 +200,25 @@ Summary: Library to provide partial ffmpeg support to Chromium License: BSD-3-Clause and LGPL-2.1+ Group: Productivity/Networking/Web/Browsers -Provides: ffmpegsumo = %{version} -Conflicts: otherproviders(ffmpegsumo) Requires: %{name} +Conflicts: otherproviders(ffmpegsumo) +Provides: ffmpegsumo = %{version} %description ffmpegsumo The is the multimedia codec library for Chromium. It is based on the internal ffmpeg source code and contains only the open source codecs from ffmpeg. Proprietary codecs (e.g. H.264) are not part of this library, but are provided in an external package %package desktop-kde - Summary: Update to chromium to use KDE's kwallet to store passwords License: BSD-3-Clause and LGPL-2.1+ Group: Productivity/Networking/Web/Browsers -Supplements: packageand(chromium:kdebase4-session) +Requires(post): chromium = %{version} Conflicts: otherproviders(chromium-password) Provides: chromium-password = %{version} -Requires(post): chromium = %{version} +%if 0%{?suse_version} > 1320 || 0%{?suse_version} == 1315 && 0%{?is_opensuse} +Supplements: packageand(chromium:plasma5-session) +%else +Supplements: packageand(chromium:kdebase4-session) +%endif %description desktop-kde By using the openSUSE update-alternatives the password store for Chromium is changed to utilize @@ -241,15 +226,14 @@ are also not converted to kwallet. %package desktop-gnome - Summary: Update to chromium to use Gnome keyring to store passwords License: BSD-3-Clause and LGPL-2.1+ Group: Productivity/Networking/Web/Browsers +Requires: libgnome +Requires(post): chromium = %{version} Supplements: packageand(chromium:gnome-session) Conflicts: otherproviders(chromium-password) Provides: chromium-password = %{version} -Requires(post): chromium = %{version} -Requires: libgnome %description desktop-gnome By using the openSUSE update-alternatives the password store for Chromium is changed to utilize @@ -257,7 +241,6 @@ are also not converted to Gnome's Keyring. %package -n chromedriver - Summary: WebDriver for Google Chrome/Chromium License: BSD-3-Clause Group: Development/Tools/Other @@ -266,15 +249,14 @@ %description -n chromedriver WebDriver is an open source tool for automated testing of webapps across many browsers. It provides capabilities for navigating to web pages, user input, JavaScript execution, and more. ChromeDriver is a standalone server which implements WebDriver's wire protocol for Chromium. It is being developed by members of the Chromium and WebDriver teams. - %if 0%{?packman_bs} %package ffmpeg Summary: The ffmpeg library for Google's opens source browser Chromium License: BSD-3-Clause and LGPL-2.1+ Group: Productivity/Networking/Web/Browsers -Provides: ffmpegsumo = %{version} -Conflicts: otherproviders(ffmpegsumo) Requires: %{name} = %{version} +Conflicts: otherproviders(ffmpegsumo) +Provides: ffmpegsumo = %{version} %if %{with libva} Recommends: Mesa-libva %endif @@ -284,33 +266,33 @@ %endif %prep -%setup -q -n %{name}-%{version} -a 999 -a 998 +%setup -q -a 999 -a 998 -%patch1 -p0 -%patch6 -p0 -%patch4 -p0 -%patch5 -p0 -%patch7 -p0 -%patch8 -p0 +%patch1 +%patch6 +%patch4 +%patch5 +%patch7 +%patch8 %if 0%{?packman_bs} -%patch9 -p0 +%patch9 %endif %if 0%{?suse_version} > 1320 -%patch10 -p0 +%patch10 %endif %patch11 -p1 %patch12 -p1 %if %{with libva} %patch13 -p1 %endif -%patch14 -p0 +%patch14 #Upstream fixes # archlinux arm enhancements -%patch100 -p0 -%patch101 -p0 -#patch102 -p0 +%patch100 +%patch101 +#patch102 export PATH="$PATH":`pwd`/depot_tools @@ -369,7 +351,6 @@ -Duse_system_libevent=1 -Duse_system_libmtp=1 -Duse_system_bzip2=1 - -Duse_system_libjpeg=1 -Duse_system_libpng=1 -Duse_system_libxslt=1 -Duse_system_libyuv=1 @@ -438,26 +419,30 @@ popd %else %ifarch x86_64 - mkdir -p %{buildroot}%{_prefix}/lib/ + mkdir -p %{buildroot}%{_libexecdir}/ %endif install -m 755 %{SOURCE100} %{buildroot}%{_libdir}/chromium/chromium-generic # x86_64 capable systems need this - sed -i "s|/usr/lib/chromium|%{_libdir}/chromium|g" %{buildroot}%{_libdir}/chromium/chromium-generic + sed -i "s|%{_libexecdir}/chromium|%{_libdir}/chromium|g" %{buildroot}%{_libdir}/chromium/chromium-generic #update the password-store settings for each alternative - sed "s|password-store=basic|password-store=kwallet|g" %{buildroot}%{_libdir}/chromium/chromium-generic > %{buildroot}%{_libdir}/chromium/chromium-kde - sed "s|password-store=basic|password-store=gnome|g" %{buildroot}%{_libdir}/chromium/chromium-generic > %{buildroot}%{_libdir}/chromium/chromium-gnome +%if 0%{?suse_version} > 1320 || 0%{?suse_version} == 1315 && 0%{?is_opensuse} + sed "s|password-store=detect|password-store=kwallet5|g" %{buildroot}%{_libdir}/chromium/chromium-generic > %{buildroot}%{_libdir}/chromium/chromium-kde +%else + sed "s|password-store=detect|password-store=kwallet|g" %{buildroot}%{_libdir}/chromium/chromium-generic > %{buildroot}%{_libdir}/chromium/chromium-kde +%endif + sed "s|password-store=detect|password-store=gnome|g" %{buildroot}%{_libdir}/chromium/chromium-generic > %{buildroot}%{_libdir}/chromium/chromium-gnome mkdir -p %{buildroot}%{_mandir}/man1/ pushd out/Release - # Install the file /etc/default/chromium which defines the chromium flags + # Install the file %{_sysconfdir}/default/chromium which defines the chromium flags mkdir -p %{buildroot}%{_sysconfdir}/default install -m 644 %{SOURCE103} %{buildroot}%{_sysconfdir}/default/chromium - # Recent Chromium builds now wants to have the sandbox in the same directory. So let's create a symlink to the one in /usr/lib - cp -a chrome_sandbox %{buildroot}%{_prefix}/lib/ - ln -s -f %{_prefix}/lib/chrome_sandbox %{buildroot}/%{_libdir}/chromium/chrome-sandbox + # Recent Chromium builds now wants to have the sandbox in the same directory. So let's create a symlink to the one in %{_prefix}/lib + cp -a chrome_sandbox %{buildroot}%{_libexecdir}/ + ln -s -f %{_libexecdir}/chrome_sandbox %{buildroot}/%{_libdir}/chromium/chrome-sandbox cp -a *.pak locales xdg-mime icudtl.dat %{buildroot}%{_libdir}/chromium/ cp -a chromedriver %{buildroot}%{_libdir}/chromium/ @@ -504,66 +489,54 @@ chmod 755 %{buildroot}%{_libdir}/%{name}/xdg-settings chmod 755 %{buildroot}%{_libdir}/%{name}/xdg-mime - # create a dummy target for /etc/alternatives/chromium + # create a dummy target for %{_sysconfdir}/alternatives/chromium mkdir -p %{buildroot}%{_sysconfdir}/alternatives mkdir -p %{buildroot}%{_bindir} touch %{buildroot}%{_sysconfdir}/alternatives/chromium ln -s -f %{_sysconfdir}/alternatives/chromium %{buildroot}/%{_bindir}/chromium %endif -%clean -rm -rf %{buildroot} - +%if !0%{?packman_bs} %pre -if [ -f %{_bindir}/chromium -a ! -L %{_bindir}/chromium ] ; then rm -f %{_bindir}/chromium +if [ -f %{_bindir}/chromium -a ! -L %{_bindir}/chromium ] ; then + rm -f %{_bindir}/chromium fi - -# Add snipplets to update the GTK cache on package install. - %verifyscript -%verify_permissions -e %{_prefix}/lib/chrome_sandbox +%verify_permissions -e %{_libexecdir}/chrome_sandbox %post %icon_theme_cache_post %desktop_database_post -"%_sbindir/update-alternatives" --install %{_bindir}/chromium chromium %{_libdir}/chromium/chromium-generic 10 -%set_permissions %{_prefix}/lib/chrome_sandbox +update-alternatives --install %{_bindir}/chromium chromium %{_libdir}/chromium/chromium-generic 10 +%set_permissions %{_libexecdir}/chrome_sandbox %postun %icon_theme_cache_postun %desktop_database_postun if [ $1 -eq 0 ]; then -update-alternatives --remove-all chromium + update-alternatives --remove chromium %{_libdir}/chromium/chromium-generic fi %post desktop-kde -if [ ! -e /.buildenv ]; then -"%_sbindir/update-alternatives" --install %{_bindir}/chromium chromium %{_libdir}/chromium/chromium-kde 15 -"%_sbindir/update-alternatives" --auto chromium -fi +update-alternatives --install %{_bindir}/chromium chromium %{_libdir}/chromium/chromium-kde 15 %preun desktop-kde -if [ $1 -eq 0 -a ! -e /.buildenv ]; then -"%_sbindir/update-alternatives" --remove chromium %{_libdir}/chromium/chromium-kde -"%_sbindir/update-alternatives" --auto chromium +if [ $1 -eq 0 ]; then + update-alternatives --remove chromium %{_libdir}/chromium/chromium-kde fi %post desktop-gnome -if [ ! -e /.buildenv ]; then -"%_sbindir/update-alternatives" --install %{_bindir}/chromium chromium %{_libdir}/chromium/chromium-gnome 15 -"%_sbindir/update-alternatives" --auto chromium -fi +update-alternatives --install %{_bindir}/chromium chromium %{_libdir}/chromium/chromium-gnome 15 %postun desktop-gnome -if [ $1 -eq 0 -a ! -e /.buildenv ]; then -"%_sbindir/update-alternatives" --remove chromium %{_libdir}/chromium/chromium-gnome -"%_sbindir/update-alternatives" --auto chromium +if [ $1 -eq 0 ]; then + update-alternatives --remove chromium %{_libdir}/chromium/chromium-gnome fi +%endif # Files! %if 0%{?packman_bs} - %files ffmpeg %defattr(-,root,root,-) %dir %{_libdir}/chromium @@ -571,10 +544,9 @@ %{_libdir}/chromium/lib/libffmpeg.so %else - %files %defattr(-,root,root,-) -%verify(not mode) %{_prefix}/lib/chrome_sandbox +%verify(not mode) %{_libexecdir}/chrome_sandbox %doc AUTHORS LICENSE %config %{_sysconfdir}/%{name} %config(noreplace) %{_sysconfdir}/default/chromium @@ -585,22 +557,26 @@ %{_datadir}/applications/*.desktop %{_datadir}/gnome-control-center/default-apps/chromium-browser.xml %{_datadir}/icons/hicolor/ -%{_prefix}/lib/chrome_sandbox +%{_libexecdir}/chrome_sandbox %exclude %{_libdir}/chromium/lib/*ffmpeg*.so %exclude %{_libdir}/chromium/chromium-kde %exclude %{_libdir}/chromium/chromium-gnome %exclude %{_libdir}/chromium/chromedriver -%_bindir/chromium -%ghost %_sysconfdir/alternatives/chromium +%{_bindir}/chromium +%ghost %{_sysconfdir}/alternatives/chromium %files ffmpegsumo %defattr(-,root,root,-) %{_libdir}/chromium/lib/*ffmpeg*.so %files desktop-kde +%defattr(-,root,root) +%ghost %{_sysconfdir}/alternatives/chromium %attr(755, root, root) %{_libdir}/chromium/chromium-kde %files desktop-gnome +%defattr(-,root,root) +%ghost %{_sysconfdir}/alternatives/chromium %attr(755, root, root) %{_libdir}/chromium/chromium-gnome %files -n chromedriver ++++++ chromium-48.0.2564.82.tar.xz -> chromium-48.0.2564.103.tar.xz ++++++ /work/SRC/openSUSE:Factory/chromium/chromium-48.0.2564.82.tar.xz /work/SRC/openSUSE:Factory/.chromium.new/chromium-48.0.2564.103.tar.xz differ: char 27, line 1 ++++++ chromium-browser.sh ++++++ --- /var/tmp/diff_new_pack.B931FX/_old 2016-02-09 13:33:02.000000000 +0100 +++ /var/tmp/diff_new_pack.B931FX/_new 2016-02-09 13:33:02.000000000 +0100 @@ -128,6 +128,6 @@ $GDB "$LIBDIR/$APPNAME" -x $tmpfile exit $? else - exec $LIBDIR/$APPNAME $SANDBOX ${CHROMIUM_FLAGS} ${PEPPERFLASH} "--password-store=basic" "--enable-threaded-compositing" "$@" + exec $LIBDIR/$APPNAME $SANDBOX ${CHROMIUM_FLAGS} ${PEPPERFLASH} "--password-store=detect" "--enable-threaded-compositing" "$@" fi
