Skip to content

Commit 98baa61

Browse files
authored
Upgrade: satyr version to 0.43 (microsoft#11240)
1 parent 3c68043 commit 98baa61

File tree

3 files changed

+27
-25
lines changed

3 files changed

+27
-25
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"Signatures": {
3-
"satyr-0.30.tar.gz": "2e4c67a09e1b47a5bf9813b2af4e2cdbefe47264a449e429710952f21b7c9709"
3+
"satyr-0.43.tar.gz": "b001c90b404308d962858b95cbd7cb1e7f13bd5bcf2249a66321d4db406b4268"
44
}
55
}

SPECS-EXTENDED/satyr/satyr.spec

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,43 +2,40 @@ Vendor: Microsoft Corporation
22
Distribution: Azure Linux
33
%bcond_without python3
44

5+
%define libdw_devel elfutils-devel
6+
%define libelf_devel elfutils-libelf-devel
57

6-
%if 0%{?suse_version}
7-
%define libdw_devel libdw-devel
8-
%define libelf_devel libelf-devel
9-
%else
10-
%define libdw_devel elfutils-devel
11-
%define libelf_devel elfutils-libelf-devel
12-
%endif
8+
%define glib_ver 2.43.4
139

1410
Name: satyr
15-
Version: 0.30
16-
Release: 3%{?dist}
11+
Version: 0.43
12+
Release: 1%{?dist}
1713
Summary: Tools to create anonymous, machine-friendly problem reports
18-
License: GPLv2+
14+
License: GPL-2.0-or-later
1915
URL: https://github.com/abrt/satyr
20-
Source0: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz
16+
Source0: https://github.com/abrt/%{name}/releases/download/%{version}/%{name}-%{version}.tar.gz
2117
%if %{with python3}
2218
BuildRequires: python3-devel
23-
%endif # with python3
19+
%endif
2420
BuildRequires: %{libdw_devel}
2521
BuildRequires: %{libelf_devel}
2622
BuildRequires: binutils-devel
2723
BuildRequires: rpm-devel
2824
BuildRequires: libtool
2925
BuildRequires: doxygen
3026
BuildRequires: pkgconfig
27+
BuildRequires: make
3128
BuildRequires: automake
3229
BuildRequires: gcc-c++
3330
BuildRequires: gdb
3431
BuildRequires: gperf
35-
BuildRequires: nettle-devel
36-
BuildRequires: pkgconfig(json-c)
32+
BuildRequires: json-c-devel
33+
BuildRequires: glib2-devel
3734
%if %{with python3}
3835
BuildRequires: python3-sphinx
39-
%endif # with python3
40-
Requires: json-c
41-
Requires: nettle
36+
%endif
37+
Requires: json-c%{?_isa}
38+
Requires: glib2%{?_isa} >= %{glib_ver}
4239

4340
%description
4441
Satyr is a library that can be used to create and process microreports.
@@ -64,31 +61,32 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
6461

6562
%description -n python3-satyr
6663
Python 3 bindings for %{name}.
67-
%endif # if with python3
64+
%endif
6865

6966
%prep
7067
%setup -q
7168

7269
%build
70+
autoreconf
71+
7372
%configure \
7473
%if %{without python3}
7574
--without-python3 \
76-
%endif # with python3
75+
%endif
7776
--disable-static \
7877
--enable-doxygen-docs
7978

8079
%make_build
81-
8280
%install
8381
%make_install
84-
8582
# Remove all libtool archives (*.la) from modules directory.
8683
find %{buildroot} -name "*.la" -delete
8784

8885
%check
8986
make check|| {
9087
# find and print the logs of failed test
9188
# do not cat tests/testsuite.log because it contains a lot of bloat
89+
cat tests/test-suite.log
9290
find tests/testsuite.dir -name "testsuite.log" -print -exec cat '{}' \;
9391
exit 1
9492
}
@@ -97,7 +95,7 @@ make check|| {
9795
%postun -p /sbin/ldconfig
9896

9997
%files
100-
%doc README NEWS
98+
%doc README.md NEWS
10199
%license COPYING
102100
%{_bindir}/satyr
103101
%{_mandir}/man1/%{name}.1*
@@ -117,6 +115,10 @@ make check|| {
117115
%endif
118116

119117
%changelog
118+
* Tue Nov 12 2024 Sumit Jena <v-sumitjena@microsoft.com> - 0.43-1
119+
- Update to version 0.43
120+
- License verified.
121+
120122
* Tue Jan 12 2021 Joe Schmitt <joschmit@microsoft.com> - 0.30-3
121123
- Initial CBL-Mariner import from Fedora 31 (license: MIT).
122124
- Build with python3

cgmanifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27534,8 +27534,8 @@
2753427534
"type": "other",
2753527535
"other": {
2753627536
"name": "satyr",
27537-
"version": "0.30",
27538-
"downloadUrl": "https://github.com/abrt/satyr/archive/0.30/satyr-0.30.tar.gz"
27537+
"version": "0.43",
27538+
"downloadUrl": "https://github.com/abrt/satyr/releases/download/0.43/satyr-0.43.tar.gz"
2753927539
}
2754027540
}
2754127541
},

0 commit comments

Comments
 (0)