- merged from DEVEL, up to 2.6.0

Changed files:
    gconf-editor.spec -> 1.21

diff --git a/gconf-editor.spec b/gconf-editor.spec
index 7cda148cf8f15bcb8ff35bdfdc7f6449307a8b6e..50f5cb83fe49a1670711a1d140cce877b2120ba7 100644 (file)
--- a/gconf-editor.spec
+++ b/gconf-editor.spec
@@ -1,17 +1,18 @@
 Summary:       An editor for the GConf configuration system
 Summary(pl):   Edytor do systemu konfiguracji GConf
 Name:          gconf-editor
-Version:       2.4.0
-Release:       2
+Version:       2.6.0
+Release:       1
 License:       GPL
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/gnome/sources/%{name}/2.4/%{name}-%{version}.tar.bz2
-# Source0-md5: 7ebc352062fc8b6d3c09a69ad6e963a7
-BuildRequires: automake
+Source0:       http://ftp.gnome.org/pub/gnome/sources/%{name}/2.6/%{name}-%{version}.tar.bz2
+# Source0-md5: 456d5dbddefffe7b49f18688aa9c1975
+Patch0:                %{name}-locale-names.patch
+BuildRequires: GConf2-devel >= 2.5.90
 BuildRequires: autoconf
-BuildRequires: GConf2-devel >= 2.3.3
-BuildRequires: gtk+2-devel >= 2.2.4
-BuildRequires: xft-devel >= 2.0-6
+BuildRequires: automake
+BuildRequires: gtk+2-devel >= 2:2.4.0
+BuildRequires: libtool
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -22,13 +23,16 @@ Edytor do systemu konfiguracji GConf.
 
 %prep
 %setup -q
+%patch0 -p1
+
+mv po/{no,nb}.po
 
 %build
+%{__libtoolize}
 %{__aclocal}
 %{__autoconf}
 %{__automake}
 %configure
-
 %{__make}
 
 %install
@@ -47,3 +51,4 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/*
 %{_desktopdir}/*
 %{_pixmapsdir}/*
+%{_mandir}/man1/*