X-Git-Url: http://git.pld-linux.org/?p=packages%2Flibreport.git;a=blobdiff_plain;f=libreport.spec;h=b1a5d2ae40fc5e405b7916083036957c9d61421c;hp=506f4ce30d84ded057f84946ac34c8dbafe2406e;hb=17b7a00;hpb=055348096768585849f9f51dd43b7b5d1304718f

diff --git a/libreport.spec b/libreport.spec
index 506f4ce..b1a5d2a 100644
--- a/libreport.spec
+++ b/libreport.spec
@@ -1,26 +1,18 @@
-# TODO: teach build system to use python3.2+ __pycache__
-# warning: Installed (but unpackaged) file(s) found:
-#        /etc/libreport/events/report_Uploader.conf
-#        /etc/libreport/workflows.d/report_uReport.conf
-#        /usr/share/libreport/workflows/workflow_uReport.xml
-#        /usr/share/man/man5/report_Uploader.conf.5.gz
-#        /usr/share/man/man5/report_uReport.conf.5.gz
-#        /usr/share/man/man5/upload.conf.5.gz
-
 #
 # Conditional build:
+%bcond_without	python3	# Python 3.x modules
 %bcond_without	tests	# "make check"
 
 Summary:	Generic library for reporting various problems
 Summary(pl.UTF-8):	Ogólna biblioteka do zgłaszania różnych problemów
 Name:		libreport
-Version:	2.7.0
-Release:	1
+Version:	2.12.0
+Release:	2
 License:	GPL v2+
 Group:		Libraries
-Source0:	https://fedorahosted.org/released/abrt/%{name}-%{version}.tar.gz
-# Source0-md5:	7354fa562de18ab690127a4ff7d5601e
-Patch0:		format-security.patch
+#Source0Download: https://github.com/abrt/libreport/releases
+Source0:	https://github.com/abrt/libreport/archive/%{version}/%{name}-%{version}.tar.gz
+# Source0-md5:	09153b254ce2d675ca77788986702ac5
 URL:		https://github.com/abrt/libreport
 BuildRequires:	asciidoc
 BuildRequires:	augeas-devel
@@ -31,7 +23,7 @@ BuildRequires:	curl-devel
 BuildRequires:	dbus-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext-tools >= 0.17
-BuildRequires:	glib2-devel >= 1:2.21
+BuildRequires:	glib2-devel >= 1:2.43.4
 BuildRequires:	gtk+3-devel >= 3.0
 BuildRequires:	intltool >= 0.35.0
 BuildRequires:	json-c-devel
@@ -42,17 +34,21 @@ BuildRequires:	libxml2-devel >= 2
 BuildRequires:	newt-devel
 BuildRequires:	nss-devel
 BuildRequires:	pkgconfig
-BuildRequires:	python-devel >= 2
-BuildRequires:	python3-devel >= 3
+%{?with_python3:BuildRequires:	python3-devel >= 1:3.6}
 BuildRequires:	rpmbuild(macros) >= 1.612
 BuildRequires:	satyr-devel
-# libsystemd-journal
-BuildRequires:	systemd-devel
+BuildRequires:	systemd-devel >= 1:209
 BuildRequires:	xmlrpc-c-client-devel
 BuildRequires:	xmlrpc-c-devel
 BuildRequires:	xmlto
-BuildRequires:	xz-devel
-Requires:	glib2 >= 1:2.21
+%if %{with tests}
+# findmnt
+BuildRequires:	mount
+# /etc/system-release for non-empty os_release content
+BuildRequires:	pld-release >= 3.0-8
+BuildRequires:	sed >= 4.0
+%endif
+Requires:	glib2 >= 1:2.43.4
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -69,7 +65,7 @@ Summary:	Header files for libreport libraries
 Summary(pl.UTF-8):	Pliki nagłówkowe bibliotek libreport
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	glib2-devel >= 1:2.21
+Requires:	glib2-devel >= 1:2.43.4
 
 %description devel
 Header files for libreport libraries.
@@ -109,25 +105,14 @@ Development headers for libreport-web.
 %description web-devel -l pl.UTF-8
 Pliki nagłówkowe biblioteki libreport-web.
 
