diff options
-rw-r--r-- | firefox.spec | 7 | ||||
-rw-r--r-- | mozilla-build.patch | 23 |
2 files changed, 4 insertions, 26 deletions
diff --git a/firefox.spec b/firefox.spec index 86a468b..a11d6ae 100644 --- a/firefox.spec +++ b/firefox.spec @@ -86,7 +86,7 @@ Summary: Mozilla Firefox Web browser Name: firefox Version: 27.0.1 -Release: 1%{?pre_tag}%{?dist} +Release: 2%{?pre_tag}%{?dist} URL: http://www.mozilla.org/projects/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -103,7 +103,6 @@ Source23: firefox.1 #Build patches Patch0: firefox-install-dir.patch -Patch2: mozilla-build.patch Patch3: mozilla-build-arm.patch Patch14: xulrunner-2.0-chromium-types.patch Patch17: xulrunner-24.0-gcc47.patch @@ -220,7 +219,6 @@ cd %{tarballdir} # ignored during this compare. %patch0 -p1 -%patch2 -p2 -b .bld %patch3 -p2 -b .arm %patch14 -p2 -b .chromium-types %patch17 -p1 -b .gcc47 @@ -637,6 +635,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog +* Thu Mar 6 2014 Martin Stransky <stransky@redhat.com> - 27.0.1-2 +- Removed needless build patch + * Mon Feb 24 2014 Martin Stransky <stransky@redhat.com> - 27.0.1-1 - Update to 27.0.1 diff --git a/mozilla-build.patch b/mozilla-build.patch deleted file mode 100644 index 5136563..0000000 --- a/mozilla-build.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -up firefox-27.0/mozilla-release/security/build/Makefile.in.bld firefox-27.0/mozilla-release/security/build/Makefile.in ---- firefox-27.0/mozilla-release/security/build/Makefile.in.bld 2014-01-28 05:04:01.000000000 +0100 -+++ firefox-27.0/mozilla-release/security/build/Makefile.in 2014-02-03 10:56:16.010749049 +0100 -@@ -128,7 +128,6 @@ DEFAULT_GMAKE_FLAGS += NSPR_INCLUDE_DIR= - DEFAULT_GMAKE_FLAGS += NSPR_LIB_DIR=$(NSPR_LIB_DIR) - DEFAULT_GMAKE_FLAGS += MOZILLA_CLIENT=1 - DEFAULT_GMAKE_FLAGS += NO_MDUPDATE=1 --DEFAULT_GMAKE_FLAGS += NSS_ENABLE_ECC=1 - ifeq ($(OS_ARCH)_$(GNU_CC),WINNT_1) - DEFAULT_GMAKE_FLAGS += OS_DLLFLAGS="-static-libgcc" - endif -diff -up firefox-27.0/mozilla-release/security/manager/ssl/src/Makefile.in.bld firefox-27.0/mozilla-release/security/manager/ssl/src/Makefile.in ---- firefox-27.0/mozilla-release/security/manager/ssl/src/Makefile.in.bld 2014-02-03 11:01:58.000000000 +0100 -+++ firefox-27.0/mozilla-release/security/manager/ssl/src/Makefile.in 2014-02-03 11:02:05.941855059 +0100 -@@ -5,7 +5,6 @@ - # file, You can obtain one at http://mozilla.org/MPL/2.0/. - - DEFINES += \ -- -DNSS_ENABLE_ECC \ - -DDLL_PREFIX=\"$(DLL_PREFIX)\" \ - -DDLL_SUFFIX=\"$(DLL_SUFFIX)\" \ - $(NULL) -diff -up firefox-27.0/mozilla-release/security/manager/ssl/src/moz.build.bld firefox-27.0/mozilla-release/security/manager/ssl/src/moz.build |