- updated to 1.6.1

- use new faster rpm's GConf automation
- run scrollkeeper-update in quiet mode
- don't package deprecated gnome-mime-data stuff

Changed files:
    epiphany.spec -> 1.85

diff --git a/epiphany.spec b/epiphany.spec
index bed8ec954d1bee108795e17e5357b59825b1c756..a67094293e1649a07569d45a0a58ba25d7718748 100644 (file)
--- a/epiphany.spec
+++ b/epiphany.spec
@@ -3,12 +3,12 @@ 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.6.0
-Release:       2
+Version:       1.6.1
+Release:       1
 License:       GPL v2
 Group:         X11/Applications/Networking
 Source0:       http://ftp.gnome.org/pub/gnome/sources/epiphany/1.6/%{name}-%{version}.tar.bz2
-# Source0-md5: 53eda1c713aec26a51fb806210c8afa7
+# Source0-md5: 945545f33714736154725ed2a3b8c8b8
 Patch0:                %{name}-first-tab.patch
 Patch1:                %{name}-desktop.patch
 Patch2:                %{name}-mozilla_includes.patch
@@ -19,22 +19,24 @@ BuildRequires:      ORBit2-devel >= 1:2.12.1
 BuildRequires: autoconf >= 2.59
 BuildRequires: automake
 BuildRequires: gnome-common >= 2.8.0
-BuildRequires: gnome-desktop >= 2.10.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
+BuildRequires: libgnomeui-devel >= 2.10.0-2
 BuildRequires: libtool
-BuildRequires: libxml2-devel >= 2.6.17
+BuildRequires: libxml2-devel >= 2.6.19
 BuildRequires: mozilla-devel >= %{minmozver}
-BuildRequires: nautilus-devel >= 2.10.0
+BuildRequires: nautilus-devel >= 2.10.0-3
 BuildRequires: pango-devel >= 1:1.8.1
 BuildRequires: pkgconfig
 BuildRequires: rpm-build >= 4.1-10
+BuildRequires: rpmbuild(macros) >= 1.196
 BuildRequires: scrollkeeper
-Requires(post):        GConf2
+Requires(post,preun):  GConf2
+Requires(post,postun): desktop-file-utils
 Requires(post,postun): scrollkeeper
 Requires:      gnome-icon-theme >= 2.10.0
 Requires:      gtk+2 >= 2:2.6.4
@@ -61,7 +63,7 @@ Summary(pl):  Pliki nag
 Group:         X11/Applications/Networking
 # doesn't require base
 Requires:      gtk+2-devel >= 2:2.6.4
-Requires:      libxml2-devel >= 2.6.17
+Requires:      libxml2-devel >= 2.6.19
 
 %description devel
 Epiphany header files for plugin development.
@@ -109,6 +111,7 @@ install -d $RPM_BUILD_ROOT%{_libdir}/%{name}-1.6/extensions
        HTML_DIR=%{_gtkdocdir}
 
 rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
+rm -r $RPM_BUILD_ROOT%{_datadir}/application-registry/*
 
 # epiphany-2.0.mo, but gnome/help/epiphany
 %find_lang %{name}-2.0 --with-gnome --all-name
@@ -117,15 +120,22 @@ rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
 rm -rf $RPM_BUILD_ROOT
 
 %post
-umask 022
-%gconf_schema_install
-/usr/bin/scrollkeeper-update
-[ ! -x /usr/bin/update-desktop-database ] || /usr/bin/update-desktop-database >/dev/null 2>&1 ||:
+%gconf_schema_install /etc/gconf/schemas/epiphany-lockdown.schemas
+%gconf_schema_install /etc/gconf/schemas/epiphany.schemas
+/usr/bin/scrollkeeper-update -q
+/usr/bin/update-desktop-database
+
+%preun
+if [ $1 = 0 ]; then
+%gconf_schema_uninstall /etc/gconf/schemas/epiphany-lockdown.schemas
+%gconf_schema_uninstall /etc/gconf/schemas/epiphany.schemas
+fi
 
 %postun
-umask 022
-/usr/bin/scrollkeeper-update
-[ ! -x /usr/bin/update-desktop-database ] || /usr/bin/update-desktop-database >/dev/null 2>&1
+if [ $1 = 0 ]; then
+/usr/bin/scrollkeeper-update -q
+/usr/bin/update-desktop-database
+fi
 
 %files -f %{name}-2.0.lang
 %defattr(644,root,root,755)
@@ -134,7 +144,6 @@ umask 022
 %{_libdir}/bonobo/servers/*
 %{_datadir}/%{name}
 %{_desktopdir}/*
-%{_datadir}/application-registry/*
 %{_pixmapsdir}/*
 %{_sysconfdir}/gconf/schemas/*
 %{_omf_dest_dir}/*