From 27390d5602dff959c948efec3729e018b6c4873b Mon Sep 17 00:00:00 2001 From: CentOS Buildsys Date: Mar 10 2014 09:27:42 +0000 Subject: import libreport-2.1.11-9.el7.src.rpm --- diff --git a/.libreport.metadata b/.libreport.metadata index 399ce87..6bf0540 100644 --- a/.libreport.metadata +++ b/.libreport.metadata @@ -1 +1,2 @@ -5fe11874abd0e7759457249366382af7e738444d SOURCES/libreport-2.1.7.tar.gz +73b29c1816322e8966bd52a2b8fac7fbe6bee855 SOURCES/0034-remove-invalid-bytes-from-sv-strings.patch +9dc1ba8c2bafc9b70a526083d7e04bba1b11c60a SOURCES/libreport-2.1.11.tar.gz diff --git a/SOURCES/0001-wizard-do-not-use-deprecated-gtk3-API.patch b/SOURCES/0001-wizard-do-not-use-deprecated-gtk3-API.patch new file mode 100644 index 0000000..7077519 --- /dev/null +++ b/SOURCES/0001-wizard-do-not-use-deprecated-gtk3-API.patch @@ -0,0 +1,29 @@ +From 0f2014b68ea19dd7a239c4c9b7a7774b03f2cca2 Mon Sep 17 00:00:00 2001 +From: Jakub Filak +Date: Wed, 8 Jan 2014 09:38:30 +0100 +Subject: [LIBREPORT PATCH 1/6] wizard: do not use deprecated gtk3 API + +Signed-off-by: Jakub Filak +--- + src/gui-wizard-gtk/wizard.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/gui-wizard-gtk/wizard.c b/src/gui-wizard-gtk/wizard.c +index c37f69f..3faa8e8 100644 +--- a/src/gui-wizard-gtk/wizard.c ++++ b/src/gui-wizard-gtk/wizard.c +@@ -2597,7 +2597,11 @@ static void add_workflow_buttons(GtkBox *box, GHashTable *workflows, GCallback f + gtk_label_set_use_markup(GTK_LABEL(label), true); + gtk_widget_set_halign(label, GTK_ALIGN_START); + gtk_widget_set_margin_top(label, 10); ++#if ((GTK_MAJOR_VERSION == 3 && GTK_MINOR_VERSION < 11) || (GTK_MAJOR_VERSION == 3 && GTK_MINOR_VERSION == 11 && GTK_MICRO_VERSION < 2)) + gtk_widget_set_margin_left(label, 40); ++#else ++ gtk_widget_set_margin_start(label, 40); ++#endif + gtk_widget_set_margin_bottom(label, 10); + free(btn_label); + g_signal_connect(button, "clicked", func, w); +-- +1.8.3.1 + diff --git a/SOURCES/0002-replace-all-Fedora-URLs-by-corresponding-values-for-.patch b/SOURCES/0002-replace-all-Fedora-URLs-by-corresponding-values-for-.patch new file mode 100644 index 0000000..d21c072 --- /dev/null +++ b/SOURCES/0002-replace-all-Fedora-URLs-by-corresponding-values-for-.patch @@ -0,0 +1,53 @@ +From 9f62c707df03b371890ad139f0633c8457b146f6 Mon Sep 17 00:00:00 2001 +From: Jakub Filak +Date: Wed, 8 Jan 2014 17:09:00 +0100 +Subject: [LIBREPORT PATCH 2/6] replace all Fedora URLs by corresponding values + for RHEL + +Signed-off-by: Jakub Filak +--- + src/plugins/report_EmergencyAnalysis.xml.in | 2 +- + src/plugins/report_uReport.xml.in | 2 +- + src/plugins/ureport.conf | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/plugins/report_EmergencyAnalysis.xml.in b/src/plugins/report_EmergencyAnalysis.xml.in +index 3fb2bd2..c00a734 100644 +--- a/src/plugins/report_EmergencyAnalysis.xml.in ++++ b/src/plugins/report_EmergencyAnalysis.xml.in +@@ -15,7 +15,7 @@ + + + +