Arch-excludes February 2020

arch-excludes@lists.fedoraproject.org

2 participants
289 discussions

Architecture specific change in rpms/firefox.git
by githook-noreply＠fedoraproject.org 24 Feb '20

24 Feb '20

The package rpms/firefox.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/firefox.git/commit/?id=558ad062d957…. Change: +%ifarch x86_64 ppc ppc64 ppc64le aarch64 %{arm} Thanks. Full change: ============ commit 558ad062d9577b143fdc0894ca351b00f0a448ad Author: Martin Stransky <stransky(a)redhat.com> Date: Mon Feb 24 21:28:32 2020 +0100 Update pipewire patch for Fedora 32, Added armv7hl fixes by Gabriel Hojda diff --git a/build-arm-libaom.patch b/build-arm-libaom.patch new file mode 100644 index 0000000..985f01d --- /dev/null +++ b/build-arm-libaom.patch @@ -0,0 +1,12 @@ +diff -up firefox-73.0/media/libaom/moz.build.old firefox-73.0/media/libaom/moz.build +--- firefox-73.0/media/libaom/moz.build.old 2020-02-07 23:13:28.000000000 +0200 ++++ firefox-73.0/media/libaom/moz.build 2020-02-17 10:30:08.509805092 +0200 +@@ -55,7 +55,7 @@ elif CONFIG['CPU_ARCH'] == 'arm': + + for f in SOURCES: + if f.endswith('neon.c'): +- SOURCES[f].flags += CONFIG['VPX_ASFLAGS'] ++ SOURCES[f].flags += CONFIG['NEON_FLAGS'] + + if CONFIG['OS_TARGET'] == 'Android': + # For cpu-features.h diff --git a/build-arm-wasm.patch b/build-arm-wasm.patch new file mode 100644 index 0000000..bd841ab --- /dev/null +++ b/build-arm-wasm.patch @@ -0,0 +1,21 @@ +diff -up firefox-72.0.2/js/src/wasm/WasmSignalHandlers.cpp.old firefox-72.0.2/js/src/wasm/WasmSignalHandlers.cpp +--- firefox-72.0.2/js/src/wasm/WasmSignalHandlers.cpp.old 2020-01-17 23:34:41.000000000 +0200 ++++ firefox-72.0.2/js/src/wasm/WasmSignalHandlers.cpp 2020-02-02 08:07:54.670341986 +0200 +@@ -249,7 +249,16 @@ using mozilla::DebugOnly; + #endif + + #ifdef WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS +-# include <sys/user.h> ++struct user_vfp { ++ unsigned long long fpregs[32]; ++ unsigned long fpscr; ++}; ++ ++struct user_vfp_exc { ++ unsigned long fpexc; ++ unsigned long fpinst; ++ unsigned long fpinst2; ++}; + #endif + + #if defined(ANDROID) diff --git a/firefox-pipewire-0.3.patch b/firefox-pipewire-0.3.patch new file mode 100644 index 0000000..6f88fa8 --- /dev/null +++ b/firefox-pipewire-0.3.patch @@ -0,0 +1,63 @@ +diff -up firefox-68.0/config/system-headers.mozbuild.firefox-pipewire firefox-68.0/config/system-headers.mozbuild +--- firefox-68.0/config/system-headers.mozbuild.firefox-pipewire 2019-07-01 22:30:26.000000000 +0200 ++++ firefox-68.0/config/system-headers.mozbuild 2019-07-08 15:26:15.397161627 +0200 +@@ -314,6 +314,7 @@ system_headers = [ + 'Gestalt.h', + 'getopt.h', + 'gio/gio.h', ++ 'gio/gunixfdlist.h', + 'glibconfig.h', + 'glib.h', + 'glib-object.h', +@@ -607,6 +608,7 @@ system_headers = [ + 'Pgenerr.h', + 'PGenErr.h', + 'Ph.h', ++ 'pipewire/pipewire.h', + 'pixman.h', + 'pk11func.h', + 'pk11pqg.h', +diff -up firefox-68.0/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build.firefox-pipewire firefox-68.0/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build +--- firefox-68.0/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build.firefox-pipewire 2019-07-01 22:30:33.000000000 +0200 ++++ firefox-68.0/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build 2019-07-08 15:26:15.397161627 +0200 +@@ -194,6 +194,28 @@ if CONFIG["OS_TARGET"] == "Linux": + "/media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer_linux.cc" + ] + ++# PipeWire specific files ++if CONFIG["OS_TARGET"] == "Linux": ++ ++ DEFINES["WEBRTC_USE_PIPEWIRE"] = "1" ++ ++ OS_LIBS += [ ++ "rt", ++ "pipewire-0.3", ++ "glib-2.0", ++ "gio-2.0", ++ "gobject-2.0" ++ ] ++ ++ CXXFLAGS += CONFIG['TK_CFLAGS'] ++ ++ UNIFIED_SOURCES += [ ++ "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc", ++ "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/screen_capturer_pipewire.cc", ++ "/media/webrtc/trunk/webrtc/modules/desktop_capture/linux/window_capturer_pipewire.cc" ++ ] ++ ++ + if CONFIG["OS_TARGET"] == "NetBSD": + + DEFINES["USE_X11"] = "1" +diff -up firefox-68.0/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_options.h.firefox-pipewire firefox-68.0/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_options.h +--- firefox-68.0/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_options.h.firefox-pipewire 2019-07-08 16:42:13.936254926 +0200 ++++ firefox-68.0/media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_options.h 2019-07-08 16:42:17.509264974 +0200 +@@ -141,7 +141,7 @@ class DesktopCaptureOptions { + bool disable_effects_ = true; + bool detect_updated_region_ = false; + #if defined(WEBRTC_USE_PIPEWIRE) +- bool allow_pipewire_ = false; ++ bool allow_pipewire_ = true; + #endif + }; + diff --git a/firefox.spec b/firefox.spec index 945cde1..b947b82 100644 --- a/firefox.spec +++ b/firefox.spec @@ -5,7 +5,7 @@ %global build_with_asan 0 # Disabled arm due to rhbz#1658940 -ExcludeArch: armv7hl +# ExcludeArch: armv7hl # Disabled due to https://pagure.io/fedora-infrastructure/issue/7581 ExcludeArch: s390x # Disabled due to neon build error @@ -24,7 +24,11 @@ ExcludeArch: aarch64 %global system_nss 1 %global system_ffi 1 +%ifarch armv7hl +%global system_libvpx 1 +%else %global system_libvpx 0 +%endif %global hardened_build 1 %global system_jpeg 1 %global run_tests 0 @@ -53,6 +57,11 @@ ExcludeArch: aarch64 %global big_endian 1 %endif +%ifarch armv7hl +%define _unpackaged_files_terminate_build 0 +%global debug_package %{nil} +%endif + %if 0%{?build_with_pgo} %global use_xvfb 1 %global build_tests 1 @@ -70,7 +79,7 @@ ExcludeArch: aarch64 %global freetype_version 2.1.9 %global libnotify_version 0.7.0 %if %{?system_libvpx} -%global libvpx_version 1.4.0 +%global libvpx_version 1.8.2 %endif %if %{?system_nss} @@ -104,7 +113,7 @@ ExcludeArch: aarch64 Summary: Mozilla Firefox Web browser Name: firefox Version: 73.0.1 -Release: 2%{?dist} +Release: 3%{?dist} URL: https://www.mozilla.org/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Source0: https://archive.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/… @@ -146,6 +155,8 @@ Patch44: build-arm-libopus.patch #Patch45: build-disable-multijobs-rust.patch Patch46: firefox-nss-version.patch Patch47: fedora-shebang-build.patch +Patch48: build-arm-wasm.patch +Patch49: build-arm-libaom.patch # Fedora specific patches Patch215: firefox-enable-addons.patch @@ -172,6 +183,7 @@ Patch430: mozilla-1605795-popup-parent-fix.patch # Wayland specific upstream patches Patch574: firefox-pipewire.patch +Patch575: firefox-pipewire-0.3.patch # PGO/LTO patches Patch600: pgo.patch @@ -343,6 +355,8 @@ This package contains results of tests executed during build. %endif #%patch46 -p1 -b .nss-version %patch47 -p1 -b .fedora-shebang +%patch48 -p1 -b .build-arm-wasm +%patch49 -p1 -b .build-arm-libaom # Fedora patches %patch215 -p1 -b .addons @@ -374,7 +388,11 @@ This package contains results of tests executed during build. %patch430 -p1 -b .1605795-popup-parent-fix # Wayland specific upstream patches +%if 0%{?fedora} < 32 %patch574 -p1 -b .firefox-pipewire +%else +%patch575 -p1 -b .firefox-pipewire +%endif # PGO patches %patch600 -p1 -b .pgo @@ -418,7 +436,7 @@ echo "ac_add_options --disable-optimize" >> .mozconfig # ARMv7 needs that (rhbz#1426850) %global optimize_flags "-g -O2 -fno-schedule-insns" # Disable libaom due to rhbz#1641623 -echo "ac_add_options --disable-av1" >> .mozconfig +#echo "ac_add_options --disable-av1" >> .mozconfig %endif %ifarch ppc64le aarch64 %global optimize_flags "-g -O2" @@ -531,6 +549,9 @@ MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-Werror=format-security// %endif %if 0%{?fedora} > 30 MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -fpermissive" +%ifarch armv7hl +MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -flax-vector-conversions" +%endif %endif %if %{?hardened_build} MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -fPIC -Wl,-z,relro -Wl,-z,now" @@ -554,7 +575,7 @@ export MOZ_DEBUG_FLAGS=" " MOZ_LINK_FLAGS="-Wl,--no-keep-memory -Wl,--reduce-memory-overheads" %endif %ifarch %{arm} -MOZ_LINK_FLAGS="-Wl,--no-keep-memory" +MOZ_LINK_FLAGS="-Wl,--no-keep-memory -Wl,--strip-debug" echo "ac_add_options --enable-linker=gold" >> .mozconfig %endif %endif @@ -603,7 +624,7 @@ MOZ_SMP_FLAGS=-j1 RPM_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`" [ "$RPM_BUILD_NCPUS" -ge 2 ] && MOZ_SMP_FLAGS=-j2 %endif -%ifarch x86_64 ppc ppc64 ppc64le aarch64 +%ifarch x86_64 ppc ppc64 ppc64le aarch64 %{arm} [ -z "$RPM_BUILD_NCPUS" ] && \ RPM_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`" [ "$RPM_BUILD_NCPUS" -ge 2 ] && MOZ_SMP_FLAGS=-j2 @@ -948,6 +969,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog +* Mon Feb 24 2020 Martin Stransky <stransky(a)redhat.com> - 73.0.1-3 +- Update pipewire patch for Fedora 32 +- Added armv7hl fixes by Gabriel Hojda + * Mon Feb 24 2020 Martin Stransky <stransky(a)redhat.com> - 73.0.1-2 - Fixed Bug 1804787 - Some .desktop menu entries unlocalized

