SPECS (DEVEL): yelp.spec - added firefox support

aflinta aflinta at pld-linux.org
Wed Jul 27 15:22:46 CEST 2005


Author: aflinta                      Date: Wed Jul 27 13:22:46 2005 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- added firefox support

---- Files affected:
SPECS:
   yelp.spec (1.66.2.6 -> 1.66.2.7) 

---- Diffs:

================================================================
Index: SPECS/yelp.spec
diff -u SPECS/yelp.spec:1.66.2.6 SPECS/yelp.spec:1.66.2.7
--- SPECS/yelp.spec:1.66.2.6	Wed Jul 13 21:31:51 2005
+++ SPECS/yelp.spec	Wed Jul 27 15:22:40 2005
@@ -3,11 +3,15 @@
 # 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.11.1
-Release:	1
+Release:	2
 License:	GPL
 Group:		X11/Applications
 Source0:	http://ftp.gnome.org/pub/gnome/sources/yelp/2.11/%{name}-%{version}.tar.bz2
@@ -28,7 +32,11 @@
 BuildRequires:	libtool
 BuildRequires:	libxml2-devel >= 2.6.18
 BuildRequires:	libxslt-devel >= 1.1.12
-BuildRequires:	mozilla-devel
+%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
@@ -39,8 +47,16 @@
 Requires:	gnome-mime-data >= 2.4.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.
@@ -95,6 +111,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+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
 
================================================================

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




More information about the pld-cvs-commit mailing list