add workaround-crash.patch patch from fedora

[packages/GConf2.git] / GConf2.spec

diff --git a/GConf2.spec b/GConf2.spec
index 747d9c33b0b6bac00ada66cdad2e2d0972e4e1be..42d21e202030843f9b2081a5f6b02a7e56107dd5 100644 (file)
--- a/GConf2.spec
+++ b/GConf2.spec
@@ -1,33 +1,34 @@
-#
 # TODO:
 # - update documentation to follow changes introduced in Patch0
 #
 # Conditional build:
 %bcond_without static_libs     # don't build static libraries
-#
+
 Summary:       GNOME2 configuration database system
 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.2
-Release:       1
+Version:       3.2.6
+Release:       2
 License:       LGPL v2+
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/GConf/2.32/GConf-%{version}.tar.bz2
-# Source0-md5: 0d19e59b8997b9968695ca863dd0acc8
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/GConf/3.2/GConf-%{version}.tar.xz
+# Source0-md5: 2b16996d0e4b112856ee5c59130e822c
 Patch0:                %{name}-NO_MAJOR_VERSION.patch
 Patch1:                %{name}-reload.patch
+Patch2:                workaround-crash.patch
 URL:           http://www.gnome.org/
 BuildRequires: ORBit2-devel >= 1:2.14.9
 BuildRequires: autoconf >= 2.60
 BuildRequires: automake >= 1:1.9
+BuildRequires: dbus-devel >= 1.0.0
 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: glib2-devel >= 1:2.31.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,9 +39,12 @@ 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(post,postun): glib2 >= 1:2.31.0
 Requires:      %{name}-libs = %{version}-%{release}
+Requires:      psmisc >= 20.1-2
 Obsoletes:     GConf2-xinitrc
 Obsoletes:     libGConf2
 # sr@Latn vs. sr@latin
@@ -67,7 +71,7 @@ Summary:      GConf2 shared library
 Summary(pl.UTF-8):     Biblioteka współdzielona GConf2
 Group:         Libraries
 Requires:      ORBit2 >= 1:2.14.9
-Requires:      glib2 >= 1:2.28.0
+Requires:      glib2 >= 1:2.31.0
 Conflicts:     GConf2 < 2.24.0-2
 
 %description libs
@@ -87,7 +91,7 @@ Group:                Development/Libraries
 Requires:      %{name}-libs = %{version}-%{release}
 Requires:      ORBit2-devel >= 1:2.14.9
 Requires:      dbus-devel >= 1.0.0
-Requires:      glib2-devel >= 1:2.28.0
+Requires:      glib2-devel >= 1:2.31.0
 Requires:      libxml2-devel >= 1:2.6.30
 Obsoletes:     libGConf2-devel
 
@@ -167,6 +171,7 @@ automatycznie skonfigurowane do używania tych adresów.
 %setup -q -n GConf-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__gtkdocize}
@@ -178,9 +183,9 @@ automatycznie skonfigurowane do używania tych adresów.
 %{__autoconf}
 %{__automake}
 %configure \
+       --disable-silent-rules \
        %{!?with_static_libs:--disable-static} \
        --enable-gtk-doc \
-       --with-gtk=2.0 \
        --with-html-dir=%{_gtkdocdir}
 
 %{__make}
@@ -233,13 +238,12 @@ exit 0
 %attr(755,root,root) %{_bindir}/gsettings-data-convert
 %attr(755,root,root) %{_bindir}/gsettings-schema-convert
 %attr(755,root,root) %{_libexecdir}/gconf-defaults-mechanism
-%attr(755,root,root) %{_libexecdir}/gconf-sanity-check-2
 %attr(755,root,root) %{_libexecdir}/gconfd-2
 %dir %{_libdir}/GConf2
 %attr(755,root,root) %{_libdir}/GConf2/libgconfbackend-oldxml.so
 %attr(755,root,root) %{_libdir}/GConf2/libgconfbackend-xml.so
 %attr(755,root,root) %{_libdir}/gio/modules/libgsettingsgconfbackend.so
-%{_sysconfdir}/dbus-1/system.d/org.gnome.GConf.Defaults.conf
+/etc/dbus-1/system.d/org.gnome.GConf.Defaults.conf
 %{_sysconfdir}/xdg/autostart/gsettings-data-convert.desktop
 %dir %{_sysconfdir}/gconf
 %dir %{_sysconfdir}/gconf/2