Hello community, here is the log from the commit of package MozillaFirefox for openSUSE:Factory checked in at Thu Jun 16 10:17:42 CEST 2011. -------- --- MozillaFirefox/MozillaFirefox.changes 2011-06-01 08:05:09.000000000 +0200 +++ /mounts/work_src_done/STABLE/MozillaFirefox/MozillaFirefox.changes 2011-06-15 17:00:40.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Jun 15 14:59:32 UTC 2011 - wr@rosenauer.org + +- update to 5.0b6 +- include proper revision information into the build +- speedier find-external-requires.sh + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- mozilla-repo.patch source-stamp.txt ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MozillaFirefox.spec ++++++ --- /var/tmp/diff_new_pack.PHUGrx/_old 2011-06-16 10:16:13.000000000 +0200 +++ /var/tmp/diff_new_pack.PHUGrx/_new 2011-06-16 10:16:13.000000000 +0200 @@ -34,8 +34,8 @@ BuildRequires: nss-shared-helper-devel License: MPLv1.1 or GPLv2+ or LGPLv2+ Version: %{mainver} -Release: 1 -%define releasedate 2011053000 +Release: 3 +%define releasedate 2011061300 Provides: web_browser Provides: firefox = %{version}-%{release} Provides: firefox = %{mainver} @@ -51,6 +51,7 @@ Source2: MozillaFirefox-rpmlintrc Source3: mozilla.sh.in Source4: find-external-requires.sh +Source5: source-stamp.txt Source6: kde.js Source7: l10n-%{version}.tar.bz2 Source8: firefox-mimeinfo.xml @@ -71,6 +72,7 @@ Patch9: mozilla-cairo-return.patch Patch10: mozilla-ntlm-full-path.patch Patch11: mozilla-ppc-ipc.patch +Patch12: mozilla-repo.patch # Firefox/browser Patch30: firefox-linkorder.patch Patch31: firefox-browser-css.patch @@ -202,6 +204,7 @@ %patch9 -p1 %patch10 -p1 %patch11 -p1 +%patch12 -p1 # %patch30 -p1 %patch31 -p1 @@ -232,6 +235,10 @@ echo fix kde helper version in the .spec file exit 1 fi +source %{SOURCE5} +export MOZ_SOURCE_STAMP=$REV +export SOURCE_REPO=$REPO +export MOZ_SOURCE_REPO=$REPO export MOZ_BUILD_DATE=%{releasedate} export MOZILLA_OFFICIAL=1 export BUILD_OFFICIAL=1 @@ -291,6 +298,9 @@ %install cd $RPM_BUILD_DIR/obj rm dist/bin/defaults/pref/firefox-l10n.js +source %{SOURCE5} +export MOZ_SOURCE_STAMP=$REV +export MOZ_SOURCE_REPO=$REPO make -C browser/installer STRIP=/bin/true # copy tree into RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/%{progdir} ++++++ compare-locales.tar.bz2 ++++++ ++++++ create-tar.sh ++++++ --- /var/tmp/diff_new_pack.PHUGrx/_old 2011-06-16 10:16:13.000000000 +0200 +++ /var/tmp/diff_new_pack.PHUGrx/_new 2011-06-16 10:16:13.000000000 +0200 @@ -1,13 +1,18 @@ #!/bin/bash BRANCH="mozilla-beta" -RELEASE_TAG="FIREFOX_5_0b3_RELEASE" +RELEASE_TAG="FIREFOX_5_0b6_RELEASE" VERSION="4.99" # mozilla hg clone http://hg.mozilla.org/$BRANCH mozilla pushd mozilla [ "$RELEASE_TAG" == "default" ] || hg update -r $RELEASE_TAG +# get repo and source stamp +echo -n "REV=" > ../source-stamp.txt +hg -R . parent --template="{node|short}\n" >> ../source-stamp.txt +echo -n "REPO=" >> ../source-stamp.txt +hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" >> ../source-stamp.txt popd tar cjf firefox-$VERSION-source.tar.bz2 --exclude=.hgtags --exclude=.hgignore --exclude=.hg --exclude=CVS mozilla ++++++ find-external-requires.sh ++++++ --- /var/tmp/diff_new_pack.PHUGrx/_old 2011-06-16 10:16:13.000000000 +0200 +++ /var/tmp/diff_new_pack.PHUGrx/_new 2011-06-16 10:16:13.000000000 +0200 @@ -1,23 +1,9 @@ #!/bin/sh - # Finds requirements provided outside of the current file set -filelist=`sed "s/[]['\"*?{}]/\\\\\&/g"` - -provides=`echo "$filelist" | /usr/lib/rpm/find-provides` - -{ -for f in $filelist ; do - echo $f | /usr/lib/rpm/find-requires | while read req ; do - found=0 - for p in $provides ; do - if [ "$req" = "$p" ]; then - found=1 - fi - done - if [ "$found" = "0" ]; then - echo $req - fi - done -done -} | sort -u +filelist=$( sed "s/[]['\"*?{}]/\\\\\&/g" ) +provides=$( echo "$filelist" | /usr/lib/rpm/find-provides ) +echo "$filelist" \ + | /usr/lib/rpm/find-requires \ + | grep -F -v "$provides" \ + | sort -u ++++++ firefox-4.99-source.tar.bz2 ++++++ MozillaFirefox/firefox-4.99-source.tar.bz2 /mounts/work_src_done/STABLE/MozillaFirefox/firefox-4.99-source.tar.bz2 differ: char 11, line 1 ++++++ l10n-4.99.tar.bz2 ++++++ MozillaFirefox/l10n-4.99.tar.bz2 /mounts/work_src_done/STABLE/MozillaFirefox/l10n-4.99.tar.bz2 differ: char 11, line 1 ++++++ mozilla-repo.patch ++++++ # HG changeset patch # Parent 84ecc6172ec5f01c80346bdb819520d08f982bac diff --git a/toolkit/content/Makefile.in b/toolkit/content/Makefile.in --- a/toolkit/content/Makefile.in +++ b/toolkit/content/Makefile.in @@ -61,17 +61,17 @@ MOZ_SOURCE_STAMP ?= $(shell hg -R $(tops ifdef MOZ_SOURCE_STAMP DEFINES += -DSOURCE_CHANGESET="$(MOZ_SOURCE_STAMP)" endif # strip a trailing slash from the repo URL because it's not always present, # and we want to construct a working URL in buildconfig.html # make+shell+sed = awful _dollar=$$ -SOURCE_REPO := $(shell cd $(topsrcdir) && hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" -e "s/\/$(_dollar)//" ) +SOURCE_REPO ?= $(shell cd $(topsrcdir) && hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" -e "s/\/$(_dollar)//" ) # extra sanity check for old versions of hg # that don't support showconfig ifeq (http,$(patsubst http%,http,$(SOURCE_REPO))) DEFINES += -DSOURCE_REPO="$(SOURCE_REPO)" endif ifdef MOZ_TOOLKIT_SEARCH DEFINES += -DMOZ_TOOLKIT_SEARCH diff --git a/toolkit/mozapps/installer/package-name.mk b/toolkit/mozapps/installer/package-name.mk --- a/toolkit/mozapps/installer/package-name.mk +++ b/toolkit/mozapps/installer/package-name.mk @@ -154,17 +154,17 @@ SYMBOL_ARCHIVE_BASENAME = $(PKG_BASENAME TEST_PACKAGE = $(PKG_BASENAME).tests.zip ifneq (,$(wildcard $(DIST)/bin/application.ini)) BUILDID = $(shell $(PYTHON) $(MOZILLA_DIR)/config/printconfigsetting.py $(DIST)/bin/application.ini App BuildID) else BUILDID = $(shell $(PYTHON) $(MOZILLA_DIR)/config/printconfigsetting.py $(DIST)/bin/platform.ini Build BuildID) endif -MOZ_SOURCE_STAMP = $(firstword $(shell hg -R $(MOZILLA_DIR) parent --template="{node|short}\n" 2>/dev/null)) +#MOZ_SOURCE_STAMP = $(firstword $(shell hg -R $(MOZILLA_DIR) parent --template="{node|short}\n" 2>/dev/null)) # strip a trailing slash from the repo URL because it's not always present, # and we want to construct a working URL in the sourcestamp file. # make+shell+sed = awful _dollar=$$ -MOZ_SOURCE_REPO = $(shell cd $(MOZILLA_DIR) && hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" -e "s/\/$(_dollar)//" ) +#MOZ_SOURCE_REPO = $(shell cd $(MOZILLA_DIR) && hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" -e "s/\/$(_dollar)//" ) MOZ_SOURCESTAMP_FILE = $(DIST)/$(PKG_PATH)/$(PKG_BASENAME).txt diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in --- a/toolkit/xre/Makefile.in +++ b/toolkit/xre/Makefile.in @@ -235,17 +235,17 @@ DEFINES += -DHAVE_USR_LIB64_DIR endif endif MOZ_SOURCE_STAMP ?= $(firstword $(shell hg -R $(topsrcdir) parent --template="{node|short}\n" 2>/dev/null)) # strip a trailing slash from the repo URL because it's not always present, # and we want to construct a working URL in buildconfig.html # make+shell+sed = awful _dollar=$$ -SOURCE_REPO := $(shell cd $(topsrcdir) && hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" -e "s/\/$(_dollar)//" ) +SOURCE_REPO ?= $(shell cd $(topsrcdir) && hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" -e "s/\/$(_dollar)//" ) ifdef MOZ_SOURCE_STAMP INIARGS = --sourcestamp=$(MOZ_SOURCE_STAMP) # extra sanity check for old versions of hg # that don't support showconfig ifeq (http,$(patsubst http%,http,$(SOURCE_REPO))) INIARGS += --sourcerepo=$(SOURCE_REPO) endif ++++++ source-stamp.txt ++++++ REV=937762949167 REPO=http://hg.mozilla.org/mozilla-beta ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org