- 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 71c6cab8f17b4164f8a2303de0f980d38b12cad9..2d511cf3900ccd694304db499741aa6a5c2cc0f3 100644 (file)
--- a/gnome-user-docs.spec
+++ b/gnome-user-docs.spec
@@ -1,16 +1,18 @@
 Summary:       General GNOME User Documentation
 Summary(pl):   Ogólna dokumentacja u¿ytkownika GNOME
-Name:          gnome2-user-docs
-Version:       2.8.0
+Name:          gnome-user-docs
+Version:       2.14.2
 Release:       2
 License:       GFDL
 Group:         Documentation
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.8/%{name}-%{version}.tar.bz2
-# Source0-md5: a63d5eb67aa033a925d23f9af1a0991a
-Patch0:                %{name}-access_guide_fix.patch
-Patch1:                %{name}-user_guide_typo.patch
+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:      yelp >= 2.6.3
+Requires(post,postun): scrollkeeper
+Requires:      yelp >= 2.14.1
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -22,11 +24,11 @@ Og
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 %build
-%configure
+gnome-doc-prepare --copy --force
+%configure \
+        --disable-scrollkeeper
 %{__make}
 
 %install
@@ -42,10 +44,13 @@ rm -rf $RPM_BUILD_ROOT
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /usr/bin/scrollkeeper-update
-%postun -p /usr/bin/scrollkeeper-update
+%post
+%scrollkeeper_update_post
+
+%postun
+%scrollkeeper_update_postun
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog README
-%{_omf_dest_dir}/%{name}
+%{_omf_dest_dir}/*-guide