X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=epiphany.spec;h=b2ced5555eca112ac744b34ac607028541871080;hb=refs%2Ftags%2Fauto%2Fth%2Fepiphany-3.24.1-1;hp=011893ddd39ec5c860aef6a3383c3b91e699fb88;hpb=be24775ff4da8c183157ccd8d26205c52f715b42;p=packages%2Fepiphany.git

diff --git a/epiphany.spec b/epiphany.spec
index 011893d..b2ced55 100644
--- a/epiphany.spec
+++ b/epiphany.spec
@@ -1,57 +1,72 @@
-%define		basever		2.29
+%define		basever		3.24
 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.30.2
-Release:	5
-License:	GPL v2
+Version:	3.24.1
+Release:	1
+License:	GPL v2+
 Group:		X11/Applications/Networking
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/epiphany/2.30/%{name}-%{version}.tar.bz2
-# Source0-md5:	29b084acfa016540d91d3601ec3dff5c
-Patch0:		%{name}-pld-homepage.patch
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/epiphany/3.24/%{name}-%{version}.tar.xz
+# Source0-md5:	d5471f6f1aaa0818d9bcd9b2c902c458
 URL:		http://www.gnome.org/projects/epiphany/
-BuildRequires:	GConf2-devel >= 2.28.0
-BuildRequires:	NetworkManager-devel
+BuildRequires:	appstream-glib-devel
 BuildRequires:	autoconf >= 2.59
-BuildRequires:	automake >= 1:1.9
+BuildRequires:	automake >= 1:1.11
+BuildRequires:	avahi-devel >= 0.6.22
 BuildRequires:	avahi-gobject-devel >= 0.6.22
-BuildRequires:	dbus-glib-devel >= 0.73
 BuildRequires:	docbook-dtd412-xml
-BuildRequires:	gettext-devel
-BuildRequires:	gir-repository-devel
+BuildRequires:	gcr-ui-devel >= 3.6.0
+BuildRequires:	gdk-pixbuf2-devel >= 2.36.5
+BuildRequires:	gettext-tools >= 0.19.8
+BuildRequires:	glib2-devel >= 1:2.46.0
 BuildRequires:	gnome-common >= 2.20.0
+BuildRequires:	gnome-desktop-devel >= 3.6.0
 BuildRequires:	gnome-doc-utils >= 0.12.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.22
-BuildRequires:	intltool >= 0.40.0
+BuildRequires:	gsettings-desktop-schemas-devel
+BuildRequires:	gtk+3-devel >= 3.22.0
+BuildRequires:	gtk-webkit4-devel >= 2.16.0
 BuildRequires:	iso-codes >= 0.53
-BuildRequires:	libgnome-keyring-devel >= 2.28.0
+BuildRequires:	json-glib-devel >= 1.2.0
 BuildRequires:	libicu-devel
-BuildRequires:	libnotify-devel >= 0.4
-BuildRequires:	libsoup-gnome-devel >= 2.30.0
+BuildRequires:	libnotify-devel >= 0.5.1
+BuildRequires:	libsecret-devel >= 0.14
+BuildRequires:	libsoup-devel >= 2.48.0
 BuildRequires:	libtool >= 2:2.2
+BuildRequires:	libwnck-devel
 BuildRequires:	libxml2-devel >= 1:2.6.28
 BuildRequires:	libxslt-devel >= 1.1.20
 BuildRequires:	nss-devel
 BuildRequires:	pkgconfig
 BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpmbuild(find_lang) >= 1.23
-BuildRequires:	rpmbuild(macros) >= 1.364
-BuildRequires:	scrollkeeper
-BuildRequires:	startup-notification-devel >= 0.8
+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
+BuildRequires:	yelp-tools
 Requires(post,postun):	desktop-file-utils
+Requires(post,postun):	glib2 >= 1:2.26.0
 Requires(post,postun):	gtk-update-icon-cache
-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
+Requires:	gdk-pixbuf2 >= 2.36.5
+Requires:	glib2 >= 1:2.46.0
+Requires:	gnome-icon-theme >= 3.4.0
+Requires:	gsettings-desktop-schemas
+Requires:	gtk+3 >= 3.22.0
+Requires:	gtk-webkit4 >= 2.16.0
+Requires:	hicolor-icon-theme
+Requires:	json-glib >= 1.2.0
+Requires:	libsoup >= 2.48.0
 Provides:	wwwbrowser
