From 46b5a71948cc7c31a8eea0b1bc5027a649f275fd Mon Sep 17 00:00:00 2001 From: Jakub Filak Date: Jul 30 2013 12:14:58 +0000 Subject: New version which provides a proper libreport configuration --- diff --git a/.gitignore b/.gitignore index 6a5256b..b9742eb 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /abrt-java-connector-1.0.2-3cc67c2.tar.gz /abrt-java-connector-1.0.3-872c1de.tar.gz /abrt-java-connector-1.0.4-e97c189.tar.gz +/abrt-java-connector-1.0.5-9214372.tar.gz diff --git a/abrt-java-connector.spec b/abrt-java-connector.spec index 4945fd8..c450870 100644 --- a/abrt-java-connector.spec +++ b/abrt-java-connector.spec @@ -1,8 +1,8 @@ -%global commit e97c189068515c894695c07b68733adc211c9805 +%global commit 9214372f6635aa377954f26a7c4dc90477a14564 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: abrt-java-connector -Version: 1.0.4 +Version: 1.0.5 Release: 1%{?dist} Summary: JNI Agent library converting Java exceptions to ABRT problems @@ -34,12 +34,49 @@ make %{?_smp_mflags} %install make install DESTDIR=%{buildroot} +# Remove unwanted Fedora specific workflow configuration files +%if 0%{!?fedora:1} +rm -f $RPM_BUILD_ROOT/%{_datadir}/libreport/workflows/workflow_FedoraJava.xml +rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/libreport/workflows.d/report_fedora_java.conf +rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/libreport/events.d/java_event_fedora.conf +rm -f $RPM_BUILD_ROOT%{_mandir}/man5/report_fedora_java.conf.5 +rm -f $RPM_BUILD_ROOT%{_mandir}/man5/java_event_fedora.conf.5 +%endif + +# Remove unwanted RHEL specific workflow configuration files +%if 0%{!?rhel:1} +rm -f $RPM_BUILD_ROOT/%{_datadir}/libreport/workflows/workflow_RHELJava.xml +rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/libreport/workflows.d/report_rhel_java.conf +rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/libreport/events.d/java_event_rhel.conf +rm -f $RPM_BUILD_ROOT%{_mandir}/man5/report_rhel_java.conf.5 +rm -f $RPM_BUILD_ROOT%{_mandir}/man5/java_event_rhel.conf.5 +%endif + %files %doc LICENSE README AUTHORS %config(noreplace) %{_sysconfdir}/libreport/plugins/bugzilla_format_java.conf %config(noreplace) %{_sysconfdir}/libreport/plugins/bugzilla_formatdup_java.conf %config(noreplace) %{_sysconfdir}/libreport/events.d/java_event.conf +%{_mandir}/man5/java_event.conf.5* +%{_mandir}/man5/bugzilla_format_java.conf.5* +%{_mandir}/man5/bugzilla_formatdup_java.conf.5* + +%if 0%{?fedora} +%{_datadir}/libreport/workflows/workflow_FedoraJava.xml +%config(noreplace) %{_sysconfdir}/libreport/events.d/java_event_fedora.conf +%config(noreplace) %{_sysconfdir}/libreport/workflows.d/report_fedora_java.conf +%{_mandir}/man5/java_event_fedora.conf.5* +%{_mandir}/man5/report_fedora_java.conf.5* +%endif + +%if 0%{?rhel} +%{_datadir}/libreport/workflows/workflow_RHELJava.xml +%config(noreplace) %{_sysconfdir}/libreport/events.d/java_event_rhel.conf +%config(noreplace) %{_sysconfdir}/libreport/workflows.d/report_rhel_java.conf +%{_mandir}/man5/java_event_rhel.conf.5* +%{_mandir}/man5/report_rhel_java.conf.5* +%endif # install only unversioned shared object because the package is a Java plugin # and not a system library but unfortunately the library must be placed in ld @@ -59,6 +96,9 @@ make test %changelog +* Tue Jul 30 2013 Jakub Filak - 1.0.5-1 +- Provide a proper configuration for libreport + * Thu Jul 18 2013 Jakub Filak - 1.0.4-1 - Stop creating an empty log file - Resolves: #985776 diff --git a/sources b/sources index b623350..95fa143 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -21494260bc32b1b6ed790703812f3484 abrt-java-connector-1.0.4-e97c189.tar.gz +22d8cd75ed08c29207b4d50b7b275568 abrt-java-connector-1.0.5-9214372.tar.gz