X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=epiphany.spec;h=1644ea899f9700fd176d33645b6c075817130d23;hb=2430211d27368880199c9b0953805fcf422a327c;hp=fee6f83983f8e798cba6aa28c1c6893511511ca0;hpb=c730c9edcb440196b947a38bf64a608ae237b961;p=packages%2Fepiphany.git

diff --git a/epiphany.spec b/epiphany.spec
index fee6f83..1644ea8 100644
--- a/epiphany.spec
+++ b/epiphany.spec
@@ -1,161 +1,216 @@
-# Conditinal build:
-%bcond_with	mozilla_firefox	# build with mozilla-firefox-devel
 #
+#Conditional build:
+%bcond_with	webkit		# Build with experimental webkit suppor instead of xulrunner
+#
+%define		basever		2.22
 Summary:	Epiphany - gecko-based GNOME web browser
-Summary(es):	Epiphany - navigador Web de GNOME basado en gecko
-Summary(pl):	Epiphany - przegl±darka WWW dla GNOME
+Summary(es.UTF-8):	Epiphany - navigador Web de GNOME basado en gecko
+Summary(pl.UTF-8):	Epiphany - przeglądarka WWW dla GNOME
 Name:		epiphany
-Version:	1.6.3
-Release:	2
+Version:	2.22.0
+Release:	3
 License:	GPL v2
 Group:		X11/Applications/Networking
-Source0:	http://ftp.gnome.org/pub/gnome/sources/epiphany/1.6/%{name}-%{version}.tar.bz2
-# Source0-md5:	dcb0dfd819a04dfaa55e63d10ef51496
-Patch0:		%{name}-first-tab.patch
-Patch1:		%{name}-desktop.patch
-Patch2:		%{name}-mozilla_includes.patch
-Patch3:		%{name}-mozilla.patch
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/epiphany/2.22/%{name}-%{version}.tar.bz2
+# Source0-md5:	81ad67d1ad706930a295a7ed9887bf5f
+Patch0:		%{name}-pld-homepage.patch
+Patch1:		%{name}-configure.patch
+Patch2:		%{name}-agent.patch
 URL:		http://www.gnome.org/projects/epiphany/
-BuildRequires:	GConf2-devel >= 2.10.0
-BuildRequires:	ORBit2-devel >= 1:2.12.1
+BuildRequires:	GConf2-devel >= 2.20.0
+BuildRequires:	NetworkManager-devel
+BuildRequires:	ORBit2-devel >= 1:2.14.9
 BuildRequires:	autoconf >= 2.59
-BuildRequires:	automake
-BuildRequires:	gnome-common >= 2.8.0
-BuildRequires:	gnome-desktop >= 2.10.0-2
-BuildRequires:	gnome-vfs2-devel >= 2.10.0-2
-BuildRequires:	gtk+2-devel >= 2:2.6.4
-BuildRequires:	gtk-doc >= 1.3
-BuildRequires:	intltool >= 0.33
-BuildRequires:	libglade2-devel >= 1:2.5.1
-BuildRequires:	libgnomeui-devel >= 2.10.0-2
-BuildRequires:	libtool
-BuildRequires:	libxml2-devel >= 1:2.6.19
-%if %{with mozilla_firefox}
-BuildRequires:	mozilla-firefox-devel
-%else
-BuildRequires:	mozilla-devel >= 5:1.7
+BuildRequires:	automake >= 1:1.9
+BuildRequires:	dbus-glib-devel >= 0.73
+BuildRequires:	enchant-devel >= 1.0
+BuildRequires:	gnome-common >= 2.20.0
+BuildRequires:	gnome-desktop-devel >= 2.20.0
+BuildRequires:	gnome-doc-utils >= 0.12.0
+BuildRequires:	gnome-vfs2-devel >= 2.22.0
+BuildRequires:	gtk+2-devel >= 2:2.12.0
+BuildRequires:	gtk-doc >= 1.8
+%if %{with webkit}
+BuildRequires:	gtk-webkit-devel
+BuildRequires:	libssh2-devel
 %endif
