- updated to 2.26.0

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

diff --git a/gconf-editor.spec b/gconf-editor.spec
index 980ad69e326467161d140e9cab6709cf3bc320ff..e8430d268ebaca40f32f2060d9d643862a34b53c 100644 (file)
--- a/gconf-editor.spec
+++ b/gconf-editor.spec
@@ -1,39 +1,43 @@
 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.15.91
+Version:       2.26.0
 Release:       1
 License:       GPL v2+
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/gnome/sources/gconf-editor/2.15/%{name}-%{version}.tar.bz2
-# Source0-md5: 5b46ca0f177428b6c84c53cebd81831e
-Patch0:                %{name}-desktop.patch
-BuildRequires: GConf2-devel >= 2.14.0
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/gconf-editor/2.26/%{name}-%{version}.tar.bz2
+# Source0-md5: 2dc76415b22d805cfacfcd5fb98f185c
+BuildRequires: GConf2-devel >= 2.24.0
+BuildRequires: PolicyKit-devel >= 0.7
 BuildRequires: autoconf
-BuildRequires: automake
-BuildRequires: gnome-common >= 2.12.0
-BuildRequires: gnome-doc-utils >= 0.7.1
-BuildRequires: gtk+2-devel >= 2:2.10.1
-BuildRequires: libgnomeui-devel >= 2.15.91
+BuildRequires: automake >= 1:1.9
+BuildRequires: dbus-glib-devel >= 0.74
+BuildRequires: gettext-devel
+BuildRequires: gnome-common >= 2.20.0
+BuildRequires: gnome-doc-utils >= 0.14.0
+BuildRequires: gtk+2-devel >= 2:2.16.0
+BuildRequires: intltool >= 0.40.0
 BuildRequires: libtool
 BuildRequires: pkgconfig
+BuildRequires: rpmbuild(find_lang) >= 1.23
 BuildRequires: rpmbuild(macros) >= 1.311
 BuildRequires: scrollkeeper
-Requires(post,preun):  GConf2 >= 2.14.0
-Requires(post,postun): gtk+2 >= 2:2.10.1
-Requires:      libgnomeui >= 2.14.0
-Requires:      hicolor-icon-theme
+Requires(post,postun): gtk+2
+Requires(post,postun): hicolor-icon-theme
+Requires(post,postun): scrollkeeper
+Requires(post,preun):  GConf2
+# sr@Latn vs. sr@latin
+Conflicts:     glibc-misc < 6:2.7
 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
 %{__intltoolize}
@@ -41,8 +45,10 @@ Edytor do systemu konfiguracji GConf.
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
+%{__autoheader}
 %{__automake}
-%configure
+%configure \
+       --disable-scrollkeeper
 %{__make}
 
 %install
@@ -51,14 +57,13 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-rm -r $RPM_BUILD_ROOT%{_datadir}/locale/ug
-
-%find_lang %{name} --with-gnome
+%find_lang %{name} --with-gnome --with-omf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
+%scrollkeeper_update_post
 %gconf_schema_install gconf-editor.schemas
 %update_icon_cache hicolor
 
@@ -66,14 +71,16 @@ rm -rf $RPM_BUILD_ROOT
 %gconf_schema_uninstall gconf-editor.schemas
 
 %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}/*
-%{_desktopdir}/*
+%attr(755,root,root) %{_bindir}/gconf-editor
+%{_desktopdir}/gconf-editor.desktop
 %{_iconsdir}/hicolor/*/*/*.png
-%{_mandir}/man1/*
-%{_pixmapsdir}/*
+%dir %{_datadir}/gconf-editor
+%{_datadir}/gconf-editor/icons
+%{_mandir}/man1/gconf-editor.1*
 %{_sysconfdir}/gconf/schemas/gconf-editor.schemas