From: Marcin Banasiak <marcin.banasiak@gmail.com>
Date: Mon, 4 Apr 2011 17:39:10 +0000 (+0000)
Subject: - updated to 3.0.0; merged from DEVEL
X-Git-Tag: auto/th/gconf-editor-3_0_0-1
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fgconf-editor.git;a=commitdiff_plain;h=63761b256d81e07718c25a5e306179389c2c9d28

- updated to 3.0.0; merged from DEVEL

Changed files:
    gconf-editor.spec -> 1.60
---

diff --git a/gconf-editor.spec b/gconf-editor.spec
index 25334c2..0ace2ee 100644
--- a/gconf-editor.spec
+++ b/gconf-editor.spec
@@ -1,21 +1,20 @@
 Summary:	An editor for the GConf configuration system
 Summary(pl.UTF-8):	Edytor do systemu konfiguracji GConf
 Name:		gconf-editor
-Version:	2.32.0
-Release:	2
+Version:	3.0.0
+Release:	1
 License:	GPL v2+
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/gconf-editor/2.32/%{name}-%{version}.tar.bz2
-# Source0-md5:	14e413e88380b0d7a463c2beea3bac2e
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/gconf-editor/3.0/%{name}-%{version}.tar.bz2
+# Source0-md5:	535eb5986d83c17a91891da26f6b78f3
 BuildRequires:	GConf2-devel >= 2.24.0
 BuildRequires:	autoconf
 BuildRequires:	automake >= 1:1.9
-BuildRequires:	dbus-glib-devel >= 0.74
 BuildRequires:	docbook-dtd412-xml
 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:	gtk+3-devel >= 3.0.0
 BuildRequires:	intltool >= 0.40.0
 BuildRequires:	libtool
 BuildRequires:	pkgconfig
@@ -23,9 +22,9 @@ BuildRequires:	rpmbuild(find_lang) >= 1.23
 BuildRequires:	rpmbuild(macros) >= 1.311
 BuildRequires:	scrollkeeper
 Requires(post,postun):	gtk-update-icon-cache
-Requires(post,postun):	hicolor-icon-theme
 Requires(post,postun):	scrollkeeper
 Requires(post,preun):	GConf2
+Requires:	hicolor-icon-theme
 # sr@Latn vs. sr@latin
 Conflicts:	glibc-misc < 6:2.7
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -48,6 +47,7 @@ Edytor do systemu konfiguracji GConf.
 %{__autoheader}
 %{__automake}
 %configure \
+	--disable-silent-rules \
 	--disable-scrollkeeper
 %{__make}