- fixed source URL

[packages/GConf2.git] / GConf2.spec

diff --git a/GConf2.spec b/GConf2.spec
index b7623c5671a22e088ea4ff82995da69226d0e666..87f65bdc34f0c817656f2e5d81c014f3209060f7 100644 (file)
--- a/GConf2.spec
+++ b/GConf2.spec
@@ -2,20 +2,24 @@ 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.2.0
-Release:       1
+Version:       1.2.1
+Release:       6
 License:       LGPL
 Group:         X11/Applications
-Source0:       ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/GConf/GConf-%{version}.tar.bz2
+Source0:       ftp://ftp.gnome.org/pub/GNOME/sources/GConf/1.2/GConf-%{version}.tar.bz2
 Patch0:                %{name}-NO_MAJOR_VERSION.patch
 Patch1:                %{name}-am.patch
+Patch2:                %{name}-path.patch
+Patch3:                %{name}-unlock-dialog.patch
 URL:           http://www.gnome.org/
 BuildRequires: ORBit2-devel
-BuildRequires: bonobo-activation-devel >= 1.0.0
-#BuildRequires:        db3-devel
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: bonobo-activation-devel >= 1.0.3
 BuildRequires: gettext-devel
-BuildRequires: gtk+2-devel >= 2.0.1
-BuildRequires: glib2-devel >= 2.0.1
+BuildRequires: gtk+2-devel >= 2.0.6
+BuildRequires: glib2-devel >= 2.0.6
+BuildRequires: libtool
 BuildRequires: libxml2-devel
 BuildRequires: pkgconfig
 BuildRequires: popt-devel
@@ -25,7 +29,7 @@ Obsoletes:    libGConf2
 %define                _prefix         /usr/X11R6
 %define                _mandir         %{_prefix}/man
 %define                _sysconfdir     /etc/X11/GNOME2
-%define                _gtkdocdir      /usr/share/doc/gtk-doc/html
+%define                _gtkdocdir      %{_defaultdocdir}/gtk-doc/html
 
 %description
 GConf2 is a configuration database system, functionally similar to the
@@ -50,8 +54,8 @@ Group:                X11/Development/Libraries
 Requires:      %{name} = %{version}
 Requires:      ORBit2-devel
 Requires:      bonobo-activation-devel
+Requires:      gtk-doc-common
 Requires:      libxml2-devel
-Requires:      bonobo-activation-devel
 Obsoletes:     libGConf2-devel
 
 %description devel
@@ -83,29 +87,36 @@ Bibliotecas est
 %setup -q -n GConf-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
 rm -f missing acinclude.m4
 %{__libtoolize}
-aclocal
+%{__aclocal}
 %{__autoconf}
 %{__automake}
 %configure \
-       --enable-gtk-doc \
-       --with-html-dir=%{_gtkdocdir}
+       --with-html-dir=%{_gtkdocdir} \
+%ifarch ppc
+       --disable-gtk-doc 
+%else
+       --enable-gtk-doc 
+%endif
 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_aclocaldir},%{_sysconfdir}/gconf/schemas}
-install gconf.m4 $RPM_BUILD_ROOT%{_aclocaldir}/gconf-2.m4
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT \
        pkgconfigdir=%{_pkgconfigdir} \
        HTML_DIR=%{_gtkdocdir} 
        
+install gconf.m4 $RPM_BUILD_ROOT%{_aclocaldir}/gconf-2.m4
+
 %find_lang %{name}
 
 %clean
@@ -116,7 +127,10 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
+%doc AUTHORS README
 %attr(755,root,root) %{_bindir}/gconf*
+%attr(755,root,root) %{_libdir}/gconf-sanity-check-2
+%attr(755,root,root) %{_libdir}/gconfd-2
 %attr(755,root,root) %{_libdir}/lib*.so.*.*
 %dir %{_libdir}/GConf2
 %attr(755,root,root) %{_libdir}/GConf2/lib*.so
@@ -126,7 +140,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 # outdated and almost empty
 #doc NEWS
-%doc AUTHORS ChangeLog TODO README
+%doc ChangeLog TODO
 %attr(755,root,root) %{_libdir}/lib*.??
 %attr(755,root,root) %{_libdir}/GConf2/lib*.la
 %doc %{_gtkdocdir}/gconf