From 20e8a6d440661fcf36929622774e6df40b264ceb Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Mon, 15 May 2006 16:04:31 +0000 Subject: [PATCH] - merged from HEAD Changed files: epiphany-configure.patch -> 1.2.4.1 epiphany-desktop.patch -> 1.3.4.1 epiphany.spec -> 1.107.2.1 --- epiphany-desktop.patch | 31 ++++++++----------------- epiphany.spec | 52 +++++++++++++++++++++++++----------------- 2 files changed, 41 insertions(+), 42 deletions(-) diff --git a/epiphany-desktop.patch b/epiphany-desktop.patch index 561dea4..c01e941 100644 --- a/epiphany-desktop.patch +++ b/epiphany-desktop.patch @@ -1,30 +1,19 @@ -diff -aurN epiphany-1.3.0.orig/data/bme.desktop.in epiphany-1.3.0/data/bme.desktop.in ---- epiphany-1.3.0.orig/data/bme.desktop.in 2003-07-02 19:56:40.000000000 +0200 -+++ epiphany-1.3.0/data/bme.desktop.in 2004-06-12 12:12:42.642358200 +0200 -@@ -11,4 +11,4 @@ - X-GNOME-Bugzilla-Bugzilla=GNOME +diff -aurN epiphany-1.9.5.1.orig/data/bme.desktop.in.in epiphany-1.9.5.1/data/bme.desktop.in.in +--- epiphany-1.9.5.1.orig/data/bme.desktop.in.in 2005-11-29 13:53:29.000000000 +0100 ++++ epiphany-1.9.5.1/data/bme.desktop.in.in 2006-01-29 22:11:47.933612000 +0100 +@@ -12,4 +12,4 @@ X-GNOME-Bugzilla-Product=epiphany X-GNOME-Bugzilla-Component=General + X-GNOME-Bugzilla-Version=@VERSION@ -Categories=Application;Network;GNOME;GTK; +Categories=GNOME;GTK;Network; -diff -aurN epiphany-1.3.0.orig/data/epiphany.desktop.in epiphany-1.3.0/data/epiphany.desktop.in ---- epiphany-1.3.0.orig/data/epiphany.desktop.in 2003-07-02 19:56:40.000000000 +0200 -+++ epiphany-1.3.0/data/epiphany.desktop.in 2004-06-12 12:17:22.643791512 +0200 -@@ -1,8 +1,8 @@ - [Desktop Entry] - Encoding=UTF-8 --_Name=Epiphany Web Browser -+_Name=Epiphany - _GenericName=Web Browser --_Comment=Browse the web -+_Comment=Web Browser - Exec=epiphany %U - StartupNotify=true - Terminal=false -@@ -11,5 +11,5 @@ - X-GNOME-Bugzilla-Bugzilla=GNOME +diff -aurN epiphany-1.9.5.1.orig/data/epiphany.desktop.in.in epiphany-1.9.5.1/data/epiphany.desktop.in.in +--- epiphany-1.9.5.1.orig/data/epiphany.desktop.in.in 2005-11-29 13:53:29.000000000 +0100 ++++ epiphany-1.9.5.1/data/epiphany.desktop.in.in 2006-01-29 22:12:59.123612000 +0100 +@@ -12,5 +12,5 @@ X-GNOME-Bugzilla-Product=epiphany X-GNOME-Bugzilla-Component=General + X-GNOME-Bugzilla-Version=@VERSION@ -Categories=Application;Network;GNOME;GTK;WebBrowser; +Categories=GNOME;GTK;Network;WebBrowser; MimeType=text/html;text/xml;application/xhtml+xml; diff --git a/epiphany.spec b/epiphany.spec index 8dfacc3..71b93db 100644 --- a/epiphany.spec +++ b/epiphany.spec @@ -1,38 +1,39 @@ # Conditinal build: -%bcond_with mozilla_firefox # build with mozilla-firefox-devel +%bcond_without mozilla_firefox # build without mozilla-firefox-devel # +%define basever 2.14 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 Name: epiphany -Version: 1.8.4.1 -Release: 1 +Version: 2.14.1 +Release: 3 License: GPL v2 Group: X11/Applications/Networking -Source0: http://ftp.gnome.org/pub/gnome/sources/epiphany/1.8/%{name}-%{version}.tar.bz2 -# Source0-md5: e34870feff1db2c529568a75be7546b0 +Source0: http://ftp.gnome.org/pub/gnome/sources/epiphany/%{basever}/%{name}-%{version}.tar.bz2 +# Source0-md5: 69f9760646b736d953f24442e0e38f7b Patch0: %{name}-first-tab.patch Patch1: %{name}-desktop.patch Patch2: %{name}-mozilla_includes.patch -Patch3: %{name}-mozilla.patch -Patch4: %{name}-pld-homepage.patch +Patch3: %{name}-pld-homepage.patch +Patch4: %{name}-configure.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.14.0 +BuildRequires: ORBit2-devel >= 1:2.14.0 BuildRequires: autoconf >= 2.59 BuildRequires: automake >= 1.8 -BuildRequires: dbus-glib-devel >= 0.34 +BuildRequires: dbus-glib-devel >= 0.60 BuildRequires: gnome-common >= 2.8.0 -BuildRequires: gnome-desktop-devel >= 2.10.0-2 +BuildRequires: gnome-desktop-devel >= 2.14.0 BuildRequires: gnome-doc-utils >= 0.3.2-1 -BuildRequires: gnome-vfs2-devel >= 2.10.0-2 +BuildRequires: gnome-vfs2-devel >= 2.14.0 BuildRequires: gtk+2-devel >= 2:2.8.3 BuildRequires: gtk-doc >= 1.3 BuildRequires: intltool >= 0.33 BuildRequires: iso-codes >= 0.35 BuildRequires: libglade2-devel >= 1:2.5.1 -BuildRequires: libgnomeprintui-devel >= 2.11.0-3 -BuildRequires: libgnomeui-devel >= 2.10.0-2 +BuildRequires: libgnomeprintui-devel >= 2.12.0 +BuildRequires: libgnomeui-devel >= 2.14.0 BuildRequires: startup-notification-devel >= 0.5 BuildRequires: libtool BuildRequires: libxslt-devel >= 1.1.15 @@ -42,7 +43,6 @@ BuildRequires: mozilla-firefox-devel >= 1.0.5 BuildRequires: mozilla-devel >= 5:1.7.9 %endif BuildRequires: pkgconfig -# Requries but python package not present? BuildRequires: python-gnome-devel >= 2.6.0 BuildRequires: python-pygtk-devel >= 2.6.0 BuildRequires: rpmbuild(macros) >= 1.197 @@ -50,7 +50,8 @@ BuildRequires: scrollkeeper Requires(post,preun): GConf2 Requires(post,postun): desktop-file-utils Requires(post,postun): scrollkeeper -Requires: gnome-icon-theme >= 2.10.0 +Requires: dbus >= 0.60 +Requires: gnome-icon-theme >= 2.14.0 Requires: gtk+2 >= 2:2.8.3 %if %{with mozilla_firefox} %requires_eq mozilla-firefox @@ -122,14 +123,14 @@ gnome-doc-prepare --copy --force %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT%{_libdir}/%{name}/1.8/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 # epiphany-2.0.mo, but gnome/help/epiphany %find_lang %{name}-2.0 --with-gnome --all-name @@ -138,13 +139,17 @@ rm -r $RPM_BUILD_ROOT%{_datadir}/application-registry/* 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 %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 @@ -155,20 +160,25 @@ rm -rf $RPM_BUILD_ROOT %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/epiphany-fonts.schemas %{_sysconfdir}/gconf/schemas/epiphany-lockdown.schemas +%{_sysconfdir}/gconf/schemas/epiphany-pango.schemas %{_sysconfdir}/gconf/schemas/epiphany.schemas %{_omf_dest_dir}/* %dir %{_libdir}/%{name} -%dir %{_libdir}/%{name}/1.8 -%dir %{_libdir}/%{name}/1.8/extensions +%dir %{_libdir}/%{name}/%{basever} +%dir %{_libdir}/%{name}/%{basever}/extensions +%dir %{_libdir}/%{name}/%{basever}/plugins +%attr(755,root,root) %{_libdir}/epiphany/%{basever}/plugins/*.so* %{_mandir}/man1/* %files devel %defattr(644,root,root,755) +%{_aclocaldir}/* %{_includedir}/epiphany %{_pkgconfigdir}/*.pc %{_datadir}/pygtk/*/defs/epiphany.defs -- 2.44.0