1 0

Architecture specific change in rpms/firefox.git
by githook-noreply＠fedoraproject.org 24 Feb '20

24 Feb '20

1 0

Architecture specific change in rpms/firefox.git
by githook-noreply＠fedoraproject.org 24 Feb '20

24 Feb '20

1 0

Architecture specific change in rpms/firefox.git
by githook-noreply＠fedoraproject.org 24 Feb '20

24 Feb '20

1 0

Architecture specific change in rpms/rust-lexical-core0.4.git
by githook-noreply＠fedoraproject.org 24 Feb '20

24 Feb '20

The package rpms/rust-lexical-core0.4.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/rust-lexical-core0.4.git/commit/?id…. Change: -ExclusiveArch: %{rust_arches} Thanks. Full change: ============ commit a24745554757eaf3b4c1589e7b02f222ab7b6a37 Author: Josh Stone <jistone(a)redhat.com> Date: Mon Feb 24 11:07:06 2020 -0800 this compat package is no longer used diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 6cfc83d..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/lexical-core-0.4.6.crate diff --git a/README.md b/README.md deleted file mode 100644 index 1555a67..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# rust-lexical-core0.4 - -The rust-lexical-core0.4 package \ No newline at end of file diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..5672ae3 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +this compat package is no longer used diff --git a/lexical-core-fix-metadata.diff b/lexical-core-fix-metadata.diff deleted file mode 100644 index 26fb96b..0000000 --- a/lexical-core-fix-metadata.diff +++ /dev/null @@ -1,29 +0,0 @@ ---- lexical-core-0.4.6/Cargo.toml 1970-01-01T00:00:00+00:00 -+++ lexical-core-0.4.6/Cargo.toml 2019-12-06T19:37:01.108614+00:00 -@@ -39,7 +39,7 @@ - [lib] - crate-type = ["lib", "staticlib", "cdylib"] - [dependencies.arrayvec] --version = "0.4" -+version = "0.5" - features = ["array-sizes-33-128"] - optional = true - -@@ -55,7 +55,7 @@ - optional = true - - [dependencies.static_assertions] --version = "0.3.3" -+version = "1" - [dev-dependencies.approx] - version = "0.3.0" - -@@ -63,7 +63,7 @@ - version = "0.9.4" - - [dev-dependencies.quickcheck] --version = "0.8.5" -+version = "0.9" - [build-dependencies.rustc_version] - version = "0.2" - diff --git a/rust-lexical-core0.4.spec b/rust-lexical-core0.4.spec deleted file mode 100644 index 02f95c4..0000000 --- a/rust-lexical-core0.4.spec +++ /dev/null @@ -1,220 +0,0 @@ -# Generated by rust2rpm 10 -%bcond_with check -%global debug_package %{nil} - -%global crate lexical-core - -Name: rust-%{crate}0.4 -Version: 0.4.6 -Release: 3%{?dist} -Summary: Lexical, to- and from-string conversion routines - -# Upstream license specification: MIT/Apache-2.0 -License: MIT or ASL 2.0 -URL: https://crates.io/crates/lexical-core -Source: %{crates_source} -# Initial patched metadata -# * Update quickcheck to 0.9, https://github.com/Alexhuszagh/rust-lexical/commit/fefe81850e5678450ec0f001… -# * Update static_assertions to 1, https://github.com/Alexhuszagh/rust-lexical/pull/31 -# * Update arrayvec to 0.5, https://github.com/Alexhuszagh/rust-lexical/pull/32 -Patch0: lexical-core-fix-metadata.diff - -ExclusiveArch: %{rust_arches} -%if %{__cargo_skip_build} -BuildArch: noarch -%endif - -BuildRequires: rust-packaging - -%global _description %{expand: -Lexical, to- and from-string conversion routines.} - -%description %{_description} - -%package devel -Summary: %{summary} -BuildArch: noarch - -%description devel %{_description} - -This package contains library source intended for building other packages -which use "%{crate}" crate. - -%files devel -%license LICENSE-MIT LICENSE-APACHE -%doc README.md CHANGELOG -%{cargo_registry}/%{crate}-%{version}/ - -%package -n %{name}+default-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+default-devel %{_description} - -This package contains library source intended for building other packages -which use "default" feature of "%{crate}" crate. - -%files -n %{name}+default-devel -%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml - -%package -n %{name}+arrayvec-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+arrayvec-devel %{_description} - -This package contains library source intended for building other packages -which use "arrayvec" feature of "%{crate}" crate. - -%files -n %{name}+arrayvec-devel -%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml - -%package -n %{name}+correct-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+correct-devel %{_description} - -This package contains library source intended for building other packages -which use "correct" feature of "%{crate}" crate. - -%files -n %{name}+correct-devel -%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml - -%package -n %{name}+dtoa-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+dtoa-devel %{_description} - -This package contains library source intended for building other packages -which use "dtoa" feature of "%{crate}" crate. - -%files -n %{name}+dtoa-devel -%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml - -%package -n %{name}+grisu3-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+grisu3-devel %{_description} - -This package contains library source intended for building other packages -which use "grisu3" feature of "%{crate}" crate. - -%files -n %{name}+grisu3-devel -%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml - -%package -n %{name}+radix-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+radix-devel %{_description} - -This package contains library source intended for building other packages -which use "radix" feature of "%{crate}" crate. - -%files -n %{name}+radix-devel -%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml - -%package -n %{name}+rounding-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+rounding-devel %{_description} - -This package contains library source intended for building other packages -which use "rounding" feature of "%{crate}" crate. - -%files -n %{name}+rounding-devel -%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml - -%package -n %{name}+ryu-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+ryu-devel %{_description} - -This package contains library source intended for building other packages -which use "ryu" feature of "%{crate}" crate. - -%files -n %{name}+ryu-devel -%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml - -%package -n %{name}+std-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+std-devel %{_description} - -This package contains library source intended for building other packages -which use "std" feature of "%{crate}" crate. - -%files -n %{name}+std-devel -%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml - -%package -n %{name}+table-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+table-devel %{_description} - -This package contains library source intended for building other packages -which use "table" feature of "%{crate}" crate. - -%files -n %{name}+table-devel -%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml - -%package -n %{name}+trim_floats-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+trim_floats-devel %{_description} - -This package contains library source intended for building other packages -which use "trim_floats" feature of "%{crate}" crate. - -%files -n %{name}+trim_floats-devel -%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml - -%package -n %{name}+unchecked_index-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+unchecked_index-devel %{_description} - -This package contains library source intended for building other packages -which use "unchecked_index" feature of "%{crate}" crate. - -%files -n %{name}+unchecked_index-devel -%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml - -%prep -%autosetup -n %{crate}-%{version_no_tilde} -p1 -# Port to the static_assertions to 1.x -sed -e '/const_assert!/s/([^;)]\+;\s*/(/' -i src/util/table.rs src/atof/algorithm/small_powers.rs -%cargo_prep - -%generate_buildrequires -%cargo_generate_buildrequires - -%build -%cargo_build - -%install -%cargo_install - -%if %{with check} -%check -%cargo_test -%endif - -%changelog -* Thu Jan 30 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.4.6-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Fri Dec 06 20:37:57 CET 2019 Robert-Andr Mauchin <zebob.m(a)gmail.com> - 0.4.6-2 -- Update arrayvec to 0.5 - -* Tue Nov 26 17:13:25 CET 2019 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 0.4.6-1 -- Initial package diff --git a/sources b/sources deleted file mode 100644 index 4262291..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (lexical-core-0.4.6.crate) = d8ff19f73adcb69211147ace5c885dd5e970daa737f7a69079983a75db617f0c2cf3bd74374ed0f421b0779ce7e5b4115fd4beee83401401f48045987d08f28b

