- rel.5, GNOME 2.15.x deps, (re)generate icon cache, remove unsupported

  locale

Changed files:
    gconf-editor.spec -> 1.35

diff --git a/gconf-editor.spec b/gconf-editor.spec
index cce44a38da9a26aec63a36b1e1a73bc8c1cdd052..4c49301c8915d5698d1a84d5581b4f8b44aae176 100644 (file)
--- a/gconf-editor.spec
+++ b/gconf-editor.spec
@@ -2,7 +2,7 @@ Summary:        An editor for the GConf configuration system
 Summary(pl):   Edytor do systemu konfiguracji GConf
 Name:          gconf-editor
 Version:       2.14.0
-Release:       4
+Release:       5
 License:       GPL v2+
 Group:         X11/Applications
 Source0:       http://ftp.gnome.org/pub/gnome/sources/gconf-editor/2.14/%{name}-%{version}.tar.bz2
@@ -12,14 +12,15 @@ Patch1:             %{name}-memcorrup.patch
 BuildRequires: GConf2-devel >= 2.14.0
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: gnome-common >= 2.4.0
-BuildRequires: gtk+2-devel >= 2:2.8.3
-BuildRequires: libgnomeui-devel >= 2.14.0
+BuildRequires: gnome-common >= 2.12.0
+BuildRequires: gtk+2-devel >= 2:2.9.3
+BuildRequires: libgnomeui-devel >= 2.15.1
 BuildRequires: libtool
 BuildRequires: pkgconfig
 BuildRequires: rpmbuild(macros) >= 1.197
 BuildRequires: scrollkeeper
-Requires(post,preun):  GConf2
+Requires(post,preun):  GConf2 >= 2.14.0
+Requires(post,postun): gtk+2 >= 2:2.9.3
 Requires(post,postun): scrollkeeper
 Requires:      libgnomeui >= 2.14.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -51,7 +52,7 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
+rm -r $RPM_BUILD_ROOT%{_datadir}/locale/{no,ug}
 
 %find_lang %{name} --with-gnome
 
@@ -61,19 +62,21 @@ rm -rf $RPM_BUILD_ROOT
 %post
 %gconf_schema_install gconf-editor.schemas
 %scrollkeeper_update_post
+gtk-update-icon-cache -qf %{_datadir}/icons/hicolor
 
 %preun
 %gconf_schema_uninstall gconf-editor.schemas
 
 %postun
 %scrollkeeper_update_postun
+gtk-update-icon-cache -qf %{_datadir}/icons/hicolor
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README
 %attr(755,root,root) %{_bindir}/*
 %{_desktopdir}/*
-%{_iconsdir}/*/*/apps/*.png
+%{_iconsdir}/hicolor/*/*/*.png
 %{_mandir}/man1/*
 %{_omf_dest_dir}/%{name}
 %{_pixmapsdir}/*