summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--firefox-packager-build.patch12
-rw-r--r--firefox.spec2
2 files changed, 0 insertions, 14 deletions
diff --git a/firefox-packager-build.patch b/firefox-packager-build.patch
deleted file mode 100644
index f35d566..0000000
--- a/firefox-packager-build.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up firefox-21.0/mozilla-release/toolkit/mozapps/installer/packager.py.old firefox-21.0/mozilla-release/toolkit/mozapps/installer/packager.py
---- firefox-21.0/mozilla-release/toolkit/mozapps/installer/packager.py.old 2013-05-15 08:27:23.000000000 +0200
-+++ firefox-21.0/mozilla-release/toolkit/mozapps/installer/packager.py 2013-05-15 08:27:54.828483740 +0200
-@@ -344,7 +344,7 @@ def main():
- # Fill startup cache
- if isinstance(formatter, OmniJarFormatter) and launcher.can_launch():
- if buildconfig.substs['LIBXUL_SDK']:
-- gre_path = buildconfig.substs['LIBXUL_DIST']
-+ gre_path = buildconfig.substs['LIBXUL_DIST'] + '/bin'
- else:
- gre_path = None
- for base in sorted([[p for p in [mozpack.path.join('bin', b), b]
diff --git a/firefox.spec b/firefox.spec
index 1f4c9b2..178ac78 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -72,7 +72,6 @@ Source23: firefox.1
#Build patches
Patch0: firefox-install-dir.patch
-Patch1: firefox-packager-build.patch
# Fedora patches
Patch14: firefox-5.0-asciidel.patch
@@ -116,7 +115,6 @@ cd %{tarballdir}
# there is a compare of config and js/config directories and .orig suffix is
# ignored during this compare.
%patch0 -p1
-%patch1 -p2 -b .build
# For branding specific patches.
bgstack15