diff --git a/.gitignore b/.gitignore index 921b0d2..3052888 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /1.1.5java-connector-1.1.5.tar.gz /abrt-java-connector-1.1.5.tar.gz /abrt-java-connector-1.2.0.tar.gz +/abrt-java-connector-1.3.2.tar.gz diff --git a/.packit.yml b/.packit.yml index c160305..196fc72 100644 --- a/.packit.yml +++ b/.packit.yml @@ -1,7 +1,7 @@ -specfile_path: package/abrt-java-connector.spec +specfile_path: abrt-java-connector.spec synced_files: - .packit.yml - - package/abrt-java-connector.spec + - abrt-java-connector.spec upstream_package_name: abrt-java-connector upstream_project_url: https://github.com/abrt/abrt-java-connector downstream_package_name: abrt-java-connector diff --git a/README.packit b/README.packit index a9e28ee..e8857c6 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.15.1.dev2+g9e55e2c. +The file was generated using packit 0.60.1.dev6+g9c9b2a8. diff --git a/abrt-java-connector-1.3.1.tar.gz b/abrt-java-connector-1.3.1.tar.gz new file mode 100644 index 0000000..8b01384 Binary files /dev/null and b/abrt-java-connector-1.3.1.tar.gz differ diff --git a/abrt-java-connector.spec b/abrt-java-connector.spec index 7bd52cc..74d9985 100644 --- a/abrt-java-connector.spec +++ b/abrt-java-connector.spec @@ -1,19 +1,16 @@ -%global snapshot 0 -%global commit bef7e39ce5fdc4a8a620d56be186d4463ed761a8 -%global shortcommit %(c=%{commit}; echo ${c:0:7}) - Name: abrt-java-connector -Version: 1.2.0 -Release: 8%{?dist} +Version: 1.3.2 +Release: 1%{?dist} Summary: JNI Agent library converting Java exceptions to ABRT problems Group: System Environment/Libraries License: GPLv2+ URL: https://github.com/abrt/abrt-java-connector -%if 0%{?snapshot} -Source0: %{url}/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz -%else Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz + +# https://fedoraproject.org/wiki/Changes/Drop_i686_JDKs +%if 0%{?fedora} >= 37 +ExcludeArch: %{ix86} %endif BuildRequires: pkgconfig(abrt) >= 2.14.1 @@ -24,11 +21,11 @@ BuildRequires: gcc-c++ BuildRequires: gettext # Tests have been redone to work under Java 11, but they are not backwards-compatible. BuildRequires: java-11-devel +BuildRequires: make BuildRequires: pkgconfig(libreport) >= 2.14.0 BuildRequires: rpm-devel BuildRequires: satyr-devel BuildRequires: systemd-devel -BuildRequires: make Requires: abrt @@ -49,11 +46,7 @@ This package contains only minimal set of files needed for container exception logging. %prep -%if 0%{?snapshot} -%autosetup -n %{name}-%{commit} -%else -%autosetup -%endif +%autosetup -n %{name}-%{version} %build @@ -64,6 +57,15 @@ logging. %install %cmake_install + +%check +cd "%{__cmake_builddir}" +# Force serial execution of tests to prevent process interleaving which seems to +# upset abrt-java-connector. +%{__ctest} --output-on-failure -j1 +cd - + + %files %doc README AUTHORS %license LICENSE @@ -96,14 +98,12 @@ logging. %{_prefix}/lib/abrt-java-connector -%check -make test || { - cat Testing/Temporary/LastTest.log - exit 1 -} - - %changelog +* Mon Oct 24 2022 Packit - 1.3.2-1 +- New version 1.3.2 (Michal Srb) +- Skip i686 build on Fedora 37+ (Michal Srb) +- Fix FTBFS in Fedora Rawhide (Michal Srb) + * Wed Jul 21 2021 Fedora Release Engineering - 1.2.0-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index 6a0a6e5..b80e02a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (abrt-java-connector-1.2.0.tar.gz) = 56f7cd8c4c38a5a5a97a04eeb55eabaae597613d60926163d4aeab02e32f5301bf42cba649c5ba74b060891d161f22851b5e48c1ee161ab3c9e944285b23659e +SHA512 (abrt-java-connector-1.3.2.tar.gz) = ab726d7ffd7332cb7ed6b7420ee982c106911f5d7cd3058ed4e5458ea6bb5087b56afa42e3eb84f1049c278a81b929adf1cb52442777eb5bb16582cc4e04a232