X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=epiphany.spec;h=ecfd3bfe32cadb39df09580e71dfbe9a2c11900a;hb=a8ca8ace453175e8bc0acd56776315f6aaed6b11;hp=c3b836d65dc3c9c5164687583ae958a57224c959;hpb=cf6e4d008294c66c799aa5cfc15106f8e9df125a;p=packages%2Fepiphany.git

diff --git a/epiphany.spec b/epiphany.spec
index c3b836d..ecfd3bf 100644
--- a/epiphany.spec
+++ b/epiphany.spec
@@ -1,96 +1,72 @@
-#
-#Conditional build:
-%bcond_with	webkit		# Build with experimental webkit suppor instead of xulrunner
-#
-%define		basever		2.24
-Summary:	Epiphany - gecko-based GNOME web browser
-Summary(es.UTF-8):	Epiphany - navigador Web de GNOME basado en gecko
+%define		basever		3.6
+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.24.0.1
+Version:	3.6.1
 Release:	1
-License:	GPL v2
+License:	GPL v2+
 Group:		X11/Applications/Networking
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/epiphany/2.24/%{name}-%{version}.tar.bz2
-# Source0-md5:	24e284d77e782faeec219574def7f34f
-Patch0:		%{name}-pld-homepage.patch
-Patch1:		%{name}-configure.patch
-Patch2:		%{name}-ti-agent.patch
-Patch3:		%{name}-agent.patch
-Patch4:		%{name}-lt.patch
-Patch5:		%{name}-libxul.patch
-Patch7:		%{name}-build_date.patch
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/epiphany/3.6/%{name}-%{version}.tar.xz
+# Source0-md5:	8360bd24a673223387c69297e8a710b8
 URL:		http://www.gnome.org/projects/epiphany/
-BuildRequires:	GConf2-devel >= 2.20.0
-BuildRequires:	NetworkManager-devel
-BuildRequires:	ORBit2-devel >= 1:2.14.9
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake >= 1:1.9
-BuildRequires:	dbus-glib-devel >= 0.73
-BuildRequires:	enchant-devel >= 1.0
+BuildRequires:	avahi-devel >= 0.6.22
+BuildRequires:	avahi-gobject-devel >= 0.6.22
+BuildRequires:	docbook-dtd412-xml
+BuildRequires:	gcr-devel >= 3.6.0
+BuildRequires:	gettext-devel
+BuildRequires:	glib2-devel >= 1:2.32.0
 BuildRequires:	gnome-common >= 2.20.0
-BuildRequires:	gnome-desktop-devel >= 2.20.0
+BuildRequires:	gnome-desktop-devel >= 3.6.0
 BuildRequires:	gnome-doc-utils >= 0.12.0
-BuildRequires:	gnome-vfs2-devel >= 2.22.0
-BuildRequires:	gtk+2-devel >= 2:2.12.0
+BuildRequires:	gobject-introspection-devel >= 0.10.0
+BuildRequires:	gsettings-desktop-schemas-devel
+BuildRequires:	gtk+3-devel >= 3.6.0
 BuildRequires:	gtk-doc >= 1.8
-%if %{with webkit}
-BuildRequires:	gtk-webkit-devel
-BuildRequires:	libssh2-devel
-%endif
-BuildRequires:	intltool >= 0.36.2
+BuildRequires:	gtk-webkit3-devel >= 1.10.0
+BuildRequires:	intltool >= 0.50.0
 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:	libgnome-keyring-devel >= 2.28.0
+BuildRequires:	libnotify-devel >= 0.5.1
+BuildRequires:	libsoup-gnome-devel >= 2.40.0
+BuildRequires:	libtool >= 2:2.2
 BuildRequires:	libxml2-devel >= 1:2.6.28
 BuildRequires:	libxslt-devel >= 1.1.20
+BuildRequires:	nss-devel
 BuildRequires:	pkgconfig
-BuildRequires:	python-gnome-devel >= 2.20.0
-BuildRequires:	python-pygtk-devel >= 2:2.12.0
 BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpmbuild(find_lang) >= 1.23
-BuildRequires:	rpmbuild(macros) >= 1.311
-BuildRequires:	scrollkeeper
-BuildRequires:	startup-notification-devel >= 0.8
-%if %{without webkit}
-BuildRequires:	xulrunner
-BuildRequires:	xulrunner-devel >= 1.9.0.1-1
-%endif
+BuildRequires:	rpmbuild(macros) >= 1.601
+BuildRequires:	sed >= 4.0
+BuildRequires:	sqlite3-devel
+BuildRequires:	tar >= 1:1.22
+BuildRequires:	xorg-lib-libICE-devel
+BuildRequires:	xorg-lib-libSM-devel
+BuildRequires:	xorg-lib-libX11-devel
+BuildRequires:	xz
 Requires(post,postun):	desktop-file-utils
