SPECS: galeon.spec - added mozilla_firefox bcond - build against m...

[hawk]

Author: hawk                         Date: Sun May 21 07:38:26 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- added mozilla_firefox bcond
- build against mozilla-firefox-devel by default
- release 2

---- Files affected:
SPECS:
   galeon.spec (1.240 -> 1.241) 

---- Diffs:

================================================================
Index: SPECS/galeon.spec
diff -u SPECS/galeon.spec:1.240 SPECS/galeon.spec:1.241
--- SPECS/galeon.spec:1.240	Mon Feb 27 20:19:20 2006
+++ SPECS/galeon.spec	Sun May 21 09:38:21 2006
@@ -1,6 +1,7 @@
 # $Revision$, $Date$
 #
 # Conditional build:
+%bcond_without	mozilla_firefox	# build without mozilla-firefox-devel
 %bcond_with	nautilus	# disable nautilus view
 %bcond_with	gcc2		# compile using gcc2 to get working gcc2-compiled java
 				# plugin (better get gcc3-compiled one).
@@ -8,7 +9,6 @@
 				# mozilla instead. To compile wit this option, You
 				# have to install mozilla compiled with gcc2.
 #
-%define		minmozver	5:1.7
 %define		snap	20040117
 
 Summary:	Galeon - gecko-based GNOME web browser
@@ -17,7 +17,7 @@
 Summary(zh_CN):	ťůÓÚGeckoľÄGNOMEÁ÷ŔŔĆ÷
 Name:		galeon
 Version:	2.0.1
-Release:	1
+Release:	2
 Epoch:		2
 License:	GPL
 Group:		X11/Applications/Networking
@@ -47,7 +47,11 @@
 BuildRequires:	libstdc++-devel
 BuildRequires:	libtool
 BuildRequires:	libxml2-devel >= 2.6.6
-BuildRequires:	mozilla-devel >= %{minmozver}
+%if %{with mozilla_firefox}
+BuildRequires:	mozilla-firefox-devel
+%else
+BuildRequires:	mozilla-devel >= 5:1.7
+%endif
 %{?with_nautilus:BuildRequires:	nautilus-devel >= 2.4.0}
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.197
@@ -58,7 +62,11 @@
 Requires:	glib2 >= 1:2.4.4
 Requires:	gtk+2 >= 2:2.4.4
 Requires:	libbonobo >= 2.4.0
+%if %{with mozilla_firefox}
+%requires_eq	mozilla-firefox
+%else
 Requires:	mozilla-embedded = %(rpm -q --qf '%{EPOCH}:%{VERSION}' --whatprovides mozilla-embedded)
+%endif
 Provides:	wwwbrowser
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -164,6 +172,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.241  2006/05/21 07:38:21  hawk
+- added mozilla_firefox bcond
+- build against mozilla-firefox-devel by default
+- release 2
+
 Revision 1.240  2006/02/27 19:19:20  twittner
 - up to 2.0.1
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/galeon.spec?r1=1.240&r2=1.241&f=u