Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-24 03:19:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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.

Browse Source
This commit is contained in:
blizzard%redhat.com 2003-05-30 13:08:50 +00:00
parent 6d51522923
commit 30dfd9090b
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build/package/rpm/SOURCES/mozilla.sh.in
View File

@ -57,7 +57,13 @@ export LD_LIBRARY_PATH
## ##
## Make sure that we set the plugin path for backwards compatibility ## 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 export MOZ_PLUGIN_PATH
function check_running() { function check_running() {

9
build/package/rpm/SPECS/mozilla-DATE.spec.in
View File

@ -28,13 +28,11 @@ Patch0: mozilla-navigator-overlay-menu.patch
Patch1: mozilla-editor-overlay-menu.patch Patch1: mozilla-editor-overlay-menu.patch
Patch6: mozilla-prefs-debug.patch Patch6: mozilla-prefs-debug.patch
Patch7: mozilla-redhat-home-page.patch Patch7: mozilla-redhat-home-page.patch
Patch8: mozilla-redhat-mail-home-page.patch
Patch12: mozilla-psfonts-7.2.patch Patch12: mozilla-psfonts-7.2.patch
Patch13: mozilla-nspr-packages.patch Patch13: mozilla-nspr-packages.patch
Patch14: mozilla-default-plugin-less-annoying.patch Patch14: mozilla-default-plugin-less-annoying.patch
Patch17: mozilla-buildid-title.patch Patch17: mozilla-buildid-title.patch
Patch18: mozilla-1.2.1-uifont.patch Patch18: mozilla-1.2.1-uifont.patch
Patch20: mozilla-1.2.1-xft-font-prefs.patch
Buildroot: /var/tmp/mozilla-root Buildroot: /var/tmp/mozilla-root
Prefix: /usr Prefix: /usr
@ -159,9 +157,6 @@ development or web page development.
%patch7 -p1 %patch7 -p1
%patch7 -p1 -R %patch7 -p1 -R
%patch8 -p1
%patch8 -p1 -R
# Can't hurt to leave this in since the defaults are empty. # Can't hurt to leave this in since the defaults are empty.
%patch12 -p1 %patch12 -p1
@ -178,10 +173,6 @@ development or web page development.
# make it possible to set the uifont # make it possible to set the uifont
%patch18 -p1 %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 # set up our default bookmarks
/bin/cp %{SOURCE19} $RPM_BUILD_DIR/mozilla/profile/defaults/bookmarks.html /bin/cp %{SOURCE19} $RPM_BUILD_DIR/mozilla/profile/defaults/bookmarks.html