diff --git a/.cvsignore b/.cvsignore index f83511e..e579d11 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -gnome-user-docs-1.4.1.tar.gz +gnome2-user-docs-1.93.tar.bz2 diff --git a/gnome-user-docs.spec b/gnome-user-docs.spec index c448ad5..85bae46 100644 --- a/gnome-user-docs.spec +++ b/gnome-user-docs.spec @@ -1,48 +1,74 @@ -%define version 1.4.1 - Summary: GNOME User Documentation Name: gnome-user-docs -Version: %{version} -Release: 4 +Version: 1.93 +Release: 1 License: FDL -Source: gnome-user-docs-%{version}.tar.gz -Patch: gnome-user-docs-scrollkeeper-dtd.patch +Source: gnome2-user-docs-%{version}.tar.bz2 Group: Documentation BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-root Obsoletes: gnome-users-guide +PreReq: scrollkeeper >= 0.3.10 +PreReq: /usr/bin/scrollkeeper-update + %description -This package contains the GNOME Glossary, Introduction to GNOME, and a Unix -Primer. +This package contains end user documentation for the GNOME desktop +environment. %prep -%setup -q -%patch -p0 -b .scrollkeeper-dtd +%setup -q -n gnome2-user-docs-%{version} %build -./configure --prefix=%{_prefix} + +## 1.91 tarball ships with a broken configure script +if test -x /usr/bin/autoconf-2.53; then + autoconf-2.53 +elif test -x /usr/bin/autoconf-2.52; then + autoconf-2.52 +elif test -x /usr/bin/autoconf; then + autoconf +fi + +%configure make %install -make prefix=$RPM_BUILD_ROOT%{_prefix} install +%makeinstall %clean rm -rf $RPM_BUILD_ROOT %post -which scrollkeeper-update > /dev/null 2>&1 && scrollkeeper-update +scrollkeeper-update exit 0 %postun -which scrollkeeper-update > /dev/null 2>&1 && scrollkeeper-update +scrollkeeper-update exit 0 %files %defattr(-, root, root) -%{_prefix}/* +%{_datadir}/gnome +%{_datadir}/omf %changelog +* Mon Jun 24 2002 Owen Taylor +- Version 1.93, should fix #67207 + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu Jun 20 2002 Havoc Pennington +- prereq scrollkeeper + +* Mon Jun 17 2002 Havoc Pennington +- upgrade to gnome 2 docs +- clean up the spec file a bit + +* Thu Jun 13 2002 Nalin Dahyabhai +- rebuild in different environment + * Thu Jun 13 2002 Nalin Dahyabhai - fix a scrollkeeper validation bug diff --git a/sources b/sources index a35bf6c..831b932 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f680f5da316d5e93fc1e129acdcbeca3 gnome-user-docs-1.4.1.tar.gz +be8e996ce8c33332049d6214c41ecdfd gnome2-user-docs-1.93.tar.bz2