packages: iceweasel/iceweasel.spec - updated files and=?UTF-8?Q?=20?=_noautoreq for build...

[qboosh]

Author: qboosh                       Date: Tue May 29 13:03:31 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated files and _noautoreq for builds with included xulrunner
- when building with system xulrunner, normally depend on xulrunner libs

---- Files affected:
packages/iceweasel:
   iceweasel.spec (1.178 -> 1.179) 

---- Diffs:

================================================================
Index: packages/iceweasel/iceweasel.spec
diff -u packages/iceweasel/iceweasel.spec:1.178 packages/iceweasel/iceweasel.spec:1.179
--- packages/iceweasel/iceweasel.spec:1.178	Sat May 26 09:43:17 2012
+++ packages/iceweasel/iceweasel.spec	Tue May 29 15:03:25 2012
@@ -49,6 +49,7 @@
 Patch7:		%{name}-prefs.patch
 Patch8:		%{name}-pld-branding.patch
 Patch9:		%{name}-no-subshell.patch
+Patch10:	%{name}-bug-722975-workaround.patch
 URL:		http://www.pld-linux.org/Packages/Iceweasel
 BuildRequires:	GConf2-devel >= 1.2.1
 BuildRequires:	OpenGL-devel
@@ -126,8 +127,10 @@
 
 # don't satisfy other packages
 %define		_noautoprovfiles	%{_libdir}/%{name}
+%if %{without xulrunner}
 # and as we don't provide them, don't require either
-%define		_noautoreq	libmozjs.so libxpcom.so libxul.so %{!?with_xulrunner:libmozalloc.so}
+%define		_noautoreq	libmozalloc.so libmozjs.so libxpcom.so libxul.so
+%endif
 
 %description
 Iceweasel is an open-source web browser, designed for standards
@@ -172,6 +175,7 @@
 %patch7 -p1
 %patch8 -p1
 %patch9 -p2
+%patch10 -p1
 
 # config/rules.mk is patched by us and js/src/config/rules.mk
 # is supposed to be exact copy
@@ -311,6 +315,8 @@
 %if %{without xulrunner}
 %{__rm} -r $RPM_BUILD_ROOT%{_libdir}/%{name}/dictionaries
 ln -s %{_datadir}/myspell $RPM_BUILD_ROOT%{_libdir}/%{name}/dictionaries
+%{__rm} -r $RPM_BUILD_ROOT%{_libdir}/%{name}/hyphenation
+ln -s %{_datadir}/myspell $RPM_BUILD_ROOT%{_libdir}/%{name}/hyphenation
 %endif
 
 sed 's, at LIBDIR@,%{_libdir},' %{SOURCE4} > $RPM_BUILD_ROOT%{_bindir}/iceweasel
@@ -393,7 +399,10 @@
 
 %dir %{_libdir}/%{name}
 %if %{without xulrunner}
-%attr(755,root,root) %{_libdir}/%{name}/*.so
+%attr(755,root,root) %{_libdir}/%{name}/libmozalloc.so
+%attr(755,root,root) %{_libdir}/%{name}/libmozjs.so
+%attr(755,root,root) %{_libdir}/%{name}/libxpcom.so
+%attr(755,root,root) %{_libdir}/%{name}/libxul.so
 %endif
 %{_libdir}/%{name}/blocklist.xml
 
@@ -474,7 +483,6 @@
 %{_libdir}/%{name}/components/nsSearchService.js
 %{_libdir}/%{name}/components/nsSearchSuggestions.js
 %{_libdir}/%{name}/components/nsTaggingService.js
-%{_libdir}/%{name}/components/nsTryToClose.js
 %{_libdir}/%{name}/components/nsURLFormatter.js
 %{_libdir}/%{name}/components/nsUpdateTimerManager.js
 %{_libdir}/%{name}/components/nsUrlClassifierHashCompleter.js
@@ -518,6 +526,7 @@
 %{_libdir}/%{name}/xulrunner
 %else
 %{_libdir}/%{name}/dictionaries
+%{_libdir}/%{name}/hyphenation
 %{_libdir}/%{name}/greprefs.js
 %{_libdir}/%{name}/res
 %endif
@@ -547,6 +556,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.179  2012/05/29 13:03:25  qboosh
+- updated files and _noautoreq for builds with included xulrunner
+- when building with system xulrunner, normally depend on xulrunner libs
+
 Revision 1.178  2012/05/26 07:43:17  qboosh
 - updated sqlite3 version
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/iceweasel/iceweasel.spec?r1=1.178&r2=1.179