SPECS (AC-branch): devhelp.spec - mozilla is dead, replaced mozill...

hawk hawk at pld-linux.org
Mon Jan 1 20:32:26 CET 2007


Author: hawk                         Date: Mon Jan  1 19:32:26 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- mozilla is dead, replaced mozilla deps with xulrunner deps
- build against xulrunner by default, added patch to make it possible
- release 10

---- Files affected:
SPECS:
   devhelp.spec (1.53.2.7 -> 1.53.2.8) 

---- Diffs:

================================================================
Index: SPECS/devhelp.spec
diff -u SPECS/devhelp.spec:1.53.2.7 SPECS/devhelp.spec:1.53.2.8
--- SPECS/devhelp.spec:1.53.2.7	Fri Dec  8 15:56:15 2006
+++ SPECS/devhelp.spec	Mon Jan  1 20:32:21 2007
@@ -1,14 +1,13 @@
 # $Revision$, $Date$
 #
 # Conditional build:
-%bcond_without	mozilla_firefox	# build with mozilla-firefox-devel
+%bcond_with	mozilla_firefox	# build with mozilla-firefox-devel
 #
-%define		minmozver	5:1.7
 Summary:	DevHelp is a developer's help program for GNOME
 Summary(pl):	Program pomocy dla programistów GNOME
 Name:		devhelp
 Version:	0.10
-Release:	9
+Release:	10
 License:	GPL v2+
 Group:		X11/Applications
 Source0:	http://ftp.imendio.com/pub/imendio/devhelp/src/%{name}-%{version}.tar.gz
@@ -17,6 +16,7 @@
 Patch1:		%{name}-mozilla.patch
 Patch2:		%{name}-mozilla_includes.patch
 Patch3:		%{name}-desktop.patch
+Patch4:		%{name}-xulrunner.patch
 URL:		http://www.imendio.com/projects/devhelp/
 BuildRequires:	GConf2-devel
 BuildRequires:	autoconf
@@ -29,7 +29,7 @@
 %if %{with mozilla_firefox}
 BuildRequires:	mozilla-firefox-devel
 %else
-BuildRequires:	mozilla-devel >= %{minmozver}
+BuildRequires:	xulrunner-devel >= 1.8.0.4
 %endif
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.197
@@ -39,7 +39,7 @@
 %if %{with mozilla_firefox}
 %requires_eq	mozilla-firefox-libs
 %else
-Requires:	mozilla = %(rpm -q --qf '%{EPOCH}:%{VERSION}' --whatprovides mozilla)
+Requires:	xulrunner-libs
 %endif
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -93,6 +93,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 %{__libtoolize}
@@ -160,6 +161,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.53.2.8  2007/01/01 19:32:21  hawk
+- mozilla is dead, replaced mozilla deps with xulrunner deps
+- build against xulrunner by default, added patch to make it possible
+- release 10
+
 Revision 1.53.2.7  2006/12/08 14:56:15  glen
 - rel 9 (fixed empty commit message)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/devhelp.spec?r1=1.53.2.7&r2=1.53.2.8&f=u



More information about the pld-cvs-commit mailing list