diff --git a/.cvsignore b/.cvsignore index 1e23858..498b9f5 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1 @@ -epiphany-2.14.0.tar.bz2 -epiphany-2.14.1.tar.bz2 +epiphany-2.15.1.tar.bz2 diff --git a/epiphany.spec b/epiphany.spec index 0737a80..f11d7b4 100644 --- a/epiphany.spec +++ b/epiphany.spec @@ -1,24 +1,28 @@ %define mozver 37:1.7.13 %define desktop_file_utils_version 0.9 %define mozilla_devel_ver 1.7 -%define glib2_devel_ver 2.8.0 -%define gtk2_devel_ver 2.8.3 +%define glib2_devel_ver 2.10.1 +%define gtk2_devel_ver 2.9.0 %define libbonoboui_devel_ver 2.1.1 %define scrollkeeper_ver 0.1.4 %define gnome_doc_utils_ver 0.3.2 Summary: GNOME web browser based on the Mozilla rendering engine Name: epiphany -Version: 2.14.1 -Release: 3 +Version: 2.15.1 +Release: 1 License: GPL Group: Applications/Internet URL: http://www.gnome.org/projects/epiphany/ Source0: %{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot -Prereq: scrollkeeper, GConf2 -PreReq: desktop-file-utils >= %{desktop_file_utils_version} +Requires(post): scrollkeeper +Requires(post): desktop-file-utils >= %{desktop_file_utils_version} +Requires(post): GConf2 +Requires(preun): GConf2 +Requires(postun): scrollkeeper +Requires(postun): desktop-file-utils >= %{desktop_file_utils_version} Requires: mozilla = %mozver Requires: gnome-icon-theme >= 1.0.6-1 Requires: iso-codes >= 0.45 @@ -95,17 +99,26 @@ rm -f $RPM_BUILD_ROOT/%{_datadir}/applications/bme.desktop rm -f $RPM_BUILD_ROOT/%{_libdir}/epiphany/*/plugins/*.la %post -update-desktop-database %{_datadir}/applications +update-desktop-database -q %{_datadir}/applications export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` SCHEMAS="epiphany.schemas epiphany-lockdown.schemas" for S in $SCHEMAS; do gconftool-2 --makefile-install-rule /etc/gconf/schemas/$S > /dev/null done -scrollkeeper-update +scrollkeeper-update -q + +%preun +if [ "$1" -eq 0 ]; then + export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` + SCHEMAS="epiphany.schemas epiphany-lockdown.schemas" + for S in $SCHEMAS; do + gconftool-2 --makefile-uninstall-rule /etc/gconf/schemas/$S > /dev/null || : + done +fi %postun -update-desktop-database %{_datadir}/applications -scrollkeeper-update +update-desktop-database -q %{_datadir}/applications +scrollkeeper-update -q %clean %{__rm} -rf $RPM_BUILD_ROOT @@ -134,6 +147,9 @@ scrollkeeper-update %{_datadir}/pygtk/2.0/defs/epiphany.defs %changelog +* Wed May 10 2006 Matthias Clasen - 2.15.1-1 +- Update to 2.15.1 + * Thu May 4 2006 Dan Williams - 2.14.1-3 - Rebuild for a mozilla update diff --git a/sources b/sources index 88574b9..d7708dc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -69f9760646b736d953f24442e0e38f7b epiphany-2.14.1.tar.bz2 +1bc4bb644617ebf1aee3cd3e1604a54d epiphany-2.15.1.tar.bz2