SPECS: blam.spec - added without mozilla_firefox bcond - strict mo...

grzegol grzegol at pld-linux.org
Tue Aug 15 01:31:40 CEST 2006


Author: grzegol                      Date: Mon Aug 14 23:31:40 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- added without mozilla_firefox bcond
- strict mozilla/mozilla-firefox Requires

---- Files affected:
SPECS:
   blam.spec (1.23 -> 1.24) 

---- Diffs:

================================================================
Index: SPECS/blam.spec
diff -u SPECS/blam.spec:1.23 SPECS/blam.spec:1.24
--- SPECS/blam.spec:1.23	Mon Aug 14 22:32:40 2006
+++ SPECS/blam.spec	Tue Aug 15 01:31:34 2006
@@ -1,4 +1,9 @@
 # $Revision$, $Date$
+#
+# Conditional build:
+%bcond_without	mozilla_firefox	# build with mozilla-devel instead of
+				# mozilla-firefox-devel
+#
 %include	 /usr/lib/rpm/macros.mono
 Summary:	.NET RSS Reader
 Summary(pl):	Program do pobierania informacji w formacie RSS
@@ -27,10 +32,19 @@
 BuildRequires:	libstdc++-devel
 BuildRequires:	libtool
 BuildRequires:	mono-csharp >= 1.1.4
+%if %{with mozilla_firefox}
+BuildRequires:	mozilla-firefox-devel
+%else
+BuildRequires:	mozilla-devel
+%endif
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.213
 Requires(post,preun):	GConf2 >= 2.4.0
-Requires:	mozilla-embedded
+%if %{with mozilla_firefox}
+%requires_eq	mozilla-firefox
+%else
+Requires:	mozilla-embedded = %(rpm -q --qf '%{EPOCH}:%{VERSION}' --whatprovides mozilla-embedded)
+%endif
 ExcludeArch:	alpha i386 sparc sparc64
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -106,6 +120,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.24  2006/08/14 23:31:34  grzegol
+- added without mozilla_firefox bcond
+- strict mozilla/mozilla-firefox Requires
+
 Revision 1.23  2006/08/14 20:32:40  grzegol
 - added dotnet2 patch (make it build with 2.0 versions of gtk#, gnome#
   and gecko#)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/blam.spec?r1=1.23&r2=1.24&f=u



More information about the pld-cvs-commit mailing list