[packages/libreport] - updated to 2.1.5 - updated format-security patch

[qboosh]

commit 267c13ea58522b6756ad2440af21be75e2b737d7
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Thu Jul 25 16:48:54 2013 +0200

    - updated to 2.1.5
    - updated format-security patch

 format-security.patch | 10 +++++-----
 libreport.spec        | 23 +++++++++++++++++------
 2 files changed, 22 insertions(+), 11 deletions(-)
---
diff --git a/libreport.spec b/libreport.spec
index 831c130..9a3eade 100644
--- a/libreport.spec
+++ b/libreport.spec
@@ -1,16 +1,20 @@
+#
+# Conditional build:
+%bcond_with	satyr	# satyr instead of btparser
+#
 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.1.3
-Release:	2
+Version:	2.1.5
+Release:	1
 License:	GPL v2+
 Group:		Libraries
 Source0:	https://fedorahosted.org/released/abrt/%{name}-%{version}.tar.gz
-# Source0-md5:	bae83bebcb2601707ac780c53d16e7fe
+# Source0-md5:	50c527d0c642dc21fa5dd3ef43b0c886
 Patch0:		format-security.patch
 URL:		https://fedorahosted.org/abrt/
 BuildRequires:	asciidoc
-BuildRequires:	btparser-devel
+%{!?with_satyr:BuildRequires:	btparser-devel}
 BuildRequires:	curl-devel
 BuildRequires:	dbus-devel
 BuildRequires:	desktop-file-utils
@@ -27,6 +31,7 @@ BuildRequires:	newt-devel
 BuildRequires:	nss-devel
 BuildRequires:	pkgconfig
 BuildRequires:	python-devel
+%{?with_satyr:BuildRequires:	satyr-devel}
 BuildRequires:	xmlrpc-c-client-devel
 BuildRequires:	xmlrpc-c-devel
 BuildRequires:	xmlto
@@ -73,11 +78,12 @@ Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki libreport-web
 Group:		Development/Libraries
 Requires:	%{name}-devel = %{version}-%{release}
 Requires:	%{name}-web = %{version}-%{release}
-Requires:	btparser-devel
+%{!?with_satyr:Requires:	btparser-devel}
 Requires:	curl-devel
 Requires:	json-c-devel
 Requires:	libproxy-devel
 Requires:	libxml2-devel >= 2
+%{?with_satyr:Requires:	satyr-devel}
 Requires:	xmlrpc-c-client-devel
 Requires:	xmlrpc-c-devel
 
@@ -301,7 +307,8 @@ zgłaszania błędów w systemach RHEL.
 
 %build
 %configure \
-	--disable-silent-rules
+	--disable-silent-rules \
+	%{?with_satyr:--with-satyr}
 %{__make}
 
 %install
@@ -355,6 +362,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/libreport/dump_dir.h
 %{_includedir}/libreport/event_config.h
 %{_includedir}/libreport/file_obj.h
+%{_includedir}/libreport/libreport_types.h
 %{_includedir}/libreport/problem_data.h
 %{_includedir}/libreport/report.h
 %{_includedir}/libreport/run_event.h
@@ -464,6 +472,9 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %{_sysconfdir}/libreport/workflows/workflow_AnacondaFedora.xml
 %{_sysconfdir}/libreport/workflows/workflow_AnacondaUpload.xml
+%config(noreplace) %{_sysconfdir}/libreport/events.d/bugzilla_anaconda_event.conf
+%config(noreplace) %{_sysconfdir}/libreport/plugins/bugzilla_format_anaconda.conf
+%config(noreplace) %{_sysconfdir}/libreport/plugins/bugzilla_formatdup_anaconda.conf
 %config(noreplace) %{_sysconfdir}/libreport/workflows.d/anaconda_event.conf
 
 %files fedora
diff --git a/format-security.patch b/format-security.patch
index 557b2a3..6830206 100644
--- a/format-security.patch
+++ b/format-security.patch
@@ -1,14 +1,14 @@
---- libreport-2.0.16/src/plugins/ureport.c~	2012-09-25 09:40:58.000000000 +0200
-+++ libreport-2.0.16/src/plugins/ureport.c	2012-10-15 12:54:26.063200601 +0200
-@@ -383,7 +383,7 @@
+--- libreport-2.1.5/src/plugins/ureport.c.orig	2013-07-25 15:39:39.289878178 +0200
++++ libreport-2.1.5/src/plugins/ureport.c	2013-07-25 15:42:58.916536467 +0200
+@@ -476,7 +476,7 @@
          {
              log(_("This problem has already been reported."));
              if (response->message)
 -                log(response->message);
 +                log("%s", response->message);
-             log("THANKYOU");
+ 
+             ret = EXIT_STOP_EVENT_RUN;
          }
-     }
 --- libreport-2.0.16/src/gui-wizard-gtk/wizard.c~	2012-10-10 18:11:04.000000000 +0200
 +++ libreport-2.0.16/src/gui-wizard-gtk/wizard.c	2012-10-15 12:55:58.123197354 +0200
 @@ -281,7 +281,7 @@
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libreport.git/commitdiff/267c13ea58522b6756ad2440af21be75e2b737d7