1 0

Architecture specific change in rpms/rr.git
by githook-noreply＠fedoraproject.org 24 Feb '20

24 Feb '20

The package rpms/rr.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/rr.git/commit/?id=5d92dff699273fe58…. Change: +%ifarch x86_64 Thanks. Full change: ============ commit 226109869962344cc20837f989a49b485eac9a44 Author: Sagar Patel <sapatel(a)redhat.com> Date: Mon Feb 24 12:30:22 2020 -0500 Enable rr to be built on older compilers diff --git a/.gitignore b/.gitignore index 752ed75..3738c13 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /rr-7908fea.tar.gz /rr-abd3442.tar.gz +/rr-4513b23.tar.gz diff --git a/rr-flags.patch b/rr-flags.patch deleted file mode 100644 index c0e687d..0000000 --- a/rr-flags.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up rr-4452c7f4f5be41e6df155682b42b4336a67ddf5c/CMakeLists.txt.flags rr-4452c7f4f5be41e6df155682b42b4336a67ddf5c/CMakeLists.txt ---- rr-4452c7f4f5be41e6df155682b42b4336a67ddf5c/CMakeLists.txt.flags 2019-12-08 03:23:38.000000000 -0500 -+++ rr-4452c7f4f5be41e6df155682b42b4336a67ddf5c/CMakeLists.txt 2020-01-10 14:27:51.971474564 -0500 -@@ -72,7 +72,7 @@ set(PRELOAD_COMPILE_FLAGS "${RR_FLAGS_RE - # Flags used to build Brotli. SHOULD be optimized. MUST NOT error on warnings. - set(BROTLI_COMPILE_FLAGS ${RR_FLAGS_RELEASE}) - # Flags used to build tests. MUST have -DDEBUG and debuginfo enabled, MUST NOT be optimized. --set(RR_TEST_FLAGS "${RR_FLAGS_DEBUG} -g3 -O0") -+set(RR_TEST_FLAGS "${RR_FLAGS_DEBUG} -g3 -Og") - # Flags used to build other files. Entirely build-type-dependent. - set(RR_FLAGS ${RR_FLAGS_RELEASE}) - -@@ -81,7 +81,7 @@ string(TOLOWER ${CMAKE_BUILD_TYPE} LOWER - if(LOWERCASE_CMAKE_BUILD_TYPE STREQUAL "debug") - set(PRELOAD_COMPILE_FLAGS "${PRELOAD_COMPILE_FLAGS} -O2 -Werror") - set(BROTLI_COMPILE_FLAGS "${RR_FLAGS_RELEASE} -O2") -- set(RR_TEST_FLAGS "${RR_TEST_FLAGS} -Werror") -+ set(RR_TEST_FLAGS "${RR_TEST_FLAGS} -Werror -Wno-error=unused-result -Wno-error=attribute-warning") - set(RR_FLAGS "${RR_FLAGS_DEBUG} -g3 -Werror") - elseif(LOWERCASE_CMAKE_BUILD_TYPE STREQUAL "release") - # CMake itself will add optimization flags diff --git a/rr.spec b/rr.spec index 7567b8f..2380968 100644 --- a/rr.spec +++ b/rr.spec @@ -1,4 +1,4 @@ -%global commit abd344288878c9b4046e0b8664927992947a46eb +%global commit 4513b23c8092097dc42c73f3cbaf4cfaebd04efe %global shortcommit %(c=%{commit}; echo ${c:0:7}) ExclusiveArch: %{ix86} x86_64 @@ -10,7 +10,7 @@ ExclusiveArch: %{ix86} x86_64 Summary: Tool to record and replay execution of applications Name: rr Version: 5.3.0 -Release: 10.20200213git%{shortcommit}%{?dist} +Release: 11.20200224git%{shortcommit}%{?dist} # The entire source code is MIT with the exceptions of # files in following directories: # third-party/blake2 CC0 @@ -20,12 +20,9 @@ License: MIT and CC0 and BSD URL: http://rr-project.org Source: https://github.com/mozilla/rr/archive/%{commit}/%{name}-%{shortcommit}.tar.… -# The following patch avoids errors during the build due to -D_FORTIFY_SOURCE=2 and -Werror. -Patch1: rr-flags.patch %if 0%{?rhel} == 7 BuildRequires: cmake3 -BuildRequires: devtoolset-9-toolchain BuildRequires: python36-pexpect %else BuildRequires: cmake @@ -46,16 +43,10 @@ For more information, please visit http://rr-project.org %prep %setup -q -n rr-%{commit} -%patch1 -p1 -b .flags - %build -%if 0%{?rhel} == 7 -. /opt/rh/devtoolset-9/enable -%endif - mkdir obj && cd obj -%cmake3 .. %{?disable32bit} +%cmake3 .. -DCMAKE_BUILD_TYPE=Release %{?disable32bit} make %{?_smp_mflags} @@ -80,6 +71,11 @@ rm -rf %{buildroot}%{_datadir}/rr/src %license LICENSE %changelog +* Mon Feb 24 2020 Sagar Patel <sapatel(a)redhat.com> 10.20200224git4513b23 +- Sync with upstream branch master, + commit 4513b23c8092097dc42c73f3cbaf4cfaebd04efe. +- New patches enable rr to be built on older compilers. + * Thu Feb 13 2020 Sagar Patel <sapatel(a)redhat.com> 10.20200213gitabd3442 - Sync with upstream branch master, commit abd344288878c9b4046e0b8664927992947a46eb. diff --git a/sources b/sources index 1e9cc6c..62074d7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rr-abd3442.tar.gz) = 8e68b9f8cb040ea8416a327019f72014e2257480d4cf0e39198dcd7566dca02daad1077a2f16227c03f5f3d11b8feb7dfba5edf91f185c9ed8b5dd44226a0c0d +SHA512 (rr-4513b23.tar.gz) = a3ecad204f436eb147e015cd0b2364f5b8e41cb74440ed23759ba0c26cd5800e612e5244b4b72f15d143d6ad37a524ed327c9c6ad0af289e2c9d712d55f64050 commit 02bb2ab021d2af9bd503459b28c701d68110a1d1 Author: Sagar Patel <sapatel(a)redhat.com> Date: Thu Feb 13 13:12:49 2020 -0500 Enable rr to be built on built on RHEL7.2 and later diff --git a/.gitignore b/.gitignore index 702c9c6..752ed75 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /rr-7908fea.tar.gz +/rr-abd3442.tar.gz diff --git a/rr.spec b/rr.spec index 5913013..7567b8f 100644 --- a/rr.spec +++ b/rr.spec @@ -1,4 +1,4 @@ -%global commit 7908feaee2ddedcee6db7619a221b24193fb5e99 +%global commit abd344288878c9b4046e0b8664927992947a46eb %global shortcommit %(c=%{commit}; echo ${c:0:7}) ExclusiveArch: %{ix86} x86_64 @@ -10,7 +10,7 @@ ExclusiveArch: %{ix86} x86_64 Summary: Tool to record and replay execution of applications Name: rr Version: 5.3.0 -Release: 8.20200124git%{shortcommit}%{?dist} +Release: 10.20200213git%{shortcommit}%{?dist} # The entire source code is MIT with the exceptions of # files in following directories: # third-party/blake2 CC0 @@ -80,6 +80,11 @@ rm -rf %{buildroot}%{_datadir}/rr/src %license LICENSE %changelog +* Thu Feb 13 2020 Sagar Patel <sapatel(a)redhat.com> 10.20200213gitabd3442 +- Sync with upstream branch master, + commit abd344288878c9b4046e0b8664927992947a46eb. +- New patches enable rr to be built on RHEL7.2 and later. + * Tue Jan 14 2020 William Cohen <wcohen(a)redhat.com> 5.3.0-8.20200124git7908fea - Sync with upstream branch master, commit 70ba28f7ab2923d4e36ffc9d5d2e32357353b25c. diff --git a/sources b/sources index 24566c3..1e9cc6c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rr-7908fea.tar.gz) = c1899a66ea2f9cb273270c68c9fa3da9a7fa5b61f15f5da8a96ec2ad9f7b4e5859fdeb5dff3178139fc4fefb77fe1501e3b6cbfae87c7a6ea57db6774a8b8472 +SHA512 (rr-abd3442.tar.gz) = 8e68b9f8cb040ea8416a327019f72014e2257480d4cf0e39198dcd7566dca02daad1077a2f16227c03f5f3d11b8feb7dfba5edf91f185c9ed8b5dd44226a0c0d commit 5d92dff699273fe582270cb45264ac4808492151 Author: Sagar Patel <sapatel(a)redhat.com> Date: Fri Jan 31 14:33:05 2020 -0500 Initial import (#1793156) diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..702c9c6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/rr-7908fea.tar.gz diff --git a/rr-flags.patch b/rr-flags.patch new file mode 100644 index 0000000..c0e687d --- /dev/null +++ b/rr-flags.patch @@ -0,0 +1,21 @@ +diff -up rr-4452c7f4f5be41e6df155682b42b4336a67ddf5c/CMakeLists.txt.flags rr-4452c7f4f5be41e6df155682b42b4336a67ddf5c/CMakeLists.txt +--- rr-4452c7f4f5be41e6df155682b42b4336a67ddf5c/CMakeLists.txt.flags 2019-12-08 03:23:38.000000000 -0500 ++++ rr-4452c7f4f5be41e6df155682b42b4336a67ddf5c/CMakeLists.txt 2020-01-10 14:27:51.971474564 -0500 +@@ -72,7 +72,7 @@ set(PRELOAD_COMPILE_FLAGS "${RR_FLAGS_RE + # Flags used to build Brotli. SHOULD be optimized. MUST NOT error on warnings. + set(BROTLI_COMPILE_FLAGS ${RR_FLAGS_RELEASE}) + # Flags used to build tests. MUST have -DDEBUG and debuginfo enabled, MUST NOT be optimized. +-set(RR_TEST_FLAGS "${RR_FLAGS_DEBUG} -g3 -O0") ++set(RR_TEST_FLAGS "${RR_FLAGS_DEBUG} -g3 -Og") + # Flags used to build other files. Entirely build-type-dependent. + set(RR_FLAGS ${RR_FLAGS_RELEASE}) + +@@ -81,7 +81,7 @@ string(TOLOWER ${CMAKE_BUILD_TYPE} LOWER + if(LOWERCASE_CMAKE_BUILD_TYPE STREQUAL "debug") + set(PRELOAD_COMPILE_FLAGS "${PRELOAD_COMPILE_FLAGS} -O2 -Werror") + set(BROTLI_COMPILE_FLAGS "${RR_FLAGS_RELEASE} -O2") +- set(RR_TEST_FLAGS "${RR_TEST_FLAGS} -Werror") ++ set(RR_TEST_FLAGS "${RR_TEST_FLAGS} -Werror -Wno-error=unused-result -Wno-error=attribute-warning") + set(RR_FLAGS "${RR_FLAGS_DEBUG} -g3 -Werror") + elseif(LOWERCASE_CMAKE_BUILD_TYPE STREQUAL "release") + # CMake itself will add optimization flags diff --git a/rr.spec b/rr.spec new file mode 100644 index 0000000..5913013 --- /dev/null +++ b/rr.spec @@ -0,0 +1,86 @@ +%global commit 7908feaee2ddedcee6db7619a221b24193fb5e99 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) +ExclusiveArch: %{ix86} x86_64 + +# Disable 32-bit builds on architectures with multilibs +# to avoid attempting pulling in 32-bit in to koji build. +%ifarch x86_64 +%global disable32bit -Ddisable32bit=ON +%endif +Summary: Tool to record and replay execution of applications +Name: rr +Version: 5.3.0 +Release: 8.20200124git%{shortcommit}%{?dist} +# The entire source code is MIT with the exceptions of +# files in following directories: +# third-party/blake2 CC0 +# third-party/gdb BSD +# third-party/proc-service BSD +License: MIT and CC0 and BSD +URL: http://rr-project.org + +Source: https://github.com/mozilla/rr/archive/%{commit}/%{name}-%{shortcommit}.tar.… +# The following patch avoids errors during the build due to -D_FORTIFY_SOURCE=2 and -Werror. +Patch1: rr-flags.patch + +%if 0%{?rhel} == 7 +BuildRequires: cmake3 +BuildRequires: devtoolset-9-toolchain +BuildRequires: python36-pexpect +%else +BuildRequires: cmake +BuildRequires: python3-pexpect +%endif +BuildRequires: make gcc gcc-c++ gdb +BuildRequires: libgcc +BuildRequires: glibc-devel +BuildRequires: libstdc++-devel +BuildRequires: man-pages +BuildRequires: capnproto capnproto-libs capnproto-devel + +%description +rr is a lightweight tool for recording and replaying execution +of applications (trees of processes and threads). +For more information, please visit http://rr-project.org + +%prep +%setup -q -n rr-%{commit} + +%patch1 -p1 -b .flags + +%build + +%if 0%{?rhel} == 7 +. /opt/rh/devtoolset-9/enable +%endif + +mkdir obj && cd obj +%cmake3 .. %{?disable32bit} + +make %{?_smp_mflags} + +%install +cd obj +%make_install + +rm -rf %{buildroot}%{_datadir}/rr/src + +%files +%dir %{_libdir}/rr +%{_libdir}/rr/librrpreload.so +%{_bindir}/rr +%{_bindir}/rr_exec_stub* +%{_bindir}/signal-rr-recording.sh +%{_bindir}/rr-collect-symbols.py +%{_datadir}/bash-completion/completions/rr +%dir %{_datadir}/rr +%{_datadir}/rr/*.xml +%{_datadir}/rr/rr_page_* + +%license LICENSE + +%changelog +* Tue Jan 14 2020 William Cohen <wcohen(a)redhat.com> 5.3.0-8.20200124git7908fea +- Sync with upstream branch master, + commit 70ba28f7ab2923d4e36ffc9d5d2e32357353b25c. +- SRPM buildable on Fedora koji or other rpm build systems. diff --git a/sources b/sources new file mode 100644 index 0000000..24566c3 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (rr-7908fea.tar.gz) = c1899a66ea2f9cb273270c68c9fa3da9a7fa5b61f15f5da8a96ec2ad9f7b4e5859fdeb5dff3178139fc4fefb77fe1501e3b6cbfae87c7a6ea57db6774a8b8472

1 0

Architecture specific change in rpms/rr.git
by githook-noreply＠fedoraproject.org 24 Feb '20

24 Feb '20

1 0

Architecture specific change in rpms/hlint.git
by githook-noreply＠fedoraproject.org 24 Feb '20

24 Feb '20

The package rpms/hlint.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/hlint.git/commit/?id=a71d33be2a8b12… https://src.fedoraproject.org/cgit/rpms/hlint.git/commit/?id=56553159c0b54d…. Change: +ExcludeArch: s390x +ExcludeArch: armv7hl s390x Thanks. Full change: ============ commit 56553159c0b54d050c35ef6567369a0e033a2a03 Author: Jens Petersen <petersen(a)redhat.com> Date: Sat Feb 22 16:47:19 2020 +0800 also disable armv7hl for now (#1806116) diff --git a/hlint.spec b/hlint.spec index 8ba5b53..172615a 100644 --- a/hlint.spec +++ b/hlint.spec @@ -56,11 +56,13 @@ BuildRequires: ghc-pretty-prof BuildRequires: ghc-time-prof BuildRequires: ghc-unix-prof # End cabal-rpm deps + # for ghc-lib-parser BuildRequires: alex BuildRequires: happy -# https://github.com/digital-asset/ghc-lib/issues/184 -ExcludeArch: s390x +# https://github.com/digital-asset/ghc-lib/issues/184 (s390x) +# ghc-lib crashes on armv7hl +ExcludeArch: armv7hl s390x %description HLint gives suggestions on how to improve your source code. @@ -197,7 +199,7 @@ echo "%{_datadir}/%{ghclibparser}/" >> %{ghclibparser}/ghc-ghc-lib-parser.files %changelog * Fri Feb 14 2020 Jens Petersen <petersen(a)redhat.com> - 2.1.26-1 - update to 2.1.26 -- add ghc-lib-parser: exclude s390x (#1806109) +- add ghc-lib-parser: exclude s390x (#1806109) and armv7hl (#1806116) * Wed Jan 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.1.11-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild commit ecd97a2caafece5388c56784e220147613d5eb2a Author: Jens Petersen <petersen(a)redhat.com> Date: Sat Feb 22 15:32:09 2020 +0800 add ghc-lib-parser datafiles diff --git a/hlint.spec b/hlint.spec index b60c810..8ba5b53 100644 --- a/hlint.spec +++ b/hlint.spec @@ -149,6 +149,8 @@ mv %{buildroot}%{_ghcdocdir}{,-common} mkdir -p %{buildroot}%{_mandir}/man1 mv %{buildroot}%{_datadir}/%{name}-%{version}/hlint.1 %{buildroot}%{_mandir}/man1 +echo "%{_datadir}/%{ghclibparser}/" >> %{ghclibparser}/ghc-ghc-lib-parser.files + %if 0%{?fedora} < 31 || 0%{?rhel} < 8 %post -n ghc-%{name}-devel @@ -195,7 +197,7 @@ mv %{buildroot}%{_datadir}/%{name}-%{version}/hlint.1 %{buildroot}%{_mandir}/man %changelog * Fri Feb 14 2020 Jens Petersen <petersen(a)redhat.com> - 2.1.26-1 - update to 2.1.26 -- add ghc-lib-parser +- add ghc-lib-parser: exclude s390x (#1806109) * Wed Jan 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.1.11-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild commit a71d33be2a8b12d07d461960128056ce0c399df6 Author: Jens Petersen <petersen(a)redhat.com> Date: Sat Feb 22 14:57:28 2020 +0800 exclude s390x for now: ghc-lib-parser fails https://github.com/digital-asset/ghc-lib/issues/184 diff --git a/hlint.spec b/hlint.spec index 976955b..b60c810 100644 --- a/hlint.spec +++ b/hlint.spec @@ -59,6 +59,8 @@ BuildRequires: ghc-unix-prof # for ghc-lib-parser BuildRequires: alex BuildRequires: happy +# https://github.com/digital-asset/ghc-lib/issues/184 +ExcludeArch: s390x %description HLint gives suggestions on how to improve your source code. commit 8daff0d780118c3ffd79ffa853829d50a5c4cf15 Author: Jens Petersen <petersen(a)redhat.com> Date: Sat Feb 22 14:11:49 2020 +0800 add happy ;) diff --git a/hlint.spec b/hlint.spec index b65d390..976955b 100644 --- a/hlint.spec +++ b/hlint.spec @@ -58,6 +58,7 @@ BuildRequires: ghc-unix-prof # End cabal-rpm deps # for ghc-lib-parser BuildRequires: alex +BuildRequires: happy %description HLint gives suggestions on how to improve your source code. commit 9a1fd6f34234793ff97f59e4d50124042f5340f1 Author: Jens Petersen <petersen(a)redhat.com> Date: Sat Feb 22 14:07:36 2020 +0800 ghc-lib-parser needs alex diff --git a/hlint.spec b/hlint.spec index a654540..b65d390 100644 --- a/hlint.spec +++ b/hlint.spec @@ -56,6 +56,8 @@ BuildRequires: ghc-pretty-prof BuildRequires: ghc-time-prof BuildRequires: ghc-unix-prof # End cabal-rpm deps +# for ghc-lib-parser +BuildRequires: alex %description HLint gives suggestions on how to improve your source code. commit c8da04441dcd00b9150b69f0ecadc58ac3b657f9 Author: Jens Petersen <petersen(a)redhat.com> Date: Sat Feb 22 13:42:53 2020 +0800 subpackage ghc-lib-parser diff --git a/.gitignore b/.gitignore index 1adfb5b..791ac9a 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,4 @@ hlint-1.7.3.tar.gz /hlint-2.1.8.tar.gz /hlint-2.1.11.tar.gz /hlint-2.1.26.tar.gz +/ghc-lib-parser-8.8.0.20190424.tar.gz diff --git a/hlint.spec b/hlint.spec index 2800745..a654540 100644 --- a/hlint.spec +++ b/hlint.spec @@ -1,11 +1,15 @@ -# generated by cabal-rpm-2.0.2 +# generated by cabal-rpm-2.0.3 --subpackage # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name hlint %global pkgver %{pkg_name}-%{version} +%global ghclibparser ghc-lib-parser-8.8.0.20190424 +%global subpkgs %{ghclibparser} + Name: %{pkg_name} Version: 2.1.26 +# can only be reset when all subpkgs bumped Release: 1%{?dist} Summary: Haskell source code suggestions @@ -13,11 +17,12 @@ License: BSD Url: https://hackage.haskell.org/package/%{name} # Begin cabal-rpm sources: Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz +Source1: https://hackage.haskell.org/package/%{ghclibparser}/%{ghclibparser}.tar.gz # End cabal-rpm sources # Begin cabal-rpm deps: BuildRequires: ghc-Cabal-devel -BuildRequires: ghc-rpm-macros +BuildRequires: ghc-rpm-macros-extra BuildRequires: ghc-aeson-prof BuildRequires: ghc-ansi-terminal-prof BuildRequires: ghc-base-prof @@ -29,7 +34,7 @@ BuildRequires: ghc-data-default-prof BuildRequires: ghc-directory-prof BuildRequires: ghc-extra-prof BuildRequires: ghc-filepath-prof -BuildRequires: ghc-ghc-lib-parser-prof +#BuildRequires: ghc-ghc-lib-parser-prof BuildRequires: ghc-haskell-src-exts-prof BuildRequires: ghc-haskell-src-exts-util-prof BuildRequires: ghc-hscolour-prof @@ -42,6 +47,14 @@ BuildRequires: ghc-unordered-containers-prof BuildRequires: ghc-vector-prof BuildRequires: ghc-yaml-prof Requires: %{name}-common = %{version}-%{release} +# for missing dep 'ghc-lib-parser': +BuildRequires: ghc-array-prof +BuildRequires: ghc-binary-prof +BuildRequires: ghc-deepseq-prof +BuildRequires: ghc-hpc-prof +BuildRequires: ghc-pretty-prof +BuildRequires: ghc-time-prof +BuildRequires: ghc-unix-prof # End cabal-rpm deps %description @@ -98,21 +111,33 @@ This package provides the Haskell %{name} profiling library. %endif +%global main_version %{version} + +%if %{defined ghclibdir} +%ghc_lib_subpackage %{ghclibparser} +%endif + +%global version %{main_version} + + %prep # Begin cabal-rpm setup: -%setup -q +%setup -q -a1 # End cabal-rpm setup %build # Begin cabal-rpm build: +%ghc_libs_build %{subpkgs} %ghc_lib_build # End cabal-rpm build %install # Begin cabal-rpm install +%ghc_libs_install %{subpkgs} %ghc_lib_install +%ghc_fix_rpath %{pkgver} mv %{buildroot}%{_ghcdocdir}{,-common} # End cabal-rpm install @@ -165,6 +190,7 @@ mv %{buildroot}%{_datadir}/%{name}-%{version}/hlint.1 %{buildroot}%{_mandir}/man %changelog * Fri Feb 14 2020 Jens Petersen <petersen(a)redhat.com> - 2.1.26-1 - update to 2.1.26 +- add ghc-lib-parser * Wed Jan 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.1.11-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index fdf86c7..7785840 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (hlint-2.1.26.tar.gz) = 6993469cf123f76923f4fe053ad9672c0393e14b670c28d80c013e9773486ba0b5e2c483d867aa3356764794afafd265471dff9c88884b4a47fa5abfc04741b8 +SHA512 (ghc-lib-parser-8.8.0.20190424.tar.gz) = f19bb4680b7f668aa8b6666f1f339368f286086a464287e1f939fdf0c7da0f58e4898f5d2afa7e5c4fa12e88e49d3d90e16136d6b86a924c649485f3801ba1d2 commit d3619badd277c99d5b1604606c76cf235390ed9f Author: Jens Petersen <petersen(a)redhat.com> Date: Fri Feb 14 14:46:32 2020 +0800 update to 2.1.26 diff --git a/.gitignore b/.gitignore index 5d089d7..1adfb5b 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ hlint-1.7.3.tar.gz /hlint-2.1.7.tar.gz /hlint-2.1.8.tar.gz /hlint-2.1.11.tar.gz +/hlint-2.1.26.tar.gz diff --git a/hlint.spec b/hlint.spec index 12b6072..2800745 100644 --- a/hlint.spec +++ b/hlint.spec @@ -5,8 +5,8 @@ %global pkgver %{pkg_name}-%{version} Name: %{pkg_name} -Version: 2.1.11 -Release: 4%{?dist} +Version: 2.1.26 +Release: 1%{?dist} Summary: Haskell source code suggestions License: BSD @@ -29,6 +29,7 @@ BuildRequires: ghc-data-default-prof BuildRequires: ghc-directory-prof BuildRequires: ghc-extra-prof BuildRequires: ghc-filepath-prof +BuildRequires: ghc-ghc-lib-parser-prof BuildRequires: ghc-haskell-src-exts-prof BuildRequires: ghc-haskell-src-exts-util-prof BuildRequires: ghc-hscolour-prof @@ -162,6 +163,9 @@ mv %{buildroot}%{_datadir}/%{name}-%{version}/hlint.1 %{buildroot}%{_mandir}/man %changelog +* Fri Feb 14 2020 Jens Petersen <petersen(a)redhat.com> - 2.1.26-1 +- update to 2.1.26 + * Wed Jan 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.1.11-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index f7a2cf3..fdf86c7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (hlint-2.1.11.tar.gz) = 70a5689a30ceef380a6117cde7a61c4f9220ea36f49e3b9077e2161db86ccb97fde5204ac1f49d941355a337d218d2bfe66a7f1ab5fbeded14791ac4e7befd60 +SHA512 (hlint-2.1.26.tar.gz) = 6993469cf123f76923f4fe053ad9672c0393e14b670c28d80c013e9773486ba0b5e2c483d867aa3356764794afafd265471dff9c88884b4a47fa5abfc04741b8 commit af68852674aac6c47ecde06765e815e04c414ff5 Author: Jens Petersen <petersen(a)redhat.com> Date: Sat Feb 8 22:53:10 2020 +0800 refresh to cabal-rpm-2.0.2 diff --git a/hlint.spec b/hlint.spec index 5fa43eb..12b6072 100644 --- a/hlint.spec +++ b/hlint.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-1.0.1 +# generated by cabal-rpm-2.0.2 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name hlint @@ -79,6 +79,7 @@ This package provides the Haskell %{name} library development files. %if %{with haddock} %package -n ghc-%{name}-doc Summary: Haskell %{name} library documentation +BuildArch: noarch %description -n ghc-%{name}-doc This package provides the Haskell %{name} library documentation. @@ -89,6 +90,7 @@ This package provides the Haskell %{name} library documentation. %package -n ghc-%{name}-prof Summary: Haskell %{name} profiling library Requires: ghc-%{name}-devel%{?_isa} = %{version}-%{release} +Supplements: (ghc-%{name}-devel and ghc-prof) %description -n ghc-%{name}-prof This package provides the Haskell %{name} profiling library. @@ -117,6 +119,16 @@ mkdir -p %{buildroot}%{_mandir}/man1 mv %{buildroot}%{_datadir}/%{name}-%{version}/hlint.1 %{buildroot}%{_mandir}/man1 +%if 0%{?fedora} < 31 || 0%{?rhel} < 8 +%post -n ghc-%{name}-devel +%ghc_pkg_recache + + +%postun -n ghc-%{name}-devel +%ghc_pkg_recache +%endif + + %files # Begin cabal-rpm files: %{_bindir}/%{name} @@ -140,6 +152,7 @@ mv %{buildroot}%{_datadir}/%{name}-%{version}/hlint.1 %{buildroot}%{_mandir}/man %if %{with haddock} %files -n ghc-%{name}-doc -f ghc-%{name}-doc.files +%license LICENSE %endif

1 0

Architecture specific change in rpms/ghc-http2.git
by githook-noreply＠fedoraproject.org 24 Feb '20

24 Feb '20

The package rpms/ghc-http2.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/ghc-http2.git/commit/?id=3b1a13b8df…. Change: +%ifnarch s390x Thanks. Full change: ============ commit 3b1a13b8df0814a6fdfa3b95b1a7d7135f058503 Author: Jens Petersen <petersen(a)redhat.com> Date: Sat Feb 22 12:17:44 2020 +0800 testsuite hangs on s390x diff --git a/ghc-http2.spec b/ghc-http2.spec index e268732..672ae49 100644 --- a/ghc-http2.spec +++ b/ghc-http2.spec @@ -7,7 +7,10 @@ %global timemanager time-manager-0.0.0 %global subpkgs %{timemanager} +# hangs +%ifnarch s390x %bcond_without tests +%endif Name: ghc-%{pkg_name} Version: 2.0.3 @@ -159,7 +162,7 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog * Fri Feb 14 2020 Jens Petersen <petersen(a)redhat.com> - 2.0.3-1 - update to 2.0.3 -- move time-manager subpackage from warp +- time-manager subpackage from warp * Tue Jan 28 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.6.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild commit 6e1dddd5be3a0ac626fe88692dd77e980a97acf9 Author: Jens Petersen <petersen(a)redhat.com> Date: Sat Feb 22 11:58:47 2020 +0800 move time-manager here from warp to break circular dep diff --git a/.gitignore b/.gitignore index d6a57da..2f98745 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /http2-1.6.4.tar.gz /http2-1.6.5.tar.gz /http2-2.0.3.tar.gz +/time-manager-0.0.0.tar.gz diff --git a/ghc-http2.spec b/ghc-http2.spec index 24ae1dc..e268732 100644 --- a/ghc-http2.spec +++ b/ghc-http2.spec @@ -1,25 +1,30 @@ -# generated by cabal-rpm-2.0.2 +# generated by cabal-rpm-2.0.3 --subpackage # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name http2 %global pkgver %{pkg_name}-%{version} -%bcond_with tests +%global timemanager time-manager-0.0.0 +%global subpkgs %{timemanager} + +%bcond_without tests Name: ghc-%{pkg_name} Version: 2.0.3 -Release: 1%{?dist} +# can only be reset when all subpkgs bumped +Release: 3%{?dist} Summary: HTTP/2 library License: BSD Url: https://hackage.haskell.org/package/%{pkg_name} # Begin cabal-rpm sources: Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz +Source1: https://hackage.haskell.org/package/%{timemanager}/%{timemanager}.tar.gz # End cabal-rpm sources # Begin cabal-rpm deps: BuildRequires: ghc-Cabal-devel -BuildRequires: ghc-rpm-macros +BuildRequires: ghc-rpm-macros-extra BuildRequires: ghc-array-prof BuildRequires: ghc-base-prof BuildRequires: ghc-bytestring-prof @@ -30,7 +35,7 @@ BuildRequires: ghc-network-prof BuildRequires: ghc-network-byte-order-prof BuildRequires: ghc-psqueues-prof BuildRequires: ghc-stm-prof -BuildRequires: ghc-time-manager-prof +#BuildRequires: ghc-time-manager-prof %if %{with tests} BuildRequires: ghc-Glob-devel BuildRequires: ghc-aeson-devel @@ -44,6 +49,8 @@ BuildRequires: ghc-text-devel BuildRequires: ghc-unordered-containers-devel BuildRequires: ghc-vector-devel %endif +# for missing dep 'time-manager': +BuildRequires: ghc-auto-update-prof # End cabal-rpm deps %description @@ -84,21 +91,33 @@ This package provides the Haskell %{pkg_name} profiling library. %endif +%global main_version %{version} + +%if %{defined ghclibdir} +%ghc_lib_subpackage %{timemanager} +%endif + +%global version %{main_version} + + %prep # Begin cabal-rpm setup: -%setup -q -n %{pkgver} +%setup -q -n %{pkgver} -a1 # End cabal-rpm setup %build # Begin cabal-rpm build: +%ghc_libs_build %{subpkgs} %ghc_lib_build # End cabal-rpm build %install # Begin cabal-rpm install +%ghc_libs_install %{subpkgs} %ghc_lib_install +%ghc_fix_rpath %{pkgver} # End cabal-rpm install @@ -140,6 +159,7 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog * Fri Feb 14 2020 Jens Petersen <petersen(a)redhat.com> - 2.0.3-1 - update to 2.0.3 +- move time-manager subpackage from warp * Tue Jan 28 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.6.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 1aa9c2a..0b14c8e 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (http2-2.0.3.tar.gz) = ff5f02c355f9f5c459d94993f05636955f81b91cbdbd4e8c262b56e1fa3846f92aff946f8ec6851ab57ffbb73afb42999cb3597eb250a9e15a8d6788da860b20 +SHA512 (time-manager-0.0.0.tar.gz) = aa8bd9dc9a66ea097fe2d6a6d9e77eff67debc58a588da7ae1d6fc312b6bb371da58b413b58cdba21623e2da26633595f379ac9e0a7a6dc7281ad42353231054 commit 3b44cfdcdc20a24d1f39d15218b8cd51587aa0f2 Author: Jens Petersen <petersen(a)redhat.com> Date: Fri Feb 14 11:40:32 2020 +0800 update to 2.0.3 diff --git a/.gitignore b/.gitignore index 39e5b69..d6a57da 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /http2-1.6.3.tar.gz /http2-1.6.4.tar.gz /http2-1.6.5.tar.gz +/http2-2.0.3.tar.gz diff --git a/ghc-http2.spec b/ghc-http2.spec index 309cf51..24ae1dc 100644 --- a/ghc-http2.spec +++ b/ghc-http2.spec @@ -7,9 +7,9 @@ %bcond_with tests Name: ghc-%{pkg_name} -Version: 1.6.5 -Release: 2%{?dist} -Summary: HTTP/2 library including frames, priority queues and HPACK +Version: 2.0.3 +Release: 1%{?dist} +Summary: HTTP/2 library License: BSD Url: https://hackage.haskell.org/package/%{pkg_name} @@ -25,9 +25,12 @@ BuildRequires: ghc-base-prof BuildRequires: ghc-bytestring-prof BuildRequires: ghc-case-insensitive-prof BuildRequires: ghc-containers-prof +BuildRequires: ghc-http-types-prof +BuildRequires: ghc-network-prof BuildRequires: ghc-network-byte-order-prof BuildRequires: ghc-psqueues-prof BuildRequires: ghc-stm-prof +BuildRequires: ghc-time-manager-prof %if %{with tests} BuildRequires: ghc-Glob-devel BuildRequires: ghc-aeson-devel @@ -40,12 +43,11 @@ BuildRequires: ghc-hspec-devel BuildRequires: ghc-text-devel BuildRequires: ghc-unordered-containers-devel BuildRequires: ghc-vector-devel -BuildRequires: ghc-word8-devel %endif # End cabal-rpm deps %description -HTTP/2 library including frames, priority queues and HPACK. +HTTP/2 library including frames, priority queues, HPACK and server. %package devel @@ -136,6 +138,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Fri Feb 14 2020 Jens Petersen <petersen(a)redhat.com> - 2.0.3-1 +- update to 2.0.3 + * Tue Jan 28 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.6.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 847d130..1aa9c2a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (http2-1.6.5.tar.gz) = 11cdacd89ed8cd895f6ff67dc43e905d077be19e3e61b58964f95f9a02e1e475484cd5a7c0b7735db7abdc006489ef362c5660f8e5d3235e7d0b09c8a7e9eb14 +SHA512 (http2-2.0.3.tar.gz) = ff5f02c355f9f5c459d94993f05636955f81b91cbdbd4e8c262b56e1fa3846f92aff946f8ec6851ab57ffbb73afb42999cb3597eb250a9e15a8d6788da860b20 commit 5772ca98ec78ed793191d277e9390a4783237381 Author: Jens Petersen <petersen(a)redhat.com> Date: Sat Feb 8 22:50:42 2020 +0800 refresh to cabal-rpm-2.0.2 diff --git a/ghc-http2.spec b/ghc-http2.spec index ca1545f..309cf51 100644 --- a/ghc-http2.spec +++ b/ghc-http2.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-1.0.1 +# generated by cabal-rpm-2.0.2 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name http2 @@ -64,6 +64,7 @@ This package provides the Haskell %{pkg_name} library development files. %if %{with haddock} %package doc Summary: Haskell %{pkg_name} library documentation +BuildArch: noarch %description doc This package provides the Haskell %{pkg_name} library documentation. @@ -74,6 +75,7 @@ This package provides the Haskell %{pkg_name} library documentation. %package prof Summary: Haskell %{pkg_name} profiling library Requires: %{name}-devel%{?_isa} = %{version}-%{release} +Supplements: (%{name}-devel and ghc-prof) %description prof This package provides the Haskell %{pkg_name} profiling library. @@ -102,6 +104,16 @@ This package provides the Haskell %{pkg_name} profiling library. %cabal_test +%if 0%{?fedora} < 31 || 0%{?rhel} < 8 +%post devel +%ghc_pkg_recache + + +%postun devel +%ghc_pkg_recache +%endif + + %files -f %{name}.files # Begin cabal-rpm files: %license LICENSE @@ -114,6 +126,7 @@ This package provides the Haskell %{pkg_name} profiling library. %if %{with haddock} %files doc -f %{name}-doc.files +%license LICENSE %endif

1 0

Architecture specific change in rpms/ghc-foldl.git
by githook-noreply＠fedoraproject.org 24 Feb '20

24 Feb '20

The package rpms/ghc-foldl.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/ghc-foldl.git/commit/?id=4c70a2507e…. Change: +%ifnarch s390x Thanks. Full change: ============ commit 4c70a2507e88e86ebd759cd9bd2d651547fbb48d Author: Jens Petersen <petersen(a)redhat.com> Date: Sat Feb 22 08:00:58 2020 +0800 testsuite hangs on s390x and doesn't run elsewhere in koji?? diff --git a/ghc-foldl.spec b/ghc-foldl.spec index f3634ca..fc3cd9e 100644 --- a/ghc-foldl.spec +++ b/ghc-foldl.spec @@ -4,7 +4,10 @@ %global pkg_name foldl %global pkgver %{pkg_name}-%{version} +# hangs on s390x +%ifnarch s390x %bcond_without tests +%endif Name: ghc-%{pkg_name} Version: 1.4.6 commit 9a5feefd22203d6a773eb3c1364f87516fdc125f Author: Jens Petersen <petersen(a)redhat.com> Date: Fri Feb 14 11:25:55 2020 +0800 update to 1.4.6 diff --git a/.gitignore b/.gitignore index 0a1c852..9da3d77 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /foldl-1.3.5.tar.gz /foldl-1.3.7.tar.gz /foldl-1.4.5.tar.gz +/foldl-1.4.6.tar.gz diff --git a/ghc-foldl.spec b/ghc-foldl.spec index 87eb1b0..f3634ca 100644 --- a/ghc-foldl.spec +++ b/ghc-foldl.spec @@ -4,9 +4,11 @@ %global pkg_name foldl %global pkgver %{pkg_name}-%{version} +%bcond_without tests + Name: ghc-%{pkg_name} -Version: 1.4.5 -Release: 4%{?dist} +Version: 1.4.6 +Release: 1%{?dist} Summary: Composable, streaming, and efficient left folds License: BSD @@ -34,6 +36,9 @@ BuildRequires: ghc-transformers-prof BuildRequires: ghc-unordered-containers-prof BuildRequires: ghc-vector-prof BuildRequires: ghc-vector-builder-prof +%if %{with tests} +BuildRequires: ghc-doctest-devel +%endif # End cabal-rpm deps %description @@ -95,6 +100,10 @@ This package provides the Haskell %{pkg_name} profiling library. # End cabal-rpm install +%check +%cabal_test + + %if 0%{?fedora} < 31 || 0%{?rhel} < 8 %post devel %ghc_pkg_recache @@ -127,6 +136,9 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog +* Fri Feb 14 2020 Jens Petersen <petersen(a)redhat.com> - 1.4.6-1 +- update to 1.4.6 + * Tue Jan 28 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.4.5-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 78e8aab..762367a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (foldl-1.4.5.tar.gz) = adc718045f344206bb2e38b92610e643c61a470e294b73331adb58ebe6a3d33f2614634a1750c7e049b3f8def761a43232baee4633cc6bb09b25b7564f3fe1b2 +SHA512 (foldl-1.4.6.tar.gz) = 14e708da0ffb4e4720ae181c0209d706278d6652390214f7c6bae791d25e16baffbb56c65293db21f84aaa721ee383927e8498461d037f16813be374b6799d3b commit 4ac8e23f90fdc99095460f8c533c37badcef9f97 Author: Jens Petersen <petersen(a)redhat.com> Date: Sat Feb 8 22:50:12 2020 +0800 refresh to cabal-rpm-2.0.2 diff --git a/ghc-foldl.spec b/ghc-foldl.spec index 3722225..87eb1b0 100644 --- a/ghc-foldl.spec +++ b/ghc-foldl.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-1.0.1 +# generated by cabal-rpm-2.0.2 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name foldl @@ -59,6 +59,7 @@ This package provides the Haskell %{pkg_name} library development files. %if %{with haddock} %package doc Summary: Haskell %{pkg_name} library documentation +BuildArch: noarch %description doc This package provides the Haskell %{pkg_name} library documentation. @@ -69,6 +70,7 @@ This package provides the Haskell %{pkg_name} library documentation. %package prof Summary: Haskell %{pkg_name} profiling library Requires: %{name}-devel%{?_isa} = %{version}-%{release} +Supplements: (%{name}-devel and ghc-prof) %description prof This package provides the Haskell %{pkg_name} profiling library. @@ -93,6 +95,16 @@ This package provides the Haskell %{pkg_name} profiling library. # End cabal-rpm install +%if 0%{?fedora} < 31 || 0%{?rhel} < 8 +%post devel +%ghc_pkg_recache + + +%postun devel +%ghc_pkg_recache +%endif + + %files -f %{name}.files # Begin cabal-rpm files: %license LICENSE @@ -105,6 +117,7 @@ This package provides the Haskell %{pkg_name} profiling library. %if %{with haddock} %files doc -f %{name}-doc.files +%license LICENSE %endif

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
29
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

Arch-excludes February 2020