Browse Source

updated: icu, libboost, WebKit

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@798 ec354946-7b23-47d6-9f5a-488ba84defc7
inagaki 15 years ago
parent
commit
2a9d003cf3
3 changed files with 39 additions and 19 deletions
  1. 15 3
      W/WebKit/WebKit-vl.spec
  2. 20 15
      i/icu/icu-vl.spec
  3. 4 1
      lib/libb/libboost/libboost-vl.spec

+ 15 - 3
W/WebKit/WebKit-vl.spec

@@ -19,7 +19,7 @@
 %bcond_with	wml
 
 Name:		WebKit
-Version:	1.1.18
+Version:	1.2.0
 Release:        1%{?_dist_release}
 Summary:	Web content engine library
 Summary(ja):	ウェブコンテンツエンジンライブラリ
@@ -34,6 +34,9 @@ Packager: yasumichi
 
 Source0:	http://www.webkitgtk.org/webkit-%{version}.tar.gz
 
+# upstream patch
+Patch100:	WebKit-icu44-36381.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires:	bison
@@ -46,7 +49,7 @@ BuildRequires:	libtool
 BuildRequires:	libxslt-devel
 BuildRequires:	libXt-devel
 BuildRequires:	pcre-devel
-BuildRequires:	sqlite-devel
+BuildRequires:	sqlite3-devel
 BuildRequires:  geoclue-devel
 BuildRequires:  gnome-keyring-devel
 BuildRequires:  gstreamer-devel
@@ -58,7 +61,7 @@ BuildRequires:  pango-devel
 %else
 BuildRequires:  cairo-devel
 BuildRequires:  fontconfig-devel
-BuildRequires:  freetype-devel
+BuildRequires:  freetype2-devel
 %endif
 
 %if %{with libsoup}
@@ -112,6 +115,8 @@ AUTHORS files.
 %prep
 %setup -q -n webkit-%{version}
 
+# upstream
+%patch100 -p0
 
 %build
 %configure \
@@ -185,6 +190,13 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Apr 11 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 1.2.0-1
+- new upstream release
+- rebuilt with libicu-4.4
+- added Patch100 for compiling with libicu-4.4
+- s/sqlite-devel/sqlite3-devel/
+- s/freetype-devel/freetype2-devel/
+
 * Mon Jan 25 2010 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 1.1.18-1
 - updated to 1.1.18
 

+ 20 - 15
i/icu/icu-vl.spec

@@ -1,21 +1,21 @@
-%define sover 40
+%define sover 44
 Summary: International Components for Unicode
 Summary(ja): ユニコード用国際化コンポーネント
 Name: icu
-Version: 4.0.1
+Version: 4.4
 Release: 1%{?_dist_release}
 Group:   Development/Tools
 License: MIT
-URL:     http://www.ibm.com/software/globalization/icu/
+URL:     http://icu-project.org/
 
-Source0: http://download.icu-project.org/files/icu4c/4.0.1/icu4c-4_0_1-src.tgz
-Source1: http://download.icu-project.org/files/icu4c/4.0.1/icu4c-4_0_1-docs.zip
+Source0: http://download.icu-project.org/files/icu4c/4.0.1/icu4c-4_4-src.tgz
+Source1: http://download.icu-project.org/files/icu4c/4.0.1/icu4c-4_4-docs.zip
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-#Requires: libicu%{sover} = %{version}
-Requires: libicu = %{version}-%{release}
 BuildRequires: gcc-c++
 BuildRequires: unzip perl 
+#Requires: libicu%{sover} = %{version}
+Requires: libicu = %{version}-%{release}
 
 %description
 ICU is a C++ and C library that provides robust and full-featured Unicode
@@ -68,7 +68,7 @@ popd
 cd source
 export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
 export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
-%configure --enable-static --with-data-packaging=library --disable-samples 
+%configure --disable-static --with-data-packaging=library --disable-samples 
 make
 
 %install
@@ -89,12 +89,13 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-, root, root, 0755)
 %doc license.html readme.html
-#%{_sysconfdir}/icu/
 %{_bindir}/derb
 %{_bindir}/genbrk
+%{_bindir}/gencfu
 %{_bindir}/gencnval
 %{_bindir}/genctd
 %{_bindir}/genrb
+%{_bindir}/icuinfo
 %{_bindir}/makeconv
 %{_bindir}/pkgdata
 %{_bindir}/uconv
@@ -112,21 +113,25 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/layout
 %{_includedir}/unicode
 %{_libdir}/*.so
-%{_libdir}/*.a
+#{_libdir}/*.a
 %{_libdir}/%{name}
 %{_mandir}/man1/icu-config.1*
 %dir %{_datadir}/icu/
-%dir %{_datadir}/icu/4.0.1
-%{_datadir}/icu/4.0.1/config
-%{_datadir}/icu/4.0.1/install-sh
-%{_datadir}/icu/4.0.1/mkinstalldirs
-%doc %{_datadir}/icu/4.0.1/license.html
+%dir %{_datadir}/icu/4.4
+%{_datadir}/icu/4.4/config
+%{_datadir}/icu/4.4/install-sh
+%{_datadir}/icu/4.4/mkinstalldirs
+%doc %{_datadir}/icu/4.4/license.html
 
 %files -n libicu-doc
 %defattr(-,root,root,-)
 %doc docs/*
 
 %changelog
+* Sat Apr 10 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.4-1
+- new upstream release
+- built with new toolchain
+
 * Sun Mar 22 2009 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.0.1-1vl5
 - new upstream release
 - updated URL

+ 4 - 1
lib/libb/libboost/libboost-vl.spec

@@ -9,7 +9,7 @@ Summary: Portable C++ source libraries
 Summary(ja): ポータブルな C++ ソースライブラリ
 Name: libboost
 Version: %{major}.%{minor}.%{teeny}
-Release: 2%{?_dist_release}
+Release: 3%{?_dist_release}
 Source0: http://downloads.sourceforge.net/%{tarname}/%{tarname}_%{ver}.tar.bz2
 Source1: user-config.jam
 License: distributable
@@ -440,6 +440,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/%{name}_system*.so*
 
 %changelog
+* Sat Apr 10 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 1.42.0-3
+- rebuilt with libicu-4.4
+
 * Mon Feb 08 2010 Shu KONNO <owa@bg.wakwak.com> 1.42.0-2
 - added "-licui18n" to bjam
 - added BR: lam