Hello community,

here is the log from the commit of package MozillaFirefox for openSUSE:Factory
checked in at Mon Aug 15 14:14:23 CEST 2011.



--------
--- MozillaFirefox/MozillaFirefox.changes       2011-07-23 16:31:13.000000000 
+0200
+++ /mounts/work_src_done/STABLE/MozillaFirefox/MozillaFirefox.changes  
2011-08-13 08:47:54.000000000 +0200
@@ -1,0 +2,7 @@
+Fri Aug 12 21:16:19 UTC 2011 - w...@rosenauer.org
+
+- update to 6.0 (bnc#711954)
+  * included security fixes
+- removed obsolete curl header dependency (mozilla-curl.patch)
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


Old:
----
  firefox-5.99-source.tar.bz2
  l10n-5.99.tar.bz2

New:
----
  firefox-6.0-source.tar.bz2
  l10n-6.0.tar.bz2
  mozilla-curl.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ MozillaFirefox.spec ++++++
--- /var/tmp/diff_new_pack.EENS0m/_old  2011-08-15 14:13:55.000000000 +0200
+++ /var/tmp/diff_new_pack.EENS0m/_new  2011-08-15 14:13:55.000000000 +0200
@@ -18,8 +18,8 @@
 
 # norootforbuild
 
-%define major 5
-%define mainver %major.99
+%define major 6
+%define mainver %major.0
 
 Name:           MozillaFirefox
 BuildRequires:  Mesa-devel autoconf213 fdupes gcc-c++ libcurl-devel 
libgnomeui-devel libidl-devel libnotify-devel python startup-notification-devel 
unzip update-desktop-files yasm zip
@@ -35,7 +35,7 @@
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Version:        %{mainver}
 Release:        1
-%define         releasedate 2011072100
+%define         releasedate 2011081200
 Provides:       web_browser
 Provides:       firefox = %{version}-%{release}
 Provides:       firefox = %{mainver}
@@ -74,6 +74,7 @@
 Patch13:        mozilla-dump_syms-static.patch
 Patch14:        mozilla-sle11.patch
 Patch15:        mozilla-linux3.patch
+Patch16:        mozilla-curl.patch
 # Firefox/browser
 Patch31:        firefox-browser-css.patch
 Patch32:        firefox-cross-desktop.patch
@@ -206,6 +207,7 @@
 %patch14 -p1
 %endif
 %patch15 -p1
+%patch16 -p1
 #
 %patch31 -p1
 %patch32 -p1
@@ -269,7 +271,7 @@
 ac_add_options --disable-debug
 ac_add_options --enable-startup-notification
 #ac_add_options --enable-chrome-format=jar
-ac_add_options --enable-update-channel=beta
+ac_add_options --enable-update-channel=default
 EOF
 %if %suse_version > 1130
 cat << EOF >> $MOZCONFIG

++++++ compare-locales.tar.bz2 ++++++

++++++ create-tar.sh ++++++
--- /var/tmp/diff_new_pack.EENS0m/_old  2011-08-15 14:13:55.000000000 +0200
+++ /var/tmp/diff_new_pack.EENS0m/_new  2011-08-15 14:13:55.000000000 +0200
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-BRANCH="releases/mozilla-beta"
-RELEASE_TAG="FIREFOX_6_0b3_RELEASE"
-VERSION="5.99"
+BRANCH="releases/mozilla-release"
+RELEASE_TAG="FIREFOX_6_0_RELEASE"
+VERSION="6.0"
 
 # mozilla
 hg clone http://hg.mozilla.org/$BRANCH mozilla
@@ -23,7 +23,7 @@
     ja-JP-mac|en-US)
       ;;
     *)
-      hg clone http://hg.mozilla.org/releases/l10n/mozilla-beta/$locale 
l10n/$locale
+      hg clone http://hg.mozilla.org/releases/l10n/mozilla-release/$locale 
l10n/$locale
       [ "$RELEASE_TAG" == "default" ] || hg -R l10n/$locale up -C -r 
$RELEASE_TAG
       ;;
   esac

++++++ firefox-5.99-source.tar.bz2 -> firefox-6.0-source.tar.bz2 ++++++
MozillaFirefox/firefox-5.99-source.tar.bz2 
/mounts/work_src_done/STABLE/MozillaFirefox/firefox-6.0-source.tar.bz2 differ: 
char 11, line 1


++++++ l10n-5.99.tar.bz2 -> l10n-6.0.tar.bz2 ++++++
MozillaFirefox/l10n-5.99.tar.bz2 
/mounts/work_src_done/STABLE/MozillaFirefox/l10n-6.0.tar.bz2 differ: char 11, 
line 1

++++++ mozilla-curl.patch ++++++
# HG changeset patch
# User Evan Shaw <eds...@gmail.com>
# Parent 891179411e19ab39f95bd7769c0e58db6f22f9e4
bug 673072 - remove deprecated curl header curl/types.h from Breakpad includes. 
r=ted

diff --git a/config/system-headers b/config/system-headers
--- a/config/system-headers
+++ b/config/system-headers
@@ -199,17 +199,16 @@ crypt.h
 cstddef
 cstdio
 cstdlib
 cstring
 ctime
 ctype.h
 curl/curl.h
 curl/easy.h
-curl/types.h
 curses.h
 cxxabi.h
 DateTimeUtils.h
 dbus/dbus.h
 dbus/dbus-glib.h
 dbus/dbus-glib-lowlevel.h
 ddeml.h
 Debug.h
diff --git a/js/src/config/system-headers b/js/src/config/system-headers
--- a/js/src/config/system-headers
+++ b/js/src/config/system-headers
@@ -199,17 +199,16 @@ crypt.h
 cstddef
 cstdio
 cstdlib
 cstring
 ctime
 ctype.h
 curl/curl.h
 curl/easy.h
-curl/types.h
 curses.h
 cxxabi.h
 DateTimeUtils.h
 dbus/dbus.h
 dbus/dbus-glib.h
 dbus/dbus-glib-lowlevel.h
 ddeml.h
 Debug.h
diff --git 
a/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc 
b/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc
--- a/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc
+++ b/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc
@@ -28,17 +28,16 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "common/linux/http_upload.h"
 
 #include <assert.h>
 #include <dlfcn.h>
 #include <curl/curl.h>
 #include <curl/easy.h>
-#include <curl/types.h>
 
 namespace {
 
 // Callback to get the response data from server.
 static size_t WriteCallback(void *ptr, size_t size,
                             size_t nmemb, void *userp) {
   if (!userp)
     return 0;
diff --git 
a/toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc 
b/toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc
--- a/toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc
+++ b/toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc
@@ -24,17 +24,16 @@
 // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <curl/curl.h>
 #include <curl/easy.h>
-#include <curl/types.h>
 #include <dlfcn.h>
 
 #include <iostream>
 #include <string>
 
 #include "common/linux/libcurl_wrapper.h"
 
 using std::string;
++++++ source-stamp.txt ++++++
--- /var/tmp/diff_new_pack.EENS0m/_old  2011-08-15 14:13:55.000000000 +0200
+++ /var/tmp/diff_new_pack.EENS0m/_new  2011-08-15 14:13:55.000000000 +0200
@@ -1,2 +1,2 @@
-REV=7864cfd02969
-REPO=http://hg.mozilla.org/releases/mozilla-beta
+REV=218ed8178b1e
+REPO=http://hg.mozilla.org/releases/mozilla-release


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to