packages: epiphany/epiphany.spec - merged from DEVEL

[megabajt]

Author: megabajt                     Date: Thu Apr  8 17:12:05 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- merged from DEVEL

---- Files affected:
packages/epiphany:
   epiphany.spec (1.217 -> 1.218) 

---- Diffs:

================================================================
Index: packages/epiphany/epiphany.spec
diff -u packages/epiphany/epiphany.spec:1.217 packages/epiphany/epiphany.spec:1.218
--- packages/epiphany/epiphany.spec:1.217	Wed Dec 16 22:10:01 2009
+++ packages/epiphany/epiphany.spec	Thu Apr  8 19:12:00 2010
@@ -1,15 +1,15 @@
 # $Revision$, $Date$
-%define		basever		2.28
+%define		basever		2.30
 Summary:	Epiphany - WebKit-based GNOME web browser
 Summary(es.UTF-8):	Epiphany - navigador Web de GNOME basado en WebKit
 Summary(pl.UTF-8):	Epiphany - przeglądarka WWW dla GNOME
 Name:		epiphany
-Version:	2.28.2
+Version:	2.30.2
 Release:	1
 License:	GPL v2
 Group:		X11/Applications/Networking
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/epiphany/2.28/%{name}-%{version}.tar.bz2
-# Source0-md5:	cf32404bfe6f0cb4d3f01d0c33c08def
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/epiphany/2.30/%{name}-%{version}.tar.bz2
+# Source0-md5:	29b084acfa016540d91d3601ec3dff5c
 Patch0:		%{name}-pld-homepage.patch
 URL:		http://www.gnome.org/projects/epiphany/
 BuildRequires:	GConf2-devel >= 2.28.0
@@ -21,17 +21,18 @@
 BuildRequires:	docbook-dtd412-xml
 BuildRequires:	gettext-devel
 BuildRequires:	gnome-common >= 2.20.0
-BuildRequires:	gnome-keyring-devel >= 2.28.0
 BuildRequires:	gnome-doc-utils >= 0.12.0
-BuildRequires:	gtk+2-devel >= 2:2.16.0
+BuildRequires:	gobject-introspection-devel >= 0.6.7
+BuildRequires:	gtk+2-devel >= 2:2.20.0
 BuildRequires:	gtk-doc >= 1.8
-BuildRequires:	gtk-webkit-devel >= 1.1.15
+BuildRequires:	gtk-webkit-devel >= 1.1.22
 BuildRequires:	intltool >= 0.40.0
 BuildRequires:	iso-codes >= 0.53
+BuildRequires:	libgnome-keyring-devel >= 2.28.0
 BuildRequires:	libicu-devel
 BuildRequires:	libnotify-devel >= 0.4
-BuildRequires:	libsoup-gnome-devel >= 2.28.0
-BuildRequires:	libtool
+BuildRequires:	libsoup-gnome-devel >= 2.30.0
+BuildRequires:	libtool >= 2:2.2
 BuildRequires:	libxml2-devel >= 1:2.6.28
 BuildRequires:	libxslt-devel >= 1.1.20
 BuildRequires:	nss-devel
@@ -40,12 +41,15 @@
 BuildRequires:	rpmbuild(find_lang) >= 1.23
 BuildRequires:	rpmbuild(macros) >= 1.364
 BuildRequires:	scrollkeeper
+BuildRequires:	sed >= 4.0
 BuildRequires:	startup-notification-devel >= 0.8
+BuildRequires:	xorg-lib-libSM-devel
 Requires(post,postun):	desktop-file-utils
 Requires(post,postun):	gtk+2
 Requires(post,postun):	hicolor-icon-theme
 Requires(post,postun):	scrollkeeper
 Requires(post,preun):	GConf2
+Requires:	ca-certificates
 Requires:	dbus >= 1.0.2
 Requires:	gnome-icon-theme >= 2.26.0
 Provides:	wwwbrowser
@@ -68,8 +72,8 @@
 Summary(pl.UTF-8):	Pliki nagłówkowe Epiphany
 Group:		X11/Applications/Networking
 # doesn't require base
-Requires:	gtk+2-devel >= 2:2.16.0
-Requires:	gtk-webkit-devel >= 1.1.15
+Requires:	gtk+2-devel >= 2:2.20.0
+Requires:	gtk-webkit-devel >= 1.1.22
 Requires:	libxml2-devel >= 1:2.6.28
 
 %description devel
@@ -97,6 +101,9 @@
 %setup -q
 %patch0 -p1
 
+sed -i -e 's/^en at shaw//' po/LINGUAS
+rm -f po/en at shaw.po
+
 %build
 %{__gnome_doc_prepare}
 %{__gnome_doc_common}
@@ -108,7 +115,9 @@
 %{__automake}
 %{__autoconf}
 %configure \
+	--disable-silent-rules \
 	--with-distributor-name="PLD Linux" \
+	--with-ca-file=/etc/certs/ca-certificates.crt \
 	--enable-network-manager \
 	--enable-gtk-doc \
 	--with-html-dir=%{_gtkdocdir} \
@@ -149,27 +158,30 @@
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README
 
-%attr(755,root,root) %{_bindir}/*
-%{_datadir}/dbus-1/services/*.service
+%attr(755,root,root) %{_bindir}/epiphany
+%{_datadir}/dbus-1/services/org.gnome.Epiphany.service
 %{_datadir}/%{name}
-%{_desktopdir}/*.desktop
+%{_desktopdir}/bme.desktop
+%{_desktopdir}/epiphany.desktop
 %{_iconsdir}/*/*/apps/*.*
 %{_sysconfdir}/gconf/schemas/epiphany-lockdown.schemas
 %{_sysconfdir}/gconf/schemas/epiphany.schemas
 %dir %{_libdir}/%{name}
 %dir %{_libdir}/%{name}/%{basever}
 %dir %{_libdir}/%{name}/%{basever}/extensions
-%{_mandir}/man1/*
+%{_libdir}/girepository-1.0/Epiphany-*.typelib
+%{_mandir}/man1/epiphany.1*
 
 %files devel
 %defattr(644,root,root,755)
-%{_aclocaldir}/*
+%{_aclocaldir}/epiphany.m4
 %{_includedir}/epiphany
-%{_pkgconfigdir}/*.pc
+%{_pkgconfigdir}/epiphany-*.pc
+%{_datadir}/gir-1.0/Epiphany-*.gir
 
 %files apidocs
 %defattr(644,root,root,755)
-%{_gtkdocdir}/*
+%{_gtkdocdir}/epiphany
 
 %define	date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -177,6 +189,18 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.218  2010/04/08 17:12:00  megabajt
+- merged from DEVEL
+
+Revision 1.217.2.3  2010/04/08 17:10:10  megabajt
+- updated to 2.30.2
+
+Revision 1.217.2.2  2010/03/29 17:02:51  megabajt
+- updated to 2.30.0
+
+Revision 1.217.2.1  2010/03/24 18:55:32  megabajt
+- updated to 2.29.92
+
 Revision 1.217  2009/12/16 21:10:01  megabajt
 - updated to 2.28.2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/epiphany/epiphany.spec?r1=1.217&r2=1.218&f=u