- release 3 for rebuild with new ldap.

[packages/GConf2.git] / GConf2.spec

diff --git a/GConf2.spec b/GConf2.spec
index 1b5b50986ae70decc4d5643c8525a2e5e727e0a9..2bf742de22c71259603fb4b6a1ebbf7b85e2bccc 100644 (file)
--- a/GConf2.spec
+++ b/GConf2.spec
@@ -1,27 +1,33 @@
-%bcond_without static  # don't build static libraries
+#
+# TODO:
+# - install evoldap.scheme ?
+#
+# Conditional build:
+%bcond_without static_libs     # don't build static libraries
+#
 Summary:       GNOME2 configuration database system
 Summary(pl):   System konfiguracyjnej bazy danych dla GNOME 2
 Summary(pt_BR):        Sistema de Configuração do GNOME 2
 Summary(ru):   óÉÓÔÅÍÁ ËÏÎÆÉÇÕÒÁÃÉÉ GNOME 2
 Name:          GConf2
-Version:       2.10.0
-Release:       5
+Version:       2.12.1
+Release:       2
 License:       LGPL
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/gnome/sources/GConf/2.10/GConf-%{version}.tar.bz2
-# Source0-md5: a7cd37be4e317195a6668a086fc72033
+Source0:       http://ftp.gnome.org/pub/gnome/sources/GConf/2.12/GConf-%{version}.tar.bz2
+# Source0-md5: 247110de013ed24b17cf4191eb6daec5
+Source1:       %{name}-merge-tree.xinit
 Patch0:                %{name}-NO_MAJOR_VERSION.patch
 Patch1:                %{name}-path.patch
-Patch2:                %{name}-shutdown.patch
 URL:           http://www.gnome.org/
-BuildRequires: ORBit2-devel >= 1:2.12.1
+BuildRequires: ORBit2-devel >= 1:2.12.3
 BuildRequires: autoconf
 BuildRequires: automake >= 1:1.7
 BuildRequires: gettext-devel
-BuildRequires: gtk+2-devel >= 2:2.6.4
-BuildRequires: gtk-doc >= 1.3
+BuildRequires: gtk+2-devel >= 2:2.8.3
+BuildRequires: gtk-doc >= 1.4-2
 BuildRequires: libtool
-BuildRequires: libxml2-devel >= 1:2.6.19
+BuildRequires: libxml2-devel >= 1:2.6.21
 BuildRequires: perl-base
 BuildRequires: pkgconfig
 BuildRequires: popt-devel
@@ -50,9 +56,9 @@ Summary(pl):  Pliki nag
 Summary(pt_BR):        Sistema de Configuração do GNOME2 - arquivos para desenvolvimento
 Group:         X11/Development/Libraries
 Requires:      %{name} = %{version}-%{release}
-Requires:      ORBit2-devel >= 1:2.12.1
+Requires:      ORBit2-devel >= 1:2.12.3
 Requires:      gtk-doc-common
-Requires:      libxml2-devel >= 1:2.6.19
+Requires:      libxml2-devel >= 1:2.6.21
 Obsoletes:     libGConf2-devel
 
 %description devel
@@ -84,7 +90,6 @@ Bibliotecas est
 %setup -q -n GConf-%{version}
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 rm -f acinclude.m4
@@ -96,7 +101,7 @@ rm -f acinclude.m4
 %{__automake}
 %configure \
        --with-html-dir=%{_gtkdocdir} \
-       %{!?with_static:--disable-static} \
+       %{!?with_static_libs:--disable-static} \
 %ifarch ppc
        --disable-gtk-doc
 %else
@@ -107,11 +112,13 @@ rm -f acinclude.m4
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas
+install -d $RPM_BUILD_ROOT%{_sysconfdir}{/gconf/schemas,/X11/xinit/xinitrc.d}
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinitrc.d/GConf2-merge-tree
+
 rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
 
 %find_lang %{name}
@@ -135,6 +142,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/GConf2
 %attr(755,root,root) %{_libdir}/GConf2/lib*.so
 %{_sysconfdir}/gconf
+%attr(755,root,root) %{_sysconfdir}/X11/xinit/xinitrc.d/*
 %{_datadir}/sgml/gconf
 %{_mandir}/man1/*
 
@@ -148,7 +156,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_pkgconfigdir}/*.pc
 %{_gtkdocdir}/gconf
 
-%if %{with static}
+%if %{with static_libs}
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/lib*.a