- updated to 2.18.0

[packages/gconf-editor.git] / gconf-editor.spec

diff --git a/gconf-editor.spec b/gconf-editor.spec
index 624374b2ef235a8a3cc4fca24f56f044a92eda11..c1baed97f5ddd1aca05c50bde8213df2e7aff032 100644 (file)
--- a/gconf-editor.spec
+++ b/gconf-editor.spec
@@ -1,43 +1,47 @@
 Summary:       An editor for the GConf configuration system
-Summary(pl):   Edytor do systemu konfiguracji GConf
+Summary(pl.UTF-8):     Edytor do systemu konfiguracji GConf
 Name:          gconf-editor
-Version:       2.10.0
+Version:       2.18.0
 Release:       1
-License:       GPL v2
+License:       GPL v2+
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/gnome/sources/gconf-editor/2.10/%{name}-%{version}.tar.bz2
-# Source0-md5: 651a18f7eb5af91761521aa4f04ccc07
-Patch0:                %{name}-desktop.patch
-BuildRequires: GConf2-devel >= 2.10.0
+Source0:       http://ftp.gnome.org/pub/gnome/sources/gconf-editor/2.18/%{name}-%{version}.tar.bz2
+# Source0-md5: cbaefa1ff8a548a3d381c67aed426fb7
+BuildRequires: GConf2-devel >= 2.18.0.1
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: gnome-common >= 2.4.0
-BuildRequires: gtk+2-devel >= 2:2.6.4
-BuildRequires: libgnomeui-devel >= 2.10.0
+BuildRequires: gnome-common >= 2.12.0
+BuildRequires: gnome-doc-utils >= 0.10.1
+BuildRequires: gtk+2-devel >= 2:2.10.10
+BuildRequires: libgnomeui-devel >= 2.18.0
 BuildRequires: libtool
 BuildRequires: pkgconfig
+BuildRequires: rpmbuild(macros) >= 1.311
 BuildRequires: scrollkeeper
-Requires(post):        GConf2
-Requires(post):        scrollkeeper
+Requires(post,postun): gtk+2
+Requires(post,postun): hicolor-icon-theme
+Requires(post,preun):  GConf2
+Requires:      libgnomeui >= 2.18.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 An editor for the GConf configuration system.
 
-%description -l pl
+%description -l pl.UTF-8
 Edytor do systemu konfiguracji GConf.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
-gnome-doc-common
+%{__intltoolize}
+%{__gnome_doc_common}
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
 %{__automake}
-%configure
+%configure \
+       --disable-scrollkeeper
 %{__make}
 
 %install
@@ -46,26 +50,34 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
-
 %find_lang %{name} --with-gnome
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-/usr/bin/scrollkeeper-update
-%gconf_schema_install
+%scrollkeeper_update_post
+%gconf_schema_install gconf-editor.schemas
+%update_icon_cache hicolor
+
+%preun
+%gconf_schema_uninstall gconf-editor.schemas
 
-%postun -p /usr/bin/scrollkeeper-update
+%postun
+%scrollkeeper_update_postun
+%update_icon_cache hicolor
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README
 %attr(755,root,root) %{_bindir}/*
-%{_sysconfdir}/gconf/schemas/*.schemas
-%{_desktopdir}/*
-%{_pixmapsdir}/*
+%{_desktopdir}/*.desktop
+%{_iconsdir}/hicolor/*/*/*.png
 %{_mandir}/man1/*
-%{_omf_dest_dir}/%{name}
-%{_iconsdir}/*/*/apps/*.png
+%{_pixmapsdir}/*
+%dir %{_omf_dest_dir}/%{name}
+%{_omf_dest_dir}/gconf-editor/gconf-editor-C.omf
+%lang(fr) %{_omf_dest_dir}/gconf-editor/gconf-editor-fr.omf
+%lang(it) %{_omf_dest_dir}/gconf-editor/gconf-editor-it.omf
+%lang(sv) %{_omf_dest_dir}/gconf-editor/gconf-editor-sv.omf
+%{_sysconfdir}/gconf/schemas/gconf-editor.schemas