rpms/firefox/FC-6 mozilla-version.patch, NONE, 1.1 firefox.spec, 1.171, 1.172

[fedora-cvs-commits at redhat.com]

Author: kengert

Update of /cvs/dist/rpms/firefox/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv5351

Modified Files:
	firefox.spec 
Added Files:
	mozilla-version.patch 
Log Message:
* Wed Jul 18 2007 Kai Engert <kengert at redhat.com> - 1.5.0.12-3
- Add a patch to stick with major versions 1.5.0.12 / 1.8.0.12


mozilla-version.patch:
 browser/config/version.txt |    2 +-
 config/milestone.txt       |    2 +-
 configure                  |    2 +-
 configure.in               |    2 +-
 mail/config/version.txt    |    2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE mozilla-version.patch ---
diff -ru org/mozilla/browser/config/version.txt fixed/mozilla/browser/config/version.txt
--- org/mozilla/browser/config/version.txt	2007-05-31 11:22:44.000000000 +0200
+++ fixed/mozilla/browser/config/version.txt	2007-07-18 13:36:42.000000000 +0200
@@ -1 +1 @@
-1.5.0.13pre
+1.5.0.12
diff -ru org/mozilla/config/milestone.txt fixed/mozilla/config/milestone.txt
--- org/mozilla/config/milestone.txt	2007-05-31 11:22:44.000000000 +0200
+++ fixed/mozilla/config/milestone.txt	2007-07-18 12:26:43.000000000 +0200
@@ -10,4 +10,4 @@
 # hardcoded milestones in the tree from these two files.
 #--------------------------------------------------------
 
-1.8.0.13pre
+1.8.0.12
diff -ru org/mozilla/configure fixed/mozilla/configure
--- org/mozilla/configure	2007-07-11 19:03:09.000000000 +0200
+++ fixed/mozilla/configure	2007-07-18 13:49:26.000000000 +0200
@@ -1020,7 +1020,7 @@
 _SUBDIR_CONFIG_ARGS="$ac_configure_args"
 
 MOZJPEG=62
-MOZPNG=10217
+MOZPNG=10207
 MOZZLIB=1.2.3
 NSPR_VERSION=4
 
diff -ru org/mozilla/configure.in fixed/mozilla/configure.in
--- org/mozilla/configure.in	2007-07-11 19:03:54.000000000 +0200
+++ fixed/mozilla/configure.in	2007-07-18 13:47:56.000000000 +0200
@@ -83,7 +83,7 @@
 dnl Set the version number of the libs included with mozilla
 dnl ========================================================
 MOZJPEG=62
-MOZPNG=10217
+MOZPNG=10207
 MOZZLIB=1.2.3
 NSPR_VERSION=4
 
diff -ru org/mozilla/mail/config/version.txt fixed/mozilla/mail/config/version.txt
--- org/mozilla/mail/config/version.txt	2007-05-31 11:22:44.000000000 +0200
+++ fixed/mozilla/mail/config/version.txt	2007-07-18 13:36:36.000000000 +0200
@@ -1 +1 @@
-1.5.0.13pre
+1.5.0.12


Index: firefox.spec
===================================================================
RCS file: /cvs/dist/rpms/firefox/FC-6/firefox.spec,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -r1.171 -r1.172
--- firefox.spec	18 Jul 2007 04:45:35 -0000	1.171
+++ firefox.spec	18 Jul 2007 13:12:52 -0000	1.172
@@ -11,13 +11,14 @@
 Summary:        Mozilla Firefox Web browser.
 Name:           firefox
 Version:        1.5.0.12
-Release:        2%{?dist}
+Release:        3%{?dist}
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPL/LGPL
 Group:          Applications/Internet
 %if %{official_branding}
 #%define tarball firefox-%{version}-source.tar.bz2
-%define tarball mozilla-180-20070717.tar.bz2
+#%define tarball mozilla-180-20070717.tar.bz2
+%define tarball mozilla-18012-20070718.tar.bz2
 %else
 %define tarball firefox-1.5rc3-source.tar.bz2
 %endif
@@ -36,6 +37,7 @@
 Source101:      add-gecko-provides.in
 
 # build patches
+Patch1:         mozilla-version.patch
 Patch3:         firefox-1.5.0.10-nss-system-nspr.patch
 Patch4:         firefox-1.5.0.10-with-system-nss.patch
 Patch5:         firefox-1.5-visibility.patch
@@ -145,6 +147,7 @@
 %setup -q -c %{name}-%{version}
 cd mozilla
 
+%patch1  -p2
 %patch3  -p1
 %patch4  -p1
 #%patch5  -p1 -b .visibility
@@ -467,6 +470,9 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Wed Jul 18 2007 Kai Engert <kengert at redhat.com> - 1.5.0.12-3
+- Add a patch to stick with major versions 1.5.0.12 / 1.8.0.12
+
 * Tue Jul 17 2007 Kai Engert <kengert at redhat.com> - 1.5.0.12-2
 - Update to latest snapshot of Mozilla 1.8.0 branch
 - Include patches for Mozilla bugs 379245, 384925, 178993,