rpms/xulrunner/OLPC-3 mozilla-pkgconfig.patch, 1.10, 1.11 sources, 1.51, 1.52 xulrunner-version.patch, 1.1, 1.2 xulrunner.spec, 1.132, 1.133
Marco Pesenti Gritti
mpg at fedoraproject.org
Thu Sep 25 21:43:56 UTC 2008
Author: mpg
Update of /cvs/pkgs/rpms/xulrunner/OLPC-3
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8814
Modified Files:
mozilla-pkgconfig.patch sources xulrunner-version.patch
xulrunner.spec
Log Message:
* Thu Sep 25 2008 Marco Pesenti Gritti <mpg at redhat.com> - 1.9.0.2-1
- Update to 1.9.0.2
mozilla-pkgconfig.patch:
Index: mozilla-pkgconfig.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/OLPC-3/mozilla-pkgconfig.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- mozilla-pkgconfig.patch 29 Jan 2008 16:25:09 -0000 1.10
+++ mozilla-pkgconfig.patch 25 Sep 2008 21:43:56 -0000 1.11
@@ -1,6 +1,6 @@
diff -up mozilla/config/autoconf.mk.in.pk mozilla/config/autoconf.mk.in
---- mozilla/config/autoconf.mk.in.pk 2008-01-22 03:50:04.000000000 +0100
-+++ mozilla/config/autoconf.mk.in 2008-01-29 17:18:01.000000000 +0100
+--- mozilla/config/autoconf.mk.in.pk 2008-05-05 23:08:14.000000000 +0200
++++ mozilla/config/autoconf.mk.in 2008-06-26 13:38:41.000000000 +0200
@@ -58,14 +58,14 @@ MOZ_PKG_SPECIAL = @MOZ_PKG_SPECIAL@
prefix = @prefix@
exec_prefix = @exec_prefix@
@@ -19,19 +19,46 @@
DIST = $(DEPTH)/dist
LIBXUL_SDK = @LIBXUL_SDK@
-diff -up mozilla/xulrunner/installer/mozilla-gtkmozembed.pc.in.pk mozilla/xulrunner/installer/mozilla-gtkmozembed.pc.in
---- mozilla/xulrunner/installer/mozilla-gtkmozembed.pc.in.pk 2008-01-10 10:17:49.000000000 +0100
-+++ mozilla/xulrunner/installer/mozilla-gtkmozembed.pc.in 2008-01-29 17:19:25.000000000 +0100
-@@ -1,5 +1,6 @@
+diff -up mozilla/xulrunner/installer/libxul-embedding.pc.in.pk mozilla/xulrunner/installer/libxul-embedding.pc.in
+--- mozilla/xulrunner/installer/libxul-embedding.pc.in.pk 2007-08-03 16:46:28.000000000 +0200
++++ mozilla/xulrunner/installer/libxul-embedding.pc.in 2008-06-26 13:41:12.000000000 +0200
+@@ -1,7 +1,7 @@
prefix=%prefix%
sdkdir=%sdkdir%
-+libdir=%libdir%
includedir=%includedir%
+-idldir=%idldir%
++idldir=%idldir%/stable
+ includetype=stable
- Name: mozilla-gtkembedmoz
+ # Note: the default pkg-config cflags will only list include directories
+@@ -11,5 +11,6 @@ includetype=stable
+ Name: libxul-embedding
+ Description: Static library for version-independent embedding of the Mozilla runtime
+ Version: %MOZILLA_VERSION%
+-Libs: -L${sdkdir}/lib -lxpcomglue
++Requires: %NSPR_NAME% >= %NSPR_VERSION%
++Libs: -L${sdkdir}/sdk/lib -lxpcomglue
+ Cflags: -DXPCOM_GLUE -I${includedir}/${includetype} -fshort-wchar
+diff -up mozilla/xulrunner/installer/libxul-embedding-unstable.pc.in.pk mozilla/xulrunner/installer/libxul-embedding-unstable.pc.in
+--- mozilla/xulrunner/installer/libxul-embedding-unstable.pc.in.pk 2008-01-05 07:50:34.000000000 +0100
++++ mozilla/xulrunner/installer/libxul-embedding-unstable.pc.in 2008-06-26 13:41:25.000000000 +0200
+@@ -1,11 +1,12 @@
+ prefix=%prefix%
+ sdkdir=%sdkdir%
+ includedir=%includedir%
+-idldir=%idldir%
++idldir=%idldir%/unstable
+ includetype=unstable
+
+ Name: libxul-embedding-unstable
+ Description: Static library for version-independent embedding of the Mozilla runtime (unstable API)
+ Version: %MOZILLA_VERSION%
++Requires: %NSPR_NAME% >= %NSPR_VERSION%
+ Libs: -L${sdkdir}/lib -lxpcomglue
+ Cflags: -DXPCOM_GLUE -I${includedir}/${includetype} -fshort-wchar
diff -up mozilla/xulrunner/installer/libxul.pc.in.pk mozilla/xulrunner/installer/libxul.pc.in
--- mozilla/xulrunner/installer/libxul.pc.in.pk 2007-08-03 16:46:28.000000000 +0200
-+++ mozilla/xulrunner/installer/libxul.pc.in 2008-01-29 17:18:01.000000000 +0100
++++ mozilla/xulrunner/installer/libxul.pc.in 2008-06-26 13:38:41.000000000 +0200
@@ -1,7 +1,8 @@
prefix=%prefix%
sdkdir=%sdkdir%
@@ -50,20 +77,9 @@
+Libs: -L${sdkdir}/sdk/lib -lxpcomglue_s -lxul -lxpcom
Cflags: -I${includedir}/${includetype} -fshort-wchar
\ No newline at end of file
-diff -up mozilla/xulrunner/installer/Makefile.in.pk mozilla/xulrunner/installer/Makefile.in
---- mozilla/xulrunner/installer/Makefile.in.pk 2008-01-29 17:18:01.000000000 +0100
-+++ mozilla/xulrunner/installer/Makefile.in 2008-01-29 17:18:01.000000000 +0100
-@@ -117,6 +117,7 @@ endif
- -e "s|%includedir%|$(includedir)|" \
- -e "s|%idldir%|$(idldir)|" \
- -e "s|%sdkdir%|$(sdkdir)|" \
-+ -e "s|%libdir%|$(installdir)|" \
- -e "s|%MOZ_APP_NAME%|$(MOZ_APP_NAME)|" \
- -e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \
- -e "s|%FULL_NSPR_LIBS%|$(FULL_NSPR_LIBS)|" \
diff -up mozilla/xulrunner/installer/libxul-unstable.pc.in.pk mozilla/xulrunner/installer/libxul-unstable.pc.in
--- mozilla/xulrunner/installer/libxul-unstable.pc.in.pk 2008-01-05 07:50:34.000000000 +0100
-+++ mozilla/xulrunner/installer/libxul-unstable.pc.in 2008-01-29 17:18:01.000000000 +0100
++++ mozilla/xulrunner/installer/libxul-unstable.pc.in 2008-06-26 13:38:41.000000000 +0200
@@ -1,7 +1,8 @@
prefix=%prefix%
sdkdir=%sdkdir%
@@ -74,40 +90,40 @@
includetype=unstable
Name: libxul
-diff -up mozilla/xulrunner/installer/libxul-embedding-unstable.pc.in.pk mozilla/xulrunner/installer/libxul-embedding-unstable.pc.in
---- mozilla/xulrunner/installer/libxul-embedding-unstable.pc.in.pk 2008-01-05 07:50:34.000000000 +0100
-+++ mozilla/xulrunner/installer/libxul-embedding-unstable.pc.in 2008-01-29 17:18:01.000000000 +0100
-@@ -1,7 +1,7 @@
+diff -up mozilla/xulrunner/installer/Makefile.in.pk mozilla/xulrunner/installer/Makefile.in
+--- mozilla/xulrunner/installer/Makefile.in.pk 2008-04-10 16:50:48.000000000 +0200
++++ mozilla/xulrunner/installer/Makefile.in 2008-06-26 13:38:41.000000000 +0200
+@@ -116,6 +116,7 @@ endif
+ -e "s|%includedir%|$(includedir)|" \
+ -e "s|%idldir%|$(idldir)|" \
+ -e "s|%sdkdir%|$(sdkdir)|" \
++ -e "s|%libdir%|$(installdir)|" \
+ -e "s|%MOZ_APP_NAME%|$(MOZ_APP_NAME)|" \
+ -e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \
+ -e "s|%FULL_NSPR_LIBS%|$(FULL_NSPR_LIBS)|" \
+diff -up mozilla/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in.pk mozilla/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in
+--- mozilla/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in.pk 2008-01-10 10:17:49.000000000 +0100
++++ mozilla/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in 2008-06-26 13:38:41.000000000 +0200
+@@ -1,5 +1,6 @@
prefix=%prefix%
sdkdir=%sdkdir%
++libdir=%libdir%
includedir=%includedir%
--idldir=%idldir%
-+idldir=%idldir%/unstable
- includetype=unstable
- Name: libxul-embedding-unstable
-diff -up mozilla/xulrunner/installer/libxul-embedding.pc.in.pk mozilla/xulrunner/installer/libxul-embedding.pc.in
---- mozilla/xulrunner/installer/libxul-embedding.pc.in.pk 2007-08-03 16:46:28.000000000 +0200
-+++ mozilla/xulrunner/installer/libxul-embedding.pc.in 2008-01-29 17:18:01.000000000 +0100
-@@ -1,7 +1,7 @@
+ Name: mozilla-gtkembedmoz
+diff -up mozilla/xulrunner/installer/mozilla-gtkmozembed.pc.in.pk mozilla/xulrunner/installer/mozilla-gtkmozembed.pc.in
+--- mozilla/xulrunner/installer/mozilla-gtkmozembed.pc.in.pk 2008-01-10 10:17:49.000000000 +0100
++++ mozilla/xulrunner/installer/mozilla-gtkmozembed.pc.in 2008-06-26 13:38:41.000000000 +0200
+@@ -1,5 +1,6 @@
prefix=%prefix%
sdkdir=%sdkdir%
++libdir=%libdir%
includedir=%includedir%
--idldir=%idldir%
-+idldir=%idldir%/stable
- includetype=stable
- # Note: the default pkg-config cflags will only list include directories
-@@ -11,5 +11,5 @@ includetype=stable
- Name: libxul-embedding
- Description: Static library for version-independent embedding of the Mozilla runtime
- Version: %MOZILLA_VERSION%
--Libs: -L${sdkdir}/lib -lxpcomglue
-+Libs: -L${sdkdir}/sdk/lib -lxpcomglue
- Cflags: -DXPCOM_GLUE -I${includedir}/${includetype} -fshort-wchar
+ Name: mozilla-gtkembedmoz
diff -up mozilla/xulrunner/installer/mozilla-js.pc.in.pk mozilla/xulrunner/installer/mozilla-js.pc.in
--- mozilla/xulrunner/installer/mozilla-js.pc.in.pk 2007-08-03 16:46:28.000000000 +0200
-+++ mozilla/xulrunner/installer/mozilla-js.pc.in 2008-01-29 17:18:01.000000000 +0100
++++ mozilla/xulrunner/installer/mozilla-js.pc.in 2008-06-26 13:38:41.000000000 +0200
@@ -6,5 +6,5 @@ Name: JavaScript
Description: The Mozilla JavaScript Library
Version: %MOZILLA_VERSION%
@@ -116,19 +132,9 @@
-Cflags: -I${includedir}/stable -DXP_UNIX -DJS_THREADSAFE
+Libs: -L${sdkdir}/sdk/lib -lmozjs
+Cflags: -I${includedir}/stable -I${includedir}/js -DXP_UNIX -DJS_THREADSAFE
-diff -up mozilla/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in.pk mozilla/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in
---- mozilla/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in.pk 2008-01-10 10:17:49.000000000 +0100
-+++ mozilla/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in 2008-01-29 17:19:04.000000000 +0100
-@@ -1,5 +1,6 @@
- prefix=%prefix%
- sdkdir=%sdkdir%
-+libdir=%libdir%
- includedir=%includedir%
-
- Name: mozilla-gtkembedmoz
diff -up mozilla/xulrunner/installer/mozilla-plugin.pc.in.pk mozilla/xulrunner/installer/mozilla-plugin.pc.in
--- mozilla/xulrunner/installer/mozilla-plugin.pc.in.pk 2007-08-03 16:46:28.000000000 +0200
-+++ mozilla/xulrunner/installer/mozilla-plugin.pc.in 2008-01-29 17:18:01.000000000 +0100
++++ mozilla/xulrunner/installer/mozilla-plugin.pc.in 2008-06-26 13:38:41.000000000 +0200
@@ -6,4 +6,4 @@ Name: Mozilla Plug-In API
Description: Mozilla Plug-In API
Version: %MOZILLA_VERSION%
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/OLPC-3/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- sources 20 Jun 2008 12:18:07 -0000 1.51
+++ sources 25 Sep 2008 21:43:56 -0000 1.52
@@ -1 +1 @@
-b514375509fd439e44def1e4a7873af4 xulrunner-1.9-source.tar.bz2
+0a6c68a5ab5b065fef221b586b8a3b8a xulrunner-1.9.0.2-source.tar.bz2
xulrunner-version.patch:
Index: xulrunner-version.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/OLPC-3/xulrunner-version.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xulrunner-version.patch 14 Dec 2007 10:24:02 -0000 1.1
+++ xulrunner-version.patch 25 Sep 2008 21:43:56 -0000 1.2
@@ -6,7 +6,7 @@
include $(DEPTH)/config/autoconf.mk
-+MOZ_APP_VERSION="1.9pre"
++MOZ_APP_VERSION="1.9"
+
NO_PKG_FILES = \
xulrunner-config \
Index: xulrunner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/OLPC-3/xulrunner.spec,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- xulrunner.spec 25 Aug 2008 13:44:08 -0000 1.132
+++ xulrunner.spec 25 Sep 2008 21:43:56 -0000 1.133
@@ -1,5 +1,5 @@
-%define nspr_version 4.6.99
-%define nss_version 3.11.99.5
+%define nspr_version 4.7.1
+%define nss_version 3.12.1.1
%define cairo_version 0.5
%define version_internal 1.9
@@ -7,12 +7,12 @@
Summary: XUL Runtime for Gecko Applications
Name: xulrunner
-Version: 1.9
-Release: 1%{?dist}.4
-URL: http://www.mozilla.org/projects/xulrunner/
+Version: 1.9.0.2
+Release: 1%{?dist}
+URL: http://developer.mozilla.org/En/XULRunner
License: MPLv1.1 or GPLv2+ or LGPLv2+
Group: Applications/Internet
-Source0: xulrunner-1.9-source.tar.bz2
+Source0: xulrunner-%{version}-source.tar.bz2
Source10: %{name}-mozconfig
Source12: %{name}-redhat-default-prefs.js
Source21: %{name}.sh.in
@@ -21,6 +21,7 @@
# build patches
Patch1: mozilla-build.patch
Patch2: xulrunner-path.patch
+Patch3: xulrunner-version.patch
Patch4: mozilla-sqlite.patch
Patch5: mozilla-mochitest.patch
@@ -119,6 +120,7 @@
cd mozilla
%patch1 -p1 -b .build
%patch2 -p1 -b .path
+%patch3 -p1 -b .version
%patch4 -p1 -b .sqlite
autoconf-2.13
%patch5 -p1 -b .mochitest
@@ -126,7 +128,7 @@
%patch10 -p1 -b .pk
%patch26 -p1 -b .ps-pdf-simplify-operators
-%patch27 -p1 -b .ssl-exception
+#%patch27 -p1 -b .ssl-exception
%patch201 -p0 -b .no-native-theme
%patch202 -p0 -b .dpi
@@ -213,7 +215,7 @@
$RPM_BUILD_ROOT/%{_includedir}/${INTERNAL_APP_SDK_NAME}
# Fix multilib devel conflicts...
-%ifarch x86_64 ia64 s390x ppc64
+%ifarch x86_64 ia64 s390x ppc64 sparc64
%define mozbits 64
%else
%define mozbits 32
@@ -224,7 +226,7 @@
mv ${genheader}.h ${genheader}%{mozbits}.h
cat > ${genheader}.h << EOF
// This file exists to fix multilib conflicts
-#if defined(__x86_64__) || defined(__ia64__) || defined(__s390x__) || defined(__powerpc64__)
+#if defined(__x86_64__) || defined(__ia64__) || defined(__s390x__) || defined(__powerpc64__) ||defined(__sparc__) && defined(__arch64__)
#include "${genheader}64.h"
#else
#include "${genheader}32.h"
@@ -282,7 +284,7 @@
popd
# GRE stuff
-%ifarch x86_64 ia64 ppc64 s390x
+%ifarch x86_64 ia64 ppc64 s390x sparc64
%define gre_conf_file gre64.conf
%else
%define gre_conf_file gre.conf
@@ -294,7 +296,7 @@
chmod 644 $RPM_BUILD_ROOT/etc/gre.d/%{gre_conf_file}
# Library path
-%ifarch x86_64 ia64 ppc64 s390x
+%ifarch x86_64 ia64 ppc64 s390x sparc64
%define ld_conf_file xulrunner-64.conf
%else
%define ld_conf_file xulrunner-32.conf
@@ -417,6 +419,9 @@
#---------------------------------------------------------------------
%changelog
+* Thu Sep 25 2008 Marco Pesenti Gritti <mpg at redhat.com> - 1.9.0.2-1
+- Update to 1.9.0.2
+
* Mon Aug 25 2008 Simon Schampijer <simon at laptop.org> - 1.9-1.4
- make the theme fill in trough for horizontal scrollbar 7871
More information about the fedora-extras-commits
mailing list