summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--firefox-1.0-nspr-config.patch25
-rw-r--r--firefox.spec8
2 files changed, 32 insertions, 1 deletions
diff --git a/firefox-1.0-nspr-config.patch b/firefox-1.0-nspr-config.patch
new file mode 100644
index 0000000..8cf740b
--- /dev/null
+++ b/firefox-1.0-nspr-config.patch
@@ -0,0 +1,25 @@
+? nsprpub/config/system_wrappers
+Index: nsprpub/config/nspr-config.in
+===================================================================
+RCS file: /cvsroot/mozilla/nsprpub/config/nspr-config.in,v
+retrieving revision 1.2.2.2
+diff -d -u -p -r1.2.2.2 nspr-config.in
+--- nsprpub/config/nspr-config.in 28 Feb 2003 01:52:53 -0000 1.2.2.2
++++ nsprpub/config/nspr-config.in 4 Apr 2005 21:33:29 -0000
+@@ -3,6 +3,7 @@
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ exec_prefix_set=no
++libdir=@libdir@
+
+ major_version=@MOD_MAJOR_VERSION@
+ minor_version=@MOD_MINOR_VERSION@
+@@ -95,7 +96,7 @@ if test "$echo_cflags" = "yes"; then
+ fi
+
+ if test "$echo_libs" = "yes"; then
+- libdirs=-L${exec_prefix}/lib
++ libdirs=-L${libdir}
+ if test -n "$lib_plds"; then
+ libdirs="$libdirs -lplds${major_version}"
+ fi
diff --git a/firefox.spec b/firefox.spec
index 9035da5..2525994 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -10,7 +10,7 @@ ExclusiveArch: i386 x86_64 ia64 ppc s390 s390x
Summary: Mozilla Firefox Web browser.
Name: firefox
Version: 1.0.2
-Release: 3
+Release: 4
Epoch: 0
URL: http://www.mozilla.org/projects/firefox/
License: MPL/LGPL
@@ -36,6 +36,7 @@ Patch1: firefox-0.7.3-freetype-compile.patch
Patch2: firefox-1.0-prdtoa.patch
Patch3: firefox-1.0-gcc4-compile.patch
Patch4: firefox-1.0-recv-fortify.patch
+Patch5: firefox-1.0-nspr-config.patch
# customization patches
Patch20: firefox-redhat-homepage.patch
@@ -116,6 +117,7 @@ compliance, performance and portability.
%patch2 -p0
%patch3 -p0
%patch4 -p0
+%patch5 -p0
%patch20 -p0
%patch21 -p1
%patch22 -p1
@@ -330,6 +332,10 @@ fi
#---------------------------------------------------------------------
%changelog
+* Tue Apr 12 2005 Christopher Aillon <caillon@redhat.com> 0:1.0.2-4
+- Update useragent patch to match upstream.
+- Add nspr-config 64 bit patch from rstrode@redhat.com
+
* Mon Mar 28 2005 Christopher Aillon <caillon@redhat.com> 0:1.0.2-3
- Updated firefox icon (https://bugzilla.mozilla.org/show_bug.cgi?id=261679)
- Fix for some more cursor issues in textareas (149991, 150002, 152089)
bgstack15