- use new %doc infrastructure.

[packages/GConf2.git] / GConf2.spec

diff --git a/GConf2.spec b/GConf2.spec
index d02488dd5a861c163c403ca8f20734f375e3d1f8..14da182491ab8bf1d31e68cff8ec4c783b51e294 100644 (file)
--- a/GConf2.spec
+++ b/GConf2.spec
@@ -2,22 +2,25 @@ Summary:      GNOME2 configuration database system
 Summary(pl):   System konfiguracyjnej bazy danych dla GNOME2
 Summary(pt_BR):        Sistema de Configuração do GNOME2
 Name:          GConf2
-Version:       1.1.6
-Release:       1
+Version:       1.1.10
+Release:       2
 License:       LGPL
 Group:         X11/Applications
-Group(de):     X11/Applikationen
-Group(pl):     X11/Aplikacje
 Source0:       ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/GConf/GConf-%{version}.tar.bz2
+Patch0:                %{name}-NO_MAJOR_VERSION.patch
+Patch1:                %{name}-am.patch
 URL:           http://www.gnome.org/
 BuildRequires: ORBit2-devel
-BuildRequires: bonobo-activation-devel
-BuildRequires: db3-devel
-BuildRequires: glib2-devel
+BuildRequires: bonobo-activation-devel >= 0.9.5
+#BuildRequires:        db3-devel
+BuildRequires: gettext-devel
+BuildRequires: gtk+2-devel >= 2.0.1
+BuildRequires: glib2-devel >= 2.0.1
 BuildRequires: libxml2-devel
 BuildRequires: pkgconfig
 BuildRequires: popt-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+Obsoletes:     libGConf2
 
 %define                _prefix         /usr/X11R6
 %define                _mandir         %{_prefix}/man
@@ -25,15 +28,15 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 GConf2 is a configuration database system, functionally similar to the
-Windows registry but lots better. :-) It's being written for the GNOME2
-desktop but does not require GNOME2; configure should notice if GNOME2
-is not installed and compile the basic GConf2 library anyway.
+Windows registry but lots better. :-) It's being written for the
+GNOME2 desktop but does not require GNOME2; configure should notice if
+GNOME2 is not installed and compile the basic GConf2 library anyway.
 
 %description -l pl
 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.
+desktopu GNOME2, ale nie wymaga GNOME2; skrypt configure powinien
+wykryæ brak gnome i skompilowaæ tylko wersjê podstawow± GConf2.
 
 %description -l pt_BR
 Gconf2 é o sistema de banco de dados de configuração do GNOME2.
@@ -43,17 +46,12 @@ 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
-Group(de):     X11/Entwicklung/Libraries
-Group(es):     X11/Desarrollo/Bibliotecas
-Group(fr):     X11/Development/Librairies
-Group(pl):     X11/Programowanie/Biblioteki
-Group(pt_BR):  X11/Desenvolvimento/Bibliotecas
-Group(ru):     X11/òÁÚÒÁÂÏÔËÁ/âÉÂÌÉÏÔÅËÉ
-Group(uk):     X11/òÏÚÒÏÂËÁ/â¦Â̦ÏÔÅËÉ
 Requires:      %{name} = %{version}
 Requires:      ORBit2-devel
-Requires:      gtk+2-devel
 Requires:      bonobo-activation-devel
+Requires:      libxml2-devel
+Requires:      bonobo-activation-devel
+Obsoletes:     libGConf2-devel
 
 %description devel
 GConf2 includes etc.
@@ -61,7 +59,7 @@ GConf2 includes etc.
 %description devel -l pl
 Pliki nag³ówkowe GConf2.
 
-%description -l pt_BR devel
+%description devel -l pt_BR
 Sistema de Configuração do GNOME2 - arquivos para desenvolvimento.
 
 %package static
@@ -69,13 +67,6 @@ Summary:     GConf2 static libraries
 Summary(pl):   Biblioteki statyczne GConf2
 Summary(pt_BR):        Bibliotecas estáticas para desenvolvimento com gconf2
 Group:         X11/Development/Libraries
-Group(de):     X11/Entwicklung/Libraries
-Group(es):     X11/Desarrollo/Bibliotecas
-Group(fr):     X11/Development/Librairies
-Group(pl):     X11/Programowanie/Biblioteki
-Group(pt_BR):  X11/Desenvolvimento/Bibliotecas
-Group(ru):     X11/òÁÚÒÁÂÏÔËÁ/âÉÂÌÉÏÔÅËÉ
-Group(uk):     X11/òÏÚÒÏÂËÁ/â¦Â̦ÏÔÅËÉ
 Requires:      %{name}-devel = %{version}
 
 %description static
@@ -84,13 +75,20 @@ GConf2 static libraries.
 %description static -l pl
 Biblioteki statyczne GConf2.
 
-%description -l pt_BR static
+%description static -l pt_BR
 Bibliotecas estáticas para desenvolvimento com gconf
 
 %prep
 %setup -q -n GConf-%{version}
+%patch0 -p1
+%patch1 -p1
 
 %build
+rm -f missing acinclude.m4
+libtoolize --copy --force
+aclocal
+%{__autoconf}
+%{__automake}
 %configure \
        --enable-gtk-doc=no
 
@@ -105,8 +103,6 @@ install gconf.m4 $RPM_BUILD_ROOT%{_aclocaldir}/gconf-2.m4
        DESTDIR=$RPM_BUILD_ROOT \
        pkgconfigdir=%{_pkgconfigdir}
        
-gzip -9nf AUTHORS ChangeLog NEWS README
-
 %find_lang %{name}
 
 %clean
@@ -117,22 +113,23 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/*-2
+%attr(755,root,root) %{_bindir}/gconf*
 %attr(755,root,root) %{_libdir}/lib*.so.*.*
-%dir %{_libdir}/GConf
-%dir %{_libdir}/GConf/2
-%attr(755,root,root) %{_libdir}/GConf/2/lib*.??
+%dir %{_libdir}/GConf2
+%attr(755,root,root) %{_libdir}/GConf2/lib*.so
 %{_sysconfdir}/gconf
 
 %files devel
 %defattr(644,root,root,755)
-%doc *gz
+%doc AUTHORS ChangeLog TODO NEWS README
 %attr(755,root,root) %{_libdir}/lib*.??
-%{_includedir}/gconf
+%attr(755,root,root) %{_libdir}/GConf2/lib*.la
+%doc %{_datadir}/gtk-doc/html/gconf
+%{_includedir}/gconf2
 %{_aclocaldir}/*.m4
 %{_pkgconfigdir}/*.pc
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/GConf/2/lib*.a
+%{_libdir}/GConf2/lib*.a
 %{_libdir}/lib*.a