|
|
@@ -4,16 +4,18 @@
|
|
|
|
|
|
# norootforbuild
|
|
|
|
|
|
+%if %{?_dist_release} == "vl6"
|
|
|
#% define with_system_icu 1
|
|
|
+%endif
|
|
|
|
|
|
-%define svn_rev 43947
|
|
|
+%define svn_rev 44472
|
|
|
|
|
|
Name: chromium
|
|
|
Summary: Google's opens source browser project
|
|
|
Summary(ja): Googleのオープンソースウェブブラウザ
|
|
|
#'
|
|
|
-Version: 5.0.372.0
|
|
|
-Release: 1%{?_dist_release}
|
|
|
+Version: 5.0.378.0
|
|
|
+Release: 2%{?_dist_release}
|
|
|
License: BSD
|
|
|
Group: Applications/Internet
|
|
|
Source0: %{name}.%{version}.svn%{svn_rev}.tar.lzma
|
|
|
@@ -34,6 +36,8 @@ Source10: chromium-vine.desktop
|
|
|
Source20: chromium-vendor-vine.patch.in
|
|
|
##!!Source30: master_preferences
|
|
|
Source30: master_preferences.vine
|
|
|
+# icu-4.2.1 contained in chromium.5.0.353.0.svn41449 (for Vine Linux 5.X)
|
|
|
+Source100: icu-4.2.1-chromium.5.0.353.0.svn41449.tar.bz2
|
|
|
Provides: chromium-browser = %{version}
|
|
|
#Obsoletes: chromium-browser < %{version}
|
|
|
|
|
|
@@ -47,7 +51,7 @@ Patch7: chromium-codechanges-nss-nspr.patch
|
|
|
Patch8: chromium-codechanges-zlib.patch
|
|
|
Patch9: chromium-drop-sse.patch
|
|
|
Patch10: chromium-fix-wrapper.patch
|
|
|
-Patch11: chromium-fix-home-kde4-path.patch
|
|
|
+#Patch11: chromium-fix-home-kde4-path.patch
|
|
|
Patch12: chromium-no-test-sources.patch
|
|
|
Patch13: chromium-no-courgette.patch
|
|
|
Patch14: chromium-master-prefs-path.patch
|
|
|
@@ -59,6 +63,7 @@ Patch19: chromium-system-zlib.patch
|
|
|
Patch20: chromium-noffmpeg.patch
|
|
|
Patch21: chromium-system-old-ffmpeg-way.patch
|
|
|
Patch22: chromium-libpng14.patch
|
|
|
+Patch23: chromium-disable-mmx.patch
|
|
|
|
|
|
# Vine
|
|
|
#Patch40: chromium-5.0.353-no-ffmpeg-vine.patch
|
|
|
@@ -155,6 +160,15 @@ Chromium は Google Chrome の後方にあるオープンソースプロジェ
|
|
|
lzma -cd %{SOURCE0} | tar xf -
|
|
|
%setup -D -T -n %{name}
|
|
|
|
|
|
+# use static libicu
|
|
|
+#%if %{?_dist_release} == "vl5"
|
|
|
+cd src/third_party || exit 1
|
|
|
+ %__rm -rf icu || exit 1
|
|
|
+ tar jxvf %{SOURCE100} || exit 1
|
|
|
+ %__mv icu-4.2.1-chromium.5.0.353.0.svn41449 icu || exit 1
|
|
|
+cd - || exit 1
|
|
|
+#%endif
|
|
|
+
|
|
|
# use system libicu only if >= 4.0
|
|
|
%{?with_system_icu:%patch3 -p1}
|
|
|
|
|
|
@@ -164,7 +178,7 @@ lzma -cd %{SOURCE0} | tar xf -
|
|
|
%patch8 -p1
|
|
|
%patch9 -p1
|
|
|
%patch10 -p1
|
|
|
-%patch11 -p1
|
|
|
+#%patch11 -p1
|
|
|
%patch12 -p1
|
|
|
%patch13 -p1
|
|
|
%patch14 -p1
|
|
|
@@ -176,6 +190,9 @@ lzma -cd %{SOURCE0} | tar xf -
|
|
|
%patch20 -p1
|
|
|
%patch21 -p1
|
|
|
%patch22 -p1
|
|
|
+%ifarch %ix86
|
|
|
+%patch23 -p1
|
|
|
+%endif
|
|
|
|
|
|
# apply vendor patch after substitution
|
|
|
%__sed "s:RPM_VERSION:%{version}-%{release}:" %{SOURCE20} | patch -p0
|
|
|
@@ -319,6 +336,15 @@ desktop-file-install --vendor Vine \
|
|
|
#%exclude %{_libdir}/libavformat.so.52
|
|
|
|
|
|
%changelog
|
|
|
+* Fri Apr 16 2010 Munehiro Yamamoto <munepi@vinelinux.org> 5.0.378.0-2
|
|
|
+- unused with_system_icu (for vl6)
|
|
|
+ - used icu-4.2.1-chromium.5.0.353.0.svn41449 (for vl6)
|
|
|
+
|
|
|
+* Wed Apr 14 2010 Munehiro Yamamoto <munepi@vinelinux.org> 5.0.378.0-1
|
|
|
+- updated to snapshot 5.0.378.0 r44472
|
|
|
+ - used with_system_icu (for vl6)
|
|
|
+ - added icu-4.2.1-chromium.5.0.353.0.svn41449.tar.bz2 (for vl5)
|
|
|
+
|
|
|
* Sat Apr 10 2010 Munehiro Yamamoto <munepi@vinelinux.org> 5.0.372.0-1
|
|
|
- updated to snapshot 5.0.372.0 r43947
|
|
|
- added BuildRequires: glew-devel
|
munepi