Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package erlang-rebar for openSUSE:Factory
checked in at 2024-01-08 23:46:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/erlang-rebar (Old)
and /work/SRC/openSUSE:Factory/.erlang-rebar.new.21961 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "erlang-rebar"
Mon Jan 8 23:46:15 2024 rev:10 rq:1137529 version:2.6.4+git20180201.b6d3094
Changes:
--------
--- /work/SRC/openSUSE:Factory/erlang-rebar/erlang-rebar-testsuite.changes
2021-01-28 21:29:31.720294218 +0100
+++
/work/SRC/openSUSE:Factory/.erlang-rebar.new.21961/erlang-rebar-testsuite.changes
2024-01-08 23:46:18.096579244 +0100
@@ -1,0 +2,26 @@
+Thu Jan 4 14:46:57 UTC 2024 - Dominique Leuenberger <dims...@opensuse.org>
+
+- HACK: do not build the -testsuite flavor in distro projects (i.e
+ in repositories called 'standard'). Allows to get fixes included
+ in the distro while the test suite actually still fails
+ (boo#1205140).
+
+-------------------------------------------------------------------
+Thu Aug 10 09:45:23 UTC 2023 - Dominique Leuenberger <dims...@opensuse.org>
+
+- Add _multibuild: declare additional spec files as further flavors
+ to build. Allows OBS to build those spec files without the need
+ for linked packages.
+
+-------------------------------------------------------------------
+Wed Oct 12 17:49:50 UTC 2022 - Matwey Kornilov <matwey.korni...@gmail.com>
+
+- Add 0001-Fix-rebar-xref-for-recent-Erlang.patch:
+ fix testsuite
+
+-------------------------------------------------------------------
+Wed Jun 30 12:41:37 UTC 2021 - Dominique Leuenberger <dims...@opensuse.org>
+
+- Move rpm macros from /etc/rpm to %{_rpmmacrodir} (boo#1185668).
+
+-------------------------------------------------------------------
--- /work/SRC/openSUSE:Factory/erlang-rebar/erlang-rebar.changes
2021-08-25 20:59:58.853021558 +0200
+++ /work/SRC/openSUSE:Factory/.erlang-rebar.new.21961/erlang-rebar.changes
2024-01-08 23:46:18.492593643 +0100
@@ -1,0 +2,21 @@
+Thu Jan 4 14:46:57 UTC 2024 - Dominique Leuenberger <dims...@opensuse.org>
+
+- HACK: do not build the -testsuite flavor in distro projects (i.e
+ in repositories called 'standard'). Allows to get fixes included
+ in the distro while the test suite actually still fails
+ (boo#1205140).
+
+-------------------------------------------------------------------
+Thu Aug 10 09:45:23 UTC 2023 - Dominique Leuenberger <dims...@opensuse.org>
+
+- Add _multibuild: declare additional spec files as further flavors
+ to build. Allows OBS to build those spec files without the need
+ for linked packages.
+
+-------------------------------------------------------------------
+Wed Oct 12 17:49:50 UTC 2022 - Matwey Kornilov <matwey.korni...@gmail.com>
+
+- Add 0001-Fix-rebar-xref-for-recent-Erlang.patch:
+ fix testsuite
+
+-------------------------------------------------------------------
New:
----
0001-Fix-rebar-xref-for-recent-Erlang.patch
_multibuild
BETA DEBUG BEGIN:
New:/work/SRC/openSUSE:Factory/.erlang-rebar.new.21961/erlang-rebar-testsuite.changes-
/work/SRC/openSUSE:Factory/.erlang-rebar.new.21961/erlang-rebar-testsuite.changes:-
Add 0001-Fix-rebar-xref-for-recent-Erlang.patch:
/work/SRC/openSUSE:Factory/.erlang-rebar.new.21961/erlang-rebar-testsuite.changes-
fix testsuite
--
/work/SRC/openSUSE:Factory/.erlang-rebar.new.21961/erlang-rebar.changes-
/work/SRC/openSUSE:Factory/.erlang-rebar.new.21961/erlang-rebar.changes:- Add
0001-Fix-rebar-xref-for-recent-Erlang.patch:
/work/SRC/openSUSE:Factory/.erlang-rebar.new.21961/erlang-rebar.changes- fix
testsuite
BETA DEBUG END:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ erlang-rebar-testsuite.spec ++++++
--- /var/tmp/diff_new_pack.9eFC94/_old 2024-01-08 23:46:19.284622439 +0100
+++ /var/tmp/diff_new_pack.9eFC94/_new 2024-01-08 23:46:19.288622585 +0100
@@ -1,7 +1,7 @@
#
# spec file for package erlang-rebar-testsuite
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -34,6 +34,7 @@
# PATCH-FIX-OPENSUSE -- bmwiedemann
Patch6: reproducible.patch
Patch7: rebar-0014-erl_interface-was-removed-in-Erlang-23.patch
+Patch8: 0001-Fix-rebar-xref-for-recent-Erlang.patch
BuildRequires: erlang >= R13B01
%if 0%{?suse_version} > 1320
BuildRequires: strip-nondeterminism
@@ -48,6 +49,9 @@
BuildRequires: erlang-retest >= 1.1.0
BuildRequires: git
BuildRequires: mercurial
+%if "%{_repository}" == "standard"
+ExclusiveArch: do-not-build
+%endif
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -85,6 +89,7 @@
%patch5 -p1
%patch6 -p1
%patch7 -p1
+%patch8 -p1
%build
export REBAR_DEPS_PREFER_LIBS=1
@@ -103,7 +108,7 @@
%if %{normal_build}
install -Dm755 rebar %{buildroot}%{_bindir}/rebar
# Install RPM macros:
-install -Dm644 %{SOURCE1} %{buildroot}%{_sysconfdir}/rpm/macros.erlang-rebar
+install -Dm644 %{SOURCE1} %{buildroot}%{_rpmmacrodir}/macros.erlang-rebar
for dir in include ebin priv src ; do
install -d %{buildroot}%{erlang_libdir}/rebar-%{mod_ver}/${dir}
cp -r ${dir}/* %{buildroot}%{erlang_libdir}/rebar-%{mod_ver}/${dir}/
@@ -136,9 +141,10 @@
%if %{normal_build}
%files
%defattr(-,root,root)
-%doc README.md THANKS LICENSE rebar.config.sample
+%doc README.md THANKS rebar.config.sample
+%license LICENSE
%{_bindir}/rebar
-%config %{_sysconfdir}/rpm/macros.erlang-rebar
+%{_rpmmacrodir}/macros.erlang-rebar
%dir %{erlang_libdir}/rebar-%{mod_ver}
%{erlang_libdir}/rebar-%{mod_ver}/ebin
%{erlang_libdir}/rebar-%{mod_ver}/include
++++++ erlang-rebar.spec ++++++
--- /var/tmp/diff_new_pack.9eFC94/_old 2024-01-08 23:46:19.312623457 +0100
+++ /var/tmp/diff_new_pack.9eFC94/_new 2024-01-08 23:46:19.316623603 +0100
@@ -1,7 +1,7 @@
#
# spec file for package erlang-rebar
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -34,6 +34,7 @@
# PATCH-FIX-OPENSUSE -- bmwiedemann
Patch6: reproducible.patch
Patch7: rebar-0014-erl_interface-was-removed-in-Erlang-23.patch
+Patch8: 0001-Fix-rebar-xref-for-recent-Erlang.patch
BuildRequires: erlang >= R13B01
%if 0%{?suse_version} > 1320
BuildRequires: strip-nondeterminism
@@ -48,6 +49,9 @@
BuildRequires: erlang-retest >= 1.1.0
BuildRequires: git
BuildRequires: mercurial
+%if "%{_repository}" == "standard"
+ExclusiveArch: do-not-build
+%endif
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -85,6 +89,7 @@
%patch5 -p1
%patch6 -p1
%patch7 -p1
+%patch8 -p1
%build
export REBAR_DEPS_PREFER_LIBS=1
@@ -136,7 +141,8 @@
%if %{normal_build}
%files
%defattr(-,root,root)
-%doc README.md THANKS LICENSE rebar.config.sample
+%doc README.md THANKS rebar.config.sample
+%license LICENSE
%{_bindir}/rebar
%{_rpmmacrodir}/macros.erlang-rebar
%dir %{erlang_libdir}/rebar-%{mod_ver}
++++++ 0001-Fix-rebar-xref-for-recent-Erlang.patch ++++++
>From 1b80dcbeee8fd9ac7117b02b7893249ad2b242d1 Mon Sep 17 00:00:00 2001
From: "Matwey V. Kornilov" <matwey.korni...@gmail.com>
Date: Wed, 12 Oct 2022 19:40:26 +0300
Subject: [PATCH] Fix rebar xref for recent Erlang
(cherry picked from commit 21c06fdf9b67b7bed0e5dd9c86905407abced6aa)
---
src/rebar_xref.erl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/rebar_xref.erl b/src/rebar_xref.erl
index ddfb029..ed905b6 100644
--- a/src/rebar_xref.erl
+++ b/src/rebar_xref.erl
@@ -288,7 +288,7 @@ find_function_source(M, F, A, Bin) ->
AbstractCode = beam_lib:chunks(Bin, [abstract_code]),
{ok, {M, [{abstract_code, {raw_abstract_v1, Code}}]}} = AbstractCode,
%% Extract the original source filename from the abstract code
- [{attribute, 1, file, {Source, _}} | _] = Code,
+ [{attribute, _, file, {Source, _}} | _] = [Attr || Attr = {attribute, _,
file, _} <- Code],
%% Extract the line number for a given function def
Fn = [E || E <- Code,
safe_element(1, E) == function,
--
2.37.3
++++++ _multibuild ++++++
<multibuild>
<package>erlang-rebar-testsuite</package>
</multibuild>
