SPECS: yelp.spec - merged from DEVEL, 2.12.0

Wed Sep 7 00:25:06 CEST 2005

Author: aflinta                      Date: Tue Sep  6 22:25:06 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merged from DEVEL, 2.12.0

---- Files affected:
SPECS:
   yelp.spec (1.68 -> 1.69) 

---- Diffs:

================================================================
Index: SPECS/yelp.spec
diff -u SPECS/yelp.spec:1.68 SPECS/yelp.spec:1.69

--- SPECS/yelp.spec:1.68	Fri Apr  8 13:02:14 2005
+++ SPECS/yelp.spec	Wed Sep  7 00:25:01 2005
@@ -1,18 +1,24 @@
 # $Revision$, $Date$
 # TODO:
+# merge changes from head
 # 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
+
 Summary:	A system documentation reader from the GNOME project
 Summary(pl):	Czytnik dokumentacji z projektu GNOME
 Name:		yelp
-Version:	2.6.5
-Release:	4
+Version:	2.12.0
+Release:	1
 License:	GPL
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/gnome/sources/yelp/2.6/%{name}-%{version}.tar.bz2
-# Source0-md5:	9bd94af344ee6a0bf69aa6f9cbd6b7e9
+Source0:	http://ftp.gnome.org/pub/gnome/sources/yelp/2.12/%{name}-%{version}.tar.bz2
+# Source0-md5:	00b36e95bdd0c8ad2679614e3ffc66af
 Patch0:		%{name}-desktop-categories.patch
+Patch1:		%{name}-MOZILLA_HOME.patch
 URL:		http://www.gnome.org/
 BuildRequires:	GConf2-devel >= 2.10.0
 BuildRequires:	ORBit2-devel >= 1:2.12.1
@@ -21,21 +27,37 @@
 BuildRequires:	bzip2-devel
 BuildRequires:	glib2-devel >= 1:2.6.4
 BuildRequires:	gnome-common >= 2.8.0
-BuildRequires:	gnome-vfs2-devel >= 2.10.0-2
+BuildRequires:	gnome-doc-utils >= 0.3.1
+BuildRequires:	gnome-vfs2-devel >= 2.11.0
 BuildRequires:	libglade2-devel >= 1:2.5.1
-BuildRequires:	libgnomeui-devel >= 2.10.0-2
-BuildRequires:	libgtkhtml-devel >= 2.6.3
+BuildRequires:	libgnomeui-devel >= 2.11.2-2
 BuildRequires:	libtool
-BuildRequires:	libxml2-devel >= 1:2.6.19
-BuildRequires:	libxslt-devel >= 1.1.14
+BuildRequires:	libxml2-devel >= 2.6.18
+BuildRequires:	libxslt-devel >= 1.1.12
+%if %{with mozilla_firefox}
+BuildRequires:  mozilla-firefox-devel
+%else
+BuildRequires:  mozilla-devel >= 5:1.7
+%endif
 BuildRequires:	pkgconfig >= 1:0.15.0
 BuildRequires:	popt-devel
-BuildRequires:	rpm-build >= 4.1-10
+BuildRequires:	rpmbuild(macros) >= 1.197
+BuildRequires:	zlib-devel
+Requires(post,preun):	GConf2
 Requires:	docbook-style-xsl >= 1.55.0
-Requires:	gnome-vfs2 >= 2.10.0-2
+Requires:	gnome-doc-utils >= 0.3.1
+Requires:	gnome-vfs2 >= 2.11.0
 Requires:	scrollkeeper
+%if %{with mozilla_firefox}
+%requires_eq    mozilla-firefox
+%else
+Requires:       mozilla-embedded = %(rpm -q --qf '%{EPOCH}:%{VERSION}' --whatprovides mozilla-embedded)
+%endif
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+# can be provided by mozilla or mozilla-embedded
+%define         _noautoreqdep   libgtkembedmoz.so libgtksuperwin.so libxpcom.so
+
 %description
 Yelp is the GNOME 2 help/documentation browser. It is designed to help
 you browse all the documentation on your system in one central tool.
@@ -48,6 +70,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__libtoolize}
@@ -70,14 +93,21 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+%gconf_schema_install yelp.schemas
+
+%preun
+%gconf_schema_uninstall yelp.schemas
+
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc README ChangeLog NEWS TODO AUTHORS
 %attr(755,root,root) %{_bindir}/*
 %{_datadir}/%{name}
-%{_libdir}/bonobo/servers/*
-%{_datadir}/sgml/docbook/%{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"`)
 %changelog
@@ -85,13 +115,44 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.68  2005/04/08 11:02:14  paladine
-- bumped BRs/Rs
-- no schemas so no %gconf_schema_install in %%post an no R(post): GConf2
-- rel. 4, STBR
+Revision 1.69  2005/09/06 22:25:01  aflinta
+- merged from DEVEL, 2.12.0
+
+Revision 1.66.2.11  2005/08/25 08:37:22  paladine
+- updated to 2.11.92
+- use style macros
+- sorted %%files
+
+Revision 1.66.2.10  2005/08/18 12:24:16  aflinta
+- rebuild with cairo, rel. 3
+
+Revision 1.66.2.9  2005/08/17 07:19:25  paladine
+- removed R: gnome-mime-data
+
+Revision 1.66.2.8  2005/07/27 14:02:01  freetz
+- TODO expanded
+
+Revision 1.66.2.7  2005/07/27 13:22:40  aflinta
+- added firefox support
+
+Revision 1.66.2.6  2005/07/13 19:31:51  wiget
+- updated some BR/R
+
+Revision 1.66.2.5  2005/07/13 19:30:08  wiget
+- updated to 2.11.1
+
+Revision 1.66.2.4  2005/05/04 10:12:35  aflinta
+- up to version 2.10.0
+
+Revision 1.66.2.3  2005/03/20 22:47:16  aflinta
+- oooops, wrong gnome-doc-utils version
+
+Revision 1.66.2.2  2005/03/20 22:09:34  aflinta
+- rebuild with howl 0.9.10, release 2
 
-Revision 1.67  2005/03/29 13:40:43  havner
-- rel 3 for new howl, afaik this version goes to gnome 2.10
+Revision 1.66.2.1  2005/02/08 22:41:53  grzegol
+- updated to 2.9.3
+- added MOZILLA_HOME patch
 
 Revision 1.66  2004/12/11 00:57:01  ankry
 - rel. 2
================================================================

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


