- merged changes from HEAD:

[packages/GConf2.git] / GConf2.spec

diff --git a/GConf2.spec b/GConf2.spec
index eda5ac6057cb1aab55057e9dfa215c5715929284..edfd3b24465b6f972d421bfb08b358866a754f79 100644 (file)
--- a/GConf2.spec
+++ b/GConf2.spec
@@ -3,29 +3,28 @@ Summary(pl):  System konfiguracyjnej bazy danych dla GNOME2
 Summary(pt_BR):        Sistema de Configuração do GNOME2
 Summary(ru):   óÉÓÔÅÍÁ ËÏÎÆÉÇÕÒÁÃÉÉ Gnome
 Name:          GConf2
-Version:       2.4.0.1
-Release:       1
+Version:       2.5.1
+Release:       2
 License:       LGPL
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/GConf/2.4/GConf-%{version}.tar.bz2
-# Source0-md5: 2f7548d0bad24d7c4beba54d0ec98a20
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/GConf/2.5/GConf-%{version}.tar.bz2
+# Source0-md5: 02d92a323caada32cd3f86f6afd87f3f
 Patch0:                %{name}-NO_MAJOR_VERSION.patch
 Patch1:                %{name}-am.patch
 Patch2:                %{name}-path.patch
+Patch3:                %{name}-am18.patch
+Patch4:                %{name}-locale-names.patch
 URL:           http://www.gnome.org/
-BuildRequires: ORBit2-devel >= 2.7.2
+BuildRequires: ORBit2-devel >= 2.9.0
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: freetype-devel >= 2.1.4
 BuildRequires: gettext-devel
-BuildRequires: gtk+2-devel >= 2.2.0
-BuildRequires: glib2-devel >= 2.2.0
-BuildRequires: libbonobo >= 2.4.0
+BuildRequires: gtk+2-devel >= 2.3.0
+BuildRequires: gtk-doc
 BuildRequires: libtool
-BuildRequires: libxml2-devel
+BuildRequires: libxml2-devel >= 2.0
 BuildRequires: pkgconfig
 BuildRequires: popt-devel
-BuildRequires: xft-devel >= 2.1.2
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:     libGConf2
 
@@ -49,11 +48,10 @@ Summary:    GConf2 includes, etc
 Summary(pl):   Pliki nag³ówkowe GConf2
 Summary(pt_BR):        Sistema de Configuração do GNOME2 - arquivos para desenvolvimento
 Group:         X11/Development/Libraries
-Requires:      %{name} = %{version}
-Requires:      ORBit2-devel
+Requires:      %{name} = %{version}-%{release}
+Requires:      ORBit2-devel >= 2.9.0
 Requires:      gtk-doc-common
-Requires:      libbonobo-devel
-Requires:      libxml2-devel
+Requires:      libxml2-devel >= 2.0
 Obsoletes:     libGConf2-devel
 
 %description devel
@@ -70,7 +68,7 @@ Summary:      GConf2 static libraries
 Summary(pl):   Biblioteki statyczne GConf2
 Summary(pt_BR):        Bibliotecas estáticas para desenvolvimento com gconf2
 Group:         X11/Development/Libraries
-Requires:      %{name}-devel = %{version}
+Requires:      %{name}-devel = %{version}-%{release}
 
 %description static
 GConf2 static libraries.
@@ -86,15 +84,19 @@ Bibliotecas est
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
+
+mv -f po/{no,nb}.po
 
 %build
-rm -f missing acinclude.m4
+rm -f acinclude.m4
 glib-gettextize --copy --force
 %{__libtoolize}
 %{__aclocal}
 %{__autoheader}
-%{__automake}
 %{__autoconf}
+%{__automake}
 %configure \
        --with-html-dir=%{_gtkdocdir} \
 %ifarch ppc
@@ -107,13 +109,11 @@ glib-gettextize --copy --force
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_aclocaldir},%{_sysconfdir}/gconf/schemas}
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-install gconf.m4 $RPM_BUILD_ROOT%{_aclocaldir}/gconf-2.m4
-
 %find_lang %{name}
 
 # no *.{la,a} for modules - shut up check-files
@@ -136,6 +136,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/GConf2/lib*.so
 %{_sysconfdir}/gconf
 %{_datadir}/sgml/gconf
+%{_mandir}/man1/*.gz
 
 %files devel
 %defattr(644,root,root,755)