- updated to 3.2.0; merged from DEVEL

[packages/GConf2.git] / GConf2.spec

diff --git a/GConf2.spec b/GConf2.spec
index 0c2b37b564a10e5eb4f6aab93bc06a57749393b2..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
-Version:       2.32.1
+Version:       3.2.0
 Release:       1
 License:       LGPL v2+
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/GConf/2.32/GConf-%{version}.tar.bz2
-# Source0-md5: e3952c493cabee2903690fc4d203dca3
+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/
@@ -26,8 +26,8 @@ BuildRequires:        dbus-glib-devel >= 0.74
 BuildRequires: docbook-dtd412-xml
 BuildRequires: gettext-devel
 BuildRequires: glib2-devel >= 1:2.28.0
-BuildRequires: gobject-introspection-devel >= 0.9.5
-BuildRequires: gtk+2-devel >= 2:2.16.0
+BuildRequires: gobject-introspection-devel >= 0.10.0
+BuildRequires: gtk+3-devel >= 3.0.0
 BuildRequires: gtk-doc >= 1.8
 BuildRequires: intltool >= 0.40.0
 BuildRequires: libtool
@@ -38,6 +38,8 @@ BuildRequires:        pkgconfig
 BuildRequires: polkit-devel >= 0.92
 BuildRequires: rpm-pythonprov
 BuildRequires: rpmbuild(macros) >= 1.197
+BuildRequires: tar >= 1:1.22
+BuildRequires: xz
 Requires(post):        findutils
 Requires(post,postun): glib2 >= 1:2.28.0
 Requires:      %{name}-libs = %{version}-%{release}
@@ -180,7 +182,6 @@ automatycznie skonfigurowane do używania tych adresów.
 %configure \
        %{!?with_static_libs:--disable-static} \
        --enable-gtk-doc \
-       --with-gtk=2.0 \
        --with-html-dir=%{_gtkdocdir}
 
 %{__make}
@@ -195,12 +196,10 @@ install -d $RPM_BUILD_ROOT{%{_examplesdir}/%{name}-%{version},%{_sysconfdir}/gco
 cp examples/*.c $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 cp examples/*.schemas $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
-rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/en@shaw
-
 %find_lang %{name}
 
 # no *.{la,a} for modules - shut up check-files
-rm -f $RPM_BUILD_ROOT%{_libdir}/{GConf2,gio/modules}/lib*.{la,a}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/{GConf2,gio/modules}/lib*.{la,a}
 
 %clean
 rm -rf $RPM_BUILD_ROOT