spec updates default
authorWolfgang Rosenauer <wr@rosenauer.org>
Sun, 28 Jun 2020 08:52:27 +0200
changeset 1137 909f866430ee
parent 1136 d068eb84b4d3
child 1138 4ac678bd2a26
spec updates
MozillaFirefox/MozillaFirefox.changes
MozillaFirefox/MozillaFirefox.spec
--- a/MozillaFirefox/MozillaFirefox.changes	Fri Jun 19 10:01:49 2020 +0200
+++ b/MozillaFirefox/MozillaFirefox.changes	Sun Jun 28 08:52:27 2020 +0200
@@ -1,5 +1,5 @@
 -------------------------------------------------------------------
-Fri Jun 19 07:59:08 UTC 2020 - Wolfgang Rosenauer <wr@rosenauer.org>
+Wed Jun 17 07:51:25 UTC 2020 - Wolfgang Rosenauer <wr@rosenauer.org>
 
 - Mozilla Firefox 78.0b8
   * startup notifications now using Gtk instead of libnotify
@@ -13,12 +13,6 @@
   WebRTC with pipewire support to enable screen sharing under
   Wayland; also add BuildRequires: pkgconfig(libpipewire-0.3)
   appropriately (boo#1172903).
-- adding SLE12 compatibility
-- add patches for s390x
-  * mozilla-bmo1602730.patch (bmo#1602730)
-  * mozilla-bmo1626236.patch (bmo#1626236)
-  * mozilla-bmo998749.patch (bmo#998749)
-  * mozilla-s390x-skia-gradient.patch
 
 -------------------------------------------------------------------
 Wed Jun 10 07:17:15 UTC 2020 - Guillaume GARDET <guillaume.gardet@opensuse.org>
--- a/MozillaFirefox/MozillaFirefox.spec	Fri Jun 19 10:01:49 2020 +0200
+++ b/MozillaFirefox/MozillaFirefox.spec	Sun Jun 28 08:52:27 2020 +0200
@@ -33,8 +33,10 @@
 %define branding       1
 %define devpkg         1
 
+%if 0%{?suse_version} > 1500
 # PGO builds do not work in TW currently (bmo#1642410)
 %define do_profiling   0
+%endif
 
 # upstream default is clang (to use gcc for large parts set to 0)
 %define clang_build 0
@@ -375,8 +377,9 @@
   echo fix kde helper version in the .spec file
   exit 1
 fi
+%endif # only_print_mozconfig
+
 source %{SOURCE4}
-%endif # only_print_mozconfig
 
 export CARGO_HOME=${RPM_BUILD_DIR}/%{srcname}-%{orig_version}/.cargo
 export MOZ_SOURCE_CHANGESET=$RELEASE_TAG
@@ -413,8 +416,17 @@
 echo "export CC=$CC"
 echo "export CXX=$CXX"
 echo "export CFLAGS=\"$CFLAGS\""
+echo "export CXXFLAGS=\"$CXXFLAGS\""
 echo "export LDFLAGS=\"$LDFLAGS\""
 echo "export RUSTFLAGS=\"$RUSTFLAGS\""
+echo "export CARGO_HOME=\"$CARGO_HOME\""
+echo "export PATH=\"$PATH\""
+echo "export LD_LIBRARY_PATH=\"$LD_LIBRARY_PATH\""
+echo "export PKG_CONFIG_PATH=\"$PKG_CONFIG_PATH\""
+echo "export MOZCONFIG=\"$MOZCONFIG\""
+echo "export MOZILLA_OFFICIAL=1"
+echo "export BUILD_OFFICIAL=1"
+echo "export MOZ_TELEMETRY_REPORTING=1"
 echo ""
 cat << EOF
 %else