-%package -n python-%{name}
-Summary:	Python 2 bindings for libreport libraries
-Summary(pl.UTF-8):	Wiązania Pythona 2 do bibliotek libreport
-Group:		Libraries/Python
-Requires:	%{name} = %{version}-%{release}
-Provides:	%{name}-python = %{version}-%{release}
-Obsoletes:	libreport-python < 2.1.3-1
-
-%description -n python-%{name}
-Python 2 bindings for libreport libraries.
-
-%description -n python-%{name} -l pl.UTF-8
-Wiązania Pythona 2 do bibliotek libreport
-
 %package -n python3-%{name}
 Summary:	Python 3 bindings for libreport libraries
 Summary(pl.UTF-8):	Wiązania Pythona 3 do bibliotek libreport
 Group:		Libraries/Python
 Requires:	%{name} = %{version}-%{release}
+Requires:	python3-libs >= 1:3.6
+Obsoletes:	libreport-python < 2.1.3-1
+Obsoletes:	python-libreport
 
 %description -n python3-%{name}
 Python 3 bindings for libreport libraries.
@@ -283,6 +268,19 @@ Plugin to report bugs into RH support system.
 %description plugin-rhtsupport -l pl.UTF-8
 Wtyczka zgłaszająca problemy do systemu obsługi RH.
 
+%package plugin-systemd-journal
+Summary:	libreport's systemd journal reporter plugin
+Summary(pl.UTF-8):	Wtyczka libreport do zgłoszeń w kronice systemd
+Group:		Libraries
+Requires:	%{name} = %{version}-%{release}
+
+%description plugin-systemd-journal
+The simple reporter plugin which writes a report to the systemd
+journal.
+
+%description plugin-systemd-journal -l pl.UTF-8
+Prosta wtyczka zgłoszeń zapisująca raport w kronice systemd.
+
 %package plugin-ureport
 Summary:	libreport's micro report plugin
 Summary(pl.UTF-8):	Wtyczka libreport do zgłoszeń typu micro-report
@@ -360,17 +358,33 @@ zgłaszania błędów w systemach RHEL.
 
 %prep
 %setup -q
-%patch0 -p1
+
+./gen-version
+
+# set_echo test from client.at fails on builders due to forkpty()
+%{__sed} -i -e '/client\.at/d' tests/testsuite.at
+# process_has_own_root randomly fails in chroot environment
+%{__sed} -i -e '/proc_helpers\.at/d' tests/testsuite.at
+# short_backtrace expects outdated output format
+%{__sed} -i -e '/problem_report\.at/d' tests/testsuite.at
 
 %build
+%{__gettextize}
+%{__intltoolize}
+%{__libtoolize}
+%{__aclocal} -I m4
+%{__autoconf}
+%{__autoheader}
+%{__automake}
 %configure \
 	AUGPARSE=/usr/bin/augparse \
-	--disable-silent-rules
+	--disable-silent-rules \
+	%{!?with_python3:--without-python3}
 
 %{__make}
 
 %if %{with tests}
-%{__make} check
+%{__make} check || (cat tests/testsuite.log && /bin/false)
 %endif
 
 %install
@@ -383,14 +397,13 @@ rm -rf $RPM_BUILD_ROOT
 # compat layer for compatibility tool
 %{__rm} $RPM_BUILD_ROOT{%{_bindir}/report,%{_mandir}/man1/report.1}
 
-%py_postclean
-%{__rm} $RPM_BUILD_ROOT%{py_sitedir}/report*/*.la
+%if %{with python3}
 %{__rm} $RPM_BUILD_ROOT%{py3_sitedir}/report*/*.la
+%py3_comp $RPM_BUILD_ROOT%{py3_sitedir}
+%py3_ocomp $RPM_BUILD_ROOT%{py3_sitedir}
+%endif
 
-# empty versions of nb,ru
-%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/{no,ru_RU}
-# not supported by glibc yet
-%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/{ach,aln,bal,ilo}
+%{__mv} $RPM_BUILD_ROOT%{_localedir}/{sr_Latn,sr@latin}
 
 %find_lang %{name}
 
