rpms/seamonkey/FC-4 seamonkey-configure.patch, 1.1, 1.2 seamonkey-mozconfig, 1.1, 1.2 seamonkey.spec, 1.2, 1.3
Kai Engert (kengert)
fedora-extras-commits at redhat.com
Wed Apr 12 15:49:31 UTC 2006
Author: kengert
Update of /cvs/extras/rpms/seamonkey/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15333
Modified Files:
seamonkey-configure.patch seamonkey-mozconfig seamonkey.spec
Log Message:
* Wed Apr 12 2006 Kai Engert <kengert at redhat.com> 1.0-11.fc4.1
- Fix spec and patches to work with FC-4
seamonkey-configure.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.1 -r 1.2 seamonkey-configure.patch
Index: seamonkey-configure.patch
===================================================================
RCS file: /cvs/extras/rpms/seamonkey/FC-4/seamonkey-configure.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- seamonkey-configure.patch 10 Apr 2006 21:58:25 -0000 1.1
+++ seamonkey-configure.patch 12 Apr 2006 15:49:31 -0000 1.2
@@ -1,33 +1,6 @@
---- mozilla/configure.ac213 2006-02-10 09:14:59.000000000 +0100
-+++ mozilla/configure 2006-02-10 09:15:01.000000000 +0100
-@@ -941,7 +941,7 @@
- fi
-
- echo $ac_n "checking host system type""... $ac_c" 1>&6
--echo "configure:938: checking host system type" >&5
-+echo "configure:945: checking host system type" >&5
-
- host_alias=$host
- case "$host_alias" in
-@@ -962,7 +962,7 @@
- echo "$ac_t""$host" 1>&6
-
- echo $ac_n "checking target system type""... $ac_c" 1>&6
--echo "configure:959: checking target system type" >&5
-+echo "configure:966: checking target system type" >&5
-
- target_alias=$target
- case "$target_alias" in
-@@ -980,7 +980,7 @@
- echo "$ac_t""$target" 1>&6
-
- echo $ac_n "checking build system type""... $ac_c" 1>&6
--echo "configure:977: checking build system type" >&5
-+echo "configure:984: checking build system type" >&5
-
- build_alias=$build
- case "$build_alias" in
-@@ -1050,12 +1050,12 @@
+--- mozilla/configure.pre1 2006-04-12 13:11:17.000000000 +0200
++++ mozilla/configure 2006-04-12 13:11:22.000000000 +0200
+@@ -1042,7 +1042,7 @@
LIBGNOME_VERSION=2.0
MISSING_X=
@@ -36,280 +9,7 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1051: checking for $ac_word" >&5
-+echo "configure:1059: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1153,7 +1153,7 @@
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1149: checking for $ac_word" >&5
-+echo "configure:1157: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_path_NSINSTALL_BIN'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1226,13 +1226,13 @@
- _SAVE_LDFLAGS="$LDFLAGS"
-
- echo $ac_n "checking for host c compiler""... $ac_c" 1>&6
--echo "configure:1222: checking for host c compiler" >&5
-+echo "configure:1230: checking for host c compiler" >&5
- for ac_prog in $HOST_CC gcc cc /usr/ucb/cc cl icc
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1228: checking for $ac_word" >&5
-+echo "configure:1236: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_HOST_CC'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1267,13 +1267,13 @@
- fi
- echo "$ac_t""$HOST_CC" 1>&6
- echo $ac_n "checking for host c++ compiler""... $ac_c" 1>&6
--echo "configure:1263: checking for host c++ compiler" >&5
-+echo "configure:1271: checking for host c++ compiler" >&5
- for ac_prog in $HOST_CXX $CCC c++ g++ gcc CC cxx cc++ cl icc
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1269: checking for $ac_word" >&5
-+echo "configure:1277: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_HOST_CXX'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1322,7 +1322,7 @@
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1318: checking for $ac_word" >&5
-+echo "configure:1326: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_HOST_RANLIB'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1357,7 +1357,7 @@
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1353: checking for $ac_word" >&5
-+echo "configure:1361: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_HOST_AR'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1392,16 +1392,16 @@
- LDFLAGS="$HOST_LDFLAGS"
-
- echo $ac_n "checking whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works""... $ac_c" 1>&6
--echo "configure:1388: checking whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works" >&5
-+echo "configure:1396: checking whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works" >&5
- cat > conftest.$ac_ext <<EOF
--#line 1390 "configure"
-+#line 1398 "configure"
- #include "confdefs.h"
-
- int main() {
- return(0);
- ; return 0; }
- EOF
--if { (eval echo configure:1397: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:1405: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- ac_cv_prog_hostcc_works=1 echo "$ac_t""yes" 1>&6
- else
-@@ -1416,16 +1416,16 @@
- CFLAGS="$HOST_CXXFLAGS"
-
- echo $ac_n "checking whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works""... $ac_c" 1>&6
--echo "configure:1412: checking whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works" >&5
-+echo "configure:1420: checking whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works" >&5
- cat > conftest.$ac_ext <<EOF
--#line 1414 "configure"
-+#line 1422 "configure"
- #include "confdefs.h"
-
- int main() {
- return(0);
- ; return 0; }
- EOF
--if { (eval echo configure:1421: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:1429: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- ac_cv_prog_hostcxx_works=1 echo "$ac_t""yes" 1>&6
- else
-@@ -1445,7 +1445,7 @@
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1441: checking for $ac_word" >&5
-+echo "configure:1449: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1479,7 +1479,7 @@
- # Extract the first word of "gcc", so it can be a program name with args.
- set dummy gcc; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1475: checking for $ac_word" >&5
-+echo "configure:1483: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1509,7 +1509,7 @@
- # Extract the first word of "cc", so it can be a program name with args.
- set dummy cc; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1505: checking for $ac_word" >&5
-+echo "configure:1513: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1560,7 +1560,7 @@
- # Extract the first word of "cl", so it can be a program name with args.
- set dummy cl; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1556: checking for $ac_word" >&5
-+echo "configure:1564: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1592,7 +1592,7 @@
- fi
-
- echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
--echo "configure:1588: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
-+echo "configure:1596: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
-
- ac_ext=c
- # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-@@ -1603,12 +1603,12 @@
[...6212 lines suppressed...]
for ac_func in _getb67 GETB67 getb67; do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:18116: checking for $ac_func" >&5
-+echo "configure:18430: checking for $ac_func" >&5
++echo "configure:18305: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 18121 "configure"
-+#line 18435 "configure"
++#line 18310 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
-@@ -18265,7 +18454,7 @@
+@@ -18140,7 +18329,7 @@
; return 0; }
EOF
-if { (eval echo configure:18144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:18458: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:18333: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
-@@ -18292,7 +18481,7 @@
+@@ -18167,7 +18356,7 @@
fi
echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:18171: checking stack direction for C alloca" >&5
-+echo "configure:18485: checking stack direction for C alloca" >&5
++echo "configure:18360: checking stack direction for C alloca" >&5
if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
-@@ -18300,7 +18489,7 @@
+@@ -18175,7 +18364,7 @@
ac_cv_c_stack_direction=0
else
cat > conftest.$ac_ext <<EOF
-#line 18179 "configure"
-+#line 18493 "configure"
++#line 18368 "configure"
#include "confdefs.h"
find_stack_direction ()
{
-@@ -18319,7 +18508,7 @@
+@@ -18194,7 +18383,7 @@
exit (find_stack_direction() < 0);
}
EOF
-if { (eval echo configure:18198: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:18512: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:18387: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_c_stack_direction=1
else
-@@ -18368,17 +18557,17 @@
+@@ -18243,17 +18432,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:18247: checking for $ac_hdr" >&5
-+echo "configure:18561: checking for $ac_hdr" >&5
++echo "configure:18436: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 18252 "configure"
-+#line 18566 "configure"
++#line 18441 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:18257: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:18571: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:18446: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
-@@ -18458,7 +18647,7 @@
+@@ -18333,7 +18522,7 @@
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:18337: checking for $ac_word" >&5
-+echo "configure:18651: checking for $ac_word" >&5
++echo "configure:18526: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
-@@ -18502,19 +18691,19 @@
+@@ -18377,19 +18566,19 @@
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
echo $ac_n "checking for cairo >= $CAIRO_VERSION""... $ac_c" 1>&6
-echo "configure:18381: checking for cairo >= $CAIRO_VERSION" >&5
-+echo "configure:18695: checking for cairo >= $CAIRO_VERSION" >&5
++echo "configure:18570: checking for cairo >= $CAIRO_VERSION" >&5
if $PKG_CONFIG --exists "cairo >= $CAIRO_VERSION" ; then
echo "$ac_t""yes" 1>&6
@@ -5615,31 +5297,31 @@
echo $ac_n "checking CAIRO_CFLAGS""... $ac_c" 1>&6
-echo "configure:18388: checking CAIRO_CFLAGS" >&5
-+echo "configure:18702: checking CAIRO_CFLAGS" >&5
++echo "configure:18577: checking CAIRO_CFLAGS" >&5
CAIRO_CFLAGS=`$PKG_CONFIG --cflags "cairo >= $CAIRO_VERSION"`
echo "$ac_t""$CAIRO_CFLAGS" 1>&6
echo $ac_n "checking CAIRO_LIBS""... $ac_c" 1>&6
-echo "configure:18393: checking CAIRO_LIBS" >&5
-+echo "configure:18707: checking CAIRO_LIBS" >&5
++echo "configure:18582: checking CAIRO_LIBS" >&5
## don't use --libs since that can do evil things like add
## -Wl,--export-dynamic
CAIRO_LIBS="`$PKG_CONFIG --libs-only-L \"cairo >= $CAIRO_VERSION\"` `$PKG_CONFIG --libs-only-l \"cairo >= $CAIRO_VERSION\"`"
-@@ -18579,7 +18768,7 @@
+@@ -18454,7 +18643,7 @@
# Extract the first word of "python", so it can be a program name with args.
set dummy python; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:18458: checking for $ac_word" >&5
-+echo "configure:18772: checking for $ac_word" >&5
++echo "configure:18647: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_PYTHON'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
-@@ -18840,14 +19029,14 @@
+@@ -18715,14 +18904,14 @@
cross_compiling=$ac_cv_prog_cc_cross
cat > conftest.$ac_ext <<EOF
-#line 18719 "configure"
-+#line 19033 "configure"
++#line 18908 "configure"
#include "confdefs.h"
#include <gmodule.h>
int main() {
@@ -5647,40 +5329,29 @@
; return 0; }
EOF
-if { (eval echo configure:18726: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:19040: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:18915: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
:
else
echo "configure: failed program was:" >&5
-@@ -19113,6 +19302,10 @@
-
-
-
-+
-+
-+
-+
- cat >> confdefs.h <<EOF
- #define MOZ_DLL_SUFFIX "$DLL_SUFFIX"
- EOF
-@@ -19140,7 +19333,7 @@
+@@ -19015,7 +19204,7 @@
_SAVE_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS $XCFLAGS"
cat > conftest.$ac_ext <<EOF
-#line 19019 "configure"
-+#line 19337 "configure"
++#line 19208 "configure"
#include "confdefs.h"
#include <stdio.h>
-@@ -19156,7 +19349,7 @@
+@@ -19031,7 +19220,7 @@
; return 0; }
EOF
-if { (eval echo configure:19035: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:19353: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:19224: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
:
else
echo "configure: failed program was:" >&5
-@@ -19373,15 +19566,34 @@
+@@ -19248,15 +19437,34 @@
# Transform confdefs.h into DEFS.
# Protect against shell expansion while executing Makefile rules.
# Protect against Makefile macro expansion.
@@ -5724,7 +5395,7 @@
MOZ_DEFINES=$DEFS
-@@ -19663,12 +19875,13 @@
+@@ -19535,12 +19743,13 @@
s%@MOZ_ENABLE_FREETYPE2@%$MOZ_ENABLE_FREETYPE2%g
s%@MOZ_XFT_CFLAGS@%$MOZ_XFT_CFLAGS%g
s%@MOZ_XFT_LIBS@%$MOZ_XFT_LIBS%g
Index: seamonkey-mozconfig
===================================================================
RCS file: /cvs/extras/rpms/seamonkey/FC-4/seamonkey-mozconfig,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- seamonkey-mozconfig 10 Apr 2006 21:58:25 -0000 1.1
+++ seamonkey-mozconfig 12 Apr 2006 15:49:31 -0000 1.2
@@ -1,5 +1,3 @@
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
ac_add_options --with-system-jpeg
ac_add_options --with-system-zlib
ac_add_options --with-system-png
Index: seamonkey.spec
===================================================================
RCS file: /cvs/extras/rpms/seamonkey/FC-4/seamonkey.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- seamonkey.spec 11 Apr 2006 14:57:49 -0000 1.2
+++ seamonkey.spec 12 Apr 2006 15:49:31 -0000 1.3
@@ -1,6 +1,4 @@
%define desktop_file_utils_version 0.9
-%define nspr_version 4.6
-%define nss_version 3.11
%define pango_version 1.6.0
%define _unpackaged_files_terminate_build 0
@@ -10,7 +8,7 @@
Name: seamonkey
Summary: Web browser, e-mail, news, IRC client, HTML editor
Version: 1.0
-Release: 11%{?dist}
+Release: 11.fc4.1
URL: http://www.mozilla.org/projects/seamonkey/
License: MPL
Group: Applications/Internet
@@ -23,15 +21,11 @@
Source10: seamonkey-mozconfig
Source12: seamonkey-mail.desktop
Source13: seamonkey-mail-icon.png
-Source17: mozilla-psm-exclude-list
-Source18: mozilla-xpcom-exclude-list
Source19: seamonkey-fedora-default-bookmarks.html
Source20: seamonkey-fedora-default-prefs.js
Source100: find-external-requires
Patch1: firefox-1.0-prdtoa.patch
-Patch3: firefox-1.1-nss-system-nspr.patch
-Patch4: firefox-1.5-with-system-nss.patch
Patch5: seamonkey-disable-visibility.patch
Patch6: firefox-1.5.0.1-dumpstack.patch
Patch21: firefox-0.7.3-default-plugin-less-annoying.patch
@@ -42,7 +36,6 @@
Patch101: thunderbird-0.7.3-gnome-uriloader.patch
Patch102: thunderbird-1.5-bug304720.patch
Patch220: seamonkey-fedora-home-page.patch
-Patch225: mozilla-nspr-packages.patch
Patch227: mozilla-1.4.1-ppc64.patch
Patch301: mozilla-1.7.3-gnome-vfs-default-app.patch
Patch304: mozilla-1.7.5-g-application-name.patch
@@ -57,10 +50,8 @@
BuildRequires: libIDL-devel
BuildRequires: glib2-devel
BuildRequires: gtk2-devel
-BuildRequires: libXt-devel
+BuildRequires: xorg-x11-devel
BuildRequires: pango-devel >= %{pango_version}
-BuildRequires: nspr-devel >= %{nspr_version}
-BuildRequires: nss-devel >= %{nss_version}
BuildRequires: fileutils
BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
PreReq: desktop-file-utils >= %{desktop_file_utils_version}
@@ -81,8 +72,6 @@
%setup -q -n mozilla
%patch1 -p0
-%patch3 -p1
-%patch4 -p1
# Pragma visibility is broken on most platforms for some reason.
# It works on i386 so leave it alone there. Disable elsewhere.
@@ -100,7 +89,6 @@
%patch101 -p1 -b .gnome-uriloader
%patch102 -p1
%patch220 -p1
-%patch225 -p1
%patch227 -p1
%patch301 -p1
%patch304 -p0
@@ -175,8 +163,7 @@
%{SOURCE7} --package xpcom --output-file %{builddir}/seamonkey.list \
--package-file $RPM_BUILD_DIR/mozilla/xpinstall/packager/packages-unix \
--install-dir $RPM_BUILD_ROOT/%{mozdir} \
- --install-root %{mozdir} \
- --exclude-file=%{SOURCE18}
+ --install-root %{mozdir}
%{SOURCE7} --package browser --output-file %{builddir}/seamonkey.list \
--package-file $RPM_BUILD_DIR/mozilla/xpinstall/packager/packages-unix \
@@ -191,8 +178,7 @@
%{SOURCE7} --package psm --output-file %{builddir}/seamonkey.list \
--package-file $RPM_BUILD_DIR/mozilla/xpinstall/packager/packages-unix \
--install-dir $RPM_BUILD_ROOT/%{mozdir} \
- --install-root %{mozdir} \
- --exclude-file=%{SOURCE17}
+ --install-root %{mozdir}
%{SOURCE7} --package mail --output-file %{builddir}/seamonkey.list \
--package-file $RPM_BUILD_DIR/mozilla/xpinstall/packager/packages-unix \
@@ -408,6 +394,8 @@
%changelog
+* Wed Apr 12 2006 Kai Engert <kengert at redhat.com> 1.0-11.fc4.1
+- Fix spec and patches to work with FC-4
* Tue Apr 11 2006 Kai Engert <kengert at redhat.com> 1.0-11
- Fix PreReq statements
* Tue Apr 11 2006 Kai Engert <kengert at redhat.com> 1.0-10
More information about the scm-commits
mailing list