OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/MozillaFirefox?expand=0&rev=18

MozillaFirefox.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Aug 28 16:44:08 CEST 2007 - maw@suse.de
+
+- Minor .spec update (#305193)
+  + Remove two obsolete patches
+  + Correct releasedate
+  + Include only the officially supported locales.
+
 -------------------------------------------------------------------
 Wed Aug 22 17:53:03 CEST 2007 - maw@suse.de
 

MozillaFirefox.spec

@@ -29,7 +29,7 @@ Obsoletes:      MozillaFirebird <= 1.0.7
 Obsoletes:      mozilla
 %endif
 Version:        2.0.0.6
-Release:        1
+Release:        3
 Summary:        Mozilla Firefox Web Browser
 URL:            http://www.mozilla.org/
 Group:          Productivity/Networking/Web/Browsers
@@ -86,15 +86,12 @@ Patch23:        startup.patch
 Patch24:        cups-paper.patch
 Patch25:        system-extensions.patch
 Patch27:        system-proxies.patch
-# bmo #307877
-Patch28:        tab-close.patch
 # bmo #331522
 Patch32:        postscript.patch
 Patch33:        proxy-dev.patch
 # integration
 Patch34:        skin-selection.patch
 Patch36:        greasemonkey.patch
-Patch37:        make-perl.patch
 Patch38:        tango-maxversion.patch
 Patch39:        x11-session.patch
 # pango-cairo.patch dbus.patch startup.patch
@@ -125,7 +122,7 @@ Requires:       mozilla-nspr >= %( echo `rpm -q --queryformat '%{VERSION}' mozil
 Requires:       mozilla-nss >= %( echo `rpm -q --queryformat '%{VERSION}' mozilla-nss`)
 %endif
 %define _unpackaged_files_terminate_build 0
-%define releasedate 2006102300
+%define releasedate 2007073000
 %define progname firefox
 %if %suse_version < 1010
 %define progdir /opt/MozillaFirefox/%_lib
@@ -212,7 +209,6 @@ cd $RPM_BUILD_DIR/mozilla
 %patch24
 %patch25
 %patch27
-%patch28
 %if %nld9
 %patch16
 %endif
@@ -319,11 +315,10 @@ cp -rf $RPM_BUILD_DIR/mozilla/dist/firefox/* $RPM_BUILD_ROOT/%{progdir}
 # install additional locales
 %if %localize
 echo %defattr\(-,root,root\) > %{_tmppath}/translations.list
-for locale in $(cat browser/locales/all-locales); do
+#for locale in $(cat browser/locales/all-locales); do
-# Removed he since it's broken
+for locale in $(awk '{ print $1; }' browser/locales/shipped-locales); do
-#for locale in ar bg ca cs da de el en-GB es-AR es-ES eu fi fr ga-IE hu it ja ko lt mk nb-NO nl pl pt-BR ro ru sk sl sv-SE tr zh-CN zh-TW ; do
   case $locale in
-   en-ZA|ja-JP-mac|hy-AM|he|hr|hy-AM|nr|nso|ro|sq|ss|st|tn|ts|ve|xh|zu)
+      ja-JP-mac)
 	# broken locales, do not work
 	;;
    *)
@@ -561,6 +556,11 @@ exit 0
 %endif
 
 %changelog
+* Tue Aug 28 2007 - maw@suse.de
+- Minor .spec update (#305193)
+  + Remove two obsolete patches
+  + Correct releasedate
+  + Include only the officially supported locales.
 * Wed Aug 22 2007 - maw@suse.de
 - Merge changes from the build service (thanks, Wolfgang):
   + Provide locale dependency information (#302288)

make-perl.patch

@@ -1,17 +0,0 @@
-Index: toolkit/mozapps/installer/packager.mk
-================================================================================
---- toolkit/mozapps/installer/packager.mk
-+++ toolkit/mozapps/installer/packager.mk
-@@ -304,9 +304,9 @@
- 	@mkdir $(DIST)/$(MOZ_PKG_APPNAME)
- ifdef MOZ_PKG_MANIFEST
- 	$(RM) -rf $(DIST)/xpt
--	$(PERL) -I$(topsrcdir)/xpinstall/packager -e 'use Packager; \
--	  Packager::Copy("$(DIST)", "$(DIST)/$(MOZ_PKG_APPNAME)", \
--	                 "$(MOZ_PKG_MANIFEST)", "$(PKGCP_OS)", 1, 0, 1);'
-+	$(PERL) -I$(topsrcdir)/xpinstall/packager -e 'use Packager;' \
-+	  -e 'Packager::Copy("$(DIST)", "$(DIST)/$(MOZ_PKG_APPNAME)", ' \
-+	  -e '"$(MOZ_PKG_MANIFEST)", "$(PKGCP_OS)", 1, 0, 1);'
- 	$(PERL) $(topsrcdir)/xpinstall/packager/xptlink.pl -s $(DIST) -d $(DIST)/xpt -f $(DIST)/$(MOZ_PKG_APPNAME)/components -v
- else # !MOZ_PKG_MANIFEST
- ifeq ($(MOZ_PKG_FORMAT),DMG)

tab-close.patch

@@ -1,13 +0,0 @@
-Index: browser/themes/winstripe/browser/browser.css
-================================================================================
---- browser/themes/winstripe/browser/browser.css
-+++ browser/themes/winstripe/browser/browser.css
-@@ -1172,7 +1172,7 @@
-   list-style-image: url("chrome://global/skin/icons/close.png");
-   -moz-appearance: none;
-   -moz-image-region: rect(0px, 16px, 16px, 0px);
--  padding: 4px 2px;
-+  padding: 0px 0px;
-   border: none !important;
- }
-