From 40b7a09a4bdffbdf0b896a136aa013e70ad64c17 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Elan=20Ruusam=C3=A4e?= <glen@delfi.ee>
Date: Wed, 27 Apr 2016 10:41:15 +0300
Subject: [PATCH] up to 2.7.0, updated format-security.patch

do not regenerate autotools as not needed
---
 format-security.patch | 27 +++++++++------------------
 libreport.spec        | 13 ++++---------
 2 files changed, 13 insertions(+), 27 deletions(-)

diff --git a/format-security.patch b/format-security.patch
index a986fbe..7f0614e 100644
--- a/format-security.patch
+++ b/format-security.patch
@@ -1,6 +1,6 @@
---- libreport-2.3.0/src/plugins/reporter-ureport.c.orig	2014-10-12 21:30:27.836212240 +0200
-+++ libreport-2.3.0/src/plugins/reporter-ureport.c	2014-10-12 21:42:03.026183064 +0200
-@@ -246,7 +246,7 @@
+--- libreport-2.7.0/src/plugins/reporter-ureport.c~	2016-04-07 18:24:05.000000000 +0300
++++ libreport-2.7.0/src/plugins/reporter-ureport.c	2016-04-27 10:31:21.566593068 +0300
+@@ -312,7 +312,7 @@
          {
              log(_("This problem has already been reported."));
              if (response->urr_message)
@@ -9,18 +9,9 @@
  
              ret = EXIT_STOP_EVENT_RUN;
          }
---- libreport-2.2.2/src/gui-wizard-gtk/wizard.c.orig	2014-04-20 22:07:04.000000000 +0200
-+++ libreport-2.2.2/src/gui-wizard-gtk/wizard.c	2014-06-14 17:08:36.638269706 +0200
-@@ -1935,7 +1935,7 @@
-         GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
-         GTK_MESSAGE_WARNING,
-         GTK_BUTTONS_YES_NO,
--        message);
-+        "%s", message);
- 
-     gtk_window_set_transient_for(GTK_WINDOW(old_private_group), GTK_WINDOW(g_wnd_assistant));
-     gtk_message_dialog_set_markup(GTK_MESSAGE_DIALOG(old_private_group),
-@@ -3118,7 +3118,7 @@
+--- libreport-2.7.0/src/gui-wizard-gtk/wizard.c~	2016-04-07 18:24:05.000000000 +0300
++++ libreport-2.7.0/src/gui-wizard-gtk/wizard.c	2016-04-27 10:39:33.488656568 +0300
+@@ -3352,7 +3352,7 @@
                  GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
                  GTK_MESSAGE_WARNING,
                  GTK_BUTTONS_CLOSE,
@@ -29,9 +20,9 @@
              free(message);
              gtk_window_set_transient_for(GTK_WINDOW(dlg), GTK_WINDOW(g_wnd_assistant));
              gtk_dialog_run(GTK_DIALOG(dlg));
---- libreport-2.3.0/src/plugins/reporter-rhtsupport.c.orig	2014-10-02 10:51:43.000000000 +0200
-+++ libreport-2.3.0/src/plugins/reporter-rhtsupport.c	2014-10-12 21:46:04.766172924 +0200
-@@ -205,7 +205,7 @@
+--- libreport-2.7.0/src/plugins/reporter-rhtsupport.c~	2016-04-07 18:24:05.000000000 +0300
++++ libreport-2.7.0/src/plugins/reporter-rhtsupport.c	2016-04-27 10:35:22.815716392 +0300
+@@ -288,7 +288,7 @@
          ureport_server_response_save_in_dump_dir(resp, dump_dir_name, conf);
  
          if (resp->urr_message)
diff --git a/libreport.spec b/libreport.spec
index 1681bb7..0b133d0 100644
--- a/libreport.spec
+++ b/libreport.spec
@@ -6,17 +6,17 @@
 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.6.3
+Version:	2.7.0
 Release:	1
 License:	GPL v2+
 Group:		Libraries
 Source0:	https://fedorahosted.org/released/abrt/%{name}-%{version}.tar.gz
-# Source0-md5:	a377e6dc8665e679a72fefd09341c9c5
+# Source0-md5:	7354fa562de18ab690127a4ff7d5601e
 Patch0:		format-security.patch
 URL:		https://github.com/abrt/libreport
 BuildRequires:	asciidoc
-%{?with_tests:BuildRequires:	augeas}
 BuildRequires:	augeas-devel
+%{?with_tests:BuildRequires:	augeas}
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
 BuildRequires:	curl-devel
@@ -306,8 +306,8 @@ infrastruktury Fedory lub przesyłając zebrane dane po ftp/scp.
 Summary:	Default configuration for reporting bugs via CentOS infrastructure
 Summary(pl.UTF-8):	Domyślna konfiguracja do zgłaszania błędów poprzez infrastrukturę CentOS
 Group:		Applications/File
-Requires:	%{name}-web = %{version}-%{release}
 Requires:	%{name}-plugin-mantisbt = %{version}-%{release}
+Requires:	%{name}-web = %{version}-%{release}
 
 %description centos
 Default configuration for reporting bugs via CentOS infrastructure
@@ -355,11 +355,6 @@ zgłaszania błędów w systemach RHEL.
 %patch0 -p1
 
 %build
-%{__libtoolize}
-%{__aclocal} -I m4
-%{__autoconf}
-%{__autoheader}
-%{__automake}
 %configure \
 	AUGPARSE=/usr/bin/augparse \
 	--disable-silent-rules
-- 
2.43.0