@@ -408,7 +421,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc README
+%doc CHANGELOG.md README.md
 %dir %{_sysconfdir}/%{name}
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/report_event.conf
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/forbidden_words.conf
@@ -453,10 +466,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/libreport/internal_libreport.h
 %{_includedir}/libreport/problem_report.h
 %{_includedir}/libreport/problem_utils.h
+%{_includedir}/libreport/report_result.h
 %{_includedir}/libreport/reporters.h
 %{_includedir}/libreport/ureport.h
 %{_includedir}/libreport/workflow.h
 %{_includedir}/libreport/xml_parser.h
+%{_includedir}/libreport/helpers
 %{_pkgconfigdir}/libreport.pc
 
 %files web
@@ -470,27 +485,21 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/libreport/libreport_curl.h
 %{_pkgconfigdir}/libreport-web.pc
 
-%files -n python-%{name}
-%defattr(644,root,root,755)
-%dir %{py_sitedir}/report
-%attr(755,root,root) %{py_sitedir}/report/_pyreport.so
-%{py_sitedir}/report/*.py[co]
-%dir %{py_sitedir}/report/io
-%{py_sitedir}/report/io/*.py[co]
-%dir %{py_sitedir}/reportclient
-%attr(755,root,root) %{py_sitedir}/reportclient/_reportclient.so
-%{py_sitedir}/reportclient/*.py[co]
-
+%if %{with python3}
 %files -n python3-%{name}
 %defattr(644,root,root,755)
 %dir %{py3_sitedir}/report
 %attr(755,root,root) %{py3_sitedir}/report/_py3report.so
 %{py3_sitedir}/report/*.py*
+%{py3_sitedir}/report/__pycache__
 %dir %{py3_sitedir}/report/io
 %{py3_sitedir}/report/io/*.py*
+%{py3_sitedir}/report/io/__pycache__
 %dir %{py3_sitedir}/reportclient
 %attr(755,root,root) %{py3_sitedir}/reportclient/_reportclient3.so
 %{py3_sitedir}/reportclient/*.py*
+%{py3_sitedir}/reportclient/__pycache__
+%endif
 
 %files cli
 %defattr(644,root,root,755)
@@ -525,9 +534,9 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/libreport/plugins/bugzilla_format_analyzer_libreport.conf
 %config(noreplace) %{_sysconfdir}/libreport/plugins/bugzilla_format_kernel.conf
 %config(noreplace) %{_sysconfdir}/libreport/plugins/bugzilla_formatdup.conf
+%{_sysconfdir}/libreport/plugins/bugzilla_formatdup_analyzer_libreport.conf
 %config(noreplace) %{_sysconfdir}/libreport/events/report_Bugzilla.conf
 %config(noreplace) %{_sysconfdir}/libreport/events.d/bugzilla_event.conf
-%{_datadir}/dbus-1/interfaces/com.redhat.problems.configuration.bugzilla.xml
 %{_datadir}/libreport/conf.d/plugins/bugzilla.conf
 %{_datadir}/libreport/events/report_Bugzilla.xml
 %{_datadir}/libreport/events/watch_Bugzilla.xml
@@ -539,6 +548,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man5/bugzilla_format_kernel.conf.5*
 %{_mandir}/man5/bugzilla_formatdup.conf.5*
 %{_mandir}/man5/report_Bugzilla.conf.5*
+%{_mandir}/man5/bugzilla_formatdup_analyzer_libreport.conf.5*
 
 %files plugin-kerneloops
 %defattr(644,root,root,755)
@@ -566,7 +576,6 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/libreport/plugins/mailx.conf
 %config(noreplace) %{_sysconfdir}/libreport/events.d/mailx_event.conf
 %config(noreplace) %{_sysconfdir}/libreport/workflows.d/report_mailx.conf
-%{_datadir}/dbus-1/interfaces/com.redhat.problems.configuration.mailx.xml
 %{_datadir}/libreport/conf.d/plugins/mailx.conf
 %{_datadir}/libreport/events/report_Mailx.xml
 %{_datadir}/libreport/workflows/workflow_Mailx.xml
@@ -596,6 +605,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/reporter-upload
 %config(noreplace) %{_sysconfdir}/libreport/plugins/upload.conf
+%config(noreplace) %{_sysconfdir}/libreport/events/report_Uploader.conf
 %config(noreplace) %{_sysconfdir}/libreport/events.d/uploader_event.conf
 %config(noreplace) %{_sysconfdir}/libreport/workflows.d/report_uploader.conf
 %{_datadir}/libreport/conf.d/plugins/upload.conf
@@ -603,32 +613,38 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/libreport/workflows/workflow_Upload.xml
 %{_datadir}/libreport/workflows/workflow_UploadCCpp.xml
 %{_mandir}/man1/reporter-upload.1*
+%{_mandir}/man5/report_Uploader.conf.5*
 %{_mandir}/man5/report_uploader.conf.5*
 %{_mandir}/man5/uploader_event.conf.5*
+%{_mandir}/man5/upload.conf.5*
 
 %files plugin-rhtsupport
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/reporter-rhtsupport
 %config(noreplace) %{_sysconfdir}/libreport/plugins/rhtsupport.conf
 %config(noreplace) %{_sysconfdir}/libreport/events.d/rhtsupport_event.conf
-%{_datadir}/dbus-1/interfaces/com.redhat.problems.configuration.rhtsupport.xml
 %{_datadir}/libreport/conf.d/plugins/rhtsupport.conf
 %{_datadir}/libreport/events/report_RHTSupport.xml
+%{_datadir}/libreport/events/report_RHTSupport_AddData.xml
 %{_mandir}/man1/reporter-rhtsupport.1*
 %{_mandir}/man5/rhtsupport.conf.5*
 %{_mandir}/man5/rhtsupport_event.conf.5*
 
+%files plugin-systemd-journal
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/reporter-systemd-journal
+%{_mandir}/man1/reporter-systemd-journal.1*
+
 %files plugin-ureport
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/reporter-ureport
-%config(noreplace) %{_sysconfdir}/libreport/events.d/emergencyanalysis_event.conf
 %config(noreplace) %{_sysconfdir}/libreport/plugins/ureport.conf
-%{_datadir}/dbus-1/interfaces/com.redhat.problems.configuration.ureport.xml
+%config(noreplace) %{_sysconfdir}/libreport/workflows.d/report_uReport.conf
 %{_datadir}/libreport/conf.d/plugins/ureport.conf
 %{_datadir}/libreport/events/report_uReport.xml
-%{_datadir}/libreport/events/report_EmergencyAnalysis.xml
+%{_datadir}/libreport/workflows/workflow_uReport.xml
 %{_mandir}/man1/reporter-ureport.1*
-%{_mandir}/man5/emergencyanalysis_event.conf.5*
+%{_mandir}/man5/report_uReport.conf.5*
 %{_mandir}/man5/ureport.conf.5*
 
 %files anaconda
@@ -654,6 +670,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/libreport/events/report_CentOSBugTracker.xml
 %{_datadir}/libreport/workflows/workflow_CentOSCCpp.xml
 %{_datadir}/libreport/workflows/workflow_CentOSJava.xml
+%{_datadir}/libreport/workflows/workflow_CentOSJavaScript.xml
 %{_datadir}/libreport/workflows/workflow_CentOSKerneloops.xml
 %{_datadir}/libreport/workflows/workflow_CentOSLibreport.xml
 %{_datadir}/libreport/workflows/workflow_CentOSPython.xml
@@ -673,6 +690,7 @@ rm -rf $RPM_BUILD_ROOT
 %files rhel
 %defattr(644,root,root,755)
 %config(noreplace) %{_sysconfdir}/libreport/workflows.d/report_rhel.conf
+%config(noreplace) %{_sysconfdir}/libreport/workflows.d/report_rhel_add_data.conf
 %config(noreplace) %{_sysconfdir}/libreport/workflows.d/report_rhel_bugzilla.conf
 %{_datadir}/libreport/workflows/workflow_RHEL*.xml
 %{_mandir}/man5/report_rhel.conf.5*