-BuildRequires:	pango-devel >= 1:1.8.1
+BuildRequires:	intltool >= 0.36.2
+BuildRequires:	iso-codes >= 0.53
+BuildRequires:	libglade2-devel >= 1:2.6.2
+BuildRequires:	libgnomeprintui-devel >= 2.18.0
+BuildRequires:	libgnomeui-devel >= 2.22.0
+BuildRequires:	libtool
+BuildRequires:	libxml2-devel >= 1:2.6.28
+BuildRequires:	libxslt-devel >= 1.1.20
 BuildRequires:	pkgconfig
-BuildRequires:	rpmbuild(macros) >= 1.197
+BuildRequires:	python-gnome-devel >= 2.20.0
+BuildRequires:	python-pygtk-devel >= 2:2.12.0
+BuildRequires:	rpmbuild(find_lang) >= 1.23
+BuildRequires:	rpmbuild(macros) >= 1.311
 BuildRequires:	scrollkeeper
-Requires(post,preun):	GConf2
+BuildRequires:	startup-notification-devel >= 0.8
+%if %{without webkit}
+BuildRequires:	xulrunner
+BuildRequires:	xulrunner-devel >= 1.8.1.6-1.20070731.2
+%endif
 Requires(post,postun):	desktop-file-utils
+Requires(post,postun):	gtk+2
+Requires(post,postun):	hicolor-icon-theme
 Requires(post,postun):	scrollkeeper
-Requires:	gnome-icon-theme >= 2.10.0
-Requires:	gtk+2 >= 2:2.6.4
-%if %{with mozilla_firefox}
-Requires:	mozilla-firefox = %(rpm -q --qf '%{EPOCH}:%{VERSION}' mozilla-firefox)
-%else
-Requires:	mozilla-embedded = %(rpm -q --qf '%{EPOCH}:%{VERSION}' --whatprovides mozilla-embedded)
+Requires(post,preun):	GConf2
+Requires:	dbus >= 1.0.2
+Requires:	gnome-icon-theme >= 2.22.0
+Requires:	libgnomeui >= 2.22.0
+%if %{without webkit}
+%requires_eq	xulrunner
 %endif
+Obsoletes:	python-epiphany
+# sr@Latn vs. sr@latin
+Conflicts:	glibc-misc < 6:2.7
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%if %{without webkit}
 # can be provided by mozilla or mozilla-embedded
 %define		_noautoreqdep	libgtkembedmoz.so libgtksuperwin.so libxpcom.so
+# we have strict deps for it
+%define		_noautoreq	libxpcom.so
+%endif
 
 %description
 GNOME browser based on Gecko (Mozilla rendering engine).
 
-%description -l es
-Navigador Web de GNOME basado en Gecko (el engine plasmante de Mozilla).
+%description -l es.UTF-8
+Navigador Web de GNOME basado en Gecko (el engine plasmante de
+Mozilla).
 
