SPECS: xulrunner.spec - use system hunspell and lcms - _noautoprovfiles for...

[qboosh]

Author: qboosh                       Date: Mon Jul 21 19:33:22 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use system hunspell and lcms
- _noautoprovfiles for private modules
  (works for base package, but not -gnome - rpm problem?)

---- Files affected:
SPECS:
   xulrunner.spec (1.73 -> 1.74) 

---- Diffs:

================================================================
Index: SPECS/xulrunner.spec
diff -u SPECS/xulrunner.spec:1.73 SPECS/xulrunner.spec:1.74
--- SPECS/xulrunner.spec:1.73	Mon Jul 21 18:44:55 2008
+++ SPECS/xulrunner.spec	Mon Jul 21 21:33:16 2008
@@ -37,11 +37,13 @@
 BuildRequires:	freetype-devel >= 1:2.1.8
 %{?with_gnome:BuildRequires:	gnome-vfs2-devel >= 2.0}
 BuildRequires:	gtk+2-devel >= 2:2.10.0
+BuildRequires:	hunspell-devel >= 1.2.3
 %if "%{pld_release}" == "ac"
 %{?with_kerberos:BuildRequires:	heimdal-devel >= 0.7.1}
 %else
 %{?with_kerberos:BuildRequires:	krb5-devel}
 %endif
+BuildRequires:	lcms-devel >= 1.17
 BuildRequires:	libIDL-devel >= 0.8.0
 %{?with_gnome:BuildRequires:	libgnome-devel >= 2.0}
 %{?with_gnome:BuildRequires:	libgnomeui-devel >= 2.2.0}
@@ -74,8 +76,10 @@
 
 %define		specflags	-fno-strict-aliasing
 
+# no Provides from private modules
+%define		_noautoprovfiles	%{_libdir}/%{name}/components %{_libdir}/%{name}/plugins
 # no need to require them (we have strict deps for these)
-%define		_noautoreq	libmozjs.so libxpcom.so libxul.so
+%define		_noautoreq		libmozjs.so libxpcom.so libxul.so
 
 %description
 XULRunner is a Mozilla runtime package that can be used to bootstrap
@@ -141,6 +145,10 @@
 %setup -qc
 cd mozilla
 rm -r nsprpub
+# avoid using included headers (-I. is before HUNSPELL_CFLAGS)
+rm extensions/spellcheck/hunspell/src/{*.hxx,hunspell.h}
+# hunspell needed for factory including mozHunspell.h
+echo 'LOCAL_INCLUDES += $(MOZ_HUNSPELL_CFLAGS)' >> extensions/spellcheck/src/Makefile.in
 
 %patch0 -p1
 %patch1 -p1
@@ -207,10 +215,12 @@
 ac_add_options --enable-xinerama
 ac_add_options --enable-default-toolkit=cairo-gtk2
 ac_add_options --enable-system-cairo
+ac_add_options --enable-system-hunspell
+ac_add_options --enable-system-lcms
 ac_add_options --enable-system-sqlite
-#ac_add_options --enable-system-lcms
 ac_add_options --enable-xft
 ac_add_options --with-distribution-id=org.pld-linux
+ac_add_options --with-system-bz2
 ac_add_options --with-system-jpeg
 ac_add_options --with-system-nspr
 ac_add_options --with-system-nss
@@ -494,6 +504,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.74  2008/07/21 19:33:16  qboosh
+- use system hunspell and lcms
+- _noautoprovfiles for private modules
+  (works for base package, but not -gnome - rpm problem?)
+
 Revision 1.73  2008/07/21 16:44:55  qboosh
 - options cleanup (ldap is enabled by default)
 - xulrunner is the only one true libxpcom provider - dropped _noautoprov here
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/xulrunner.spec?r1=1.73&r2=1.74&f=u