- merged from DEVEL and updated to 2.8.0

Changed files:
    gconf-editor.spec -> 1.24

diff --git a/gconf-editor.spec b/gconf-editor.spec
index 62ebe9871e671168d67082d84f5b6cd921fc5a92..32efe0c955328db405bd6aebc0d452b16b4dc079 100644 (file)
--- a/gconf-editor.spec
+++ b/gconf-editor.spec
@@ -1,18 +1,21 @@
 Summary:       An editor for the GConf configuration system
 Summary(pl):   Edytor do systemu konfiguracji GConf
 Name:          gconf-editor
-Version:       2.6.2
+Version:       2.8.0
 Release:       1
 License:       GPL
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/gnome/sources/%{name}/2.6/%{name}-%{version}.tar.bz2
-# Source0-md5: 4b739532de350969c71f96c3b97f1093
-Patch0:                %{name}-locale-names.patch
-BuildRequires: GConf2-devel >= 2.6.2
+Source0:       http://ftp.gnome.org/pub/gnome/sources/%{name}/2.8/%{name}-%{version}.tar.bz2
+# Source0-md5: 8222990dd271cadb259b55beb5c80cc9
+BuildRequires: GConf2-devel >= 2.7.92
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: gtk+2-devel >= 2:2.4.3
+BuildRequires: gnome-common >= 2.4.0
+BuildRequires: gtk+2-devel >= 2:2.4.4
+BuildRequires: libgnomeui-devel >= 2.7.92
 BuildRequires: libtool
+Requires(post):        GConf2
+Requires(post):        scrollkeeper
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -23,11 +26,9 @@ Edytor do systemu konfiguracji GConf.
 
 %prep
 %setup -q
-%patch0 -p1
-
-mv po/{no,nb}.po
 
 %build
+gnome-doc-common
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
@@ -41,14 +42,24 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-%find_lang %{name}
+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
+
+%postun -p /usr/bin/scrollkeeper-update
+
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/*
+%{_sysconfdir}/gconf/schemas/*.schemas
 %{_desktopdir}/*
 %{_pixmapsdir}/*
 %{_mandir}/man1/*
+%{_omf_dest_dir}/%{name}