- added locale-names patch, rename no->nb

[packages/GConf2.git] / GConf2.spec

diff --git a/GConf2.spec b/GConf2.spec
index 8f06ac025f3d22183ca9f392d1c92bb78af1e5a1..ffdf3726dd46cb234c664a647bb3c5d52dee6f69 100644 (file)
--- a/GConf2.spec
+++ b/GConf2.spec
@@ -1,36 +1,34 @@
 Summary:       GNOME2 configuration database system
 Summary(pl):   System konfiguracyjnej bazy danych dla GNOME2
 Summary(pt_BR):        Sistema de Configuração do GNOME2
+Summary(ru):   óÉÓÔÅÍÁ ËÏÎÆÉÇÕÒÁÃÉÉ Gnome
 Name:          GConf2
-Version:       1.2.1
-Release:       7
+Version:       2.4.0.1
+Release:       3
 License:       LGPL
 Group:         X11/Applications
-Source0:       ftp://ftp.gnome.org/pub/GNOME/sources/GConf/1.2/GConf-%{version}.tar.bz2
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/GConf/2.4/GConf-%{version}.tar.bz2
+# Source0-md5: 2f7548d0bad24d7c4beba54d0ec98a20
 Patch0:                %{name}-NO_MAJOR_VERSION.patch
 Patch1:                %{name}-am.patch
 Patch2:                %{name}-path.patch
-Patch3:                %{name}-unlock-dialog.patch
+Patch3:                %{name}-am18.patch
+Patch4:                %{name}-locale-names.patch
 URL:           http://www.gnome.org/
-BuildRequires: ORBit2-devel
+BuildRequires: ORBit2-devel >= 2.8.0
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: bonobo-activation-devel >= 1.0.3
 BuildRequires: gettext-devel
-BuildRequires: gtk+2-devel >= 2.0.6
-BuildRequires: glib2-devel >= 2.0.6
+BuildRequires: gtk+2-devel >= 2.2.0
+BuildRequires: gtk-doc
+BuildRequires: glib2-devel >= 2.2.0
 BuildRequires: libtool
-BuildRequires: libxml2-devel
+BuildRequires: libxml2-devel >= 2.0
 BuildRequires: pkgconfig
 BuildRequires: popt-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:     libGConf2
 
-%define                _prefix         /usr/X11R6
-%define                _mandir         %{_prefix}/man
-%define                _sysconfdir     /etc/X11/GNOME2
-%define                _gtkdocdir      %{_defaultdocdir}/gtk-doc/html
-
 %description
 GConf2 is a configuration database system, functionally similar to the
 Windows registry but lots better. :-) It's being written for the
@@ -41,7 +39,7 @@ GNOME2 is not installed and compile the basic GConf2 library anyway.
 GConf2 jest systemem konfiguracyjnej bazy danych, funkcjonalnie
 podobnej do rejestru Windows, ale o wiele lepszej :-). Jest pisana dla
 desktopu GNOME2, ale nie wymaga GNOME2; skrypt configure powinien
-wykryæ brak gnome i skompilowaæ tylko wersjê podstawow± GConf2.
+wykryæ brak GNOME2 i skompilowaæ tylko wersjê podstawow± GConf2.
 
 %description -l pt_BR
 Gconf2 é o sistema de banco de dados de configuração do GNOME2.
@@ -51,11 +49,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:      bonobo-activation-devel
+Requires:      %{name} = %{version}-%{release}
+Requires:      ORBit2-devel >= 2.8.0
 Requires:      gtk-doc-common
-Requires:      libxml2-devel
+Requires:      libxml2-devel >= 2.0
 Obsoletes:     libGConf2-devel
 
 %description devel
@@ -72,7 +69,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.
@@ -89,19 +86,24 @@ Bibliotecas est
 %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}
-%{__autoconf}
+%{__autoheader}
 %{__automake}
+%{__autoconf}
 %configure \
        --with-html-dir=%{_gtkdocdir} \
 %ifarch ppc
-       --disable-gtk-doc 
+       --disable-gtk-doc
 %else
-       --enable-gtk-doc 
+       --enable-gtk-doc
 %endif
 
 %{__make}
@@ -111,14 +113,15 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_aclocaldir},%{_sysconfdir}/gconf/schemas}
 
 %{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT \
-       pkgconfigdir=%{_pkgconfigdir} \
-       HTML_DIR=%{_gtkdocdir} 
-       
+       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
+rm -f $RPM_BUILD_ROOT%{_libdir}/GConf2/lib*.{la,a}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -135,20 +138,18 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/GConf2
 %attr(755,root,root) %{_libdir}/GConf2/lib*.so
 %{_sysconfdir}/gconf
+%{_datadir}/sgml/gconf
 
 %files devel
 %defattr(644,root,root,755)
-# outdated and almost empty
-#doc NEWS
 %doc ChangeLog TODO
-%attr(755,root,root) %{_libdir}/lib*.??
-%{_libdir}/GConf2/lib*.la
 %doc %{_gtkdocdir}/gconf
+%attr(755,root,root) %{_libdir}/lib*.so
+%{_libdir}/lib*.la
 %{_includedir}/gconf2
 %{_aclocaldir}/*.m4
 %{_pkgconfigdir}/*.pc
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/GConf2/lib*.a
 %{_libdir}/lib*.a