From: Elan Ruusamäe <glen@delfi.ee>
Date: Sun, 24 Feb 2013 21:10:00 +0000 (+0200)
Subject: up to 25.0.1364.97
X-Git-Tag: auto/th/chromium-browser-25.0.1364.97-1~1
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fchromium-browser.git;a=commitdiff_plain;h=92fcbe1237128817c422e36b8ea9c83628e9e345

up to 25.0.1364.97
---

92fcbe1237128817c422e36b8ea9c83628e9e345
diff --cc chromium-browser.spec
index 3068d50,8ccdecc..998ba61
--- a/chromium-browser.spec
+++ b/chromium-browser.spec
@@@ -66,26 -56,15 +56,26 @@@
  # http://carme.pld-linux.org/~glen/chromium-browser/th/x86_64/chromium-nightly.conf
  # http://carme.pld-linux.org/~glen/chromium-browser/th/i686/chromium-nightly.conf
  
- %define		branch		24.0.1312
- %define		basever		52
- %define		patchver	70
++%define		branch		25.0.1364
++%define		basever		97
++#define		patchver	70
  %define		gyp_rev	1014
  Summary:	A WebKit powered web browser
  Name:		chromium-browser
 -Version:	25.0.1364.97
 -Release:	0.25
 +%if "%{?patchver}" != ""
 +Version:	%{branch}.%{patchver}
 +%else
 +Version:	%{branch}.%{basever}
 +%endif
 +Release:	1
  License:	BSD, LGPL v2+ (ffmpeg)
  Group:		X11/Applications/Networking
 -Source0:	http://carme.pld-linux.org/~glen/chromium-browser/src/beta/%{name}-%{version}.tar.gz
 -# Source0-md5:	2995d5aa3f1ecb470e60e0984229fcce
 +Source0:	http://carme.pld-linux.org/~glen/chromium-browser/src/stable/%{name}-%{branch}.%{basever}.tar.xz
- # Source0-md5:	bcc3976e61b9ce715ba9c85d46df72f1
++# Source0-md5:	07a041c89f2e44219fff4e3553ae8c02
 +%if "%{?patchver}" != ""
 +Patch0:		http://carme.pld-linux.org/~glen/chromium-browser/src/stable/%{name}-%{version}.patch.xz
 +# Patch0-md5:	37675cd75c578d26d6210259877f3947
 +%endif
  Source1:	%{name}.default
  Source2:	%{name}.sh
  Source3:	%{name}.desktop
@@@ -159,8 -137,6 +148,7 @@@ BuildRequires:	libstdc++-deve
  %{?with_system_libwebp:BuildRequires:	libwebp-devel >= 0.1.99}
  BuildRequires:	libxml2-devel
  BuildRequires:	libxslt-devel
- BuildRequires:	lzma
 +BuildRequires:	man-db
  %{?with_system_minizip:BuildRequires:	minizip-devel}
  BuildRequires:	nspr-devel
  BuildRequires:	nss-devel >= 1:3.12.3
@@@ -431,19 -415,10 +439,14 @@@ test -e Makefile || 
  %{__make} -r chrome %{?with_sandboxing:chrome_sandbox} \
  	BUILDTYPE=%{!?debug:Release}%{?debug:Debug} \
  	%{?with_verbose:V=1} \
- 	CC="%{__cc}" \
- 	CXX="%{__cxx}" \
- 	LDFLAGS="%{rpmldflags} -fuse-ld=gold" \
  	CC.host="%{__cc}" \
  	CXX.host="%{__cxx}" \
- 	LDFLAGS.host="%{rpmldflags}" \
- 	CFLAGS="%{rpmcflags} %{rpmcppflags}" \
- 	CXXFLAGS="%{rpmcxxflags} %{rpmcppflags}"
+ 	LDFLAGS.host="%{rpmldflags} -fuse-ld=gold" \
  
 +cd ../out/%{!?debug:Release}%{?debug:Debug}
 +MANWIDTH=80 man ./chrome.1 > man.out
 +%{__sed} -e '1,/OPTIONS/d; /ENVIRONMENT/,$d' man.out > options.txt
 +
  %install
  rm -rf $RPM_BUILD_ROOT
  install -d $RPM_BUILD_ROOT%{_libdir}/%{name}/{themes,plugins,extensions} \