rpms/xulrunner/devel xulrunner-mozconfig-debuginfo, NONE, 1.1 .cvsignore, 1.83, 1.84 sources, 1.86, 1.87 xulrunner.spec, 1.200, 1.201

Jan Horak xhorak at fedoraproject.org
Tue Jun 22 15:36:32 UTC 2010


Author: xhorak

Update of /cvs/pkgs/rpms/xulrunner/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv1240

Modified Files:
	.cvsignore sources xulrunner.spec 
Added Files:
	xulrunner-mozconfig-debuginfo 
Log Message:
Update to 1.9.2.4


--- NEW FILE xulrunner-mozconfig-debuginfo ---
# For mozilla's debuginfo:
export CFLAGS="-gstabs+"
export CXXFLAGS="-gstabs+"
export MOZ_DEBUG_SYMBOLS=1
ac_add_options --enable-crashreporter


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/devel/.cvsignore,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- .cvsignore	2 Apr 2010 19:35:03 -0000	1.83
+++ .cvsignore	22 Jun 2010 15:36:31 -0000	1.84
@@ -1,2 +1,3 @@
 xulrunner-1.9.2.2.source.tar.bz2
 xulrunner-1.9.2.3.source.tar.bz2
+xulrunner-1.9.2.4.source.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/devel/sources,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -p -r1.86 -r1.87
--- sources	2 Apr 2010 19:35:03 -0000	1.86
+++ sources	22 Jun 2010 15:36:32 -0000	1.87
@@ -1 +1 @@
-5e4541ab23084b7b14ba228291ce2688  xulrunner-1.9.2.3.source.tar.bz2
+66b1610362ed6009d66fe762645679a0  xulrunner-1.9.2.4.source.tar.bz2


Index: xulrunner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/devel/xulrunner.spec,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -p -r1.200 -r1.201
--- xulrunner.spec	15 Jun 2010 13:02:38 -0000	1.200
+++ xulrunner.spec	22 Jun 2010 15:36:32 -0000	1.201
@@ -5,6 +5,7 @@
 %define freetype_version 2.1.9
 %define sqlite_version 3.6.16
 %define tarballdir mozilla-1.9.2
+%define include_debuginfo       0
 
 # The actual sqlite version (see #480989):
 %global sqlite_build_version %(pkg-config --silence-errors --modversion sqlite3 2>/dev/null || echo 65536)
@@ -14,14 +15,15 @@
 
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner
-Version:        1.9.2.3
-Release:        2%{?pretag}%{?dist}
+Version:        1.9.2.4
+Release:        1%{?pretag}%{?dist}
 URL:            http://developer.mozilla.org/En/XULRunner
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
 # You can get sources at ftp://ftp.mozilla.org/pub/firefox/releases/%{version}%{?pretag}/source
 Source0:        %{name}-%{version}%{?pretag}.source.tar.bz2
 Source10:       %{name}-mozconfig
+Source11:       %{name}-mozconfig-debuginfo
 Source12:       %{name}-redhat-default-prefs.js
 Source21:       %{name}.sh.in
 Source23:       %{name}.1
@@ -144,6 +146,9 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{ver
 
 %{__rm} -f .mozconfig
 %{__cp} %{SOURCE10} .mozconfig
+%if %{include_debuginfo}
+%{__cat} %{SOURCE11} >> .mozconfig
+%endif
 
 #---------------------------------------------------------------------
 
@@ -181,6 +186,12 @@ MOZ_SMP_FLAGS=-j1
 export LDFLAGS="-Wl,-rpath,${MOZ_APP_DIR}"
 make -f client.mk build STRIP="/bin/true" MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS"
 
+# create debuginfo for crash-stats.mozilla.com
+%if %{include_debuginfo}
+#cd %{moz_objdir}
+make buildsymbols
+%endif
+
 #---------------------------------------------------------------------
 
 %install
@@ -338,6 +349,13 @@ ln -s %{_datadir}/myspell ${RPM_BUILD_RO
 touch $RPM_BUILD_ROOT${MOZ_APP_DIR}/components/compreg.dat
 touch $RPM_BUILD_ROOT${MOZ_APP_DIR}/components/xpti.dat
 
+# Add debuginfo for crash-stats.mozilla.com 
+%if %{include_debuginfo}
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/debug%{mozappdir}
+cp dist/%{name}-%{version}.en-US.linux-*.crashreporter-symbols.zip $RPM_BUILD_ROOT/%{_libdir}/debug%{mozappdir}
+#cp %{moz_objdir}/mozilla/dist/firefox-%{version}.en-US.linux-i686.crashreporter-symbols.zip $RPM_BUILD_ROOT%{_libdir}/debug%{mozappdir}
+%endif
+
 #---------------------------------------------------------------------
 
 %clean
@@ -396,6 +414,13 @@ fi
 %exclude %{mozappdir}/update.locale
 %exclude %{mozappdir}/components/components.list
 
+%if %{include_debuginfo}
+%{mozappdir}/crashreporter
+%{mozappdir}/crashreporter.ini
+%{mozappdir}/Throbber-small.gif
+%{mozappdir}/plugin-container
+%endif
+
 %files devel
 %defattr(-,root,root,-)
 %dir %{_libdir}/%{name}-sdk-*
@@ -414,6 +439,9 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
+* Tue Jun 22 2010 Jan Horak <jhorak at redhat.com> - 1.9.2.4-1
+- Update to 1.9.2.4
+
 * Tue Jun 15 2010 Dan Horák <dan at danny.cz> 1.9.2.3-2
 - Fixed build on s390
 



More information about the scm-commits mailing list