Mercurial Mercurial > hg > mozilla / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
removed obsolete overlapping patch (firefox-libxul-sdk.patch)
authorWolfgang Rosenauer <wr@rosenauer.org>
Tue, 05 Oct 2010 08:31:35 +0200
changeset 170 b688db617cb7
parent 169 cba7c6321c84
child 171 49162ac3619c
removed obsolete overlapping patch (firefox-libxul-sdk.patch)
MozillaFirefox/MozillaFirefox.spec file | annotate | diff | comparison | revisions
MozillaFirefox/firefox-libxul-sdk.patch file | annotate | diff | comparison | revisions
firefox-libxul-sdk.patch file | annotate | diff | comparison | revisions
firefox-libxulsdk-locales.patch file | annotate | diff | comparison | revisions
firefox-no-sync-l10n.patch file | annotate | diff | comparison | revisions
series file | annotate | diff | comparison | revisions 
--- a/MozillaFirefox/MozillaFirefox.spec	Tue Oct 05 07:54:56 2010 +0200
+++ b/MozillaFirefox/MozillaFirefox.spec	Tue Oct 05 08:31:35 2010 +0200
@@ -52,7 +52,6 @@
 Source9:        firefox-lockdown.js
 Source10:       compare-locales.tar.bz2
 Source16:       firefox.1
-Patch1:         firefox-libxul-sdk.patch
 Patch3:         toolkit-download-folder.patch
 Patch4:         firefox-linkorder.patch
 Patch5:         firefox-browser-css.patch
@@ -106,9 +105,6 @@
 Provides:       locale(%{name}:ar;ca;cs;da;de;en_GB;es_AR;es_CL;es_ES;fi;fr;hu;it;ja;ko;nb_NO;nl;pl;pt_BR;pt_PT;ru;sv_SE;zh_CN;zh_TW)
 Group:          System/Localization
 Requires:       %{name} = %{version}
-%if 0%{?use_xulrunner}
-Requires:       %{xulrunner}-translations-common
-%endif
 Obsoletes:      %{name}-translations < %{version}-%{release}
 
 %description translations-common
@@ -121,9 +117,6 @@
 Provides:       locale(%{name}:af;as;be;bg;bn_BD;bn_IN;cy;el;eo;es_MX;et;eu;fa;fy_NL;ga_IE;gl;gu_IN;he;hi_IN;hr;id;is;ka;kk;kn;ku;lt;lv;mk;ml;mr;nn_NO;oc;or;pa_IN;rm;ro;si;sk;sl;sq;sr;ta;ta_LK;te;th;tr;uk;vi)
 Group:          System/Localization
 Requires:       %{name} = %{version}
-%if 0%{?use_xulrunner}
-Requires:       %{xulrunner}-translations-other
-%endif
 Obsoletes:      %{name}-translations < %{version}-%{release}
 
 %description translations-other
@@ -158,7 +151,6 @@
 %prep
 %setup -q -n mozilla -b 7 -b 10
 cd $RPM_BUILD_DIR/mozilla
