rpms
/
chromium
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into f27

This commit is contained in:
Tom Callaway 2018-06-25 16:08:38 -04:00
parent 0653cb2925 77c46e3fc5
commit cd9828b360
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
chromium-67.0.3396.87-fedora-user-agent.patch Normal file
View File

@ -0,0 +1,12 @@
diff -up chromium-67.0.3396.87/content/common/user_agent.cc.fedora-user-agent chromium-67.0.3396.87/content/common/user_agent.cc
--- chromium-67.0.3396.87/content/common/user_agent.cc.fedora-user-agent 2018-06-25 16:01:48.092188102 -0400
+++ chromium-67.0.3396.87/content/common/user_agent.cc 2018-06-25 16:02:42.634878954 -0400
@@ -141,7 +141,7 @@ std::string getUserAgentPlatform() {
#elif defined(OS_MACOSX)
"Macintosh; ";
#elif defined(USE_X11) || defined(USE_OZONE)
- "X11; "; // strange, but that's what Firefox uses
+ "X11; Fedora; "; // strange, but that's what Firefox uses
#elif defined(OS_ANDROID)
"Linux; ";
#else

14
chromium.spec
View File

@ -140,7 +140,7 @@ Name: chromium%{chromium_channel}%{?freeworld:-freeworld}
Name: chromium%{chromium_channel}
%endif
Version: %{majorversion}.0.3396.87
Release: 1%{?dist}
Release: 2%{?dist}
Summary: A WebKit (Blink) powered web browser
Url: http://www.chromium.org/Home
License: BSD and LGPLv2+ and ASL 2.0 and IJG and MIT and GPLv2+ and ISC and OpenSSL and (MPLv1.1 or GPLv2 or LGPLv2)
@ -257,6 +257,8 @@ Patch99: chromium-67.0.3396.62-crashpad-aarch64-buildfix.patch
# RHEL 7 has a bug in its python2.7 which does not propely handle exec with a tuple
# https://bugs.python.org/issue21591
Patch100: chromium-67.0.3396.62-epel7-use-old-python-exec-syntax.patch
# Add "Fedora" to the user agent string
Patch101: chromium-67.0.3396.87-fedora-user-agent.patch
# Use chromium-latest.py to generate clean tarball from released build tarballs, found here:
@ -776,6 +778,7 @@ udev.
%if 0%{?rhel} == 7
%patch100 -p1 -b .oldexec
%endif
%patch101 -p1 -b .fedora-user-agent
# Change shebang in all relevant files in this directory and all subdirectories
@ -1459,8 +1462,8 @@ install -m 0644 %{SOURCE13} %{buildroot}%{_sysconfdir}/%{name}/
mkdir -p %{buildroot}%{_datadir}/applications/
desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE4}
install -D -m0644 chrome/installer/linux/common/chromium-browser/chromium-browser.appdata.xml ${RPM_BUILD_ROOT}%{_datadir}/appdata/%{chromium_browser_channel}.appdata.xml
appstream-util validate-relax --nonet ${RPM_BUILD_ROOT}%{_datadir}/appdata/%{chromium_browser_channel}.appdata.xml
install -D -m0644 chrome/installer/linux/common/chromium-browser/chromium-browser.appdata.xml ${RPM_BUILD_ROOT}%{_datadir}/metainfo/%{chromium_browser_channel}.appdata.xml
appstream-util validate-relax --nonet ${RPM_BUILD_ROOT}%{_datadir}/metainfo/%{chromium_browser_channel}.appdata.xml
mkdir -p %{buildroot}%{_datadir}/gnome-control-center/default-apps/
cp -a %{SOURCE9} %{buildroot}%{_datadir}/gnome-control-center/default-apps/
@ -1591,7 +1594,7 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
%{_mandir}/man1/%{chromium_browser_channel}.*
%{_datadir}/icons/hicolor/*/apps/%{chromium_browser_channel}.png
%{_datadir}/applications/*.desktop
%{_datadir}/appdata/*.appdata.xml
%{_datadir}/metainfo/*.appdata.xml
%{_datadir}/gnome-control-center/default-apps/chromium-browser.xml
%files common
@ -1709,6 +1712,9 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
%changelog
* Mon Jun 25 2018 Tom Callaway <spot@fedoraproject.org> 67.0.3396.87-2
- add "Fedora" to the user agent string
* Tue Jun 19 2018 Tom Callaway <spot@fedoraproject.org> 67.0.3396.87-1
- update to 67.0.3396.87