+Obsoletes:	epiphany-apidocs < 3.8.0-2
+Obsoletes:	epiphany-devel < 3.8.0-2
+Obsoletes:	epiphany-extensions < 3.8.0
 # sr@Latn vs. sr@latin
 Conflicts:	glibc-misc < 6:2.7
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -65,46 +80,10 @@ Navigador Web de GNOME basado en WebKit.
 %description -l pl.UTF-8
 Epiphany jest przeglądarką WWW opartą na silniku WebKit.
 
-%package devel
-Summary:	Epiphany header files
-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.20.0
-Requires:	gtk-webkit-devel >= 1.1.22
-Requires:	libxml2-devel >= 1:2.6.28
-
-%description devel
-Epiphany header files for plugin development.
-
-%description devel -l es.UTF-8
-Ficheros de cabecera de Epiphany para desarrollar plug-ins.
-
-%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
 
 %build
-%{__gnome_doc_prepare}
-%{__gnome_doc_common}
-%{__glib_gettextize}
-%{__intltoolize}
 %{__libtoolize}
 %{__aclocal} -I m4
 %{__autoheader}
@@ -112,22 +91,18 @@ Dokumentacja API Epiphany.
 %{__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} \
-	--disable-schemas-install
+	--disable-schemas-compile \
+	--with-distributor-name="PLD Linux"
+
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_libdir}/%{name}/%{basever}/extensions
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-%{__rm} -r $RPM_BUILD_ROOT%{_iconsdir}/LowContrastLargePrint
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/{,web-extensions/}*.la
 
 %find_lang %{name} --with-gnome --with-omf
 
@@ -135,46 +110,33 @@ install -d $RPM_BUILD_ROOT%{_libdir}/%{name}/%{basever}/extensions
 rm -rf $RPM_BUILD_ROOT
 
 %post
-%gconf_schema_install epiphany-lockdown.schemas
-%gconf_schema_install epiphany.schemas
-%scrollkeeper_update_post
 %update_desktop_database_post
+%glib_compile_schemas
 %update_icon_cache hicolor
 
-%preun
-%gconf_schema_uninstall epiphany-lockdown.schemas
-%gconf_schema_uninstall epiphany.schemas
-
 %postun
-%scrollkeeper_update_postun
 %update_desktop_database_postun
+%glib_compile_schemas
 %update_icon_cache hicolor
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README
-
 %attr(755,root,root) %{_bindir}/epiphany
-%{_datadir}/dbus-1/services/org.gnome.Epiphany.service
+%dir %{_libdir}/epiphany
+%attr(755,root,root) %{_libdir}/epiphany/ephy-profile-migrator
+%attr(755,root,root) %{_libdir}/epiphany/libephymain.so
+%attr(755,root,root) %{_libdir}/epiphany/libephymisc.so
+%dir %{_libdir}/epiphany/web-extensions
+%attr(755,root,root) %{_libdir}/epiphany/web-extensions/libephywebextension.so
+%{_datadir}/appdata/org.gnome.Epiphany.appdata.xml
+%{_datadir}/dbus-1/services/org.gnome.EpiphanySearchProvider.service
 %{_datadir}/%{name}
-%{_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
-%{_libdir}/girepository-1.0/Epiphany-*.typelib
+%{_datadir}/glib-2.0/schemas/org.gnome.Epiphany.enums.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.epiphany.gschema.xml
+%{_datadir}/gnome-shell/search-providers/epiphany-search-provider.ini
+%{_desktopdir}/org.gnome.Epiphany.desktop
+%{_iconsdir}/hicolor/*/*/org.gnome.Epiphany*.png
+%{_iconsdir}/hicolor/symbolic/*/org.gnome.Epiphany*.svg
+%attr(755,root,root) %{_libdir}/epiphany-search-provider
 %{_mandir}/man1/epiphany.1*
-
-%files devel
-%defattr(644,root,root,755)
-%{_aclocaldir}/epiphany.m4
-%{_includedir}/epiphany
-%{_pkgconfigdir}/epiphany-*.pc
-%{_datadir}/gir-1.0/Epiphany-*.gir
-
-%files apidocs
-%defattr(644,root,root,755)
-%{_gtkdocdir}/epiphany