From 175f0277036f361a0e8870c8461dae5dc8eeb33c Mon Sep 17 00:00:00 2001 From: "blizzard%redhat.com" Date: Fri, 30 May 2003 13:08:50 +0000 Subject: [PATCH] Checkpointing changes. Not part of the regular build. Update the plugin path bits in the startup script. Remove some patches that aren't needed anymore. git-svn-id: svn://10.0.0.236/trunk@143097 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/build/package/rpm/SOURCES/mozilla.sh.in | 8 +++++++- mozilla/build/package/rpm/SPECS/mozilla-DATE.spec.in | 9 --------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/mozilla/build/package/rpm/SOURCES/mozilla.sh.in b/mozilla/build/package/rpm/SOURCES/mozilla.sh.in index 790d4fffee7..d78a3416a40 100755 --- a/mozilla/build/package/rpm/SOURCES/mozilla.sh.in +++ b/mozilla/build/package/rpm/SOURCES/mozilla.sh.in @@ -57,7 +57,13 @@ export LD_LIBRARY_PATH ## ## Make sure that we set the plugin path for backwards compatibility ## -MOZ_PLUGIN_PATH=LIBDIR/mozilla/plugins +if [ "$MOZ_PLUGIN_PATH" ] +then + MOZ_PLUGIN_PATH=$MOZ_PLUGIN_PATH:/usr/lib/mozilla/plugins:LIBDIR/mozilla/plugins +else + MOZ_PLUGIN_PATH=/usr/lib/mozilla/plugins:LIBDIR/mozilla/plugins +fi + export MOZ_PLUGIN_PATH function check_running() { diff --git a/mozilla/build/package/rpm/SPECS/mozilla-DATE.spec.in b/mozilla/build/package/rpm/SPECS/mozilla-DATE.spec.in index 17a4ea4632a..b4c3f9c62b6 100644 --- a/mozilla/build/package/rpm/SPECS/mozilla-DATE.spec.in +++ b/mozilla/build/package/rpm/SPECS/mozilla-DATE.spec.in @@ -28,13 +28,11 @@ Patch0: mozilla-navigator-overlay-menu.patch Patch1: mozilla-editor-overlay-menu.patch Patch6: mozilla-prefs-debug.patch Patch7: mozilla-redhat-home-page.patch -Patch8: mozilla-redhat-mail-home-page.patch Patch12: mozilla-psfonts-7.2.patch Patch13: mozilla-nspr-packages.patch Patch14: mozilla-default-plugin-less-annoying.patch Patch17: mozilla-buildid-title.patch Patch18: mozilla-1.2.1-uifont.patch -Patch20: mozilla-1.2.1-xft-font-prefs.patch Buildroot: /var/tmp/mozilla-root Prefix: /usr @@ -159,9 +157,6 @@ development or web page development. %patch7 -p1 %patch7 -p1 -R -%patch8 -p1 -%patch8 -p1 -R - # Can't hurt to leave this in since the defaults are empty. %patch12 -p1 @@ -178,10 +173,6 @@ development or web page development. # make it possible to set the uifont %patch18 -p1 -# patch to make it possible to use the font prefs with xft in a sane -# manner -%patch20 -p1 - # set up our default bookmarks /bin/cp %{SOURCE19} $RPM_BUILD_DIR/mozilla/profile/defaults/bookmarks.html