diff --git a/.gitignore b/.gitignore index ebda8c9..23c2ea8 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /libreport-2.12.0.tar.gz /libreport-2.13.0.tar.gz /libreport-2.13.1.tar.gz +/libreport-2.14.0.tar.gz diff --git a/libreport.spec b/libreport.spec index 4c4c9a8..a4b72ee 100644 --- a/libreport.spec +++ b/libreport.spec @@ -14,30 +14,30 @@ Summary: Generic library for reporting various problems Name: libreport -Version: 2.13.1 -Release: 4%{?dist} +Version: 2.14.0 +Release: 1%{?dist} License: GPLv2+ URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz BuildRequires: %{dbus_devel} -BuildRequires: gtk3-devel -BuildRequires: curl-devel +BuildRequires: gtk3-devel%{?_isa} +BuildRequires: curl-devel%{?_isa} BuildRequires: desktop-file-utils BuildRequires: python3-devel BuildRequires: gettext -BuildRequires: libxml2-devel -BuildRequires: libtar-devel +BuildRequires: libxml2-devel%{?_isa} +BuildRequires: libtar-devel%{?_isa} BuildRequires: intltool BuildRequires: libtool BuildRequires: texinfo BuildRequires: asciidoc BuildRequires: xmlto -BuildRequires: newt-devel -BuildRequires: libproxy-devel -BuildRequires: satyr-devel >= 0.24 -BuildRequires: glib2-devel >= %{glib_ver} -BuildRequires: nettle-devel +BuildRequires: newt-devel%{?_isa} +BuildRequires: libproxy-devel%{?_isa} +BuildRequires: satyr-devel%{?_isa} >= 0.24 +BuildRequires: glib2-devel%{?_isa} >= %{glib_ver} +BuildRequires: nettle-devel%{?_isa} BuildRequires: git-core %if 0%{?fedora} >= 24 || 0%{?rhel} > 7 @@ -49,23 +49,25 @@ BuildRequires: glibc-all-langpacks BuildRequires: xmlrpc-c-devel %endif BuildRequires: doxygen -BuildRequires: systemd-devel +BuildRequires: systemd-devel%{?_isa} BuildRequires: augeas-devel BuildRequires: augeas -BuildRequires: xz -BuildRequires: lz4 +BuildRequires: libarchive-devel%{?_isa} Requires: libreport-filesystem = %{version}-%{release} -Requires: satyr >= 0.24 -Requires: glib2 >= %{glib_ver} -Requires: xz -Requires: lz4 -Requires: nettle +Requires: satyr%{?_isa} >= 0.24 +Requires: glib2%{?_isa} >= %{glib_ver} +Requires: libarchive%{?_isa} +Requires: nettle%{?_isa} # Required for the temporary modularity hack, see below %if 0%{?_module_build} BuildRequires: sed %endif +Obsoletes: %{name}-compat < 2.13.2 +Obsoletes: %{name}-plugin-rhtsupport < 2.13.2 +Obsoletes: %{name}-rhel < 2.13.2 + %description Libraries providing API for reporting different problems in applications to different bug targets like Bugzilla, ftp, trac, etc... @@ -224,25 +226,6 @@ Requires: python3-subscription-manager-rhsm %description plugin-ureport Uploads micro-report to abrt server -%package plugin-rhtsupport -Summary: %{name}'s RHTSupport plugin -Requires: %{name} = %{version}-%{release} -Requires: libreport-web = %{version}-%{release} - -%description plugin-rhtsupport -Plugin to report bugs into RH support system. - -%if %{with bugzilla} -%package compat -Summary: %{name}'s compat layer for obsoleted 'report' package -Requires: libreport = %{version}-%{release} -Requires: %{name}-plugin-bugzilla = %{version}-%{release} -Requires: %{name}-plugin-rhtsupport = %{version}-%{release} - -%description compat -Provides 'report' command-line tool. -%endif - %package plugin-reportuploader Summary: %{name}'s reportuploader plugin Requires: %{name} = %{version}-%{release} @@ -263,16 +246,6 @@ install this package and you're done. %endif %if 0%{?rhel} -%package rhel -Summary: Default configuration for reporting bugs via Red Hat infrastructure -Requires: %{name} = %{version}-%{release} -Requires: %{name}-plugin-ureport - -%description rhel -Default configuration for reporting bugs via Red Hat infrastructure -used to easily configure the reporting process for Red Hat systems. Just -install this package and you're done. - %package rhel-bugzilla Summary: Default configuration for reporting bugs to Red Hat Bugzilla Requires: %{name} = %{version}-%{release} @@ -300,9 +273,7 @@ package and you're done. Summary: Default configuration for reporting anaconda bugs Requires: %{name} = %{version}-%{release} Requires: libreport-plugin-reportuploader = %{version}-%{release} -%if 0%{?rhel} -Requires: libreport-plugin-rhtsupport = %{version}-%{release} -%else +%if ! 0%{?rhel} Requires: libreport-plugin-bugzilla = %{version}-%{release} %endif @@ -321,9 +292,6 @@ autoconf %if %{without bugzilla} --without-bugzilla \ %endif -%if 0%{?rhel} - --enable-import-rhtsupport-cert \ -%endif --enable-doxygen-docs \ --disable-silent-rules @@ -375,16 +343,7 @@ rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_AnacondaFedora.xml # Remove unwanted RHEL specific workflow configuration files %if 0%{!?rhel:1} -rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_RHELCCpp.xml -rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_RHELKerneloops.xml -rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_RHELPython.xml -rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_RHELvmcore.xml -rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_RHELxorg.xml -rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_RHELLibreport.xml -rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_RHELJava.xml -rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_RHELJavaScript.xml rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_uReport.xml -rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_AnacondaRHEL.xml rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_AnacondaRHELBugzilla.xml rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_RHELBugzillaCCpp.xml rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_RHELBugzillaKerneloops.xml @@ -402,11 +361,8 @@ rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_RHELAddDataxorg.xml rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_RHELAddDataLibreport.xml rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_RHELAddDataJava.xml rm -f %{buildroot}/%{_datadir}/libreport/workflows/workflow_RHELAddDataJavaScript.xml -rm -f %{buildroot}/%{_sysconfdir}/libreport/workflows.d/report_rhel.conf -rm -f %{buildroot}/%{_sysconfdir}/libreport/workflows.d/report_rhel_add_data.conf rm -f %{buildroot}/%{_sysconfdir}/libreport/workflows.d/report_uReport.conf rm -f %{buildroot}/%{_sysconfdir}/libreport/workflows.d/report_rhel_bugzilla.conf -rm -f %{buildroot}%{_mandir}/man5/report_rhel.conf.5 rm -f %{buildroot}%{_mandir}/man5/report_uReport.conf.5 rm -f %{buildroot}%{_mandir}/man5/report_rhel_bugzilla.conf.5 %endif @@ -635,26 +591,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %config(noreplace) %{_sysconfdir}/libreport/events.d/centos_report_event.conf %{_mandir}/man5/centos_report_event.conf.5.gz -%files plugin-rhtsupport -%config(noreplace) %{_sysconfdir}/libreport/plugins/rhtsupport.conf -%{_datadir}/%{name}/conf.d/plugins/rhtsupport.conf -%{_datadir}/%{name}/events/report_RHTSupport.xml -%{_datadir}/%{name}/events/report_RHTSupport_AddData.xml -%if 0%{?rhel} -%attr(600,root,root)%{_sysconfdir}/%{name}/cert-api.access.redhat.com.pem -%endif -%config(noreplace) %{_sysconfdir}/libreport/events.d/rhtsupport_event.conf -%{_mandir}/man1/reporter-rhtsupport.1.gz -%{_mandir}/man5/rhtsupport.conf.5.* -%{_mandir}/man5/rhtsupport_event.conf.5.* -%{_bindir}/reporter-rhtsupport - -%if %{with bugzilla} -%files compat -%{_bindir}/report -%{_mandir}/man1/report.1.gz -%endif - %files plugin-reportuploader %{_mandir}/man*/reporter-upload.* %{_mandir}/man5/uploader_event.conf.5.* @@ -687,27 +623,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %endif %if 0%{?rhel} -%files rhel -%{_datadir}/%{name}/workflows/workflow_RHELCCpp.xml -%{_datadir}/%{name}/workflows/workflow_RHELKerneloops.xml -%{_datadir}/%{name}/workflows/workflow_RHELPython.xml -%{_datadir}/%{name}/workflows/workflow_RHELvmcore.xml -%{_datadir}/%{name}/workflows/workflow_RHELxorg.xml -%{_datadir}/%{name}/workflows/workflow_RHELLibreport.xml -%{_datadir}/%{name}/workflows/workflow_RHELJava.xml -%{_datadir}/%{name}/workflows/workflow_RHELJavaScript.xml -%{_datadir}/%{name}/workflows/workflow_RHELAddDataCCpp.xml -%{_datadir}/%{name}/workflows/workflow_RHELAddDataJava.xml -%{_datadir}/%{name}/workflows/workflow_RHELAddDataKerneloops.xml -%{_datadir}/%{name}/workflows/workflow_RHELAddDataLibreport.xml -%{_datadir}/%{name}/workflows/workflow_RHELAddDataPython.xml -%{_datadir}/%{name}/workflows/workflow_RHELAddDatavmcore.xml -%{_datadir}/%{name}/workflows/workflow_RHELAddDataxorg.xml -%{_datadir}/%{name}/workflows/workflow_RHELAddDataJavaScript.xml -%config(noreplace) %{_sysconfdir}/libreport/workflows.d/report_rhel.conf -%config(noreplace) %{_sysconfdir}/libreport/workflows.d/report_rhel_add_data.conf -%{_mandir}/man5/report_rhel.conf.5.* - %files rhel-bugzilla %{_datadir}/%{name}/workflows/workflow_RHELBugzillaCCpp.xml %{_datadir}/%{name}/workflows/workflow_RHELBugzillaKerneloops.xml diff --git a/sources b/sources index 36fbd1b..38afa93 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libreport-2.13.1.tar.gz) = fc3db46ee6885053387b86e682f9ed1908d050149a5d820b40444b7db413af89afdcd6abef780179c5ca968ea036f3ae245884414b94d426547e58a89b8bbb65 +SHA512 (libreport-2.14.0.tar.gz) = aa56b994c97b07596a7022d156ffaa7733aa9db94b743ffeb031810f5aaae4f0ebfa62d9d66dff60f224e91ddfd2794278830d6ceab5ab2582e055ade329eee4