From e7375e103c3748579defc2eef8c43dac3bb30f3e Mon Sep 17 00:00:00 2001 From: Funda Wang Date: Sun, 27 Jul 2025 06:35:09 +0800 Subject: [PATCH] drop useless requires on fros (cherry picked from commit a66b5d21b07060d6e99a86d2a177aa9b3d6d68af) --- libreport.spec | 76 ++++++++++++++++++++++++++------------------------ 1 file changed, 40 insertions(+), 36 deletions(-) diff --git a/libreport.spec b/libreport.spec index f7d5ec7..5e25508 100644 --- a/libreport.spec +++ b/libreport.spec @@ -2,8 +2,8 @@ Name: libreport Version: 2.17.15 -Release: 1 -License: GPLv2+ +Release: 2 +License: GPL-2.0-or-later Summary: Generic library for reporting various problems URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -11,15 +11,32 @@ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.t Patch9000: fix-bug-delete-gtk-deprecation-warnings.patch Patch9001: huawei-modify-testcase-port-for-avoid-conflict-with-k8s-in-.patch -BuildRequires: dbus-devel gtk3-devel curl-devel desktop-file-utils python3-devel -BuildRequires: gettext libxml2-devel libtar-devel intltool libtool texinfo asciidoc xmlto -BuildRequires: newt-devel libproxy-devel satyr-devel >= 0.24 glib2-devel >= 2.43 git-core doxygen -BuildRequires: glibc-all-langpacks xmlrpc-c-devel systemd-devel augeas-devel augeas xz lz4 -BuildRequires: json-c-devel nettle-devel libarchive-devel +BuildRequires: gcc make +BuildRequires: autoconf automake libtool +BuildRequires: gettext-devel intltool +BuildRequires: pkgconfig(augeas) +BuildRequires: pkgconfig(gio-2.0) >= 2.43.4 +BuildRequires: pkgconfig(gio-unix-2.0) >= 2.43.4 +BuildRequires: pkgconfig(glib-2.0) >= 2.43.4 +BuildRequires: pkgconfig(gobject-2.0) +BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: pkgconfig(json-c) +BuildRequires: pkgconfig(libarchive) +BuildRequires: pkgconfig(libcurl) +BuildRequires: pkgconfig(libnewt) +BuildRequires: pkgconfig(libsystemd) +BuildRequires: pkgconfig(libxml-2.0) +BuildRequires: pkgconfig(satyr) +BuildRequires: python3-devel +BuildRequires: xmlrpc-c-devel +BuildRequires: doxygen +BuildRequires: /usr/bin/asciidoc +BuildRequires: /usr/bin/augparse +BuildRequires: /usr/bin/xmlto Requires: libreport-filesystem = %{version}-%{release} -Requires: satyr >= 0.24 glib2 >= 2.43 xz lz4 -Requires: nettle +Requires: satyr >= 0.24 +Requires: glib2 >= 2.43.4 Obsoletes: %{name}-plugin-bugzilla %{name}-plugin-mantisbt %{name}-plugin-ureport %{name}-plugin-rhtsupport %{name}-rhel @@ -88,7 +105,6 @@ bugs Summary: GTK front-end for libreport Requires: libreport = %{version}-%{release} Requires: libreport-plugin-reportuploader = %{version}-%{release} -Requires: fros >= 1.0 Provides: report-gtk = 0:0.23-1 Obsoletes: report-gtk < 0:0.23-1 @@ -149,25 +165,23 @@ data over ftp/scp... %autosetup -n %{name}-%{version} -p1 %build -./autogen.sh +autoreconf -fi -CFLAGS="%{optflags}" -%configure --enable-doxygen-docs --disable-silent-rules - -rm -rf po/.intltool-merge-cache* -rm -rf src/plugins/*.xml -rm -rf src/workflows/*.xml - -make +%configure \ + --enable-doxygen-docs \ + --disable-silent-rules \ + --disable-static \ +%{nil} +%make_build %install %make_install +%delete_la %find_lang %{name} find %{buildroot} -name "*.py[co]" -delete -find %{buildroot} -name '*.la' -or -name '*.a' | xargs rm -f mkdir -p %{buildroot}/%{_initrddir} mkdir -p %{buildroot}/%{_sysconfdir}/%{name}/events.d/ mkdir -p %{buildroot}/%{_sysconfdir}/%{name}/events/ @@ -178,27 +192,13 @@ mkdir -p %{buildroot}/%{_datadir}/%{name}/workflows/ rm -f %{buildroot}/%{_infodir}/dir %check -make check|| { +%make_build check|| { # find and print the logs of failed test # do not cat tests/testsuite.log because it contains a lot of bloat find tests/testsuite.dir -name "testsuite.log" -print -exec cat '{}' \; exit 1 } -%post -/sbin/ldconfig -touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : - -%postun -/sbin/ldconfig -if [ $1 -eq 0 ] ; then - touch --no-create %{_datadir}/icons/hicolor &>/dev/null - gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -fi - -%posttrans -gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : - %files -f %{name}.lang %doc README.md %license COPYING @@ -223,7 +223,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %dir %{_sysconfdir}/%{name}/plugins/ %files devel -%doc apidoc/html/*.{html,png,css,js} +%doc apidoc/html/*.{html,css,js} %{_includedir}/libreport/libreport_types.h %{_includedir}/libreport/client.h %{_includedir}/libreport/dump_dir.h @@ -335,6 +335,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_mandir}/man5/bugzilla_formatdup_anaconda.conf.5.* %changelog +* Sun Jul 27 2025 Funda Wang - 2.17.15-2 +- drop useless requires on fros +- cleanup spec + * Mon Aug 5 2024 dillon chen - 2.17.15-1 - update version to 2.17.15 -- Gitee