[mozilla-firetray/f14/master] Change symlinking for all applications to use relative symlinks targets instead of absolute ones ( f

Hicham HAOUARI hicham at fedoraproject.org
Sun Oct 24 23:16:10 UTC 2010


commit 1995b93787c69db35d767520aedd80916a6c81e9
Author: Hicham HAOUARI <hicham.haouari at gmail.com>
Date:   Sun Oct 24 23:15:58 2010 +0000

    Change symlinking for all applications to use relative symlinks targets instead of absolute ones ( fixes a weird conflict issue between -core and the other packages )

 mozilla-firetray.spec |   69 +++++++++++++++++++++++++-----------------------
 1 files changed, 36 insertions(+), 33 deletions(-)
---
diff --git a/mozilla-firetray.spec b/mozilla-firetray.spec
index eeb5b6b..0ed549a 100644
--- a/mozilla-firetray.spec
+++ b/mozilla-firetray.spec
@@ -230,34 +230,34 @@ ln -s %{_datadir}/doc/%{name}-core-%{version}/ChangeLog symdoc/ChangeLog
 # firefox
 pushd $RPM_BUILD_ROOT%{mz_ext_dir}%{ff_guid}/%{ft_guid}
     #more symlink vodoo for firefox since it crashes after the first start when using a whole symlinked extension directory
-    ln -s %{_libdir}/%{name}-%{version}/install.rdf install.rdf
-    ln -s %{_libdir}/%{name}-%{version}/chrome.manifest chrome.manifest
-    ln -s %{_libdir}//%{name}-%{version}/chrome chrome
-    ln -s %{_libdir}//%{name}-%{version}/defaults defaults
+    ln -s ../../../../%{name}-%{version}/install.rdf install.rdf
+    ln -s ../../../../%{name}-%{version}/chrome.manifest chrome.manifest
+    ln -s ../../../../%{name}-%{version}/chrome chrome
+    ln -s ../../../../%{name}-%{version}/defaults defaults
 
     mkdir components
     cd components
-        ln -s %{_libdir}/%{name}-%{version}/components/nsMinimize.js nsMinimize.js
-        ln -s %{_libdir}/%{name}-%{version}/components/nsITray.xpt nsITray.xpt
-        ln -s %{_libdir}/%{name}-%{version}/components/nsIMinimize.xpt nsIMinimize.xpt
-        ln -s %{_libdir}/%{name}-%{version}/components/libnptray.so libnptray.so
+        ln -s ../../../../../%{name}-%{version}/components/nsMinimize.js nsMinimize.js
+        ln -s ../../../../../%{name}-%{version}/components/nsITray.xpt nsITray.xpt
+        ln -s ../../../../../%{name}-%{version}/components/nsIMinimize.xpt nsIMinimize.xpt
+        ln -s ../../../../../%{name}-%{version}/components/libnptray.so libnptray.so
     cd ..
 popd
 
 # thunderbird
 #more symlink vodoo for thunderbird since it crashes after the first start when using a whole symlinked extension directory
 pushd $RPM_BUILD_ROOT%{mz_ext_dir}%{tb_guid}/%{ft_guid}
-    ln -s %{_libdir}/%{name}-%{version}/install.rdf install.rdf
-    ln -s %{_libdir}/%{name}-%{version}/chrome.manifest chrome.manifest
-    ln -s %{_libdir}//%{name}-%{version}/chrome chrome
-    ln -s %{_libdir}//%{name}-%{version}/defaults defaults
+    ln -s ../../../../%{name}-%{version}/install.rdf install.rdf
+    ln -s ../../../../%{name}-%{version}/chrome.manifest chrome.manifest
+    ln -s ../../../../%{name}-%{version}/chrome chrome
+    ln -s ../../../../%{name}-%{version}/defaults defaults
 
     mkdir components
     cd components
-        ln -s %{_libdir}/%{name}-%{version}/components/nsMinimize.js nsMinimize.js
-        ln -s %{_libdir}/%{name}-%{version}/components/nsITray.xpt nsITray.xpt
-        ln -s %{_libdir}/%{name}-%{version}/components/nsIMinimize.xpt nsIMinimize.xpt
-        ln -s %{_libdir}/%{name}-%{version}/components/libnptray.so libnptray.so
+        ln -s ../../../../../%{name}-%{version}/components/nsMinimize.js nsMinimize.js
+        ln -s ../../../../../%{name}-%{version}/components/nsITray.xpt nsITray.xpt
+        ln -s ../../../../../%{name}-%{version}/components/nsIMinimize.xpt nsIMinimize.xpt
+        ln -s ../../../../../%{name}-%{version}/components/libnptray.so libnptray.so
     cd ..
 popd
 
@@ -272,34 +272,34 @@ popd
 #sunbird
 #more symlink vodoo for sunbird since it crashes after the first start when using a whole symlinked extension directory
 pushd $RPM_BUILD_ROOT%{mz_ext_dir}%{sb_guid}/%{ft_guid}
-    ln -s %{_libdir}/%{name}-%{version}/install.rdf install.rdf
-    ln -s %{_libdir}/%{name}-%{version}/chrome.manifest chrome.manifest
-    ln -s %{_libdir}//%{name}-%{version}/chrome chrome
-    ln -s %{_libdir}//%{name}-%{version}/defaults defaults
+    ln -s ../../../../%{name}-%{version}/install.rdf install.rdf
+    ln -s ../../../../%{name}-%{version}/chrome.manifest chrome.manifest
+    ln -s ../../../../%{name}-%{version}/chrome chrome
+    ln -s ../../../../%{name}-%{version}/defaults defaults
 
     mkdir components
     cd components
-        ln -s %{_libdir}/%{name}-%{version}/components/nsMinimize.js nsMinimize.js
-        ln -s %{_libdir}/%{name}-%{version}/components/nsITray.xpt nsITray.xpt
-        ln -s %{_libdir}/%{name}-%{version}/components/nsIMinimize.xpt nsIMinimize.xpt
-        ln -s %{_libdir}/%{name}-%{version}/components/libnptray.so libnptray.so
+        ln -s ../../../../../%{name}-%{version}/components/nsMinimize.js nsMinimize.js
+        ln -s ../../../../../%{name}-%{version}/components/nsITray.xpt nsITray.xpt
+        ln -s ../../../../../%{name}-%{version}/components/nsIMinimize.xpt nsIMinimize.xpt
+        ln -s ../../../../../%{name}-%{version}/components/libnptray.so libnptray.so
     cd ..
 popd
 
 # chatzilla
 pushd $RPM_BUILD_ROOT%{mz_ext_dir}%{cz_guid}/%{ft_guid}
     #more symlink vodoo for chatzilla also since it crashes after the first start when using a whole symlinked extension directory
-    ln -s %{_libdir}/%{name}-%{version}/install.rdf install.rdf
-    ln -s %{_libdir}/%{name}-%{version}/chrome.manifest chrome.manifest
-    ln -s %{_libdir}//%{name}-%{version}/chrome chrome
-    ln -s %{_libdir}//%{name}-%{version}/defaults defaults
+    ln -s ../../../../%{name}-%{version}/install.rdf install.rdf
+    ln -s ../../../../%{name}-%{version}/chrome.manifest chrome.manifest
+    ln -s ../../../../%{name}-%{version}/chrome chrome
+    ln -s ../../../../%{name}-%{version}/defaults defaults
 
     mkdir components
     cd components
-        ln -s %{_libdir}/%{name}-%{version}/components/nsMinimize.js nsMinimize.js
-        ln -s %{_libdir}/%{name}-%{version}/components/nsITray.xpt nsITray.xpt
-        ln -s %{_libdir}/%{name}-%{version}/components/nsIMinimize.xpt nsIMinimize.xpt
-        ln -s %{_libdir}/%{name}-%{version}/components/libnptray.so libnptray.so
+        ln -s ../../../../../%{name}-%{version}/components/nsMinimize.js nsMinimize.js
+        ln -s ../../../../../%{name}-%{version}/components/nsITray.xpt nsITray.xpt
+        ln -s ../../../../../%{name}-%{version}/components/nsIMinimize.xpt nsIMinimize.xpt
+        ln -s ../../../../../%{name}-%{version}/components/libnptray.so libnptray.so
     cd ..
 popd
 
@@ -347,7 +347,10 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Sun Oct 24 2010 Hicham HAOUARI <hicham.haouari at gmail.com> - 0.2.8-3
 - Symlink the extension's directory for sunbird the same way of the
-  other applications using gecko >= 1.9.2, fixes rhbz #646185 
+  other applications using gecko >= 1.9.2, fixes rhbz #646185
+- Change symlinking for all applications to use relative symlinks targets
+  instead of absolute ones ( fixes a weird conflict issue between -core
+  and the other packages ).  
 
 * Wed Sep 29 2010 jkeating - 0.2.8-2.1
 - Rebuilt for gcc bug 634757


More information about the scm-commits mailing list