From 01852d0129f8111a09ceec055303ff2fe235073a360d95313212185332d0e797 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Fri, 25 Feb 2011 13:44:41 +0000 Subject: [PATCH 1/2] Updating link to change in openSUSE:Factory/MozillaFirefox revision 109.0 OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=42068d0845709d7774ad4bf664282517 --- MozillaFirefox.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index 395730a..071da7c 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -1,5 +1,5 @@ # -# spec file for package MozillaFirefox (Version 4.0b12) +# spec file for package MozillaFirefox # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # 2006-2011 Wolfgang Rosenauer @@ -24,7 +24,7 @@ Name: MozillaFirefox %define use_xulrunner 1 %define xulrunner mozilla-xulrunner20 -BuildRequires: autoconf213 gcc-c++ libcurl-devel libgnomeui-devel libidl-devel libnotify-devel python unzip update-desktop-files zip fdupes Mesa-devel yasm +BuildRequires: Mesa-devel autoconf213 fdupes gcc-c++ libcurl-devel libgnomeui-devel libidl-devel libnotify-devel python unzip update-desktop-files yasm zip %if %suse_version > 1110 BuildRequires: libiw-devel %else @@ -121,6 +121,7 @@ Requires: perl(Archive::Zip) Development files for Firefox to make packaging of addons easier. %if %localize + %package translations-common Summary: Common translations for MozillaFirefox License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ @@ -445,6 +446,7 @@ exit 0 %config /etc/rpm/macros.%{progname} %if %localize + %files translations-common -f %{_tmppath}/translations.common %defattr(-,root,root) %dir %{progdir} From b02133a80a0106b11804bb67c12494c3ea2c885732fa8ccb7809712505215443 Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Mon, 21 Mar 2011 09:47:37 +0000 Subject: [PATCH 2/2] 4.0rc2 OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=195 --- MozillaFirefox.changes | 6 ++++++ MozillaFirefox.spec | 16 +++++++--------- compare-locales.tar.bz2 | 4 ++-- firefox-4.0.0-source.tar.bz2 | 3 +++ firefox-4.0b12-source.tar.bz2 | 3 --- l10n-4.0.0.tar.bz2 | 3 +++ l10n-4.0b12.tar.bz2 | 3 --- 7 files changed, 21 insertions(+), 17 deletions(-) create mode 100644 firefox-4.0.0-source.tar.bz2 delete mode 100644 firefox-4.0b12-source.tar.bz2 create mode 100644 l10n-4.0.0.tar.bz2 delete mode 100644 l10n-4.0b12.tar.bz2 diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index be42c13..f0f5697 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Mar 18 08:49:15 UTC 2011 - wr@rosenauer.org + +- update to version 4.0 (rc2) +- fixed rpm macros delivered with devel package (bnc#679950) + ------------------------------------------------------------------- Wed Feb 23 07:52:04 UTC 2011 - wr@rosenauer.org diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index 071da7c..8d5b54c 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -24,22 +24,22 @@ Name: MozillaFirefox %define use_xulrunner 1 %define xulrunner mozilla-xulrunner20 -BuildRequires: Mesa-devel autoconf213 fdupes gcc-c++ libcurl-devel libgnomeui-devel libidl-devel libnotify-devel python unzip update-desktop-files yasm zip +BuildRequires: autoconf213 gcc-c++ libcurl-devel libgnomeui-devel libidl-devel libnotify-devel python unzip update-desktop-files zip fdupes Mesa-devel yasm %if %suse_version > 1110 BuildRequires: libiw-devel %else BuildRequires: wireless-tools %endif %if 0%{?use_xulrunner} -BuildRequires: %{xulrunner}-devel = 2.0b12 +BuildRequires: %{xulrunner}-devel = 2.0.0 %endif License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ -Version: %{mainver}b12 +Version: %{mainver}.0 Release: 1 Provides: web_browser Provides: firefox = %{version}-%{release} Provides: firefox = %{mainver} -%define releasedate 2011022200 +%define releasedate 2011031700 Summary: Mozilla Firefox Web Browser Url: http://www.mozilla.org/ Group: Productivity/Networking/Web/Browsers @@ -121,7 +121,6 @@ Requires: perl(Archive::Zip) Development files for Firefox to make packaging of addons easier. %if %localize - %package translations-common Summary: Common translations for MozillaFirefox License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ @@ -137,7 +136,7 @@ of MozillaFirefox. %package translations-other Summary: Extra translations for MozillaFirefox License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ -Provides: locale(%{name}:af;ak;ast;be;bg;bn_BD;br;bs;cy;el;en_ZA;eo;es_MX;et;eu;fy_NL;ga_IE;gd;gl;gu_IN;he;hi_IN;hr;hy_AM;id;is;kk;kn;ku;lg;lt;lv;mai;mk;ml;mr;nn_NO;nso;or;pa_IN;rm;ro;si;sk;sl;son;sq;sr;ta;ta_LK;te;th;tr;uk;zu) +Provides: locale(%{name}:af;ak;ast;be;bg;bn_BD;br;bs;cy;el;en_ZA;eo;es_MX;et;eu;fa;fy_NL;ga_IE;gd;gl;gu_IN;he;hi_IN;hr;hy_AM;id;is;kk;kn;ku;lg;lt;lv;mai;mk;ml;mr;nn_NO;nso;or;pa_IN;rm;ro;si;sk;sl;son;sq;sr;ta;ta_LK;te;th;tr;uk;zu) Group: System/Localization Requires: %{name} = %{version} Obsoletes: %{name}-translations < %{version}-%{release} @@ -338,10 +337,10 @@ cat <<'FIN' >%{buildroot}/etc/rpm/macros.%{progname} %%firefox_major %{major} %%firefox_version %{version} %%firefox_mainver %{mainver} -%%firefox_mozillapath %{progdir} +%%firefox_mozillapath %%{_libdir}/%{progname} %%firefox_xulrunner %{xulrunner} %%firefox_xulrunner_version %(rpm -q --queryformat '%{VERSION}' %{xulrunner}) -%%firefox_pluginsdir %{_libdir}/browser-plugins +%%firefox_pluginsdir %%{_libdir}/browser-plugins %%firefox_appid \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} %%firefox_extdir %%(if [ "%%_target_cpu" = "noarch" ]; then echo %%{_datadir}/mozilla/extensions/%%{firefox_appid}; else echo %%{_libdir}/mozilla/extensions/%%{firefox_appid}; fi) @@ -446,7 +445,6 @@ exit 0 %config /etc/rpm/macros.%{progname} %if %localize - %files translations-common -f %{_tmppath}/translations.common %defattr(-,root,root) %dir %{progdir} diff --git a/compare-locales.tar.bz2 b/compare-locales.tar.bz2 index 8fc4190..9c33256 100644 --- a/compare-locales.tar.bz2 +++ b/compare-locales.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:95595f842ce9c2e84f948a85f323b51256bb41312a3261bd127969b701daa9c6 -size 25667 +oid sha256:d4cbf447289438496e96566771c6279d88988d302da27f05d53693a055bc819c +size 25670 diff --git a/firefox-4.0.0-source.tar.bz2 b/firefox-4.0.0-source.tar.bz2 new file mode 100644 index 0000000..9144321 --- /dev/null +++ b/firefox-4.0.0-source.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ab6a9b723a26bc00c5d54ff395062a2a06674442f4790fe1a195bf10b095985e +size 65256829 diff --git a/firefox-4.0b12-source.tar.bz2 b/firefox-4.0b12-source.tar.bz2 deleted file mode 100644 index 85c8943..0000000 --- a/firefox-4.0b12-source.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:977ad5dd5300ff28301825c82e3ee89c090f027043c726fec9b4cd181243d41b -size 65464044 diff --git a/l10n-4.0.0.tar.bz2 b/l10n-4.0.0.tar.bz2 new file mode 100644 index 0000000..33bef1d --- /dev/null +++ b/l10n-4.0.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7f1eb747793a4c4007f3010736a9677fe311a11473021f073f95523c1283f558 +size 42612118 diff --git a/l10n-4.0b12.tar.bz2 b/l10n-4.0b12.tar.bz2 deleted file mode 100644 index a64fb02..0000000 --- a/l10n-4.0b12.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:720062506a1770184e228e204ebc3e5a78000df90c6dfd9de59cc402f7d2e0e6 -size 40302792