SPECS (AC-branch): yelp.spec - merged from HEAD without beagle

[baggins]

Author: baggins                      Date: Tue May 16 14:49:49 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- merged from HEAD without beagle

---- Files affected:
SPECS:
   yelp.spec (1.75.4.1 -> 1.75.4.2) 

---- Diffs:

================================================================
Index: SPECS/yelp.spec
diff -u SPECS/yelp.spec:1.75.4.1 SPECS/yelp.spec:1.75.4.2
--- SPECS/yelp.spec:1.75.4.1	Thu Apr 20 13:35:25 2006
+++ SPECS/yelp.spec	Tue May 16 16:49:44 2006
@@ -1,23 +1,19 @@
 # $Revision$, $Date$
-# 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
+Version:	2.14.1
 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:	3d569f8e9372bc88c7f9fca6a94388a9
+Patch0:		%{name}-desktop.patch
+Patch1:		%{name}-m4.patch
 Patch2:		%{name}-bs.patch
 URL:		http://www.gnome.org/
 BuildRequires:	GConf2-devel >= 2.12.0
@@ -75,7 +71,7 @@
 
 %build
 %{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I m4
 %{__autoconf}
 %{__automake}
 %configure
@@ -104,10 +100,10 @@
 %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
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -116,8 +112,44 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.75.4.1  2006/04/20 11:35:25  ankry
+Revision 1.75.4.2  2006/05/16 14:49:44  baggins
+- merged from HEAD without beagle
+
+Revision 1.78  2006/04/20 11:33:09  ankry
 - added bs patch, rel. 2
+
+Revision 1.77  2006/04/10 16:41:09  freetz
+- 2.14.1
+
+Revision 1.76  2006/04/02 14:56:35  freetz
+- merged from DEVEL
+
+Revision 1.75.2.8  2006/03/19 18:40:04  freetz
+- enable beagle support
+
+Revision 1.75.2.7  2006/03/13 08:04:26  freetz
+- 2.14.0
+
+Revision 1.75.2.6  2006/03/04 23:10:11  freetz
+- disable beagle until poldek overloaded provides is fixed, rel.2
+
+Revision 1.75.2.5  2006/02/27 08:55:08  freetz
+- 2.13.6, dropped xslt_location patch (rejected upstream), enable beagle
+  support by default (should fallback to basic search now when beagled is
+  not running)
+
+Revision 1.75.2.4  2006/02/13 10:05:28  freetz
+- 2.13.5, use system location for xslt, use basic seach (beagle search
+  has no fallback)
+
+Revision 1.75.2.3  2006/02/01 18:02:24  freetz
+- added m4 fix
+
+Revision 1.75.2.2  2006/02/01 15:12:23  freetz
+- fixed version in commit log
+
+Revision 1.75.2.1  2006/02/01 15:01:25  freetz
+- 2.13.4
 
 Revision 1.75  2005/11/28 18:03:32  freetz
 - 2.12.2
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/yelp.spec?r1=1.75.4.1&r2=1.75.4.2&f=u