- updated to 3.2.0; merged from DEVEL

- use gtk+3

Changed files:
    GConf2.spec -> 1.155

diff --git a/GConf2.spec b/GConf2.spec
index ffb637ba0f00b1f0d118a4aa0461989a24f72ac3..22fc0e14e42ba948e89acd33a1d9e7fa8b8c93d0 100644 (file)
--- a/GConf2.spec
+++ b/GConf2.spec
@@ -10,12 +10,12 @@ Summary(pl.UTF-8):  System konfiguracyjnej bazy danych dla GNOME 2
 Summary(pt_BR.UTF-8):  Sistema de Configuração do GNOME 2
 Summary(ru.UTF-8):     Система конфигурации GNOME 2
 Name:          GConf2
 Summary(pt_BR.UTF-8):  Sistema de Configuração do GNOME 2
 Summary(ru.UTF-8):     Система конфигурации GNOME 2
 Name:          GConf2

-Version:       2.32.5
+Version:       3.2.0

 Release:       1
 License:       LGPL v2+
 Group:         X11/Applications
 Release:       1
 License:       LGPL v2+
 Group:         X11/Applications

-Source0:       http://ftp.gnome.org/pub/GNOME/sources/GConf/2.32/GConf-%{version}.tar.xz
-# Source0-md5: 3e237bf98933c356c9b774393ce427c6
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/GConf/3.2/GConf-%{version}.tar.xz
+# Source0-md5: 33bb4d86e67cd5aacba089eb752e3f3c

 Patch0:                %{name}-NO_MAJOR_VERSION.patch
 Patch1:                %{name}-reload.patch
 URL:           http://www.gnome.org/
 Patch0:                %{name}-NO_MAJOR_VERSION.patch
 Patch1:                %{name}-reload.patch
 URL:           http://www.gnome.org/


@@ -27,7 +27,7 @@ BuildRequires:        docbook-dtd412-xml
 BuildRequires: gettext-devel
 BuildRequires: glib2-devel >= 1:2.28.0
 BuildRequires: gobject-introspection-devel >= 0.10.0
 BuildRequires: gettext-devel
 BuildRequires: glib2-devel >= 1:2.28.0
 BuildRequires: gobject-introspection-devel >= 0.10.0

-BuildRequires: gtk+2-devel >= 2:2.16.0
+BuildRequires: gtk+3-devel >= 3.0.0

 BuildRequires: gtk-doc >= 1.8
 BuildRequires: intltool >= 0.40.0
 BuildRequires: libtool
 BuildRequires: gtk-doc >= 1.8
 BuildRequires: intltool >= 0.40.0
 BuildRequires: libtool


@@ -182,7 +182,6 @@ automatycznie skonfigurowane do używania tych adresów.
 %configure \
        %{!?with_static_libs:--disable-static} \
        --enable-gtk-doc \
 %configure \
        %{!?with_static_libs:--disable-static} \
        --enable-gtk-doc \

-       --with-gtk=2.0 \

        --with-html-dir=%{_gtkdocdir}
 
 %{__make}
        --with-html-dir=%{_gtkdocdir}
 
 %{__make}