[packages/xulrunner] Install missing files Remove references to non-existing icons
baggins
baggins at pld-linux.org
Thu Jul 19 10:31:14 CEST 2012
commit bf098deb7df53ce686f06ad263fb296406e35bd6
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Thu Jul 19 10:30:42 2012 +0200
Install missing files
Remove references to non-existing icons
xulrunner.spec | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/xulrunner.spec b/xulrunner.spec
index 172001d..1bd0481 100644
--- a/xulrunner.spec
+++ b/xulrunner.spec
@@ -307,9 +307,7 @@ install -d \
# move arch independant ones to datadir
mv $RPM_BUILD_ROOT%{_libdir}/%{name}/chrome $RPM_BUILD_ROOT%{_datadir}/%{name}/chrome
-#mv $RPM_BUILD_ROOT%{_libdir}/%{name}/icons $RPM_BUILD_ROOT%{_datadir}/%{name}/icons
ln -s ../../share/%{name}/chrome $RPM_BUILD_ROOT%{_libdir}/%{name}/chrome
-#ln -s ../../share/%{name}/icons $RPM_BUILD_ROOT%{_libdir}/%{name}/icons
%{__rm} -r $RPM_BUILD_ROOT%{_libdir}/%{name}/dictionaries
ln -s %{_datadir}/myspell $RPM_BUILD_ROOT%{_libdir}/%{name}/dictionaries
@@ -320,6 +318,10 @@ touch $RPM_BUILD_ROOT%{_libdir}/%{name}/components/xpti.dat
%{__make} -C obj-%{_target_cpu}/build/unix install \
DESTDIR=$RPM_BUILD_ROOT
+# Install xpcshell and run-mozilla.sh
+%{__cp} -pL obj-%{_target_cpu}/dist/bin/xpcshell $RPM_BUILD_ROOT/%{_libdir}/%{name}
+%{__cp} -pL obj-%{_target_cpu}/dist/bin/run-mozilla.sh $RPM_BUILD_ROOT/%{_libdir}/%{name}
+
%browser_plugins_add_browser %{name} -p %{_libdir}/%{name}/plugins
# remove unecessary stuff
@@ -349,7 +351,6 @@ fi
# symlinks
%{_libdir}/%{name}/chrome
%{_libdir}/%{name}/dictionaries
-#%%{_libdir}/%{name}/icons
%{_browserpluginsconfdir}/browsers.d/%{name}.*
%config(noreplace) %verify(not md5 mtime size) %{_browserpluginsconfdir}/blacklist.d/%{name}.*.blacklist
@@ -374,7 +375,6 @@ fi
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/chrome
-#%%{_datadir}/%{name}/icons
%files libs
%defattr(644,root,root,755)
More information about the pld-cvs-commit
mailing list