[packages/google-chrome] - fix building beta browser

arekm arekm at pld-linux.org
Thu Mar 1 12:54:52 CET 2018


commit d5e076ee707c5bb35dbb5521bcca51e2c0a0b7f6
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Thu Mar 1 12:54:34 2018 +0100

    - fix building beta browser

 google-chrome.spec | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)
---
diff --git a/google-chrome.spec b/google-chrome.spec
index ce47e8e..5855a49 100644
--- a/google-chrome.spec
+++ b/google-chrome.spec
@@ -102,7 +102,11 @@ rm default-app-block default-apps/google-chrome%{?gcsuffix}.xml
 rm chrome%{?gcsuffix}/xdg-settings
 rm chrome%{?gcsuffix}/xdg-mime
 
-[ -f *.1.gz ] && gzip -d *.1.gz
+if [ -n "$(ls *.1.gz)" ]; then
+	for file in *.1.gz; do
+		[ -f "$file" ] && gzip -d "$file"
+	done
+fi
 
 %{__sed} -e 's, at localedir@,%{_libdir}/%{name},' %{SOURCE2} > find-lang.sh
 %{__sed} -i 's;/opt/google/chrome/product_logo_48.png;%{name}.png;' google-chrome%{?gcsuffix}.desktop
@@ -122,7 +126,7 @@ sed -i -e 's#RPM_STATE#%{state}#g' $RPM_BUILD_ROOT%{_bindir}/%{name}
 
 %{__sed} -i -e 's, at libdir@,%{_libdir}/%{name},' $RPM_BUILD_ROOT%{_bindir}/%{name}
 cp -a chrome%{?gcsuffix}/* $RPM_BUILD_ROOT%{_libdir}/%{name}
-cp -p google-chrome%{?gcsuffix}.1.gz $RPM_BUILD_ROOT%{_mandir}/man1/google-chrome.1.gz
+cp -p google-chrome-%{state}.1 $RPM_BUILD_ROOT%{_mandir}/man1/google-chrome.1
 # for google-chrome --help
 echo ".so google-chrome.1" > $RPM_BUILD_ROOT%{_mandir}/man1/chrome.1
 cp -p google-chrome%{?gcsuffix}.desktop $RPM_BUILD_ROOT%{_desktopdir}/google-chrome.desktop
@@ -130,6 +134,7 @@ cp -p google-chrome%{?gcsuffix}.desktop $RPM_BUILD_ROOT%{_desktopdir}/google-chr
 for icon in product_logo_*.png; do
 	size=${icon##product_logo_}
 	size=${size%.png}
+	size=${size%_%{state}}
 
 	install -d $RPM_BUILD_ROOT%{_iconsdir}/hicolor/${size}x${size}/apps
 	cp -p $icon $RPM_BUILD_ROOT%{_iconsdir}/hicolor/${size}x${size}/apps/%{name}.png
@@ -175,6 +180,9 @@ fi
 %{_iconsdir}/hicolor/*/apps/%{name}.png
 
 %dir %{_libdir}/%{name}
+%if "%{state}" == "beta"
+%{_libdir}/%{name}/MEIPreload
+%endif
 %{_libdir}/%{name}/icudtl.dat
 %{_libdir}/%{name}/chrome_*_percent.pak
 %{_libdir}/%{name}/resources.pak
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/google-chrome.git/commitdiff/d5e076ee707c5bb35dbb5521bcca51e2c0a0b7f6



More information about the pld-cvs-commit mailing list