From ffb3afb49d87b61cad108e13dfbd327eaf8921e8 Mon Sep 17 00:00:00 2001 From: Jacco Ligthart Date: Sun, 13 Dec 2015 17:11:27 +0100 Subject: [PATCH] redsleeve --- SPECS/libreport.spec | 121 ++++++++++++++++++++++++++------------------------- 1 file changed, 62 insertions(+), 59 deletions(-) diff --git a/SPECS/libreport.spec b/SPECS/libreport.spec index 75731a6..e1548c0 100644 --- a/SPECS/libreport.spec +++ b/SPECS/libreport.spec @@ -7,7 +7,7 @@ Summary: Generic library for reporting various problems Name: libreport Version: 2.1.11 -Release: 32%{?dist} +Release: 32%{?dist}.redsleeve License: GPLv2+ Group: System Environment/Libraries URL: https://fedorahosted.org/abrt/ @@ -182,21 +182,21 @@ Patch157: 0157-testsuite-ureport-initialize-post_state.patch Patch158: 0158-testsuite-ureport-use-less-strange-testing-error-mes.patch # git format-patch 2.1.11-30.el7 -N --start-number 159 --topo-order Patch159: 0159-wizard-fix-save-users-changes-after-reviewing-dump-d.patch -Patch1000: 1000-lib-add-Problem-Format-API.patch -Patch1001: 1001-bugzilla-port-to-Problem-Format-API.patch +#Patch1000: 1000-lib-add-Problem-Format-API.patch +#Patch1001: 1001-bugzilla-port-to-Problem-Format-API.patch #Patch1002: 1002-spec-reflect-changes-due-to-Problem-Report-API.patch -Patch1003: 1003-lib-created-a-new-lib-file-for-reporters.patch +#Patch1003: 1003-lib-created-a-new-lib-file-for-reporters.patch #Patch1004: 1004-spec-changed-spec-file-to-work-with-last-commit.patch -Patch1005: 1005-ureport-set-url-to-public-faf-server.patch -Patch1006: 1006-conf-changed-URL-for-sending-uReport.patch -Patch1007: 1007-reporter-mantisbt-first-version-of-the-reporter-mant.patch +#Patch1005: 1005-ureport-set-url-to-public-faf-server.patch +#Patch1006: 1006-conf-changed-URL-for-sending-uReport.patch +#Patch1007: 1007-reporter-mantisbt-first-version-of-the-reporter-mant.patch #Patch1008: 1008-spec-changed-spec-file-to-work-with-reporter-mantisb.patch -Patch1009: 1009-reporter-mantisbt-change-default-formating-file-for-.patch +#Patch1009: 1009-reporter-mantisbt-change-default-formating-file-for-.patch #Patch1010: 1010-spec-change-spec-file-to-work-with-last-commit.patch -Patch1011: 1011-reporter-mantisbt-adds-man-pages-for-reporter-mantis.patch -Patch1012: 1012-move-problem_report-to-plugins.patch +#Patch1011: 1011-reporter-mantisbt-adds-man-pages-for-reporter-mantis.patch +#Patch1012: 1012-move-problem_report-to-plugins.patch #Patch1013: 1013-spec-change-related-to-moving-problem_report-to-plug.patch -Patch1014: 1014-reporter-mantisbt-add-event-for-reporting-AVCs.patch +#Patch1014: 1014-reporter-mantisbt-add-event-for-reporting-AVCs.patch #Patch1015: 1015-spec-add-files-related-to-reporting-AVCs-by-reporter.patch Patch1016: 1016-event-disable-report_RHTSupport-event-and-change-URL.patch # git format-patch 2.1.11-31.el7 -N --start-number 160 --topo-order @@ -389,24 +389,24 @@ Uploads micro-report to abrt server %description plugin-bugzilla Plugin to report bugs into the bugzilla. -%package plugin-mantisbt -Summary: %{name}'s mantisbt plugin -Group: System Environment/Libraries -Requires: %{name} = %{version}-%{release} -Requires: libreport-web = %{version}-%{release} +#%package plugin-mantisbt +#Summary: %{name}'s mantisbt plugin +#Group: System Environment/Libraries +#Requires: %{name} = %{version}-%{release} +#Requires: libreport-web = %{version}-%{release} -%description plugin-mantisbt -Plugin to report bugs into the mantisbt. +#%description plugin-mantisbt +#Plugin to report bugs into the mantisbt. -%package centos -Summary: %{name}'s CentOS Bug Tracker workflow -Group: System Environment/Libraries -Requires: %{name} = %{version}-%{release} -Requires: libreport-web = %{version}-%{release} -Requires: libreport-plugin-mantisbt = %{version}-%{release} +#%package centos +#Summary: %{name}'s CentOS Bug Tracker workflow +#Group: System Environment/Libraries +#Requires: %{name} = %{version}-%{release} +#Requires: libreport-web = %{version}-%{release} +#Requires: libreport-plugin-mantisbt = %{version}-%{release} -%description centos -Workflows to report issues into the CentOS Bug Tracker. +#%description centos +#Workflows to report issues into the CentOS Bug Tracker. %package plugin-rhtsupport Summary: %{name}'s RHTSupport plugin @@ -650,7 +650,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_includedir}/libreport/config_item_info.h %{_includedir}/libreport/workflow.h %{_includedir}/libreport/ureport.h -%{_includedir}/libreport/reporters.h +#%{_includedir}/libreport/reporters.h # Private api headers: %{_includedir}/libreport/internal_abrt_dbus.h %{_includedir}/libreport/internal_libreport.h @@ -770,39 +770,39 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_mandir}/man5/bugzilla_format_kernel.conf.5.* %{_bindir}/reporter-bugzilla -%files plugin-mantisbt -%defattr(-,root,root,-) -%config(noreplace) %{_sysconfdir}/libreport/plugins/mantisbt.conf -%{_datadir}/%{name}/conf.d/plugins/mantisbt.conf -%config(noreplace) %{_sysconfdir}/libreport/plugins/mantisbt_format.conf -%config(noreplace) %{_sysconfdir}/libreport/plugins/mantisbt_formatdup.conf -%config(noreplace) %{_sysconfdir}/libreport/plugins/mantisbt_format_analyzer_libreport.conf -%config(noreplace) %{_sysconfdir}/libreport/plugins/mantisbt_formatdup_analyzer_libreport.conf -%{_bindir}/reporter-mantisbt -%{_mandir}/man1/reporter-mantisbt.1.gz -%{_mandir}/man5/mantisbt.conf.5.* -%{_mandir}/man5/mantisbt_format.conf.5.* -%{_mandir}/man5/mantisbt_formatdup.conf.5.* -%{_mandir}/man5/mantisbt_format_analyzer_libreport.conf.5.* -%{_mandir}/man5/mantisbt_formatdup_analyzer_libreport.conf.5.* - -%files centos -%{_datadir}/%{name}/workflows/workflow_CentOSCCpp.xml -%{_datadir}/%{name}/workflows/workflow_CentOSKerneloops.xml -%{_datadir}/%{name}/workflows/workflow_CentOSPython.xml -%{_datadir}/%{name}/workflows/workflow_CentOSPython3.xml -%{_datadir}/%{name}/workflows/workflow_CentOSVmcore.xml -%{_datadir}/%{name}/workflows/workflow_CentOSXorg.xml -%{_datadir}/%{name}/workflows/workflow_CentOSLibreport.xml -%{_datadir}/%{name}/workflows/workflow_CentOSJava.xml -%config(noreplace) %{_sysconfdir}/libreport/workflows.d/report_centos.conf -%{_mandir}/man5/report_centos.conf.5.* -%{_datadir}/%{name}/events/report_CentOSBugTracker.xml -%config(noreplace) %{_sysconfdir}/libreport/events/report_CentOSBugTracker.conf -%{_mandir}/man5/report_CentOSBugTracker.conf.5.* +#%files plugin-mantisbt +#%defattr(-,root,root,-) +#%config(noreplace) %{_sysconfdir}/libreport/plugins/mantisbt.conf +#%{_datadir}/%{name}/conf.d/plugins/mantisbt.conf +#%config(noreplace) %{_sysconfdir}/libreport/plugins/mantisbt_format.conf +#%config(noreplace) %{_sysconfdir}/libreport/plugins/mantisbt_formatdup.conf +#%config(noreplace) %{_sysconfdir}/libreport/plugins/mantisbt_format_analyzer_libreport.conf +#%config(noreplace) %{_sysconfdir}/libreport/plugins/mantisbt_formatdup_analyzer_libreport.conf +#%{_bindir}/reporter-mantisbt +#%{_mandir}/man1/reporter-mantisbt.1.gz +#%{_mandir}/man5/mantisbt.conf.5.* +#%{_mandir}/man5/mantisbt_format.conf.5.* +#%{_mandir}/man5/mantisbt_formatdup.conf.5.* +#%{_mandir}/man5/mantisbt_format_analyzer_libreport.conf.5.* +#%{_mandir}/man5/mantisbt_formatdup_analyzer_libreport.conf.5.* + +#%files centos +#%{_datadir}/%{name}/workflows/workflow_CentOSCCpp.xml +#%{_datadir}/%{name}/workflows/workflow_CentOSKerneloops.xml +#%{_datadir}/%{name}/workflows/workflow_CentOSPython.xml +#%{_datadir}/%{name}/workflows/workflow_CentOSPython3.xml +#%{_datadir}/%{name}/workflows/workflow_CentOSVmcore.xml +#%{_datadir}/%{name}/workflows/workflow_CentOSXorg.xml +#%{_datadir}/%{name}/workflows/workflow_CentOSLibreport.xml +#%{_datadir}/%{name}/workflows/workflow_CentOSJava.xml +#%config(noreplace) %{_sysconfdir}/libreport/workflows.d/report_centos.conf +#%{_mandir}/man5/report_centos.conf.5.* +#%{_datadir}/%{name}/events/report_CentOSBugTracker.xml +#%config(noreplace) %{_sysconfdir}/libreport/events/report_CentOSBugTracker.conf +#%{_mandir}/man5/report_CentOSBugTracker.conf.5.* # report_CentOSBugTracker events are shipped by libreport package -%config(noreplace) %{_sysconfdir}/libreport/events.d/centos_report_event.conf -%{_mandir}/man5/centos_report_event.conf.5.gz +#%config(noreplace) %{_sysconfdir}/libreport/events.d/centos_report_event.conf +#%{_mandir}/man5/centos_report_event.conf.5.gz %files plugin-rhtsupport %defattr(-,root,root,-) @@ -897,6 +897,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Sun Dec 13 2015 Jacco Ligthart = 2.1.11-32.el7.redsleeve +- undo most of the CentOS work to get an unbranded version. + * Mon Nov 30 2015 Matej Habrnal - 2.1.11-32.el7.centos - add mantisbt plugin patches from https://github.com/abrt/libreport/tree/centos7 - remove dependency on redhat-access-insights -- 1.8.3.1