Djam/firefox
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/firefox.git synced 2025-02-25 19:13:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

clean up spec

Browse source
This commit is contained in:
Tigro 2013-09-30 18:41:34 +04:00
parent 42171d237a
commit 046c6d5795
1 changed files with 1 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
firefox.spec
View file

@ -17,13 +17,6 @@
%define mozillalibdir %{_libdir}/%{name}-%{major} %define mozillalibdir %{_libdir}/%{name}-%{major}
%define pluginsdir %{_libdir}/mozilla/plugins %define pluginsdir %{_libdir}/mozilla/plugins
## libxul.so is provided by libxulrunnner2.0.
#if %{_use_internal_dependency_generator}
#define __noautoreq 'libxul.so'
#else
#define _requires_exceptions libxul.so
#endif
# this seems fragile, so require the exact version or later (#58754) # this seems fragile, so require the exact version or later (#58754)
%define sqlite3_version %(pkg-config --modversion sqlite3 &>/dev/null && pkg-config --modversion sqlite3 2>/dev/null || echo 0) %define sqlite3_version %(pkg-config --modversion sqlite3 &>/dev/null && pkg-config --modversion sqlite3 2>/dev/null || echo 0)
%define nss_version %(pkg-config --modversion nss &>/dev/null && pkg-config --modversion nss 2>/dev/null || echo 0) %define nss_version %(pkg-config --modversion nss &>/dev/null && pkg-config --modversion nss 2>/dev/null || echo 0)
@ -58,29 +51,16 @@ Source11: firefox-searchengines-google.xml
Source12: firefox-searchengines-bing.xml Source12: firefox-searchengines-bing.xml
Patch1: firefox-6.0-lang.patch Patch1: firefox-6.0-lang.patch
Patch2: firefox-vendor.patch Patch2: firefox-vendor.patch
Patch3: mozilla-firefox-1.5.0.6-systemproxy.patch
#Patch4: firefox-17.0-nss-binary.patch
# (OpenSuse) add patch to make firefox always use /usr/bin/firefox when "make firefox
# the default web browser" is used fix mdv bug#58784
#Patch5: firefox-6.0-appname.patch
Patch6: firefox-7.0-fix-str-fmt.patch
Patch7: mozilla-firefox-run-mozilla.patch
Patch8: firefox-22.0-disable-check-default-browser.patch Patch8: firefox-22.0-disable-check-default-browser.patch
Patch9: firefox-5.0-asciidel.patch Patch9: firefox-5.0-asciidel.patch
Patch10: firefox-3.5.3-default-mail-handler.patch Patch10: firefox-3.5.3-default-mail-handler.patch
# Patches for kde integration of FF # Patches for kde integration of FF
Patch11: firefox-24-kde.patch Patch11: firefox-24-kde.patch
Patch12: mozilla-24-kde.patch Patch12: mozilla-24-kde.patch
Patch13: firefox-13-fix-nspr-include.patch
Patch14: firefox-18-fix-cairo-build.patch
Patch17: xulrunner-15.0-gcc47.patch
Patch34: xulrunner_nojit.patch Patch34: xulrunner_nojit.patch
# Upstream patches # Upstream patches
# (cjw) use system virtualenv
Patch36: firefox-17.0-virtualenv.patch
# ROSA # ROSA
Patch90: firefox-15.0-enable-addons.patch Patch90: firefox-15.0-enable-addons.patch
@ -102,7 +82,7 @@ BuildRequires: nspr-devel >= 2:4.9.4
BuildRequires: startup-notification-devel BuildRequires: startup-notification-devel
BuildRequires: dbus-glib-devel BuildRequires: dbus-glib-devel
BuildRequires: python BuildRequires: python
BuildRequires: sqlite3-devel >= 3.7.7.1 BuildRequires: sqlite3-devel >= 3.7.17
%ifnarch %arm %mips %ifnarch %arm %mips
BuildRequires: valgrind BuildRequires: valgrind
BuildRequires: java-rpmbuild BuildRequires: java-rpmbuild
@ -181,16 +161,9 @@ Files and macros mainly for building Firefox extensions.
%setup -qn mozilla-%update_channel %setup -qn mozilla-%update_channel
%patch1 -p1 -b .lang %patch1 -p1 -b .lang
%patch2 -p1 -b .vendor %patch2 -p1 -b .vendor
#patch3 -p1 -b .systemproxy
#patch4 -p1 -b .nsspatch
#patch5 -p1 -b .appname
# It was disabled because firefox3 hangs when using soundwrapper
#patch7 -p1
%patch8 -p1 -b .disable-software-update %patch8 -p1 -b .disable-software-update
%patch9 -p1 -b .ascii %patch9 -p1 -b .ascii
%patch10 -p1 -b .default-mail-handler %patch10 -p1 -b .default-mail-handler
#%patch14 -p1
#%patch17 -p2 -b .gcc47
## KDE INTEGRATION ## KDE INTEGRATION
# Disable kde integration , need refactoring # Disable kde integration , need refactoring