Updating rpm build files. Not part of the build.

This commit is contained in:
blizzard%redhat.com 2002-07-29 03:22:52 +00:00
Родитель 776a5c1a1b
Коммит e374afb751
19 изменённых файлов: 590 добавлений и 586 удалений

Просмотреть файл

Просмотреть файл

@ -1 +0,0 @@
bin/mozilla-xremote-client

Просмотреть файл

Просмотреть файл

@ -28,25 +28,25 @@ use File::Find;
use strict;
# global vars
my $srcdir = "";
my $install_dir = "";
my $install_root = "";
my $package_name = "";
my $package_file = "";
my $output_file = "";
my $exclude_file = "";
my $shared_pass;
my $retval;
# std return val
$retval = GetOptions('source=s', \$srcdir,
$retval = GetOptions('install-dir=s', \$install_dir,
'install-root=s', \$install_root,
'package=s', \$package_name,
'package-file=s', \$package_file,
'output-file=s', \$output_file,
'exclude-file=s', \$exclude_file,
'shared!', \$shared_pass);
'exclude-file=s', \$exclude_file);
# make sure that all of the values are specific on the command line
if (!$retval || !$srcdir || !$package_name ||
if (!$retval || !$install_dir || !$install_root || !$package_name ||
!$package_file || !$output_file) {
print_usage();
exit 1;
@ -56,8 +56,8 @@ if (!$retval || !$srcdir || !$package_name ||
open (PACKAGE_FILE, $package_file) || die("$0: Failed to open file $package_file for reading.");
print "chdir to $srcdir\n";
chdir($srcdir);
print "chdir to $install_dir\n";
chdir($install_dir);
my @file_list;
my @exclude_list;
@ -133,20 +133,12 @@ foreach (@final_file_list) {
# strip off the bin/
s/^bin\///;
# if it's a shared library and we're doing a shared pass print it.
# otherwise ignore it.
my $is_shared_library = 0;
$is_shared_library = /^[a-zA-Z0-9]+\.so$/;
if ($shared_pass && $is_shared_library) {
print ("Adding $_\n");
print (OUTPUT_FILE $_ . "\n");
}
elsif (!$shared_pass && !$is_shared_library) {
print ("Adding $_\n");
print (OUTPUT_FILE $_ . "\n");
if ( ! -f $_ ) {
print("Skipping $_ because it doesn't exist\n");
}
else {
print("Ignoring $_\n");
print ("Adding $_\n");
print (OUTPUT_FILE $install_root . "/" . $_ . "\n");
}
}
close OUTPUT_FILE;
@ -164,12 +156,16 @@ sub expand_file_list {
my $final_file_list_ref = shift;
my $this_file;
foreach $this_file (@{$file_list_ref}) {
# strip off the bin/
$this_file =~ s/^bin\///;
# is it a wild card?
if ($this_file =~ /\*$/) {
print "Wild card $this_file\n";
# expand that wild card, removing anything in the exclude
# list
my @temp_list;
printf ("Expanding $this_file\n");
@temp_list = glob($this_file);
foreach $this_file (@temp_list) {
if (!in_exclude_list($this_file, $exclude_list_ref)) {
@ -202,10 +198,10 @@ sub in_exclude_list {
# print out a usage message
sub print_usage {
print ("$0: --source dir --package name --package-file file --output-file file [--shared]\n");
print ("\t source is the source directory where the files can be found.\n");
print ("$0: --install-dir dir --install-root dir --package name --package-file file --output-file file\n");
print ("\t install-dir is the directory where the files are installed.\n");
print ("\t install-root is the directory that should prefix files in the package file.\n");
print ("\t package is the name of the package to list\n");
print ("\t package-file is the file that contains the list of packages\n");
print ("\t output-file is the file which will contain the list of files\n");
print ("\t shared pulls out only the shared libraries\n");
}

Просмотреть файл

@ -1,6 +1,6 @@
--- mozilla/xpfe/browser/resources/content/navigatorOverlay.xul.debug Thu Feb 21 15:18:58 2002
+++ mozilla/xpfe/browser/resources/content/navigatorOverlay.xul Thu Feb 21 15:19:31 2002
@@ -351,133 +351,6 @@
--- mozilla/xpfe/browser/resources/content/navigatorOverlay.xul.foo Tue Jul 23 14:43:07 2002
+++ mozilla/xpfe/browser/resources/content/navigatorOverlay.xul Tue Jul 23 14:44:43 2002
@@ -363,133 +363,6 @@
<menu accesskey="&helpMenuCmd.accesskey;" id="menu_Help"/>
@ -106,7 +106,7 @@
- </menu>
-
- <menu id="qaMenu" accesskey="Q" label="QA">
- <menupopup>
- <menupopup id="qaMenuPopup">
- <menuitem label="Getting Involved" oncommand="loadURI('http://www.mozilla.org/start/');"/>
- <menuitem label="Mozilla QA Overview" oncommand="loadURI('http://www.mozilla.org/quality/');"/>
-

Просмотреть файл

@ -1,27 +0,0 @@
--- mozilla/xpfe/components/prefwindow/resources/content/preftree.xul.debug Wed Jan 16 13:15:13 2002
+++ mozilla/xpfe/components/prefwindow/resources/content/preftree.xul Wed Jan 16 13:15:29 2002
@@ -151,24 +151,6 @@
</outlinerchildren>
</outlineritem>
- <outlineritem container="true" id="debugItem">
- <outlinerrow>
- <outlinercell url="chrome://communicator/content/pref/pref-debug.xul" label="&debug.label;"/>
- </outlinerrow>
- <outlinerchildren id="debugChildren">
- <outlineritem>
- <outlinerrow>
- <outlinercell url="chrome://communicator/content/pref/pref-debug1.xul" label="&debug1.label;"/>
- </outlinerrow>
- </outlineritem>
- <outlineritem>
- <outlinerrow>
- <outlinercell url="chrome://communicator/content/pref/pref-debug2.xul" label="&debug2.label;"/>
- </outlinerrow>
- </outlineritem>
- </outlinerchildren>
- </outlineritem>
-
<outlineritem id="offlineItem">
<outlinerrow>
<outlinercell url="chrome://communicator/content/pref/pref-offline.xul" label="&offline.label;"/>

Просмотреть файл

@ -1,15 +0,0 @@
--- mozilla/modules/libpref/src/unix/unix.js.psfoo Thu Feb 21 15:58:23 2002
+++ mozilla/modules/libpref/src/unix/unix.js Thu Feb 21 16:00:22 2002
@@ -344,8 +344,10 @@
pref("print.postscript.nativefont.ar", "");
pref("print.postscript.nativefont.el", "");
pref("print.postscript.nativefont.he", "");
-pref("print.postscript.nativefont.ja", "");
-pref("print.postscript.nativefont.ko", "");
+pref("print.postscript.nativecode.ja", "euc-jp");
+pref("print.postscript.nativefont.ja", "Ryumin-Light-EUC-H");
+pref("print.postscript.nativecode.ko", "euc-kr");
+pref("print.postscript.nativefont.ko", "Baekmuk-Gulim-KSC-EUC-H");
pref("print.postscript.nativefont.th", "");
pref("print.postscript.nativefont.tr", "");
pref("print.postscript.nativefont.x-baltic", "");

Просмотреть файл

@ -1,5 +1,4 @@
bin/libnssckbi.so
bin/libnss3.so
bin/libsmime3.so
bin/libsoftokn3.so
bin/libssl3.so
libnss3.so
libsmime3.so
libsoftokn3.so
libssl3.so

Просмотреть файл

@ -0,0 +1,70 @@
#!/usr/bin/perl
use File::Path;
use POSIX ":sys_wait_h";
$timeout = 60;
%{ENV}->{"MOZILLA_FIVE_HOME"}="/usr/lib/mozilla-MOZILLA_VERSION";
%{ENV}->{"LD_LIBRARY_PATH"}="/usr/lib/mozilla-MOZILLA_VERSION";
umask 022;
if ( -f "/usr/lib/mozilla-MOZILLA_VERSION/regxpcom" )
{
# remove all of the old files
rmtree("/usr/lib/mozilla-MOZILLA_VERSION/chrome/overlayinfo");
unlink </usr/lib/mozilla-MOZILLA_VERSION/chrome/*.rdf>;
unlink("/usr/lib/mozilla-MOZILLA_VERSION/component.reg");
unlink("/usr/lib/mozilla-MOZILLA_VERSION/components/compreg.dat");
unlink("/usr/lib/mozilla-MOZILLA_VERSION/components/xpti.dat");
# crate a new clean path
mkpath("/usr/lib/mozilla-MOZILLA_VERSION/chrome/overlayinfo");
# run regxpcom
$pid = fork();
# I am the child.
if ($pid == 0) {
exec("/usr/lib/mozilla-MOZILLA_VERSION/regxpcom > /dev/null 2> /dev/null");
}
# I am the parent.
else {
my $timepassed = 0;
do {
$kid = waitpid($pid, &WNOHANG);
sleep(1);
$timepassed++;
} until $kid == -1 || $timepassed > $timeout;
# should we kill?
if ($timepassed > $timeout) {
kill (9, $pid);
}
}
# and run regchrome for good measure
$pid = fork();
# I am the child.
if ($pid == 0) {
exec("/usr/lib/mozilla-MOZILLA_VERSION/regchrome > /dev/null 2> /dev/null");
}
# I am the parent.
else {
my $timepassed = 0;
do {
$kid = waitpid($pid, &WNOHANG);
sleep(1);
$timepassed++;
} until $kid == -1 || $timepassed > $timeout;
# should we kill?
if ($timepassed > $timeout) {
kill (9, $pid);
}
}
}

Просмотреть файл

@ -0,0 +1,37 @@
<!DOCTYPE NETSCAPE-Bookmark-file-1>
<!-- This is an automatically generated file.
It will be read and overwritten.
Do Not Edit! -->
<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
<TITLE>Bookmarks</TITLE>
<H1>Bookmarks</H1>
<DL><p>
<DT><H3 ADD_DATE="961112773" LAST_MODIFIED="994788142" PERSONAL_TOOLBAR_FOLDER="true" ID="NC:PersonalToolbarFolder">Personal Toolbar Folder</H3>
<DL><p>
<DT><A HREF="http://www.redhat.com/network/main/login.html" ADD_DATE="994787542" LAST_VISIT="994788277" LAST_CHARSET="ISO-8859-1">Red Hat Network</A>
<DT><H3 ADD_DATE="994787811" LAST_MODIFIED="994788115" ID="NC:BookmarksRoot#$7957b8a">Support</H3>
<DL><p>
<DT><A HREF="http://www.redhat.com/linux_docs.html" ADD_DATE="994787827" LAST_VISIT="994788333" LAST_CHARSET="ISO-8859-1">Red Hat Linux Documentation</A>
<DT><A HREF="http://www.redhat.com/devnet" ADD_DATE="994787868">Red Hat Developer Network</A>
<DT><A HREF="http://www.redhat.com/downloads.html" ADD_DATE="994787795">Red Hat Downloads</A>
<DT><A HREF="http://www.redhat.com/apps/support" ADD_DATE="994787936">Red Hat Support</A>
<DT><A HREF="http://hardware.redhat.com/redhatready/cgi-bin/us/db-hcl.cgi" ADD_DATE="994788088" LAST_VISIT="994788380" LAST_CHARSET="ISO-8859-1">Red Hat Hardware Compatibility Search</A>
<DT><A HREF="http://www.redhat.com/apps/search/" ADD_DATE="994788115" LAST_VISIT="994788390" LAST_CHARSET="ISO-8859-1">Red Hat Search</A>
</DL><p>
<DT><H3 ADD_DATE="994787567" LAST_MODIFIED="994787722" ID="NC:BookmarksRoot#$7957b87">Shop</H3>
<DL><p>
<DT><A HREF="http://www.redhat.com/apps/commerce/" ADD_DATE="994787588" LAST_VISIT="994788303" LAST_CHARSET="ISO-8859-1">Red Hat Store</A>
<DT><A HREF="http://www.redhat.com/apps/marketplace/" ADD_DATE="994787635" LAST_VISIT="994788310" LAST_CHARSET="ISO-8859-1">Red Hat Marketplace</A>
</DL><p>
<DT><H3 ADD_DATE="994787973" LAST_MODIFIED="994788056" ID="NC:BookmarksRoot#$1fc98069">Products</H3>
<DL><p>
<DT><A HREF="http://www.redhat.com/embedded/" ADD_DATE="994787951" LAST_VISIT="994788350" LAST_CHARSET="ISO-8859-1">Red Hat Embedded Tech Center</A>
<DT><A HREF="http://www.redhat.com/products/" ADD_DATE="994788056" LAST_VISIT="994788371" LAST_CHARSET="ISO-8859-1">Red Hat Product Offerings</A>
</DL><p>
<DT><H3 ADD_DATE="994787705" LAST_MODIFIED="994787760" ID="NC:BookmarksRoot#$7957b88">Training</H3>
<DL><p>
<DT><A HREF="http://www.redhat.com/training/" ADD_DATE="994787760" LAST_VISIT="994788297" LAST_CHARSET="ISO-8859-1">Red Hat Global Learning Services</A>
</DL><p>
</DL><p>
</DL><p>

Просмотреть файл

Просмотреть файл

@ -1,5 +1,5 @@
--- mozilla/xpfe/browser/resources/locale/en-US/region.properties.home-page Fri Sep 7 12:43:36 2001
+++ mozilla/xpfe/browser/resources/locale/en-US/region.properties Fri Sep 7 12:44:24 2001
--- mozilla/xpfe/browser/resources/locale/en-US/region.properties.foo Wed Jul 10 10:45:55 2002
+++ mozilla/xpfe/browser/resources/locale/en-US/region.properties Wed Jul 10 10:46:35 2002
@@ -1,5 +1,5 @@
# navigator.properties
-homePageDefault=http://www.mozilla.org/
@ -11,14 +11,8 @@
#
# all.js
#
-browser.startup.homepage=http://www.mozilla.org/start
-browser.startup.homepage=http://www.mozilla.org/start/
+browser.startup.homepage=file:///usr/share/doc/HTML/index.html
browser.throbber.url=http://www.mozilla.org/
browser.search.defaulturl=http://search.netscape.com/cgi-bin/search?search=
@@ -20,4 +20,4 @@
#config.js
#
-startup.homepage_override_url=http://www.mozilla.org/start
+startup.homepage_override_url=file:///usr/share/doc/HTML/index.html

Просмотреть файл

@ -1,4 +1,5 @@
bin/libnspr4.so
bin/libplc4.so
bin/libplds4.so
libnspr4.so
libplc4.so
libplds4.so
libxpcom.so

Просмотреть файл

@ -1,7 +0,0 @@
[Desktop Entry]
Name=Mozilla
Comment=Mozilla
Exec=/usr/bin/mozilla
Icon=mozilla-icon.png
Terminal=0
Type=Application

Просмотреть файл

Просмотреть файл

@ -0,0 +1,218 @@
#!/bin/sh
#
# The contents of this file are subject to the Netscape Public
# License Version 1.1 (the "License"); you may not use this file
# except in compliance with the License. You may obtain a copy of
# the License at http://www.mozilla.org/NPL/
#
# Software distributed under the License is distributed on an "AS
# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
# implied. See the License for the specific language governing
# rights and limitations under the License.
#
# The Original Code is mozilla.org code.
#
# The Initial Developer of the Original Code is Netscape
# Communications Corporation. Portions created by Netscape are
# Copyright (C) 1998 Netscape Communications Corporation. All
# Rights Reserved.
#
# Contributor(s):
#
##
## Usage:
##
## $ mozilla
##
## This script is meant to run a mozilla program from the mozilla
## rpm installation.
##
## The script will setup all the environment voodoo needed to make
## mozilla work.
cmdname=`basename $0`
## don't leave any core files around
ulimit -c 0
##
## Variables
##
MOZ_DIST_BIN="/usr/lib/mozilla-MOZILLA_VERSION"
MOZ_PROGRAM="/usr/lib/mozilla-MOZILLA_VERSION/mozilla-bin"
MOZ_CLIENT_PROGRAM="/usr/lib/mozilla-MOZILLA_VERSION/mozilla-xremote-client"
##
## Set MOZILLA_FIVE_HOME
##
MOZILLA_FIVE_HOME="/usr/lib/mozilla-MOZILLA_VERSION"
export MOZILLA_FIVE_HOME
##
## Set LD_LIBRARY_PATH
##
if [ "$LD_LIBRARY_PATH" ]
then
LD_LIBRARY_PATH=/usr/lib/mozilla-MOZILLA_VERSION:/usr/lib/mozilla-MOZILLA_VERSION/plugins:$LD_LIBRARY_PATH
else
LD_LIBRARY_PATH=/usr/lib/mozilla-MOZILLA_VERSION:/usr/lib/mozilla-MOZILLA_VERSION/plugins
fi
export LD_LIBRARY_PATH
##
## Make sure that we set the plugin path for backwards compatibility
##
MOZ_PLUGIN_PATH=/usr/lib/mozilla/plugins
export MOZ_PLUGIN_PATH
##
## Set FONTCONFIG_PATH for Xft/fontconfig
##
FONTCONFIG_PATH="/etc/fonts:${MOZILLA_FIVE_HOME}/res/Xft"
export FONTCONFIG_PATH
# Figure out if we need to ser LD_ASSUME_KERNEL for older versions of the JVM.
function set_jvm_vars() {
# see if the jvm exists in either of the locations
if [ -L /usr/lib/mozilla-MOZILLA_VERSION/plugins/libjavaplugin_oji.so ]; then
JVM_ORIG_LINK=/usr/lib/mozilla-MOZILLA_VERSION/plugins/libjavaplugin_oji.so
fi
if [ -L /usr/lib/mozilla/plugins/libjavaplugin_oji.so ]; then
JVM_ORIG_LINK=/usr/lib/mozilla/plugins/libjavaplugin_oji.so
fi
if [ -z "$JVM_ORIG_LINK" ]; then
return;
fi
JVM_LINK=`perl -e "print readlink('$JVM_ORIG_LINK')"`
# is it relative? if so append the full path
echo "${JVM_LINK}" | grep -e "^/" 2>&1 > /dev/null
if [ "$?" -ne "0" ]; then
JVM_LINK=/usr/lib/mozilla-MOZILLA_VERSION/plugins/${JVM_LINK}
fi
JVM_BASE=`basename $JVM_LINK`
JVM_DIR=`echo $JVM_LINK | sed -e s/$JVM_BASE//g`
JVM_COMMAND=$JVM_DIR/java
if [ ! -r $JVM_COMMAND ]; then
JVM_DIR=${JVM_DIR}../../../bin/
JVM_COMMAND=$JVM_DIR/java
# does the command exist?
if [ ! -r "$JVM_COMMAND" ]; then
return
fi
fi
# export this temporarily - it seems to work with old and new
# versions of the JVM.
export LD_ASSUME_KERNEL=2.2.5
# get the version
JVM_VERSION=`$JVM_COMMAND -version 2>&1 | grep version | cut -f 3 -d " " | sed -e 's/\"//g'`
unset LD_ASSUME_KERNEL
case "$JVM_VERSION" in
(1.3.0*)
# bad JVM
export LD_ASSUME_KERNEL=2.2.5
;;
esac
}
function check_running() {
$MOZ_CLIENT_PROGRAM 'ping()' 2>/dev/null >/dev/null
RETURN_VAL=$?
if [ "$RETURN_VAL" -eq "2" ]; then
echo 0
return 0
else
echo 1
return 1
fi
}
function open_mail() {
if [ "${ALREADY_RUNNING}" -eq "1" ]; then
exec $MOZ_CLIENT_PROGRAM 'xfeDoCommand(openInbox)' \
2>/dev/null >/dev/null
else
exec $MOZ_PROGRAM $*
fi
}
function open_compose() {
if [ "${ALREADY_RUNNING}" -eq "1" ]; then
exec $MOZ_CLIENT_PROGRAM 'xfeDoCommand(composeMessage)' \
2>/dev/null >/dev/null
else
exec $MOZ_PROGRAM $*
fi
}
# OK, here's where all the real work gets done
# set our JVM vars
set_jvm_vars
# check to see if there's an already running instance or not
ALREADY_RUNNING=`check_running`
# If there is no command line argument at all then try to open a new
# window in an already running instance.
if [ "${ALREADY_RUNNING}" -eq "1" ] && [ -z "$1" ]; then
exec $MOZ_CLIENT_PROGRAM "xfeDoCommand(openBrowser)" 2>/dev/null >/dev/null
fi
# if there's no command line argument and there's not a running
# instance then just fire up a new copy of the browser
if [ -z "$1" ]; then
exec $MOZ_PROGRAM 2>/dev/null >/dev/null
fi
unset RETURN_VAL
# If there's a command line argument but it doesn't begin with a -
# it's probably a url. Try to send it to a running instance.
USE_EXIST=0
opt="$1"
case "$opt" in
-mail)
open_mail ${1+"$@"}
;;
-compose)
open_compose ${1+"$@"}
;;
-*) ;;
*) USE_EXIST=1 ;;
esac
if [ "${USE_EXIST}" -eq "1" ] && [ "${ALREADY_RUNNING}" -eq "1" ]; then
# check to make sure that the command contains at least a :/ in it.
echo $opt | grep -e ':/' 2>/dev/null > /dev/null
RETURN_VAL=$?
if [ "$RETURN_VAL" -eq "1" ]; then
# if it doesn't begin with a '/' and it exists when the pwd is
# prepended to it then append the full path
echo $opt | grep -e '^/' 2>/dev/null > /dev/null
if [ "${RETURN_VAL}" -ne "0" ] && [ -e `pwd`/$opt ]; then
opt="`pwd`/$opt"
fi
exec $MOZ_CLIENT_PROGRAM "openurl($opt)" 2>/dev/null >/dev/null
fi
# just pass it off if it looks like a url
exec $MOZ_CLIENT_PROGRAM "openurl($opt,new-window)" 2>/dev/null >/dev/null
fi
exec $MOZ_PROGRAM ${1+"$@"}

Просмотреть файл

@ -1,18 +1,17 @@
Name: mozilla
Summary: Web browser and mail reader
Version: VERSION
Release: 0_rh7
Version: VERSION_REPLACE
Release: RELEASE_REPLACE
Serial: 35
Copyright: MPL
Source0: mozilla-source-VERSION.tar.gz
Source1: mozilla.sh
Source0: mozilla-source-RELEASE_REPLACE.tar.gz
Source1: mozilla.sh.in
Source2: mozilla-icon.png
Source4: mozilla.desktop
Source7: mozilla-make-package.pl
Source8: mozilla-copy-package-files.sh
Source9: mozicon16.xpm
Source10: mozicon50.xpm
Source11: rebuild-databases.sh
Source11: mozilla-rebuild-databases.pl.in
Source12: mozilla-mail.desktop
Source13: mozilla-mail-icon.gif
Source14: mozilla-compose.desktop
@ -20,23 +19,24 @@ Source15: mozilla-compose-icon.gif
Source16: mozilla-exclude-list
Source17: mozilla-psm-exclude-list
Source18: mozilla-xpcom-exclude-list
Source19: mozilla-redhat-default-bookmarks.html
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
Patch10: mozilla-redhat-home-page-6.2.patch
Patch11: mozilla-taskbar-nomozilla.patch
Patch12: mozilla-psfonts-7.2.patch
Patch13: mozilla-nspr-packages.patch
Patch14: mozilla-default-plugin-less-annoying.patch
Patch17: mozilla-buildid-title.patch
Buildroot: /var/tmp/mozilla-root
Prefix: /usr
Group: Applications/Internet
Provides: webclient
BuildPrereq: libpng-devel, libjpeg-devel, zlib-devel, zip, perl, autoconf, indexhtml, ORBit-devel, glib-devel, gtk+-devel
ExcludeArch: ia64
Prereq: fileutils
Requires: perl mozilla-nspr = %{version}-%{release}
Prereq: fileutils perl
Requires: mozilla-nspr = %{version}-%{release}
%description
Mozilla is an open-source web browser, designed for standards
@ -45,6 +45,7 @@ compliance, performance and portability.
%package nspr
Summary: Netscape Portable Runtime
Group: Applications/Internet
Conflicts: mozilla < 0.9.9
%description nspr
NSPR provides platform independence for non-GUI operating system
@ -146,14 +147,8 @@ development or web page development.
%patch6 -p1
%patch6 -p1 -R
# is it a RH 7.0 system?
if [ -f /usr/share/doc/HTML/index.html ]; then
%patch7 -p1
%patch7 -p1 -R
else
%patch10 -p1
%patch10 -p1 -R
fi
%patch8 -p1
%patch8 -p1 -R
@ -166,6 +161,17 @@ fi
%patch13 -p1
# make the plugin dialog less annoying and disable redirection to the
# plugin downloader page.
%patch14 -p1
# remove the annoying buildid from the titlebar
%patch17 -p1
%patch17 -p1 -R
# set up our default bookmarks
#/bin/cp %{SOURCE19} $RPM_BUILD_DIR/mozilla/profile/defaults/bookmarks.html
%build
if [ -x /usr/bin/getconf ]; then
@ -176,9 +182,10 @@ if test "x$CPUS" = "x" -o "x$CPUS" = "x0"; then
fi
# build mozilla
BUILD_OFFICIAL=1 ./configure --prefix=%{_prefix} --enable-optimize \
BUILD_OFFICIAL=1 MOZILLA_OFFICIAL=1 \
./configure --prefix=%{_prefix} --enable-optimize \
--disable-debug \
--with-default-mozilla-five-home=/usr/lib/mozilla \
--with-default-mozilla-five-home=/usr/lib/mozilla-%{version} \
--enable-strip-libs \
--disable-tests \
--disable-short-wchar \
@ -191,185 +198,124 @@ BUILD_OFFICIAL=1 ./configure --prefix=%{_prefix} --enable-optimize \
--with-system-zlib \
--disable-freetype2
#BUILD_OFFICIAL=1 make -s export
#BUILD_OFFICIAL=1 make -j$CPUS -s libs
BUILD_OFFICIAL=1 make -s
BUILD_OFFICIAL=1 MOZILLA_OFFICIAL=1 make -s export
BUILD_OFFICIAL=1 MOZILLA_OFFICIAL=1 make -j$CPUS -s libs
%install
/bin/rm -rf $RPM_BUILD_ROOT
/bin/mkdir -p $RPM_BUILD_ROOT/%{prefix}/lib/mozilla
/bin/mkdir -p $RPM_BUILD_ROOT/%{prefix}/bin
/bin/mkdir -p $RPM_BUILD_ROOT/%{prefix}/include/mozilla
/bin/mkdir -p $RPM_BUILD_ROOT/%{prefix}/include/nspr
/bin/mkdir -p $RPM_BUILD_ROOT/%{prefix}/include/nss
/bin/mkdir -p $RPM_BUILD_ROOT/%{prefix}/share/idl/mozilla
BUILD_OFFICIAL=1 MOZILLA_OFFICIAL=1 \
DESTDIR=$RPM_BUILD_ROOT \
make install
# create a list of all of the different package and the files that
# will hold them
# NSS and NSPR are both installed into /usr/lib instead of
# /usr/lib/mozilla-VERSION
pushd .
cd $RPM_BUILD_ROOT/usr/lib/mozilla-%{version}
# copy nspr
mv -v \
libnspr4.so libplc4.so libplds4.so \
$RPM_BUILD_ROOT/usr/lib/
# copy nss
mv -v \
libnss3.so libsmime3.so libsoftokn3.so libssl3.so \
$RPM_BUILD_ROOT/usr/lib/
# copy system libs
mv -v \
libgkgfx.so libjsj.so libmozjs.so libxpcom.so \
libgtkembedmoz.so libgtksuperwin.so libgtkxtbin.so \
$RPM_BUILD_ROOT/usr/lib/
# libnssckbi.so must be in both places
cp -v libnssckbi.so $RPM_BUILD_ROOT/usr/lib/
popd
/bin/rm -f /tmp/mozilla-nspr.list
/bin/rm -f /tmp/mozilla-nspr.list.shared
/bin/rm -f /tmp/mozilla-nspr.package
%{SOURCE7} --package nspr --output-file /tmp/mozilla-nspr.list \
--package-file $RPM_BUILD_DIR/mozilla/xpinstall/packager/packages-unix \
--source $RPM_BUILD_DIR/mozilla/dist
%{SOURCE7} --package nspr --output-file /tmp/mozilla-nspr.list.shared \
--package-file $RPM_BUILD_DIR/mozilla/xpinstall/packager/packages-unix \
--source $RPM_BUILD_DIR/mozilla/dist -shared
--install-dir $RPM_BUILD_ROOT/usr/lib \
--install-root /usr/lib
/bin/rm -f /tmp/mozilla-nss.list
/bin/rm -f /tmp/mozilla-nss.list.shared
/bin/rm -f /tmp/mozilla-nss.package
%{SOURCE7} --package nss --output-file /tmp/mozilla-nss.list \
--package-file $RPM_BUILD_DIR/mozilla/xpinstall/packager/packages-unix \
--source $RPM_BUILD_DIR/mozilla/dist
%{SOURCE7} --package nss --output-file /tmp/mozilla-nss.list.shared \
--package-file $RPM_BUILD_DIR/mozilla/xpinstall/packager/packages-unix \
--source $RPM_BUILD_DIR/mozilla/dist -shared
--install-dir $RPM_BUILD_ROOT/usr/lib \
--install-root /usr/lib
# manually add the libnssckbi.so file
echo /usr/lib/mozilla-%{version}/libnssckbi.so >> /tmp/mozilla-nss.list
# build all of the default browser components
/bin/rm -f /tmp/mozilla.list
/bin/rm -f /tmp/mozilla.list.shared
/bin/rm -f /tmp/mozilla.package
%{SOURCE7} --package langenus --output-file /tmp/mozilla.list \
--package-file $RPM_BUILD_DIR/mozilla/xpinstall/packager/packages-unix \
--source $RPM_BUILD_DIR/mozilla/dist
%{SOURCE7} --package langenus --output-file /tmp/mozilla.list.shared \
--package-file $RPM_BUILD_DIR/mozilla/xpinstall/packager/packages-unix \
--source $RPM_BUILD_DIR/mozilla/dist -shared
--install-dir $RPM_BUILD_ROOT/usr/lib/mozilla-%{version} \
--install-root /usr/lib/mozilla-%{version}
%{SOURCE7} --package regus --output-file /tmp/mozilla.list \
--package-file $RPM_BUILD_DIR/mozilla/xpinstall/packager/packages-unix \
--source $RPM_BUILD_DIR/mozilla/dist
%{SOURCE7} --package regus --output-file /tmp/mozilla.list.shared \
--package-file $RPM_BUILD_DIR/mozilla/xpinstall/packager/packages-unix \
--source $RPM_BUILD_DIR/mozilla/dist --shared
--install-dir $RPM_BUILD_ROOT/usr/lib/mozilla-%{version} \
--install-root /usr/lib/mozilla-%{version}
%{SOURCE7} --package deflenus --output-file /tmp/mozilla.list \
--package-file $RPM_BUILD_DIR/mozilla/xpinstall/packager/packages-unix \
--source $RPM_BUILD_DIR/mozilla/dist
%{SOURCE7} --package deflenus --output-file /tmp/mozilla.list.shared \
--package-file $RPM_BUILD_DIR/mozilla/xpinstall/packager/packages-unix \
--source $RPM_BUILD_DIR/mozilla/dist --shared
--install-dir $RPM_BUILD_ROOT/usr/lib/mozilla-%{version} \
--install-root /usr/lib/mozilla-%{version}
%{SOURCE7} --package xpcom --output-file /tmp/mozilla.list \
--package-file $RPM_BUILD_DIR/mozilla/xpinstall/packager/packages-unix \
--source $RPM_BUILD_DIR/mozilla/dist \
--exclude-file=%{SOURCE18}
%{SOURCE7} --package xpcom --output-file /tmp/mozilla.list.shared \
--package-file $RPM_BUILD_DIR/mozilla/xpinstall/packager/packages-unix \
--source $RPM_BUILD_DIR/mozilla/dist --shared \
--install-dir $RPM_BUILD_ROOT/usr/lib/mozilla-%{version} \
--install-root /usr/lib/mozilla-%{version} \
--exclude-file=%{SOURCE18}
%{SOURCE7} --package browser --output-file /tmp/mozilla.list \
--package-file $RPM_BUILD_DIR/mozilla/xpinstall/packager/packages-unix \
--source $RPM_BUILD_DIR/mozilla/dist \
--exclude-file=%{SOURCE16}
%{SOURCE7} --package browser --output-file /tmp/mozilla.list.shared \
--package-file $RPM_BUILD_DIR/mozilla/xpinstall/packager/packages-unix \
--source $RPM_BUILD_DIR/mozilla/dist --shared \
--install-dir $RPM_BUILD_ROOT/usr/lib/mozilla-%{version} \
--install-root /usr/lib/mozilla-%{version} \
--exclude-file=%{SOURCE16}
/bin/rm -f /tmp/mozilla-mail.list
/bin/rm -f /tmp/mozilla-mail.list.shared
/bin/rm -f /tmp/mozilla-mail.package
%{SOURCE7} --package mail --output-file /tmp/mozilla-mail.list \
--package-file $RPM_BUILD_DIR/mozilla/xpinstall/packager/packages-unix \
--source $RPM_BUILD_DIR/mozilla/dist
%{SOURCE7} --package mail --output-file /tmp/mozilla-mail.list.shared \
--package-file $RPM_BUILD_DIR/mozilla/xpinstall/packager/packages-unix \
--source $RPM_BUILD_DIR/mozilla/dist --shared
--install-dir $RPM_BUILD_ROOT/usr/lib/mozilla-%{version} \
--install-root /usr/lib/mozilla-%{version}
/bin/rm -f /tmp/mozilla-psm.list
/bin/rm -f /tmp/mozilla-psm.list.shared
/bin/rm -f /tmp/mozilla-psm.package
%{SOURCE7} --package psm --output-file /tmp/mozilla-psm.list \
--package-file $RPM_BUILD_DIR/mozilla/xpinstall/packager/packages-unix \
--source $RPM_BUILD_DIR/mozilla/dist \
--exclude-file=%{SOURCE17}
# libnssckbi.so needs to be in /usr/lib/mozilla and in /usr/lib so
# that it can ebe loaded by both mozilla and lame programs that don't
# know about MOZILLA_FIVE_HOME
echo libnssckbi.so >> /tmp/mozilla-psm.list
# manually add the nss libraries
# I'll add these back in later when they are actual shared libraries
#echo libnss3.so >> /tmp/mozilla-psm.list.shared
#echo libsmime3.so >> /tmp/mozilla-psm.list.shared
#echo libssl3.so >> /tmp/mozilla-psm.list.shared
%{SOURCE7} --package psm --output-file /tmp/mozilla-psm.list.shared \
--package-file $RPM_BUILD_DIR/mozilla/xpinstall/packager/packages-unix \
--source $RPM_BUILD_DIR/mozilla/dist --shared \
--install-dir $RPM_BUILD_ROOT/usr/lib/mozilla-%{version} \
--install-root /usr/lib/mozilla-%{version} \
--exclude-file=%{SOURCE17}
/bin/rm -f /tmp/mozilla-chat.list
/bin/rm -f /tmp/mozilla-chat.list.shared
/bin/rm -f /tmp/mozilla-chat.package
%{SOURCE7} --package chatzilla --output-file /tmp/mozilla-chat.list \
--package-file $RPM_BUILD_DIR/mozilla/xpinstall/packager/packages-unix \
--source $RPM_BUILD_DIR/mozilla/dist
%{SOURCE7} --package chatzilla --output-file /tmp/mozilla-chat.list.shared \
--package-file $RPM_BUILD_DIR/mozilla/xpinstall/packager/packages-unix \
--source $RPM_BUILD_DIR/mozilla/dist --shared
--install-dir $RPM_BUILD_ROOT/usr/lib/mozilla-%{version} \
--install-root /usr/lib/mozilla-%{version}
/bin/rm -f /tmp/mozilla-js-debugger.list
/bin/rm -f /tmp/mozilla-js-debugger.list.shared
/bin/rm -f /tmp/mozilla-js-debugger.package
%{SOURCE7} --package venkman --output-file /tmp/mozilla-js-debugger.list \
--package-file $RPM_BUILD_DIR/mozilla/xpinstall/packager/packages-unix \
--source $RPM_BUILD_DIR/mozilla/dist
%{SOURCE7} --package venkman \
--output-file /tmp/mozilla-js-debugger.list.shared \
--package-file $RPM_BUILD_DIR/mozilla/xpinstall/packager/packages-unix \
--source $RPM_BUILD_DIR/mozilla/dist --shared
--install-dir $RPM_BUILD_ROOT/usr/lib/mozilla-%{version} \
--install-root /usr/lib/mozilla-%{version}
/bin/rm -f /tmp/mozilla-dom-inspector.list
/bin/rm -f /tmp/mozilla-dom-inspector.list.shared
/bin/rm -f /tmp/mozilla-dom-inspector.package
%{SOURCE7} --package inspector --output-file /tmp/mozilla-dom-inspector.list \
--package-file $RPM_BUILD_DIR/mozilla/xpinstall/packager/packages-unix \
--source $RPM_BUILD_DIR/mozilla/dist
%{SOURCE7} --package inspector \
--output-file /tmp/mozilla-dom-inspector.list.shared \
--package-file $RPM_BUILD_DIR/mozilla/xpinstall/packager/packages-unix \
--source $RPM_BUILD_DIR/mozilla/dist --shared
# copy all of the files
%{SOURCE8} /tmp/mozilla-nspr.list /tmp/mozilla-nspr.package \
$RPM_BUILD_ROOT/%{prefix}/lib/mozilla \
$RPM_BUILD_DIR/mozilla/dist/bin \
%{prefix}/lib/mozilla
%{SOURCE8} /tmp/mozilla-nspr.list.shared /tmp/mozilla-nspr.package \
$RPM_BUILD_ROOT/%{prefix}/lib \
$RPM_BUILD_DIR/mozilla/dist/bin \
%{prefix}/lib
%{SOURCE8} /tmp/mozilla-nss.list /tmp/mozilla-nss.package \
$RPM_BUILD_ROOT/%{prefix}/lib/mozilla \
$RPM_BUILD_DIR/mozilla/dist/bin \
%{prefix}/lib/mozilla
%{SOURCE8} /tmp/mozilla-nss.list.shared /tmp/mozilla-nss.package \
$RPM_BUILD_ROOT/%{prefix}/lib \
$RPM_BUILD_DIR/mozilla/dist/bin \
%{prefix}/lib
%{SOURCE8} /tmp/mozilla.list /tmp/mozilla.package \
$RPM_BUILD_ROOT/%{prefix}/lib/mozilla \
$RPM_BUILD_DIR/mozilla/dist/bin \
%{prefix}/lib/mozilla
%{SOURCE8} /tmp/mozilla.list.shared /tmp/mozilla.package \
$RPM_BUILD_ROOT/%{prefix}/lib \
$RPM_BUILD_DIR/mozilla/dist/bin \
%{prefix}/lib
--install-dir $RPM_BUILD_ROOT/usr/lib/mozilla-%{version} \
--install-root /usr/lib/mozilla-%{version}
# build our initial component and chrome registry
# we don't need to do this anymore
pushd `pwd`
cd $RPM_BUILD_ROOT/%{prefix}/lib/mozilla
cd $RPM_BUILD_ROOT/%{prefix}/lib/mozilla-%{version}
# register our components
LD_LIBRARY_PATH=`pwd`:`pwd`/.. MOZILLA_FIVE_HOME=`pwd` ./regxpcom
# set up the default skin and locale to trigger the generation of
@ -382,127 +328,110 @@ pushd `pwd`
/usr/bin/find . -type d -perm 0700 -exec chmod 755 {} \; || :
popd
%{SOURCE8} /tmp/mozilla-mail.list /tmp/mozilla-mail.package \
$RPM_BUILD_ROOT/%{prefix}/lib/mozilla \
$RPM_BUILD_DIR/mozilla/dist/bin \
%{prefix}/lib/mozilla
%{SOURCE8} /tmp/mozilla-mail.list.shared /tmp/mozilla-mail.package \
$RPM_BUILD_ROOT/%{prefix}/lib \
$RPM_BUILD_DIR/mozilla/dist/bin \
%{prefix}/lib
%{SOURCE8} /tmp/mozilla-psm.list /tmp/mozilla-psm.package \
$RPM_BUILD_ROOT/%{prefix}/lib/mozilla \
$RPM_BUILD_DIR/mozilla/dist/bin \
%{prefix}/lib/mozilla
%{SOURCE8} /tmp/mozilla-psm.list.shared /tmp/mozilla-psm.package \
$RPM_BUILD_ROOT/%{prefix}/lib \
$RPM_BUILD_DIR/mozilla/dist/bin \
%{prefix}/lib
%{SOURCE8} /tmp/mozilla-chat.list /tmp/mozilla-chat.package \
$RPM_BUILD_ROOT/%{prefix}/lib/mozilla \
$RPM_BUILD_DIR/mozilla/dist/bin \
%{prefix}/lib/mozilla
%{SOURCE8} /tmp/mozilla-chat.list.shared /tmp/mozilla-chat.package \
$RPM_BUILD_ROOT/%{prefix}/lib \
$RPM_BUILD_DIR/mozilla/dist/bin \
%{prefix}/lib
%{SOURCE8} /tmp/mozilla-js-debugger.list /tmp/mozilla-js-debugger.package \
$RPM_BUILD_ROOT/%{prefix}/lib/mozilla \
$RPM_BUILD_DIR/mozilla/dist/bin \
%{prefix}/lib/mozilla
%{SOURCE8} /tmp/mozilla-js-debugger.list.shared \
/tmp/mozilla-js-debugger.package \
$RPM_BUILD_ROOT/%{prefix}/lib \
$RPM_BUILD_DIR/mozilla/dist/bin \
%{prefix}/lib
%{SOURCE8} /tmp/mozilla-dom-inspector.list /tmp/mozilla-dom-inspector.package \
$RPM_BUILD_ROOT/%{prefix}/lib/mozilla \
$RPM_BUILD_DIR/mozilla/dist/bin \
%{prefix}/lib/mozilla
%{SOURCE8} /tmp/mozilla-dom-inspector.list.shared \
/tmp/mozilla-dom-inspector.package \
$RPM_BUILD_ROOT/%{prefix}/lib \
$RPM_BUILD_DIR/mozilla/dist/bin \
%{prefix}/lib
# cp -L (dereference all symlinks) is required for fileutils >= 2.0.27
# (POSIX compliance); prior versions don't understand -L, so fall back...
# copy the nss files to the right place
mkdir $RPM_BUILD_ROOT/%{prefix}/include/mozilla-%{version}/nss/
/usr/bin/find security/nss/lib/ -name '*.h' -type f -exec /bin/cp {} \
$RPM_BUILD_ROOT/%{prefix}/include/nss/ \;
$RPM_BUILD_ROOT/%{prefix}/include/mozilla-%{version}/nss/ \;
# copy the nspr files to the right place
/bin/cp -rL dist/include/nspr/* \
$RPM_BUILD_ROOT/%{prefix}/include/nspr/ || \
/bin/cp -r dist/include/nspr/* \
$RPM_BUILD_ROOT/%{prefix}/include/nspr/
# build the list of include files
rm -f /tmp/mozilla-devel.list
rm -f /tmp/mozilla-nss-devel.list
rm -f /tmp/mozilla-nspr-devel.list
# make sure to remove nspr so we don't get two copies of it
#/bin/rm -rf dist/include/nspr
find $RPM_BUILD_ROOT/%{prefix}/include/mozilla-%{version}/ -type f | \
sed -e "s,$RPM_BUILD_ROOT,," | \
grep -v "/%{prefix}/include/mozilla-%{version}/nss" | \
grep -v "/%{prefix}/include/mozilla-%{version}/nspr" > \
/tmp/mozilla-devel.list
# copy include and idl files
/bin/cp -rL dist/include/* $RPM_BUILD_ROOT/%{prefix}/include/mozilla || \
/bin/cp -r dist/include/* $RPM_BUILD_ROOT/%{prefix}/include/mozilla
find $RPM_BUILD_ROOT/%{prefix}/include/mozilla-%{version}/ -type f | \
sed -e "s,$RPM_BUILD_ROOT,," | \
grep "/%{prefix}/include/mozilla-%{version}/nspr" > \
/tmp/mozilla-nspr-devel.list
/bin/cp -rL dist/idl/* $RPM_BUILD_ROOT/%{prefix}/share/idl/mozilla || \
/bin/cp -r dist/idl/* $RPM_BUILD_ROOT/%{prefix}/share/idl/mozilla
find $RPM_BUILD_ROOT/%{prefix}/include/mozilla-%{version}/ -type f| \
sed -e "s,$RPM_BUILD_ROOT,," | \
grep "/%{prefix}/include/mozilla-%{version}/nss" > \
/tmp/mozilla-nss-devel.list
# copy our idl into place
#mkdir -p $RPM_BUILD_ROOT/%{prefix}/share/idl/mozilla-%{version}
#(cd dist/idl ; tar chf - * | \
# (cd $RPM_BUILD_ROOT/%{prefix}/share/idl/mozilla-%{version} ; \
# tar xvf -))
# copy our devel tools
/bin/cp -rL dist/bin/xpcshell $RPM_BUILD_ROOT/%{prefix}/bin/ || \
/bin/cp -r dist/bin/xpcshell $RPM_BUILD_ROOT/%{prefix}/bin/
/bin/cp -rL dist/bin/xpidl $RPM_BUILD_ROOT/%{prefix}/bin/ || \
/bin/cp -r dist/bin/xpidl $RPM_BUILD_ROOT/%{prefix}/bin/
/bin/cp -rL dist/bin/xpt_dump $RPM_BUILD_ROOT/%{prefix}/bin/ || \
/bin/cp -r dist/bin/xpt_dump $RPM_BUILD_ROOT/%{prefix}/bin/
/bin/cp -rL dist/bin/xpt_link $RPM_BUILD_ROOT/%{prefix}/bin/ || \
/bin/cp -r dist/bin/xpt_link $RPM_BUILD_ROOT/%{prefix}/bin/
install -c -m 755 %{SOURCE1} $RPM_BUILD_ROOT/%{prefix}/bin/mozilla
install -c -m 755 %{SOURCE11} $RPM_BUILD_ROOT/%{prefix}/lib/mozilla/
# put mozilla-xremote-client into the standard path
/bin/cp $RPM_BUILD_DIR/mozilla/dist/bin/mozilla-xremote-client \
$RPM_BUILD_ROOT/%{prefix}/bin
install -c -m 755 dist/bin/xpcshell \
dist/bin/xpidl \
dist/bin/xpt_dump \
dist/bin/xpt_link \
$RPM_BUILD_ROOT/%{prefix}/lib/mozilla-%{version}
# set up our desktop files
/bin/mkdir -p $RPM_BUILD_ROOT/%{prefix}/share/pixmaps/
/bin/mkdir -p $RPM_BUILD_ROOT/etc/X11/applnk/Internet
/bin/cp %{SOURCE2} %{SOURCE13} %{SOURCE15} \
install -c -m 644 %{SOURCE2} %{SOURCE13} %{SOURCE15} \
$RPM_BUILD_ROOT/%{prefix}/share/pixmaps/
/bin/cp %{SOURCE4} %{SOURCE12} %{SOURCE14} \
install -c -m 644 %{SOURCE4} %{SOURCE12} %{SOURCE14} \
$RPM_BUILD_ROOT/etc/X11/applnk/Internet
# our icons are better!
/bin/cp %{SOURCE9} $RPM_BUILD_ROOT/usr/lib/mozilla/icons/
/bin/cp %{SOURCE10} $RPM_BUILD_ROOT/usr/lib/mozilla/icons/
install -c -m 644 %{SOURCE9} $RPM_BUILD_ROOT/usr/lib/mozilla-%{version}/icons/
install -c -m 644 %{SOURCE10} $RPM_BUILD_ROOT/usr/lib/mozilla-%{version}/icons/
# install our mozilla.sh file
cat %{SOURCE1} | sed -e 's/MOZILLA_VERSION/%{version}/g' > \
$RPM_BUILD_ROOT/usr/bin/mozilla
chmod 755 $RPM_BUILD_ROOT/usr/bin/mozilla
# install our rebuild file
cat %{SOURCE11} | sed -e 's/MOZILLA_VERSION/%{version}/g' > \
$RPM_BUILD_ROOT/usr/lib/mozilla-%{version}/mozilla-rebuild-databases.pl
chmod 755 \
$RPM_BUILD_ROOT/usr/lib/mozilla-%{version}/mozilla-rebuild-databases.pl
%clean
/bin/rm -rf $RPM_BUILD_ROOT
#/bin/rm -rf $RPM_BUILD_ROOT
%post
# run ldconfig before regxpcom
/sbin/ldconfig >/dev/null 2>/dev/null
if [ -f /usr/lib/mozilla/rebuild-databases.sh ]; then
/usr/lib/mozilla/rebuild-databases.sh
if [ -f /usr/lib/mozilla-%{version}/mozilla-rebuild-databases.pl ]; then
/usr/lib/mozilla-%{version}/mozilla-rebuild-databases.pl
fi
%postun
/sbin/ldconfig >/dev/null 2>/dev/null
# was this an upgrade?
if [ "$1" == "2" ]; then
if [ -f /usr/lib/mozilla-%{version}/mozilla-rebuild-databases.pl ]; then
/usr/lib/mozilla-%{version}/mozilla-rebuild-databases.pl
fi
fi
%triggerpostun -- mozilla < 1.0
# Older packages will leave mozilla unusable after the postun script
# script is run for the old package. Rebuild the databases after that
# has been run.
if [ -f /usr/lib/mozilla-%{version}/mozilla-rebuild-databases.pl ]; then
/usr/lib/mozilla-%{version}/mozilla-rebuild-databases.pl
fi
%preun
/bin/rm -rf /usr/lib/mozilla/chrome/overlayinfo
/bin/rm -f /usr/lib/mozilla/chrome/*.rdf
# is a final removal?
if [ "$1" == "0" ]; then
/bin/rm -rf /usr/lib/mozilla/chrome/overlayinfo
/bin/rm -f /usr/lib/mozilla/chrome/*.rdf
fi
%post nspr
/sbin/ldconfig >/dev/null 2>/dev/null
@ -519,8 +448,8 @@ fi
%post mail
/sbin/ldconfig >/dev/null 2>/dev/null
if [ -f /usr/lib/mozilla/rebuild-databases.sh ]; then
/usr/lib/mozilla/rebuild-databases.sh
if [ -f /usr/lib/mozilla-%{version}/mozilla-rebuild-databases.pl ]; then
/usr/lib/mozilla-%{version}/mozilla-rebuild-databases.pl
fi
%postun mail
@ -528,357 +457,167 @@ fi
# run ldconfig before regxpcom
/sbin/ldconfig >/dev/null 2>/dev/null
if [ -f /usr/lib/mozilla/rebuild-databases.sh ]; then
/usr/lib/mozilla/rebuild-databases.sh
if [ -f /usr/lib/mozilla-%{version}/mozilla-rebuild-databases.pl ]; then
/usr/lib/mozilla-%{version}/mozilla-rebuild-databases.pl
fi
%post psm
# run ldconfig before regxpcom
/sbin/ldconfig >/dev/null 2>/dev/null
if [ -f /usr/lib/mozilla/rebuild-databases.sh ]; then
/usr/lib/mozilla/rebuild-databases.sh
if [ -f /usr/lib/mozilla-%{version}/mozilla-rebuild-databases.pl ]; then
/usr/lib/mozilla-%{version}/mozilla-rebuild-databases.pl
fi
%postun psm
# run ldconfig before regxpcom
/sbin/ldconfig >/dev/null 2>/dev/null
if [ -f /usr/lib/mozilla/rebuild-databases.sh ]; then
/usr/lib/mozilla/rebuild-databases.sh
if [ -f /usr/lib/mozilla-%{version}/mozilla-rebuild-databases.pl ]; then
/usr/lib/mozilla-%{version}/mozilla-rebuild-databases.pl
fi
%post chat
# run ldconfig before regxpcom
/sbin/ldconfig >/dev/null 2>/dev/null
if [ -f /usr/lib/mozilla/rebuild-databases.sh ]; then
/usr/lib/mozilla/rebuild-databases.sh
if [ -f /usr/lib/mozilla-%{version}/mozilla-rebuild-databases.pl ]; then
/usr/lib/mozilla-%{version}/mozilla-rebuild-databases.pl
fi
%postun chat
# run ldconfig before regxpcom
/sbin/ldconfig >/dev/null 2>/dev/null
if [ -f /usr/lib/mozilla/rebuild-databases.sh ]; then
/usr/lib/mozilla/rebuild-databases.sh
if [ -f /usr/lib/mozilla-%{version}/mozilla-rebuild-databases.pl ]; then
/usr/lib/mozilla-%{version}/mozilla-rebuild-databases.pl
fi
%post js-debugger
# run ldconfig before regxpcom
/sbin/ldconfig >/dev/null 2>/dev/null
if [ -f /usr/lib/mozilla/rebuild-databases.sh ]; then
/usr/lib/mozilla/rebuild-databases.sh
if [ -f /usr/lib/mozilla-%{version}/mozilla-rebuild-databases.pl ]; then
/usr/lib/mozilla-%{version}/mozilla-rebuild-databases.pl
fi
%postun js-debugger
# run ldconfig before regxpcom
/sbin/ldconfig >/dev/null 2>/dev/null
if [ -f /usr/lib/mozilla/rebuild-databases.sh ]; then
/usr/lib/mozilla/rebuild-databases.sh
if [ -f /usr/lib/mozilla-%{version}/mozilla-rebuild-databases.pl ]; then
/usr/lib/mozilla-%{version}/mozilla-rebuild-databases.pl
fi
%post dom-inspector
# run ldconfig before regxpcom
/sbin/ldconfig >/dev/null 2>/dev/null
if [ -f /usr/lib/mozilla/rebuild-databases.sh ]; then
/usr/lib/mozilla/rebuild-databases.sh
if [ -f /usr/lib/mozilla-%{version}/mozilla-rebuild-databases.pl ]; then
/usr/lib/mozilla-%{version}/mozilla-rebuild-databases.pl
fi
%postun dom-inspector
# run ldconfig before regxpcom
/sbin/ldconfig >/dev/null 2>/dev/null
if [ -f /usr/lib/mozilla/rebuild-databases.sh ]; then
/usr/lib/mozilla/rebuild-databases.sh
if [ -f /usr/lib/mozilla-%{version}/mozilla-rebuild-databases.pl ]; then
/usr/lib/mozilla-%{version}/mozilla-rebuild-databases.pl
fi
%files -f /tmp/mozilla.package
%files -f /tmp/mozilla.list
%defattr(-,root,root)
%{prefix}/bin/mozilla
%{prefix}/bin/mozilla-xremote-client
%{prefix}/lib/mozilla/rebuild-databases.sh
%{prefix}/lib/mozilla-%{version}/mozilla-rebuild-databases.pl
%{prefix}/share/pixmaps/mozilla-icon.png
%{prefix}/share/pixmaps/mozilla-mail-icon.gif
%{prefix}/share/pixmaps/mozilla-compose-icon.gif
%verify (not md5 mtime size) %{prefix}/lib/mozilla/component.reg
%verify (not md5 mtime size) %{prefix}/lib/mozilla/components/xpti.dat
%{prefix}/lib/libgkgfx.so
%{prefix}/lib/libjsj.so
%{prefix}/lib/libmozjs.so
%{prefix}/lib/libxpcom.so
%{prefix}/lib/libgtkembedmoz.so
%{prefix}/lib/libgtksuperwin.so
%{prefix}/lib/libgtkxtbin.so
%dir %{prefix}/lib/mozilla/defaults/pref
%dir %{prefix}/lib/mozilla/defaults/profile
%dir %{prefix}/lib/mozilla/defaults/wallet
%dir %{prefix}/lib/mozilla/defaults
%dir %{prefix}/lib/mozilla/chrome
%dir %{prefix}/lib/mozilla/components
%dir %{prefix}/lib/mozilla/res/builtin
%dir %{prefix}/lib/mozilla/res/rdf
%dir %{prefix}/lib/mozilla/res
%dir %{prefix}/lib/mozilla/icons
%dir %{prefix}/lib/mozilla/defaults/profile/US
%dir %{prefix}/lib/mozilla/searchplugins
%verify (not md5 mtime size) %{prefix}/lib/mozilla-%{version}/components/compreg.dat
%verify (not md5 mtime size) %{prefix}/lib/mozilla-%{version}/components/xpti.dat
%dir %{prefix}/lib/mozilla/plugins
%dir %{prefix}/lib/mozilla/res/html
%dir %{prefix}/lib/mozilla/res/samples
%dir %{prefix}/lib/mozilla/res/entityTables
%dir %{prefix}/lib/mozilla-%{version}/defaults/pref
%dir %{prefix}/lib/mozilla-%{version}/defaults/profile
%dir %{prefix}/lib/mozilla-%{version}/defaults/wallet
%dir %{prefix}/lib/mozilla-%{version}/defaults
%dir %{prefix}/lib/mozilla-%{version}/chrome
%dir %{prefix}/lib/mozilla-%{version}/components
%dir %{prefix}/lib/mozilla-%{version}/res/builtin
%dir %{prefix}/lib/mozilla-%{version}/res/rdf
%dir %{prefix}/lib/mozilla-%{version}/res
%dir %{prefix}/lib/mozilla-%{version}/icons
%dir %{prefix}/lib/mozilla-%{version}/defaults/profile/US
%dir %{prefix}/lib/mozilla-%{version}/searchplugins
%dir %{prefix}/lib/mozilla-%{version}/plugins
%dir %{prefix}/lib/mozilla-%{version}/res/html
%dir %{prefix}/lib/mozilla-%{version}/res/samples
%dir %{prefix}/lib/mozilla-%{version}/res/entityTables
/etc/X11/applnk/Internet/mozilla.desktop
%files nspr -f /tmp/mozilla-nspr.package
%files nspr -f /tmp/mozilla-nspr.list
%defattr(-,root,root)
%files nspr-devel
%files nspr-devel -f /tmp/mozilla-nspr-devel.list
%defattr(-,root,root)
%{prefix}/include/nspr/*
%{prefix}/lib/pkgconfig/*
%{prefix}/bin/mozilla-config
%files nss -f /tmp/mozilla-nss.package
%files nss -f /tmp/mozilla-nss.list
%defattr(-,root,root)
%files nss-devel
%files nss-devel -f /tmp/mozilla-nss-devel.list
%defattr(-,root,root)
%{prefix}/include/nss/*
%files mail -f /tmp/mozilla-mail.package
%files mail -f /tmp/mozilla-mail.list
%defattr(-,root,root)
/etc/X11/applnk/Internet/mozilla-mail.desktop
/etc/X11/applnk/Internet/mozilla-compose.desktop
%files psm -f /tmp/mozilla-psm.package
%files psm -f /tmp/mozilla-psm.list
%defattr(-,root,root)
%files chat -f /tmp/mozilla-chat.package
%files chat -f /tmp/mozilla-chat.list
%defattr(-,root,root)
%files js-debugger -f /tmp/mozilla-js-debugger.package
%files js-debugger -f /tmp/mozilla-js-debugger.list
%defattr(-,root,root)
%files dom-inspector -f /tmp/mozilla-dom-inspector.package
%files dom-inspector -f /tmp/mozilla-dom-inspector.list
%defattr(-,root,root)
%files devel
%files devel -f /tmp/mozilla-devel.list
%defattr(-,root,root)
%dir %{prefix}/include/mozilla
%{prefix}/include/mozilla/*
%{prefix}/share/idl/mozilla/*
%{prefix}/bin/xpcshell
%{prefix}/bin/xpidl
%{prefix}/bin/xpt_dump
%{prefix}/bin/xpt_link
%{prefix}/share/idl/mozilla-%{version}/*
%{prefix}/lib/mozilla-%{version}/xpcshell
%{prefix}/lib/mozilla-%{version}/xpidl
%{prefix}/lib/mozilla-%{version}/xpt_dump
%{prefix}/lib/mozilla-%{version}/xpt_link
%changelog
* Wed Mar 13 2002 Christopher Blizzard <blizzard@redhat.com>
- Use system zlib in configure line.
* Wed Jul 10 2002 Christopher Blizzard <blizzard@redhat.com>
- Use the components/*.dat files instead of component.reg both in
rebuild-databases.pl and in packaging.
* Fri Mar 08 2002 Christopher Blizzard <blizzard@redhat.com>
- Fix ordering of defattr in new -devel packages so that we don't end
up with files with bad permissions.
* Mon Jul 1 2002 Chris Blizzard <blizzard@redhat.com>
- Move libs into the system that need to be there
* Fri Feb 22 2002 Christopher Blizzard <blizzard@redhat.com>
- Add --disable-freetype2 so that we don't build the freetype code.
* Tue Jun 25 2002 Christopher Blizzard <blizzard@redhat.com>
- Change mozilla-rebuild-databases.pl to remove compreg.dat as well as
component.reg.
* Sat Dec 29 2001 Christopher Blizzard <blizzard@redhat.com>
- Add mozilla-xremote-client to the package in /usr/bin
* Sun Jun 23 2002 Chris Blizzard <blizzard@redhat.com>
- Move nspr + nss back into /usr/lib
* Fri Dec 14 2001 Christopher Blizzard <blizzard@redhat.com>
- Add DOM Inspector package.
* Thu Nov 01 2001 Christopher Blizzard <blizzard@redhat.com>
- Add JS debugger package.
* Sun Sep 16 2001 Christopher Blizzard <blizzard@redhat.com>
- Add mail and compose .desktop entries.
- Fix launcher script to handle all of the much improved xremote code.
* Sun Aug 05 2001 Christopher Blizzard <blizzard@redhat.com>
- Remove alpha compiler patch.
* Sun Jul 08 2001 Christopher Blizzard <blizzard@redhat.com>
- add --shared to the deflenus package section so that things don't
end up in /usr/lib/defaults
- We now require perl so that we can figure out what java version is
installed on the machine.
- Add verify options to three files that change when you install.
* Mon Jun 04 2001 Christopher Blizzard <blizzard@redhat.com>
- Fix problems with the default SSL CA list not being loaded. This
would cause certificate warnings on sites that would normally have a
recognized certificate authority. This was fixed by putting
libnssckbi.so into /usr/lib/mozilla instead of /usr/lib.
- Use --enable-crypto instead of a second build with
BUILD_MODULES=psm2
* Wed May 16 2001 Christopher Blizzard <blizzard@redhat.com>
- Add missing --shared on the second pass of the chatzilla package.
* Sat Apr 28 2001 Christopher Blizzard <blizzard@redhat.com>
- Add script to do all the db rebuilds for us.
- Add versioned prereqs
* Tue Apr 24 2001 Christopher Blizzard <blizzard@redhat.com>
- Move .so libraries that aren't components to /usr/lib
- Move devel tools to /usr/bin
* Wed Apr 18 2001 Christopher Blizzard <blizzard@redhat.com>
- Add /usr/lib/mozilla/plugins to LD_LIBRARY_PATH in mozilla.sh
* Thu Mar 29 2001 Christopher Blizzard <blizzard@redhat.com>
- Add --without-mng to configure lines to avoid picking up the mng
library in rawhide.
* Tue Mar 20 2001 Christopher Blizzard <blizzard@redhat.com>
- Ignore the return value of regxpcom and regchrome. They will
segfault because of binary incompatible changes during upgrades but
the last upgrade bits will always work so we should be OK.
* Mon Mar 12 2001 Christopher Blizzard <blizzard@redhat.com>
- Add chatzilla rpms.
* Wed Mar 07 2001 Christopher Blizzard <blizzard@redhat.com>
- Add LD_ASSUME_KERNEL hack to mozilla.sh so that the JVM will work.
* Tue Feb 27 2001 Christopher Blizzard <blizzard@redhat.com>
- Add missing directories to file sections for mozilla and
mozilla-psm.
* Fri Feb 16 2001 Christopher Blizzard <blizzard@redhat.com>
- Remove requires since we have prereq.
* Sat Feb 10 2001 Christopher Blizzard <blizzard@redhat.com>
- Add xpidl compiler + related tools to the devel package.
- Check that regxpcom exists in postun sections. There's no ordering
guarantee when you uninstall rpms.
* Mon Feb 05 2001 Christopher Blizzard <blizzard@redhat.com>
- Turn of parallel builds again.
* Sun Jan 28 2001 Christopher Blizzard <blizzard@redhat.com>
- Try with parallel builds again.
- Use --enable-nspr-autoconf
- In the clean section don't delete the building area.
* Sat Jan 27 2001 Christopher Blizzard <blizzard@redhat.com>
- Remove hacks for installed-chrome.txt and regchrome. They are
listed in the packages files now.
* Thu Jan 18 2001 Christopher Blizzard <blizzard@redhat.com>
- Add proper prereq for psm, mail and base package
- Remove checks for programs before running post and postun
* Tue Jan 16 2001 Christopher Blizzard <blizzard@redhat.com>
- Check the existence of programs before running post and postun
scripts for sub-packages.
* Mon Jan 15 2001 Christopher Blizzard <blizzard@redhat.com>
- Remove mozilla-specific rdf toolbar items
* Thu Jan 11 2001 Christopher Blizzard <blizzard@redhat.com>
- Re-add rm in clean
* Tue Jan 09 2001 Christopher Blizzard <blizzard@redhat.com>
- Change tip serial to 8 and 0.7 release serial to 7. This way we can
do upgrades properly.
* Mon Jan 08 2001 Christopher Blizzard <blizzard@redhat.com>
- Add explicit paths for rm and mkdir
* Sat Jan 06 2001 Christopher Blizzard <blizzard@redhat.com>
- Remove patch for -fshort-wchar problems and use
--disable-short-wchar until the next compiler release.
- Use cooler icons.
* Tue Jan 02 2001 Christopher Blizzard <blizzard@redhat.com>
- Add patch to get default home page on 6.2 builds, too.
* Mon Jan 01 2001 Christopher Blizzard <blizzard@redhat.com>
- Add patch to point default page at local file system and to point
mailnews at about:blank.
* Mon Jan 01 2001 Christopher Blizzard <blizzard@redhat.com>
- Add patch to remove debug menu from preferences.
* Sun Dec 31 2000 Christopher Blizzard <blizzard@redhat.com>
- Add patch to support building psm on ppc.
* Fri Dec 29 2000 Christopher Blizzard <blizzard@redhat.com>
- Add autoconf check for bad -fshort-wchar support in compiler.
- Clean up a lot of cruft in the spec file that I don't need anymore.
- Make regxpcom generated files non-config so that they aren't saved
as .rpmsave files.
* Thu Dec 28 2000 Christopher Blizzard <blizzard@redhat.com>
- Change the sparc patch to support sparc + sparc64.
* Thu Dec 28 2000 Christopher Blizzard <blizzard@redhat.com>
- Don't remove the CVS directories anymore since we're using the
package files now.
* Thu Dec 28 2000 Christopher Blizzard <blizzard@redhat.com>
- Breakout psm
- Re-add the sparc config patch.
* Wed Dec 20 2000 Christopher Blizzard <blizzard@redhat.com>
- Add a bunch of dir entries to make sure that we don't leave a lot of
crap behind when we uninstall the rpm.
* Tue Dec 19 2000 Christopher Blizzard <blizzard@redhat.com>
- Finish with mail/news breakout.
- Move component registration to package install time instead of at
package build time.
* Wed Dec 13 2000 Christopher Blizzard <blizzard@redhat.com>
- Break out mail/news
* Tue Dec 12 2000 Christopher Blizzard <blizzard@redhat.com>
- Remove Debug menus from mail/news, browser and editor.
* Mon Dec 11 2000 Christopher Blizzard <blizzard@redhat.com>
- Add new mozilla.sh script that tries to send commands to a running
instance first.
- Add desktop files and icons.
* Tue Dec 05 2000 Christopher Blizzard <blizzard@redhat.com>
- Build on only one CPU until the parallel build problems are worked
out.
- Don't try to build on ai64
* Thu Oct 26 2000 Bernhard Rosenkraenzer <bero@redhat.com>
- Fix build with new fileutils
* Fri Oct 13 2000 Christopher Blizzard <blizzard@redhat.com>
- Move to post M18 builds
* Mon Oct 2 2000 Christopher Blizzard <blizzard@redhat.com>
- start daily builds - remove the old patches
- delete installed directories for chrome since everything
is in jar files now.
* Fri Aug 18 2000 Matt Wilson <msw@redhat.com>
- added patch to work around va_arg mess on gcc 2.96
* Wed Aug 9 2000 Christopher Blizzard <blizzard@redhat.com>
- Use official M17 source tarball
* Tue Aug 8 2000 Christopher Blizzard <blizzard@redhat.com>
- Add patch to fix crash when viewing some rgba images
- Add patch to fix sign warnings in gtkmozembed.h header
* Mon Aug 7 2000 Christopher Blizzard <blizzard@redhat.com>
- Build M17 official
- Add patch to fix crash when viewing some png images
- Add patch to fix context menu popup grab behaviour
- Add patch to fix focus problems with the file upload widget
* Thu Jul 27 2000 Christopher Blizzard <blizzard@redhat.com>
- Update to M17 snapshot
* Mon Jul 24 2000 Christopher Blizzard <blizzard@redhat.com>
- Update to most recent snapshot
- Added chrome rdf hacks
* Tue Mar 14 2000 Bernhard Rosenkränzer <bero@redhat.com>
- initial RPM
* Thu Jun 20 2002 Christopher Blizzard <blizzard@redhat.com>
- Time for a new changelog.