mozilla: comparison MozillaFirefox/MozillaFirefox.spec

equal deleted inserted replaced

-:747f09b514d8
+:1256d8842872
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 # norootforbuild
-%define major 6
+%define major 7
-%define mainver %major.99
+%define mainver %major.0
 Name:           MozillaFirefox
-BuildRequires:  autoconf213 dbus-1-glib-devel gcc-c++ libcurl-devel libgnomeui-devel libidl-devel libnotify-devel python startup-notification-devel unzip update-desktop-files zip fdupes Mesa-devel yasm
+BuildRequires:  Mesa-devel autoconf213 dbus-1-glib-devel fdupes gcc-c++ libcurl-devel libgnomeui-devel libidl-devel libnotify-devel python startup-notification-devel unzip update-desktop-files yasm zip
 %if %suse_version > 1110
 BuildRequires:  libiw-devel
 BuildRequires:  libproxy-devel
 %else
 BuildRequires:  wireless-tools
 BuildRequires:  mozilla-nss-devel >= 3.12.10
 BuildRequires:  nss-shared-helper-devel
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Version:        %{mainver}
 Release:        1
-%define         releasedate 2011090900
+%define         releasedate 2011092200
 Provides:       web_browser
 Provides:       firefox = %{version}-%{release}
 Provides:       firefox = %{mainver}
 # this is needed to match this package with the kde4 helper package without the main package
 # having a hard requirement on the kde4 package
 Patch1:         toolkit-download-folder.patch
 Patch2:         mozilla-nongnome-proxies.patch
 Patch3:         mozilla-prefer_plugin_pref.patch
 Patch4:         mozilla-shared-nss-db.patch
 Patch5:         mozilla-kde.patch
-Patch6:         mozilla-cairo-lcd.patch
 Patch7:         mozilla-language.patch
 Patch9:         mozilla-cairo-return.patch
 Patch10:        mozilla-ntlm-full-path.patch
 Patch12:        mozilla-repo.patch
 Patch13:        mozilla-dump_syms-static.patch
 %description devel
 Development files for Firefox to make packaging of addons easier.
 %if %localize
 %package translations-common
 Summary:        Common translations for MozillaFirefox
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 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
 %description branding-upstream
 This package provides upstream look and feel for MozillaFirefox.
 %if %crashreporter
 %package buildsymbols
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Summary:        Breakpad buildsymbols for %{name}
 Group:          Development/Debug
 %description buildsymbols
 This subpackage contains the Breakpad created and compatible debugging
 symbols meant for upload to Mozilla's crash collector database.
 %endif
 %prep
 %setup -q -n mozilla -b 7 -b 10
 cd $RPM_BUILD_DIR/mozilla
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-#%patch6 -p1
 %patch7 -p1
 %patch9 -p1
 %patch10 -p1
 %patch12 -p1
 %patch13 -p1
 ac_add_options --disable-updater
 ac_add_options --disable-tests
 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
 ac_add_options --disable-gnomevfs
 ac_add_options --enable-gio
 %defattr(-,root,root)
 %{_bindir}/mozilla-get-app-id
 %config /etc/rpm/macros.%{progname}
 %if %localize
 %files translations-common -f %{_tmppath}/translations.common
 %defattr(-,root,root)
 %dir %{progdir}
 %dir %{progdir}/extensions/
 %dir %{progdir}/extensions/
 %endif
 # this package does not need to provide files but is needed to fulfill
 # requirements if no other branding package is to be installed
 %files branding-upstream
 %defattr(-,root,root)
 %dir %{progdir}
 %if %crashreporter
 %files buildsymbols
 %defattr(-,root,root)
 %{_datadir}/mozilla/*.zip
 %endif

branch	firefox7
changeset 334	1256d8842872
parent 327	34013ee9fafd
child 337	cf16b6560dd1