diff --git a/chromium.spec b/chromium.spec index b712c4a..040af33 100644 --- a/chromium.spec +++ b/chromium.spec @@ -1,6 +1,6 @@ Name: chromium Epoch: 3 -Version: 41.0.2272.118 +Version: 43.0.2357.134 Release: 1mamba Summary: An open-source browser project that aims to build a safer, faster, and more stable way to experience the web Group: Graphical Desktop/Applications/Internet @@ -155,7 +155,7 @@ Chromium is an open-source browser project that aims to build a safer, faster, a %prep %setup -q #-D -T -#:<< ___EOF +#:<< _EOF #mv home/chrome-svn/tarball/chromium/src/* . #rm -rf home %patch0 -p2 @@ -191,7 +191,7 @@ python build/download_nacl_toolchains.py \ sync --extract %build -#:<< ___EOF +#:<< _EOF #ln -sf %{_bindir}/ld.gold third_party/gold/ld.gold #ln -sf %{_bindir}/ld.bfd third_party/gold/ld.bfd # Build with clang as a temporary solution to startup crash with GCC 4.9 @@ -298,15 +298,15 @@ ninja -C out/Release chrome chrome_sandbox chromedriver %install [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" #cd src -install -d -m0755 %{buildroot}/opt/chromium/ %{buildroot}%{_bindir} -install -m0755 out/Release/chrome %{buildroot}/opt/chromium/ -install -m0755 out/Release/chrome_sandbox %{buildroot}/opt/chromium/chrome-sandbox -install -m0755 out/Release/chromedriver %{buildroot}/opt/chromium/chromedriver -cp out/Release/{*.pak,libffmpegsumo.so,libpdf.so} \ - %{buildroot}/opt/chromium/ -cp out/Release/*.bin %{buildroot}/opt/chromium/ +install -d -m0755 %{buildroot}%{_libdir}/chromium/ %{buildroot}%{_bindir} +install -m0755 out/Release/chrome %{buildroot}%{_libdir}/chromium/chromium +install -m0755 out/Release/chrome_sandbox %{buildroot}%{_libdir}/chromium/chrome-sandbox +install -m0755 out/Release/chromedriver %{buildroot}%{_libdir}/chromium/chromedriver +cp out/Release/{*.pak,libffmpegsumo.so} \ + %{buildroot}%{_libdir}/chromium +cp out/Release/*.bin %{buildroot}%{_libdir}/chromium/ -install -m0755 chrome/tools/build/linux/chrome-wrapper %{buildroot}/opt/chromium/ +install -m0755 chrome/tools/build/linux/chrome-wrapper %{buildroot}%{_libdir}/chromium/ #install -m0755 third_party/xdg-utils/scripts/xdg-settings %{buildroot}/opt/chromium/xdg-settings #%ifnarch arm @@ -316,19 +316,18 @@ install -m0755 chrome/tools/build/linux/chrome-wrapper %{buildroot}/opt/chromium ##install -m0755 out/Release/ncdecode* %{buildroot}/opt/chromium/ #%endif %if "%cross_target_cpu" != "i586" -install -m0755 out/Release/protoc %{buildroot}/opt/chromium/ +install -m0755 out/Release/protoc %{buildroot}%{_libdir}/chromium/ %endif #install -m0644 out/Release/resources.pak %{buildroot}/opt/chromium/ -install -D -m0644 out/Release/icudtl.dat %{buildroot}/opt/chromium/ -install -D -m0644 out/Release/chrome.1 %{buildroot}%{_mandir}/man1/chrome.1 -install -D -m0644 chrome/app/theme/chromium/product_logo_48.png %{buildroot}%{_datadir}/pixmaps/chrome.png -cp -a out/Release/locales %{buildroot}/opt/chromium/ +install -D -m0644 out/Release/icudtl.dat %{buildroot}%{_libdir}/chromium +install -D -m0644 out/Release/chrome.1 %{buildroot}%{_mandir}/man1/chromium.1 +install -D -m0644 chrome/app/theme/chromium/product_logo_48.png %{buildroot}%{_datadir}/pixmaps/chromium.png +cp -a out/Release/locales %{buildroot}%{_libdir}/chromium/ -ln -s /opt/chromium/chrome-wrapper %{buildroot}%{_bindir}/chromium -ln -s /opt/chromium/chrome-wrapper %{buildroot}%{_bindir}/chrome +#ln -s %{_libdir}/chromium/chrome-wrapper %{buildroot}%{_bindir}/chromium mkdir -p %{buildroot}%{_datadir}/applications -cat > %{buildroot}%{_datadir}/applications/chromium-devel.desktop << EOF +cat > %{buildroot}%{_datadir}/applications/chromium.desktop << EOF [Desktop Entry] Name=Chromium Browser Name[it]=Browser Chromium @@ -339,39 +338,57 @@ Comment[it]=Un browser open source pensato per un web più moderno Exec=chromium --password-store=detect --ignore-gpu-blacklist %u Type=Application Terminal=0 -Icon=%{_datadir}/pixmaps/chrome.png +Icon=%{_datadir}/pixmaps/chromium.png Categories=Network; MimeType=text/html; X-KDE-StartupNotify=true EOF -cat > %{buildroot}%{_datadir}/applications/chromium-accelerated.desktop << EOF -[Desktop Entry] -Name=Chromium Browser (not GPU accelerated) -Name[it]=Browser Chromium (senza accelerazioni GPU) -GenericName=Web Browser -GenericName[it]=Browser Web -Comment=An open-source browser to help move the web forward -Comment[it]=Un browser open source pensato per un web più moderno -Exec=chromium --password-store=detect %u -Type=Application -Terminal=0 -Icon=/usr/share/pixmaps/chrome.png -Categories=Network; -MimeType=text/html; -X-KDE-StartupNotify=true -EOF +#cat > %{buildroot}%{_datadir}/applications/chromium-accelerated.desktop << EOF +#[Desktop Entry] +#Name=Chromium Browser (not GPU accelerated) +#Name[it]=Browser Chromium (senza accelerazioni GPU) +#GenericName=Web Browser +#GenericName[it]=Browser Web +#Comment=An open-source browser to help move the web forward +#Comment[it]=Un browser open source pensato per un web più moderno +#Exec=chromium --password-store=detect %u +#Type=Application +#Terminal=0 +#Icon=/usr/share/pixmaps/chrome.png +#Categories=Network; +#MimeType=text/html; +#X-KDE-StartupNotify=true +#EOF # install master_preferences file for first run and homepage customization -install -m0644 %{SOURCE1} %{buildroot}/opt/chromium/master_preferences +install -m0644 %{SOURCE1} %{buildroot}%{_libdir}/chromium/master_preferences #%find_lang %{name} +cat > %{buildroot}%{_bindir}/chromium << _EOF +#!/bin/bash +set -- "\${ARGS[@]}" "\$@" + +if [ -r /opt/chromium/PepperFlash/manifest.json ]; then + PEPPER_FLASH_VERSION="\$(grep '"version":' /opt/chromium/PepperFlash/manifest.json | grep -Po '(?<=version": ")(?:\d|\.)*')" + exec %{_libdir}/chromium/chromium \\ + --ppapi-flash-path=/opt/chromium/PepperFlash/libpepflashplayer.so \\ + --ppapi-flash-version=\${PEPPER_FLASH_VERSION} "\$@" +else + exec %{_libdir}/chromium/chromium "\$@" +fi +_EOF +chmod 755 %{buildroot}%{_bindir}/chromium + +# legacy favorites symlink +ln -s chromium.desktop %{buildroot}%{_datadir}/applications/chromium-devel.desktop + %post /sbin/ldconfig if [ $1 -ge 1 ]; then [ -e %{_kde4_bindir}/kickoffcfg ] && \ - %{_kde4_bindir}/kickoffcfg --add-favorite %{_datadir}/applications/chromium-devel.desktop + %{_kde4_bindir}/kickoffcfg --add-favorite %{_datadir}/applications/chromium.desktop fi : @@ -379,53 +396,88 @@ fi /sbin/ldconfig if [ $1 -eq 0 ]; then [ -e %{_kde4_bindir}/kickoffcfg ] && \ - %{_kde4_bindir}/kickoffcfg --del-favorite %{_datadir}/applications/chromium-devel.desktop + %{_kde4_bindir}/kickoffcfg --del-favorite %{_datadir}/applications/chromium.desktop fi : +%posttrans +/usr/bin/update-desktop-database -q +: + %clean [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" %files %defattr(-,root,root) %{_bindir}/chromium -%{_bindir}/chrome +%{_datadir}/applications/chromium.desktop %{_datadir}/applications/chromium-devel.desktop -%{_datadir}/applications/chromium-accelerated.desktop -%{_datadir}/pixmaps/chrome.png -%dir /opt/chromium -/opt/chromium/chrome -/opt/chromium/chromedriver -/opt/chromium/*.pak -/opt/chromium/*.bin -/opt/chromium/chrome-wrapper -%attr(4755,root,root) /opt/chromium/chrome-sandbox -#/opt/chromium/ffmpegsumo_nolink -/opt/chromium/icudtl.dat -/opt/chromium/libffmpegsumo.so -/opt/chromium/libpdf.so +%{_datadir}/pixmaps/chromium.png +%dir %{_libdir}/chromium +%{_libdir}/chromium/chromium +%{_libdir}/chromium/chromedriver +%{_libdir}/chromium/*.pak +%{_libdir}/chromium/*.bin +%{_libdir}/chromium/chrome-wrapper +%attr(4755,root,root) %{_libdir}/chromium/chrome-sandbox +%{_libdir}/chromium/icudtl.dat +%{_libdir}/chromium/libffmpegsumo.so +#/opt/chromium/libpdf.so #/opt/chromium/nacl_helper #/opt/chromium/nacl_helper-bootstrap #/opt/chromium/libppGoogleNaClPluginChrome.so #/opt/chromium/nacl_irt_*.nexe -/opt/chromium/master_preferences +%{_libdir}/chromium/master_preferences #/opt/chromium/xdg-settings #%ifnarch arm #/opt/chromium/ncdecode* #%endif %if "%cross_target_cpu" != "i586" -/opt/chromium/protoc +%{_libdir}/chromium/protoc %endif #%ifnarch arm #/opt/chromium/gen* #/opt/chromium/re2c #/opt/chromium/yasm #%endif -/opt/chromium/locales -#/opt/chromium/resources -%{_mandir}/man1/chrome.1* +%{_libdir}/chromium/locales +%{_mandir}/man1/chromium.1* %changelog +* Wed Jul 15 2015 Automatic Build System 43.0.2357.134-1mamba +- automatic version update by autodist + +* Wed Jul 08 2015 Automatic Build System 43.0.2357.132-1mamba +- automatic version update by autodist + +* Tue Jun 23 2015 Automatic Build System 43.0.2357.130-1mamba +- automatic version update by autodist + +* Fri Jun 12 2015 Automatic Build System 43.0.2357.125-1mamba +- automatic version update by autodist + +* Thu Jun 11 2015 Automatic Build System 43.0.2357.124-1mamba +- automatic version update by autodist + +* Tue May 26 2015 Automatic Build System 43.0.2357.81-1mamba +- automatic version update by autodist + +* Thu May 21 2015 Silvan Calarco 43.0.2357.65-3mamba +- re-enable sanbox, but requires recent kernels built with CONFIG_PID_NS=y + +* Wed May 20 2015 Silvan Calarco 43.0.2357.65-2mamba +- move from /opt to %{_libdir} +- launch with --disable-namespace-sandbox needed since 42 + +* Wed May 20 2015 Automatic Build System 43.0.2357.65-1mamba +- automatic version update by autodist + +* Wed Apr 29 2015 Automatic Build System 42.0.2311.135-1mamba +- automatic version update by autodist + +* Sat Apr 18 2015 Automatic Build System 42.0.2311.90-1mamba +- automatic version update by autodist + * Fri Apr 03 2015 Automatic Build System 41.0.2272.118-1mamba - automatic version update by autodist