-%patch1 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
--- a/MozillaFirefox/firefox-libxul-sdk.patch	Tue Oct 05 07:54:56 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-../firefox-libxul-sdk.patch
\ No newline at end of file
--- a/firefox-libxul-sdk.patch	Tue Oct 05 07:54:56 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in
---- a/browser/locales/Makefile.in
-+++ b/browser/locales/Makefile.in
-@@ -180,19 +180,21 @@ libs:: $(addsuffix .xml,$(SEARCH_PLUGINS
- 	$(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/searchplugins
- 
- install:: $(addsuffix .xml,$(SEARCH_PLUGINS))
- 	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/searchplugins
- 
- 
- libs-%:
- 	$(NSINSTALL) -D $(DIST)/install
-+ifndef LIBXUL_SDK
- 	@$(MAKE) -C ../../toolkit/locales libs-$* BOTH_MANIFESTS=1
-+	@$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1
-+endif
- 	@$(MAKE) -C ../../services/sync/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1
--	@$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1
- 	@$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=defaults/pref BOTH_MANIFESTS=1
- 	@$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1
- 
- 
- repackage-win32-installer: WIN32_INSTALLER_OUT="$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe"
- repackage-win32-installer: $(WIN32_INSTALLER_IN) $(SUBMAKEFILES)
- 	@echo "Repackaging $(WIN32_INSTALLER_IN) into $(WIN32_INSTALLER_OUT)."
- 	$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY) export
--- a/firefox-libxulsdk-locales.patch	Tue Oct 05 07:54:56 2010 +0200
+++ b/firefox-libxulsdk-locales.patch	Tue Oct 05 08:31:35 2010 +0200
@@ -1,30 +1,6 @@
 # HG changeset patch
-# Parent 6e05daaf579aa134cadb3e42451c1918409d18c3
+# Parent aae1343996e42d97b8d19e41d19b5d31b5465af0
 
-diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in
---- a/browser/locales/Makefile.in
-+++ b/browser/locales/Makefile.in
-@@ -180,20 +180,18 @@ libs:: $(addsuffix .xml,$(SEARCH_PLUGINS
- 	$(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/searchplugins
- 
- install:: $(addsuffix .xml,$(SEARCH_PLUGINS))
- 	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/searchplugins
- 
- 
- libs-%:
- 	$(NSINSTALL) -D $(DIST)/install
--ifndef LIBXUL_SDK
- 	@$(MAKE) -C ../../toolkit/locales libs-$* BOTH_MANIFESTS=1
- 	@$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1
--endif
- ifdef MOZ_SERVICES_SYNC
- 	@$(MAKE) -C ../../services/sync/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1
- endif
- 	@$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=defaults/pref BOTH_MANIFESTS=1
- 	@$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1
- 
- 
- repackage-win32-installer: WIN32_INSTALLER_OUT="$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe"
 diff --git a/browser/makefiles.sh b/browser/makefiles.sh
 --- a/browser/makefiles.sh
 +++ b/browser/makefiles.sh
--- a/firefox-no-sync-l10n.patch	Tue Oct 05 07:54:56 2010 +0200
+++ b/firefox-no-sync-l10n.patch	Tue Oct 05 08:31:35 2010 +0200
@@ -1,21 +1,22 @@
 # HG changeset patch
-# Parent c0749d2284c555e499beef7a8ae08d37abe45fcd
+# Parent e386d64898cac5a2e10bc4fbce606ffeefe1f210
 
 diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in
 --- a/browser/locales/Makefile.in
 +++ b/browser/locales/Makefile.in
-@@ -184,17 +184,19 @@ install:: $(addsuffix .xml,$(SEARCH_PLUG
+@@ -181,17 +181,19 @@ libs:: $(addsuffix .xml,$(SEARCH_PLUGINS
+ 
+ install:: $(addsuffix .xml,$(SEARCH_PLUGINS))
+ 	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/searchplugins
  
  
  libs-%:
  	$(NSINSTALL) -D $(DIST)/install
- ifndef LIBXUL_SDK
  	@$(MAKE) -C ../../toolkit/locales libs-$* BOTH_MANIFESTS=1
- 	@$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1
- endif
 +ifdef MOZ_SERVICES_SYNC
  	@$(MAKE) -C ../../services/sync/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1
 +endif
+ 	@$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1
  	@$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=defaults/pref BOTH_MANIFESTS=1
  	@$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1
  
@@ -23,4 +24,3 @@
  repackage-win32-installer: WIN32_INSTALLER_OUT="$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe"
  repackage-win32-installer: $(WIN32_INSTALLER_IN) $(SUBMAKEFILES)
  	@echo "Repackaging $(WIN32_INSTALLER_IN) into $(WIN32_INSTALLER_OUT)."
- 	$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY) export
--- a/series	Tue Oct 05 07:54:56 2010 +0200
+++ b/series	Tue Oct 05 08:31:35 2010 +0200
@@ -15,7 +15,6 @@
 mozilla-language.patch
 
 # Firefox patches
-firefox-libxul-sdk.patch
 firefox-linkorder.patch
 firefox-browser-css.patch
 firefox-cross-desktop.patch
mozilla