-Requires(post,postun):	gtk+2
-Requires(post,postun):	hicolor-icon-theme
+Requires(post,postun):	glib2 >= 1:2.26.0
 Requires(post,postun):	scrollkeeper
-Requires(post,preun):	GConf2
+Requires:	ca-certificates
 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
+Requires:	gnome-icon-theme >= 3.4.0
+Requires:	gsettings-desktop-schemas
+Requires:	gtk-webkit3 >= 1.10.0
+Provides:	wwwbrowser
 # 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).
+GNOME browser based on WebKit.
 
 %description -l es.UTF-8
-Navigador Web de GNOME basado en Gecko (el engine plasmante de
-Mozilla).
+Navigador Web de GNOME basado en WebKit.
 
 %description -l pl.UTF-8
-Epiphany jest przeglądarką WWW bazującą na Gecko (mechanizmie
-interpretacji stron Mozilli).
+Epiphany jest przeglądarką WWW opartą na silniku WebKit.
 
 %package devel
 Summary:	Epiphany header files
@@ -98,8 +74,9 @@ 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.12.0
-Requires:	libxslt-devel >= 1.1.20
+Requires:	gtk+3-devel >= 3.6.0
+Requires:	gtk-webkit3-devel >= 1.10.0
+Requires:	libxml2-devel >= 1:2.6.28
 
 %description devel
 Epiphany header files for plugin development.
@@ -124,16 +101,6 @@ Dokumentacja API Epiphany.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%if "%{pld_release}" == "ti"
-%patch2 -p1
-%else
-%patch3 -p1
-%endif
-%patch4 -p1
-%patch5 -p1
-%patch7 -p1
 
 %build
 %{__gnome_doc_prepare}
@@ -146,16 +113,10 @@ Dokumentacja API Epiphany.
 %{__automake}
 %{__autoconf}
 %configure \
-	--disable-schemas-install \
-	--enable-dbus \
-	%{?!with_webkit:--enable-gtk-doc} \
-	--enable-network-manager \
-	--enable-python \
-	%if %{with webkit}
-	--with-engine=webkit \
-	%else
-	--with-gecko=libxul-embedding \
-	%endif
+	--disable-silent-rules \
+	--disable-schemas-compile \
+	--with-distributor-name="PLD Linux" \
+	--enable-gtk-doc \
 	--with-html-dir=%{_gtkdocdir}
 %{__make}
 
@@ -164,11 +125,7 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_libdir}/%{name}/%{basever}/extensions
 
 %{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT \
-	HTML_DIR=%{_gtkdocdir}
-
-rm -f $RPM_BUILD_ROOT%{_libdir}/epiphany/%{basever}/plugins/*.la
-rm -rf $RPM_BUILD_ROOT%{_iconsdir}/LowContrastLargePrint
+	DESTDIR=$RPM_BUILD_ROOT
 
 %find_lang %{name} --with-gnome --with-omf
 
@@ -176,53 +133,39 @@ rm -rf $RPM_BUILD_ROOT%{_iconsdir}/LowContrastLargePrint
 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
+%glib_compile_schemas
 
 %postun
 %scrollkeeper_update_postun
 %update_desktop_database_postun
-%update_icon_cache hicolor
+%glib_compile_schemas
 
 %files -f %{name}.lang
 %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
+%attr(755,root,root) %{_bindir}/ephy-profile-migrator
+%{_datadir}/dbus-1/services/org.gnome.Epiphany.service
 %{_datadir}/%{name}
-%{_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
+%{_datadir}/GConf/gsettings/epiphany.convert
+%{_datadir}/glib-2.0/schemas/org.gnome.Epiphany.enums.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.epiphany.gschema.xml
+%{_desktopdir}/epiphany.desktop
 %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/*
+%{_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
-%{_datadir}/pygtk/*/defs/epiphany.defs
+%{_pkgconfigdir}/epiphany-*.pc
+%{_datadir}/gir-1.0/Epiphany-*.gir
 
 %files apidocs
 %defattr(644,root,root,755)
-%{_gtkdocdir}/*
+%{_gtkdocdir}/epiphany