|
@@ -5,12 +5,12 @@
|
|
%define gecko_version 1.9.1
|
|
%define gecko_version 1.9.1
|
|
%define webkit_version 1.1.15
|
|
%define webkit_version 1.1.15
|
|
|
|
|
|
-ExclusiveArch: i386 ppc x86_64 alpha
|
|
+ExclusiveArch: %ix86 ppc x86_64 alpha
|
|
|
|
|
|
Summary: GNOME web browser based on Gecko/WebKit
|
|
Summary: GNOME web browser based on Gecko/WebKit
|
|
Summary(ja): Gecko/WebKit レンダリングエンジンベースの GNOME ウェブブラウザ
|
|
Summary(ja): Gecko/WebKit レンダリングエンジンベースの GNOME ウェブブラウザ
|
|
Name: epiphany
|
|
Name: epiphany
|
|
-Version: 2.28.2
|
|
+Version: 2.30.0
|
|
Release: 1%{?_dist_release}
|
|
Release: 1%{?_dist_release}
|
|
License: GPL
|
|
License: GPL
|
|
Group: Applications/Internet
|
|
Group: Applications/Internet
|
|
@@ -21,7 +21,7 @@ Patch1: epiphany-2.26.2-gecko191.patch
|
|
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
|
|
|
|
-Requires: gnome-icon-theme >= 2.24.0
|
|
+Requires: gnome-icon-theme >= 2.30.0
|
|
%if %{with_gecko}
|
|
%if %{with_gecko}
|
|
Requires: gecko-libs
|
|
Requires: gecko-libs
|
|
%endif
|
|
%endif
|
|
@@ -34,14 +34,14 @@ BuildRequires: gecko-devel-unstable >= %{gecko_version}
|
|
%if %{with_webkit}
|
|
%if %{with_webkit}
|
|
BuildRequires: WebKit-gtk-devel >= %{webkit_version}
|
|
BuildRequires: WebKit-gtk-devel >= %{webkit_version}
|
|
%endif
|
|
%endif
|
|
-BuildRequires: glib2-devel >= 2.20.0
|
|
+BuildRequires: glib2-devel >= 2.24.0
|
|
-BuildRequires: gtk2-devel >= 2.16.0
|
|
+BuildRequires: gtk2-devel >= 2.20.0
|
|
BuildRequires: libxml2-devel >= 2.6.12
|
|
BuildRequires: libxml2-devel >= 2.6.12
|
|
BuildRequires: libxslt-devel >= 1.1.7
|
|
BuildRequires: libxslt-devel >= 1.1.7
|
|
BuildRequires: libnotify-devel >= 0.4.0
|
|
BuildRequires: libnotify-devel >= 0.4.0
|
|
BuildRequires: dbus-glib-devel >= 0.35
|
|
BuildRequires: dbus-glib-devel >= 0.35
|
|
-BuildRequires: libsoup-devel >= 2.28.0
|
|
+BuildRequires: libsoup-devel >= 2.30.0
|
|
-BuildRequires: gnome-desktop-devel >= 2.26.0
|
|
+BuildRequires: gnome-desktop-devel >= 2.30.0
|
|
BuildRequires: GConf2-devel
|
|
BuildRequires: GConf2-devel
|
|
BuildRequires: nss-devel
|
|
BuildRequires: nss-devel
|
|
BuildRequires: avahi-gobject-devel >= 0.6.22
|
|
BuildRequires: avahi-gobject-devel >= 0.6.22
|
|
@@ -50,7 +50,10 @@ BuildRequires: iso-codes
|
|
BuildRequires: intltool >= 0.40
|
|
BuildRequires: intltool >= 0.40
|
|
BuildRequires: libICE-devel
|
|
BuildRequires: libICE-devel
|
|
BuildRequires: libSM-devel
|
|
BuildRequires: libSM-devel
|
|
-BuildRequires: gnome-keyring-devel
|
|
+BuildRequires: libgnome-keyring-devel
|
|
|
|
+BuildRequires: gobject-introspection-devel
|
|
|
|
+BuildRequires: gir-repository-devel
|
|
|
|
+BuildRequires: gnome-doc-utils
|
|
|
|
|
|
%description
|
|
%description
|
|
epiphany is a simple GNOME web browser based on the Mozilla rendering
|
|
epiphany is a simple GNOME web browser based on the Mozilla rendering
|
|
@@ -71,7 +74,6 @@ export RPM_OPT_FLAGS=$MOZ_OPT_FLAGS
|
|
|
|
|
|
%configure \
|
|
%configure \
|
|
%if %{with_gecko}
|
|
%if %{with_gecko}
|
|
- --with-engine=mozilla \
|
|
|
|
--with-gecko=libxul-embedding \
|
|
--with-gecko=libxul-embedding \
|
|
%endif
|
|
%endif
|
|
%if %{with_webkit}
|
|
%if %{with_webkit}
|
|
@@ -79,7 +81,8 @@ export RPM_OPT_FLAGS=$MOZ_OPT_FLAGS
|
|
%endif
|
|
%endif
|
|
--enable-zeroconf \
|
|
--enable-zeroconf \
|
|
--enable-network-manager \
|
|
--enable-network-manager \
|
|
- --disable-scrollkeeper
|
|
+ --disable-scrollkeeper \
|
|
|
|
+ --without-ca-file
|
|
|
|
|
|
%__make %{?_smp_mflags}
|
|
%__make %{?_smp_mflags}
|
|
|
|
|
|
@@ -146,9 +149,11 @@ rm -rf $RPM_BUILD_ROOT
|
|
%{_bindir}/epiphany
|
|
%{_bindir}/epiphany
|
|
%{_includedir}/epiphany/*
|
|
%{_includedir}/epiphany/*
|
|
%{_libdir}/pkgconfig/epiphany*.pc
|
|
%{_libdir}/pkgconfig/epiphany*.pc
|
|
|
|
+%{_libdir}/girepository-1.0/Epiphany-2.29.typelib
|
|
%if %{with_gecko}
|
|
%if %{with_gecko}
|
|
%{_libdir}/epiphany
|
|
%{_libdir}/epiphany
|
|
%endif
|
|
%endif
|
|
|
|
+%{_datadir}/gir-1.0/Epiphany-2.29.gir
|
|
#{_datadir}/pygtk/*/defs/*
|
|
#{_datadir}/pygtk/*/defs/*
|
|
%{_datadir}/applications/*.desktop
|
|
%{_datadir}/applications/*.desktop
|
|
%{_datadir}/epiphany
|
|
%{_datadir}/epiphany
|
|
@@ -159,6 +164,13 @@ rm -rf $RPM_BUILD_ROOT
|
|
%{_mandir}/man1/epiphany.1*
|
|
%{_mandir}/man1/epiphany.1*
|
|
|
|
|
|
%changelog
|
|
%changelog
|
|
|
|
+* Sat Apr 17 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.30.0-1
|
|
|
|
+- new upstream release
|
|
|
|
+- add BuildRequires: gobject-introspection-devel, gir-repository-devel
|
|
|
|
+- change BuildRequires: gnome-keyring-devel -> libgnome-keyring-devel
|
|
|
|
+- add configure option (--without-ca-file)
|
|
|
|
+- remove unrecognized configure option (--with-engine)
|
|
|
|
+
|
|
* Sat Jan 09 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 2.28.2-1
|
|
* Sat Jan 09 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 2.28.2-1
|
|
- new upstream release
|
|
- new upstream release
|
|
- added BR: libICE-devel, libSM-devel and gnome-keyring-devel
|
|
- added BR: libICE-devel, libSM-devel and gnome-keyring-devel
|