-%description -l pl
-Epiphany jest przegl±dark± WWW bazuj±c± na Gecko (mechanizmie
+%description -l pl.UTF-8
+Epiphany jest przeglądarką WWW bazującą na Gecko (mechanizmie
 interpretacji stron Mozilli).
 
 %package devel
 Summary:	Epiphany header files
-Summary(es):	Ficheros de cabecera de Epiphany
-Summary(pl):	Pliki nag³ówkowe Epiphany
+Summary(es.UTF-8):	Ficheros de cabecera de Epiphany
+Summary(pl.UTF-8):	Pliki nagłówkowe Epiphany
 Group:		X11/Applications/Networking
 # doesn't require base
-Requires:	gtk+2-devel >= 2:2.6.4
-Requires:	libxml2-devel >= 1:2.6.19
+Requires:	gtk+2-devel >= 2:2.12.0
+Requires:	libxslt-devel >= 1.1.20
 
 %description devel
 Epiphany header files for plugin development.
 
-%description devel -l es
+%description devel -l es.UTF-8
 Ficheros de cabecera de Epiphany para desarrollar plug-ins.
 
-%description devel -l pl
-Pliki nag³ówkowe Epiphany do tworzenia wtyczek.
+%description devel -l pl.UTF-8
+Pliki nagłówkowe Epiphany do tworzenia wtyczek.
+
+%package apidocs
+Summary:	Epiphany API documentation
+Summary(pl.UTF-8):	Dokumentacja API Epiphany
+Group:		Documentation
+Requires:	gtk-doc-common
+
+%description apidocs
+Epiphany API documentation.
+
+%description apidocs -l pl.UTF-8
+Dokumentacja API Epiphany.
 
 %prep
 %setup -q
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
+
+sed -i -e 's#sr\@Latn#sr\@latin#' po/LINGUAS
+mv po/sr\@{Latn,latin}.po
 
 %build
-rm -f acconfig.h
+%{__gnome_doc_prepare}
+%{__gnome_doc_common}
 %{__glib_gettextize}
 %{__intltoolize}
-%{__gnome_doc_common}
 %{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I m4
 %{__autoheader}
 %{__automake}
 %{__autoconf}
-
 %configure \
 	--disable-schemas-install \
-	--enable-nautilus-view=yes \
-	--enable-gtk-doc \
+	--enable-dbus \
+	%{?!with_webkit:--enable-gtk-doc} \
+	--enable-network-manager \
+	--enable-python\
+	--enable-spell-checker \
+	%{?with_webkit:--with-engine=webkit} \
 	--with-html-dir=%{_gtkdocdir}
-# CFLAGS is a hack for gcc 3.3
-%{__make} \
-	CFLAGS="%{rpmcflags} -fno-strict-aliasing"
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_libdir}/%{name}-1.6/extensions
+install -d $RPM_BUILD_ROOT%{_libdir}/%{name}/%{basever}/extensions
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
 	HTML_DIR=%{_gtkdocdir}
 
-rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
-rm -r $RPM_BUILD_ROOT%{_datadir}/application-registry/*
+rm -f $RPM_BUILD_ROOT%{_libdir}/epiphany/%{basever}/plugins/*.la
+rm -rf $RPM_BUILD_ROOT${_iconsdir}/LowContrastLargePrint
 
-# epiphany-2.0.mo, but gnome/help/epiphany
-%find_lang %{name}-2.0 --with-gnome --all-name
+%find_lang %{name} --with-gnome --with-omf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
+%gconf_schema_install epiphany-fonts.schemas
 %gconf_schema_install epiphany-lockdown.schemas
+%gconf_schema_install epiphany-pango.schemas
 %gconf_schema_install epiphany.schemas
 %scrollkeeper_update_post
 %update_desktop_database_post
+%update_icon_cache hicolor
 
 %preun
+%gconf_schema_uninstall epiphany-fonts.schemas
 %gconf_schema_uninstall epiphany-lockdown.schemas
+%gconf_schema_uninstall epiphany-pango.schemas
 %gconf_schema_uninstall epiphany.schemas
 
 %postun
 %scrollkeeper_update_postun
 %update_desktop_database_postun
+%update_icon_cache hicolor
 
-%files -f %{name}-2.0.lang
+%files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README
 %attr(755,root,root) %{_bindir}/*
-%{_libdir}/bonobo/servers/*
+%{_datadir}/dbus-1/services/*.service
 %{_datadir}/%{name}
-%{_desktopdir}/*
-%{_pixmapsdir}/*
-%{_sysconfdir}/gconf/schemas/*
-%{_omf_dest_dir}/*
-%dir %{_libdir}/%{name}-1.6
-%dir %{_libdir}/%{name}-1.6/extensions
+%{_desktopdir}/*.desktop
+%{_iconsdir}/*/*/apps/*.*
+%{_sysconfdir}/gconf/schemas/epiphany-fonts.schemas
+%{_sysconfdir}/gconf/schemas/epiphany-lockdown.schemas
+%{_sysconfdir}/gconf/schemas/epiphany-pango.schemas
+%{_sysconfdir}/gconf/schemas/epiphany.schemas
+%dir %{_libdir}/%{name}
+%dir %{_libdir}/%{name}/%{basever}
+%dir %{_libdir}/%{name}/%{basever}/extensions
+%if %{without webkit}
+%dir %{_libdir}/%{name}/%{basever}/plugins
+%attr(755,root,root) %{_libdir}/epiphany/%{basever}/plugins/*.so*
+%endif
 %{_mandir}/man1/*
 
 %files devel
 %defattr(644,root,root,755)
-%{_includedir}/epiphany-1.6
+%{_aclocaldir}/*
+%{_includedir}/epiphany
 %{_pkgconfigdir}/*.pc
+%{_datadir}/pygtk/*/defs/epiphany.defs
+
+%files apidocs
+%defattr(644,root,root,755)
 %{_gtkdocdir}/*