[packages/iceweasel] - cleanup xulrunner bcond

baggins baggins at pld-linux.org
Fri Apr 19 12:47:43 CEST 2013


commit aa62deae9e41ff174f57f0bb59c1a1edd79ab302
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Fri Apr 19 12:47:31 2013 +0200

    - cleanup xulrunner bcond

 iceweasel.spec | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
---
diff --git a/iceweasel.spec b/iceweasel.spec
index 8ab419c..528d006 100644
--- a/iceweasel.spec
+++ b/iceweasel.spec
@@ -356,12 +356,19 @@ done
 cp -a %{SOURCE3} $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop
 
 # install our settings
-#cp -a %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/%{name}/defaults/preferences/vendor.js
+%if %{without xulrunner}
 cp -a %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/%{name}/defaults/pref/vendor.js
+%else
+cp -a %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/%{name}/defaults/preferences/vendor.js
+%endif
 
 %if "%{pld_release}" == "ac"
+%if %{without xulrunner}
+cp -a %{SOURCE6} $RPM_BUILD_ROOT%{_datadir}/%{name}/defaults/pref/vendor.js
+%else
 cp -a %{SOURCE6} $RPM_BUILD_ROOT%{_datadir}/%{name}/defaults/preferences/vendor.js
 %endif
+%endif
 
 # files created by iceweasel -register
 touch $RPM_BUILD_ROOT%{_libdir}/%{name}/components/compreg.dat
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/iceweasel.git/commitdiff/aa62deae9e41ff174f57f0bb59c1a1edd79ab302



More information about the pld-cvs-commit mailing list