Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5009)

Unified Diff: chrome/installer/linux/rpm/chrome.spec.template

Issue 2107893004: Support relocatable RPM packages (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/installer/linux/rpm/chrome.spec.template
diff --git a/chrome/installer/linux/rpm/chrome.spec.template b/chrome/installer/linux/rpm/chrome.spec.template
index 08c402caa958d069c2dc7581ddcd97bc7111dd4b..00b13d0b3e47c008cdaddb1341fdc19fe9ac623b 100644
--- a/chrome/installer/linux/rpm/chrome.spec.template
+++ b/chrome/installer/linux/rpm/chrome.spec.template
@@ -88,7 +88,6 @@ rm -rf "$RPM_BUILD_ROOT"
# accidentally "own" stuff that's not ours (crbug.com/123990).
/etc/cron.daily/@@PACKAGE@@
%ghost %attr(755,root,root) /usr/bin/google-chrome
-/usr/bin/@@USR_BIN_SYMLINK_NAME@@
Lei Zhang 2016/06/29 00:57:45 Presumably you've installed the RPM and it's not h
Tom (Use chromium acct) 2016/06/29 01:03:43 I didn't see that even before this change
/usr/share/applications/@@PACKAGE@@.desktop
/usr/share/gnome-control-center/default-apps/@@PACKAGE@@.xml
%docdir /usr/share/man/man1
@@ -109,6 +108,8 @@ exit 0
#------------------------------------------------------------------------------
%post
+@@include@@../common/variables.include
+
@@include@@../common/postinst.include
@@include@@../common/rpm.include
@@ -118,6 +119,9 @@ exit 0
remove_nss_symlinks
add_nss_symlinks
+remove_chrome_symlinks
+add_chrome_symlinks
+
remove_udev_symlinks
DEFAULTS_FILE="/etc/default/@@PACKAGE@@"
@@ -188,6 +192,8 @@ elif [ "$1" -eq "1" ]; then
mode="upgrade"
fi
+@@include@@../common/variables.include
+
@@include@@../common/rpm.include
@@include@@../common/symlinks.include
@@ -196,11 +202,12 @@ fi
# old_pkg's %preun runs after new_pkg's %post.
if [ "$mode" = "uninstall" ]; then
@@include@@../common/prerm.include
- remove_nss_symlinks
- remove_udev_symlinks
-
%{_sbindir}/update-alternatives --remove google-chrome \
/usr/bin/@@USR_BIN_SYMLINK_NAME@@
+
+ remove_nss_symlinks
+ remove_chrome_symlinks
+ remove_udev_symlinks
fi
# On Debian we only remove when we purge. However, RPM has no equivalent to
« chrome/installer/linux/common/rpm.include ('K') | « chrome/installer/linux/debian/prerm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698