- merged changes from HEAD

- fixed source URL

Changed files:
    yelp.spec -> 1.16.2.1

diff --git a/yelp.spec b/yelp.spec
index 932476061c381bd2f2339e7e39b19dc83b777d37..f728f716f3785b430c5e2bbb91ce66ae3c4752b5 100644 (file)
--- a/yelp.spec
+++ b/yelp.spec
@@ -9,22 +9,24 @@ Version:      1.0.6
 Release:       2
 License:       GPL
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/GNOME/2.0.1/sources/%{name}/%{name}-%{version}.tar.bz2
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/%{name}/1.0/%{name}-%{version}.tar.bz2
 Patch0:                %{name}-pixmapsdir.patch
-#Patch1:               %{name}-pld.patch
 URL:           http://www.gnome.org/
-Requires:      docbook-style-xsl = 1.55.0
-Requires:      scrollkeeper
-BuildRequires: pkgconfig >= 0.12.0
+BuildRequires: GConf2-devel >= 1.2.1
 BuildRequires: ORBit2-devel >= 2.4.3
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: bzip2-devel
 BuildRequires: glib2-devel >= 2.0.6
-BuildRequires: libgtkhtml-devel >= 2.0.2
 BuildRequires: gnome-vfs2-devel >= 2.0.3
 BuildRequires: libgnome-devel >= 2.0.4
 BuildRequires: libgnomeui-devel >= 2.0.5
+BuildRequires: libgtkhtml-devel >= 2.0.2
 BuildRequires: libxslt-devel >= 1.0.20
-BuildRequires: GConf2-devel >= 1.2.1
-BuildRequires: bzip2-devel
+BuildRequires: pkgconfig >= 0.12.0
+Requires(post):        GConf2
+Requires:      docbook-style-xsl = 1.55.0
+Requires:      scrollkeeper
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _prefix         /usr/X11R6
@@ -42,7 +44,6 @@ narz
 %prep
 %setup  -q 
 %patch0 -p1
-#%patch1 -p1
 
 %build
 %{__aclocal} -I %{_aclocaldir}/gnome2-macros