- merged deps update from AC-branch

[packages/gnome-user-docs.git] / gnome-user-docs.spec

diff --git a/gnome-user-docs.spec b/gnome-user-docs.spec
index 605a9178f9468fb8f87ab65ea3fe91f69c4bf16c..2d511cf3900ccd694304db499741aa6a5c2cc0f3 100644 (file)
--- a/gnome-user-docs.spec
+++ b/gnome-user-docs.spec
@@ -1,24 +1,21 @@
 Summary:       General GNOME User Documentation
 Summary(pl):   Ogólna dokumentacja u¿ytkownika GNOME
-Name:          gnome2-user-docs
-Version:       2.0.1
-Release:       1
+Name:          gnome-user-docs
+Version:       2.14.2
+Release:       2
 License:       GFDL
 Group:         Documentation
-Source0:       ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/2.0/%{name}-%{version}.tar.bz2
-Patch0:                %{name}-xml.patch
-Requires(post,postun):scrollkeeper >= 0.3.11-4
-Requires:      yelp >= 1.0.6
+Source0:       http://ftp.gnome.org/pub/gnome/sources/gnome-user-docs/2.14/%{name}-%{version}.tar.bz2
+# Source0-md5: 4f5a7114ccf9e4e31137da50b7333570
+BuildRequires: gnome-doc-utils >= 0.5.6
+BuildRequires: libxslt-progs
+BuildRequires: rpmbuild(macros) >= 1.197
 BuildRequires: scrollkeeper >= 0.3.11-4
+Requires(post,postun): scrollkeeper
+Requires:      yelp >= 2.14.1
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _prefix         /usr/X11R6
-%define                _mandir         %{_prefix}/man
-%define         _sysconfdir     /etc/X11/GNOME2
-%define         _gtkdocdir      %{_defaultdocdir}/gtk-doc/html
-%define                _omf_dest_dir   %(scrollkeeper-config --omfdir)
-
 %description
 General GNOME User Guide.
 
@@ -27,12 +24,11 @@ Og
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
-%configure2_13 \
-       --with-html-path=%{_gtkdocdir}
-
+gnome-doc-prepare --copy --force
+%configure \
+        --disable-scrollkeeper
 %{__make}
 
 %install
@@ -49,12 +45,12 @@ rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
 %post
-scrollkeeper-update
+%scrollkeeper_update_post
 
 %postun
-scrollkeeper-update
+%scrollkeeper_update_postun
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog
-%{_omf_dest_dir}/%{name}
+%doc AUTHORS ChangeLog README
+%{_omf_dest_dir}/*-guide