Automatic import for version 10.0

This commit is contained in:
Rosa 2012-02-05 04:10:47 +04:00
parent ad01a7d6ed
commit cd33234418
3 changed files with 652 additions and 239 deletions

View file

@ -1,3 +1,3 @@
--- ---
sources: sources:
firefox-9.0.1.source.tar.bz2: e0748d86753eead5c0929d74158c601bf33b5db0 firefox-10.0.source.tar.bz2: cbf1fb0efe0a3a2b2dafaa324b136736e93de70c

View file

@ -1,5 +1,5 @@
%define major 9 %define major 10
%define realver %{major}.0.1 %define realver %{major}.0
# (tpg) MOZILLA_FIVE_HOME # (tpg) MOZILLA_FIVE_HOME
%define mozillalibdir %{_libdir}/%{name}-%{realver} %define mozillalibdir %{_libdir}/%{name}-%{realver}
@ -8,11 +8,11 @@
%if %mandriva_branch == Cooker %if %mandriva_branch == Cooker
# Cooker # Cooker
%define release 2 %define release 1
%else %else
# Old distros # Old distros
%define subrel 1 %define subrel 1
%define release %mkrel 1 %define release %mkrel 0
%endif %endif
# this seems fragile, so require the exact version or later (#58754) # this seems fragile, so require the exact version or later (#58754)
@ -74,7 +74,7 @@ BuildRequires: java-rpmbuild
BuildRequires: wget BuildRequires: wget
BuildRequires: libnotify-devel BuildRequires: libnotify-devel
BuildRequires: libevent-devel >= 1.4.7 BuildRequires: libevent-devel >= 1.4.7
BuildRequires: libvpx-devel >= 0.9.5 BuildRequires: libvpx-devel >= 0.9.7
%if %mdkversion >= 201100 %if %mdkversion >= 201100
BuildRequires: cairo-devel >= 1.10 BuildRequires: cairo-devel >= 1.10
%endif %endif
@ -107,8 +107,8 @@ Files and macros mainly for building Firefox extensions.
%patch6 -p1 -b .wintitle %patch6 -p1 -b .wintitle
## KDE INTEGRATION ## KDE INTEGRATION
# copy current files and patch them later to keep them in sync # copy current files and patch them later to keep them in sync
%patch4 -p1 -b .kde # %%patch4 -p1 -b .kde
%patch41 -F 1 -p1 -b .kdemoz # %%patch41 -F 1 -p1 -b .kdemoz
# install kde.js # install kde.js
install -m 644 %{SOURCE9} browser/app/profile/kde.js install -m 644 %{SOURCE9} browser/app/profile/kde.js
@ -276,6 +276,10 @@ fi
%{_sys_macros_dir}/%{name}.macros %{_sys_macros_dir}/%{name}.macros
%changelog %changelog
* Thu Feb 02 2012 Oden Eriksson <oeriksson@mandriva.com> 10.0-0.1
- 10.0
- disable the kde patches for now
* Tue Dec 27 2011 Oden Eriksson <oeriksson@mandriva.com> 9.0.1-0.1 * Tue Dec 27 2011 Oden Eriksson <oeriksson@mandriva.com> 9.0.1-0.1
- 9.0.1 - 9.0.1
- fix #64991 (Firefox and Thunderbird consider l10n plugins as third party) - fix #64991 (Firefox and Thunderbird consider l10n plugins as third party)

File diff suppressed because it is too large Load diff