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

diff --git a/libreport.spec b/libreport.spec
index 04979ca..b1a5d2a 100644
--- a/libreport.spec
+++ b/libreport.spec
@@ -1,18 +1,18 @@
 #
 # Conditional build:
-%bcond_without	python2	# Python 2.x modules
 %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.9.5
-Release:	5
+Version:	2.12.0
+Release:	2
 License:	GPL v2+
 Group:		Libraries
+#Source0Download: https://github.com/abrt/libreport/releases
 Source0:	https://github.com/abrt/libreport/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	a3abcdfbf1b1ec27ce6c44d5ba22b31b
+# Source0-md5:	09153b254ce2d675ca77788986702ac5
 URL:		https://github.com/abrt/libreport
 BuildRequires:	asciidoc
 BuildRequires:	augeas-devel
@@ -23,7 +23,7 @@ BuildRequires:	curl-devel
 BuildRequires:	dbus-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext-tools >= 0.17
-BuildRequires:	glib2-devel >= 1:2.43
+BuildRequires:	glib2-devel >= 1:2.43.4
 BuildRequires:	gtk+3-devel >= 3.0
 BuildRequires:	intltool >= 0.35.0
 BuildRequires:	json-c-devel
@@ -34,11 +34,10 @@ BuildRequires:	libxml2-devel >= 2
 BuildRequires:	newt-devel
 BuildRequires:	nss-devel
 BuildRequires:	pkgconfig
-%{?with_python2:BuildRequires:	python-devel >= 2}
-%{?with_python3:BuildRequires:	python3-devel >= 1:3}
+%{?with_python3:BuildRequires:	python3-devel >= 1:3.6}
 BuildRequires:	rpmbuild(macros) >= 1.612
 BuildRequires:	satyr-devel
-BuildRequires:	systemd-devel
+BuildRequires:	systemd-devel >= 1:209
 BuildRequires:	xmlrpc-c-client-devel
 BuildRequires:	xmlrpc-c-devel
 BuildRequires:	xmlto
@@ -49,7 +48,7 @@ BuildRequires:	mount
 BuildRequires:	pld-release >= 3.0-8
 BuildRequires:	sed >= 4.0
 %endif
-Requires:	glib2 >= 1:2.43
+Requires:	glib2 >= 1:2.43.4
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -66,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.43
+Requires:	glib2-devel >= 1:2.43.4
 
 %description devel
 Header files for libreport libraries.
@@ -106,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.
@@ -377,6 +365,8 @@ zgłaszania błędów w systemach RHEL.
 %{__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}
@@ -389,7 +379,6 @@ zgłaszania błędów w systemach RHEL.
 %configure \
 	AUGPARSE=/usr/bin/augparse \
 	--disable-silent-rules \
-	%{!?with_python2:--without-python2} \
 	%{!?with_python3:--without-python3}
 
 %{__make}
@@ -408,22 +397,13 @@ rm -rf $RPM_BUILD_ROOT
 # compat layer for compatibility tool
 %{__rm} $RPM_BUILD_ROOT{%{_bindir}/report,%{_mandir}/man1/report.1}
 
-%if %{with python2}
-%py_postclean
-%{__rm} $RPM_BUILD_ROOT%{py_sitedir}/report*/*.la
-%endif
 %if %{with python3}
 %{__rm} $RPM_BUILD_ROOT%{py3_sitedir}/report*/*.la
-# automake uses $PYTHON for both versions, recompile using python3
-%py_postclean %{py3_sitedir}
 %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}
 
@@ -486,6 +466,7 @@ 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
@@ -504,30 +485,20 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/libreport/libreport_curl.h
 %{_pkgconfigdir}/libreport-web.pc
 
-%if %{with python2}
-%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]
-%endif
-
 %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
@@ -563,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
@@ -577,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)
@@ -604,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
@@ -652,7 +623,6 @@ rm -rf $RPM_BUILD_ROOT
 %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
@@ -668,16 +638,12 @@ rm -rf $RPM_BUILD_ROOT
 %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
 %config(noreplace) %{_sysconfdir}/libreport/workflows.d/report_uReport.conf
-%{_datadir}/dbus-1/interfaces/com.redhat.problems.configuration.ureport.xml
 %{_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*