- merged from DEVEL

Changed files:
    yelp.spec -> 1.76

diff --git a/yelp.spec b/yelp.spec
index 7951268036b090a654cf8c182595ae56c0c92eff..43e81a667537fd2670c04128a00da2f5e4eff897 100644 (file)
--- a/yelp.spec
+++ b/yelp.spec
@@ -1,27 +1,24 @@
-# TODO:
-# move stylesheets to /usr/share/sgml
-# use more generic stylesheet location
-# remove docbook dtds and stylesheets from package and use system xml catalog
-
+#
 # Conditinal build:
-%bcond_with    mozilla_firefox # build with mozilla-firefox-devel
-
+%bcond_with    mozilla_firefox         # build with mozilla-firefox
+#
 Summary:       A system documentation reader from the GNOME project
 Summary(pl):   Czytnik dokumentacji z projektu GNOME
 Name:          yelp
-Version:       2.12.2
-Release:       1
+Version:       2.14.0
+Release:       2
 License:       GPL
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/gnome/sources/yelp/2.12/%{name}-%{version}.tar.bz2
-# Source0-md5: e229529aa1dacfd269024511e2c12ad2
-Patch0:                %{name}-desktop-categories.patch
-Patch1:                %{name}-MOZILLA_HOME.patch
+Source0:       http://ftp.gnome.org/pub/gnome/sources/yelp/2.14/%{name}-%{version}.tar.bz2
+# Source0-md5: eef25315bfe8162dd7bcc2aabf31bcf8
+Patch0:                %{name}-desktop.patch
+Patch1:                %{name}-m4.patch
 URL:           http://www.gnome.org/
 BuildRequires: GConf2-devel >= 2.12.0
 BuildRequires: ORBit2-devel >= 1:2.12.4
 BuildRequires: autoconf
 BuildRequires: automake
+BuildRequires: beagle-devel
 BuildRequires: bzip2-devel
 BuildRequires: glib2-devel >= 1:2.8.1
 BuildRequires: gnome-common >= 2.8.0
@@ -72,7 +69,7 @@ narz
 
 %build
 %{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I m4
 %{__autoconf}
 %{__automake}
 %configure
@@ -101,8 +98,8 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc README ChangeLog NEWS TODO AUTHORS
 %attr(755,root,root) %{_bindir}/*
+%{_libdir}/bonobo/servers/*
 %{_datadir}/%{name}
 %{_desktopdir}/*
 %{_iconsdir}/hicolor/192x192/apps/yelp-icon-big.png
-%{_libdir}/bonobo/servers/*
 %{_sysconfdir}/gconf/schemas/yelp.schemas