diff --git a/.gitignore b/.gitignore index fe925cd..3ca2637 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ abrt-1.1.13.tar.gz /abrt-2.0.0.tar.gz /abrt-2.0.1.tar.gz /abrt-2.0.2.tar.gz +/abrt-2.0.3.tar.gz diff --git a/abrt.spec b/abrt.spec index 296fe76..5648541 100644 --- a/abrt.spec +++ b/abrt.spec @@ -1,16 +1,16 @@ -%{!?python_site: %define python_site %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")} +%{!?python_site: %global python_site %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")} # platform-dependent -%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} -%if 0%{?fedora} >= 14 - %define with_systemd 1 +%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} +%if 0%{?fedora} >= 16 + %bcond_without systemd %else - %define with_systemd 0 + %bcond_with systemd %endif Summary: Automatic bug detection and reporting tool Name: abrt -Version: 2.0.2 -Release: 5%{?dist} +Version: 2.0.3 +Release: 1%{?dist} License: GPLv2+ Group: Applications/System URL: https://fedorahosted.org/abrt/ @@ -18,12 +18,8 @@ Source: https://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.gz Source1: abrt.init Source2: abrt-ccpp.init Source3: abrt-oops.init -Patch0: remove_libreport_python.patch -Patch1: blacklist.patch -Patch2: allow_bz_for_koops.patch -Patch3: retrace_addr.patch -Patch4: retrace_client_flush.patch -Patch5: prgname.patch +Patch0: blacklist.patch +Patch1: allow_bz_for_koops.patch BuildRequires: dbus-devel BuildRequires: gtk2-devel BuildRequires: curl-devel @@ -31,7 +27,6 @@ BuildRequires: rpm-devel >= 4.6 BuildRequires: desktop-file-utils BuildRequires: libnotify-devel BuildRequires: xmlrpc-c-devel -BuildRequires: file-devel BuildRequires: python-devel BuildRequires: gettext BuildRequires: libxml2-devel @@ -39,9 +34,10 @@ BuildRequires: libtar-devel BuildRequires: intltool BuildRequires: libtool BuildRequires: nss-devel -BuildRequires: texinfo BuildRequires: asciidoc BuildRequires: xmlto +BuildRequires: libreport-devel +BuildRequires: btparser-devel # for rhel6 %if 0%{?rhel} >= 6 @@ -50,12 +46,11 @@ BuildRequires: gnome-keyring-devel BuildRequires: libgnome-keyring-devel %endif -%if %{?with_systemd} +%if %{with systemd} Requires: systemd-units %endif BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: %{name}-libs = %{version}-%{release} -Requires: libreport = %{version}-%{release} Requires(pre): shadow-utils Obsoletes: abrt-plugin-sqlite3 > 0.0.1 # required for transition from 1.1.13, can be removed after some time @@ -68,37 +63,6 @@ Obsoletes: abrt-plugin-sosreport > 0.0.1 to create a bug report with all informations needed by maintainer to fix it. It uses plugin system to extend its functionality. -%package -n libreport -Summary: Libraries for reporting crashes to different targets. -Group: System Environment/Libraries - -%description -n libreport -Libraries providing API for reporting different problems in applications -to different bug targets like bugzilla, ftp, trac, etc... - -%package -n libreport-devel -Summary: Development libraries and headers for libreport. -Group: Development/Libraries - -%description -n libreport-devel -Development libraries and headers for libreport. - -#%package -n libreport-python -#Summary: Python bindings for report-libs. -## Is group correct here? - -#Group: System Environment/Libraries - -#%description -n libreport-python -#Python bindings for report-libs. - -%package -n libreport-gtk -Summary: GTK frontend for libreport -Group: User Interface/Desktops -Requires: libreport = %{version}-%{release} - -%description -n libreport-gtk -Applications for reporting bugs using libreport backend. - %package libs Summary: Libraries for %{name} Group: System Environment/Libraries @@ -118,7 +82,7 @@ Development libraries and headers for %{name}. Summary: %{name}'s gui Group: User Interface/Desktops Requires: %{name} = %{version}-%{release} -Requires: libreport-gtk = %{version}-%{release} +BuildRequires: libreport-gtk-devel # we used to have abrt-applet, now abrt-gui includes it: Provides: abrt-applet = %{version}-%{release} Obsoletes: abrt-applet < 0.0.5 @@ -213,6 +177,7 @@ uncaught exception in python programs. Summary: %{name}'s command line interface Group: User Interface/Desktops Requires: %{name} = %{version}-%{release} +Requires: libreport-cli Requires: abrt-addon-kerneloops Requires: abrt-addon-ccpp, abrt-addon-python Requires: abrt-plugin-bugzilla, abrt-plugin-logger @@ -243,29 +208,10 @@ Provides: bug-buddy %description desktop Virtual package to make easy default installation on desktop environments. -%package retrace-server -Summary: %{name}'s retrace server using HTTP protocol -Group: System Environment/Daemons -Requires: abrt-addon-ccpp -Requires: gdb >= 7.0-3 -Requires: httpd, mod_wsgi, mod_ssl, python-webob -Requires: mock, xz, elfutils, createrepo, rsync -%{?el6:Requires: python-argparse} -Requires(preun): /sbin/install-info -Requires(post): /sbin/install-info - -%description retrace-server -The retrace server provides a coredump analysis and backtrace -generation service over a network using HTTP protocol. - %prep %setup -q -%patch0 -p1 -b .libreport_py -%patch1 -p1 -b .blacklist -%patch2 -p1 -b bz_for_oops -%patch3 -p1 -b retrace_addr -%patch4 -p1 -b flush_messages -%patch5 -p1 -b prgname +%patch0 -p1 -b .blacklist +%patch1 -p1 -b bz_for_oops %build autoconf @@ -283,16 +229,17 @@ make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} # remove all .la and .a files find $RPM_BUILD_ROOT -name '*.la' -or -name '*.a' | xargs rm -f mkdir -p ${RPM_BUILD_ROOT}/%{_initrddir} +%if ! %{with systemd} install -m 755 %SOURCE1 ${RPM_BUILD_ROOT}/%{_initrddir}/abrtd install -m 755 %SOURCE2 ${RPM_BUILD_ROOT}/%{_initrddir}/abrt-ccpp install -m 755 %SOURCE3 ${RPM_BUILD_ROOT}/%{_initrddir}/abrt-oops +%endif mkdir -p $RPM_BUILD_ROOT/var/cache/abrt-di mkdir -p $RPM_BUILD_ROOT/var/run/abrt mkdir -p $RPM_BUILD_ROOT/var/spool/abrt -mkdir -p $RPM_BUILD_ROOT/var/spool/abrt-retrace -mkdir -p $RPM_BUILD_ROOT/var/cache/abrt-retrace -mkdir -p $RPM_BUILD_ROOT/var/log/abrt-retrace mkdir -p $RPM_BUILD_ROOT/var/spool/abrt-upload +# compat before we split abrt-cli and report-cli +ln -s %{_bindir}/report-cli $RPM_BUILD_ROOT/%{_bindir}/abrt-cli desktop-file-install \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ @@ -319,92 +266,85 @@ exit 0 %post if [ $1 -eq 1 ]; then -/sbin/chkconfig --add abrtd -fi -#systemd -%if %{?with_systemd} -#if [ $1 -eq 1 ]; then -# Enable (but don't start) the units by default - /bin/systemctl enable abrtd.service >/dev/null 2>&1 || : -#fi +%if %{with systemd} + # Enable (but don't start) the units by default + /bin/systemctl enable abrtd.service >/dev/null 2>&1 || : +%else + /sbin/chkconfig --add abrtd %endif +fi %post addon-ccpp +# this is required for transition from 1.1.x to 2.x +# because /cache/abrt-di/* was created under root with root:root +# so 2.x fails when it tries to extract debuginfo there.. chown -R abrt:abrt %{_localstatedir}/cache/abrt-di -#if [ $1 -eq 1 ]; then -/sbin/chkconfig --add abrt-ccpp -#fi - -%if %{?with_systemd} -if [ "$1" -eq "0" ] ; then - /bin/systemctl stop abrt-ccpp.service >/dev/null 2>&1 || : - /bin/systemctl disable abrt-ccpp.service >/dev/null 2>&1 || : -fi +if [ $1 -eq 1 ]; then +%if %{with systemd} + # Enable (but don't start) the units by default + /bin/systemctl enable abrt-ccpp.service >/dev/null 2>&1 || : +%else + /sbin/chkconfig --add abrt-ccpp %endif +fi %post addon-kerneloops if [ $1 -eq 1 ]; then +%if %{with systemd} + # Enable (but don't start) the units by default + /bin/systemctl enable abrt-oops.service >/dev/null 2>&1 || : +%else /sbin/chkconfig --add abrt-oops +%endif fi -%post retrace-server -/sbin/install-info %{_infodir}/abrt-retrace-server %{_infodir}/dir 2> /dev/null || : -/usr/sbin/usermod -G mock apache 2> /dev/null || : - %preun if [ "$1" -eq "0" ] ; then - service abrtd stop >/dev/null 2>&1 - /sbin/chkconfig --del abrtd -fi -#systemd -%if %{?with_systemd} -if [ "$1" -eq "0" ] ; then - /bin/systemctl stop abrtd.service >/dev/null 2>&1 || : - /bin/systemctl disable abrtd.service >/dev/null 2>&1 || : -fi +%if %{with systemd} + /bin/systemctl --no-reload disable abrtd.service > /dev/null 2>&1 || : + /bin/systemctl stop abrtd.service >/dev/null 2>&1 || : +%else + service abrtd stop >/dev/null 2>&1 + /sbin/chkconfig --del abrtd %endif +fi %preun addon-ccpp if [ "$1" -eq "0" ] ; then - service abrt-ccpp stop >/dev/null 2>&1 - /sbin/chkconfig --del abrt-ccpp -fi -#systemd (not tested): -%if %{?with_systemd} -if [ "$1" -eq "0" ] ; then +%if %{with systemd} + /bin/systemctl --no-reload disable abrt-ccpp.service >/dev/null 2>&1 || : /bin/systemctl stop abrt-ccpp.service >/dev/null 2>&1 || : - /bin/systemctl disable abrt-ccpp.service >/dev/null 2>&1 || : -fi +%else + service abrt-ccpp stop >/dev/null 2>&1 + /sbin/chkconfig --del abrt-ccpp %endif +fi %preun addon-kerneloops if [ "$1" -eq "0" ] ; then +%if %{with systemd} + /bin/systemctl --no-reload abrt-oops.service >/dev/null 2>&1 || : + /bin/systemctl stop abrt-oops.service >/dev/null 2>&1 || : +%else service abrt-oops stop >/dev/null 2>&1 /sbin/chkconfig --del abrt-oops -fi -#systemd (not tested): -%if %{?with_systemd} -if [ "$1" -eq "0" ] ; then - /bin/systemctl stop abrt-oops.service >/dev/null 2>&1 || : - /bin/systemctl disable abrt-oops.service >/dev/null 2>&1 || : -fi %endif - -%preun retrace-server -if [ "$1" = 0 ]; then - /sbin/install-info --delete %{_infodir}/abrt-retrace-server %{_infodir}/dir 2> /dev/null || : fi +%if %{with systemd} %postun -#systemd -%if %{?with_systemd} -if [ $1 -ge 1 ] ; then -# On upgrade, reload init system configuration if we changed unit files - /bin/systemctl daemon-reload >/dev/null 2>&1 || : -fi +/bin/systemctl daemon-reload >/dev/null 2>&1 || : + +%postun addon-kerneloops +/bin/systemctl daemon-reload >/dev/null 2>&1 || : + +%postun addon-ccpp +/bin/systemctl daemon-reload >/dev/null 2>&1 || : + %endif %post gui +# update icon cache touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : %post libs -p /sbin/ldconfig @@ -432,71 +372,48 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %files -f %{name}.lang %defattr(-,root,root,-) %doc README COPYING -#systemd -%if %{?with_systemd} +%if %{with systemd} /lib/systemd/system/abrtd.service +%else +%{_initrddir}/abrtd %endif %{_sbindir}/abrtd %{_sbindir}/abrt-server %{_bindir}/abrt-handle-upload -%{_bindir}/abrt-handle-crashdump %{_bindir}/abrt-action-save-package-data %{_bindir}/abrt-retrace-client %config(noreplace) %{_sysconfdir}/%{name}/abrt.conf -%config(noreplace) %{_sysconfdir}/%{name}/abrt_event.conf %config(noreplace) %{_sysconfdir}/%{name}/gpg_keys +%config(noreplace) %{_sysconfdir}/libreport/events.d/abrt_event.conf %config(noreplace) %{_sysconfdir}/dbus-1/system.d/dbus-abrt.conf -%{_initrddir}/abrtd +%config(noreplace) %{_sysconfdir}/libreport/events.d/smart_event.conf %dir %attr(0755, abrt, abrt) %{_localstatedir}/spool/%{name} %dir %attr(0700, abrt, abrt) %{_localstatedir}/spool/%{name}-upload %dir %attr(0775, abrt, abrt) %{_localstatedir}/run/%{name} %ghost %attr(0666, -, -) %{_localstatedir}/run/%{name}/abrt.socket %ghost %attr(0644, -, -) %{_localstatedir}/run/abrtd.pid + %dir %{_sysconfdir}/%{name} %dir %{_sysconfdir}/%{name}/plugins -%dir %{_sysconfdir}/%{name}/events.d -%dir %{_sysconfdir}/%{name}/events #%dir %{_libdir}/%{name} %{_mandir}/man8/abrtd.8.gz %{_mandir}/man5/abrt.conf.5.gz %{_mandir}/man5/abrt_event.conf.5.gz # {_mandir}/man5/pyhook.conf.5.gz %{_mandir}/man7/abrt-plugins.7.gz +%{_mandir}/man1/abrt-retrace-client.1.gz %{_datadir}/dbus-1/system-services/com.redhat.abrt.service -%files -n libreport -%defattr(-,root,root,-) -%{_libdir}/libreport.so.* - -%files -n libreport-devel -%defattr(-,root,root,-) -%{_includedir}/report/* -%{_libdir}/libreport.so - -#%files -n libreport-python -#%defattr(-,root,root,-) -#%{python_sitearch}/report/* - -%files -n libreport-gtk -%defattr(-,root,root,-) -%{_bindir}/bug-reporting-wizard -%{_libdir}/libreportgtk.so.* - %files libs %defattr(-,root,root,-) %{_libdir}/libabrt*.so.* -%{_libdir}/libbtparser.so.* %files devel %defattr(-,root,root,-) %{_includedir}/abrt/* %{_libdir}/libabrt*.so -%{_includedir}/btparser/* -%{_libdir}/libbtparser.so #FIXME: this should go to libreportgtk-devel package -%{_libdir}/libreportgtk.so %{_libdir}/pkgconfig/* -%doc doc/abrt-plugin doc/howto-write-reporter %files gui %defattr(-,root,root,-) @@ -515,71 +432,78 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/%{name}/plugins/CCpp.conf %dir %attr(0775, abrt, abrt) %{_localstatedir}/cache/abrt-di +%if %{with systemd} +/lib/systemd/system/abrt-ccpp.service +%else %{_initrddir}/abrt-ccpp +%endif %{_libexecdir}/abrt-hook-ccpp %{_bindir}/abrt-action-analyze-c %{_bindir}/abrt-action-trim-files -%attr(4755, abrt, abrt) %{_bindir}/abrt-action-install-debuginfo +%attr(4755, abrt, abrt) %{_bindir}/abrt-action-install-debuginfo-to-abrt-cache %{_bindir}/abrt-action-analyze-core.py* -%{_bindir}/abrt-action-install-debuginfo.py* +%{_bindir}/abrt-action-install-debuginfo %{_bindir}/abrt-action-generate-backtrace %{_bindir}/abrt-action-analyze-backtrace %{_bindir}/abrt-action-list-dsos.py* -%{_sysconfdir}/%{name}/events.d/ccpp_events.conf -%{_sysconfdir}/%{name}/events/analyze_LocalGDB.xml -%{_sysconfdir}/%{name}/events/reanalyze_LocalGDB.xml -%{_sysconfdir}/%{name}/events/analyze_RetraceServer.xml -%{_sysconfdir}/%{name}/events/reanalyze_RetraceServer.xml +%{_sbindir}/abrt-install-ccpp-hook +%{_sysconfdir}/libreport/events.d/ccpp_events.conf +%{_sysconfdir}/libreport/events/analyze_LocalGDB.xml +%{_sysconfdir}/libreport/events/analyze_RetraceServer.xml +%{_sysconfdir}/libreport/events/analyze_xsession_errors.xml %{_mandir}/man*/abrt-action-trim-files.* %{_mandir}/man*/abrt-action-generate-backtrace.* %{_mandir}/man*/abrt-action-analyze-backtrace.* +%{_mandir}/man*/abrt-action-list-dsos.* %files addon-kerneloops %defattr(-,root,root,-) -%config(noreplace) %{_sysconfdir}/%{name}/plugins/Kerneloops.conf -%{_sysconfdir}/%{name}/events/report_Kerneloops.xml -%config(noreplace) %{_sysconfdir}/%{name}/events.d/koops_events.conf +%config(noreplace) %{_sysconfdir}/libreport/plugins/Kerneloops.conf +%{_sysconfdir}/libreport/events/report_Kerneloops.xml +%config(noreplace) %{_sysconfdir}/libreport/events.d/koops_events.conf +%if %{with systemd} +/lib/systemd/system/abrt-oops.service +%else %{_initrddir}/abrt-oops -%{_mandir}/man7/abrt-KerneloopsReporter.7.gz +%endif +%{_mandir}/man*/abrt-action-kerneloops.* %{_bindir}/abrt-dump-oops %{_bindir}/abrt-action-analyze-oops %{_bindir}/abrt-action-kerneloops %files plugin-logger %defattr(-,root,root,-) -%{_sysconfdir}/%{name}/events/report_Logger.conf -%{_mandir}/man7/abrt-Logger.7.gz +%{_sysconfdir}/libreport/events/report_Logger.conf %{_bindir}/abrt-action-print %{_mandir}/man*/abrt-action-print.* %files plugin-mailx %defattr(-,root,root,-) -%{_sysconfdir}/%{name}/events/report_Mailx.xml -%config(noreplace) %{_sysconfdir}/%{name}/events.d/mailx_events.conf -%{_mandir}/man7/abrt-Mailx.7.gz +%{_sysconfdir}/libreport/events/report_Mailx.xml +%config(noreplace) %{_sysconfdir}/libreport/events.d/mailx_events.conf %{_mandir}/man*/abrt-action-mailx.* %{_bindir}/abrt-action-mailx %files plugin-bugzilla %defattr(-,root,root,-) -%config(noreplace) %{_sysconfdir}/%{name}/plugins/Bugzilla.conf -%{_sysconfdir}/%{name}/events/report_Bugzilla.xml -%config(noreplace) %{_sysconfdir}/%{name}/events/report_Bugzilla.conf +%config(noreplace) %{_sysconfdir}/libreport/plugins/Bugzilla.conf +%{_sysconfdir}/libreport/events/report_Bugzilla.xml +%config(noreplace) %{_sysconfdir}/libreport/events/report_Bugzilla.conf # FIXME: remove with the old gui -%{_mandir}/man7/abrt-Bugzilla.7.gz +%{_mandir}/man1/abrt-action-bugzilla.1.gz %{_bindir}/abrt-action-bugzilla %files plugin-rhtsupport %defattr(-,root,root,-) -%{_sysconfdir}/%{name}/events/report_RHTSupport.xml -%config(noreplace) %{_sysconfdir}/%{name}/events.d/rhtsupport_events.conf +%{_sysconfdir}/libreport/events/report_RHTSupport.xml +%config(noreplace) %{_sysconfdir}/libreport/events.d/rhtsupport_events.conf # {_mandir}/man7/abrt-RHTSupport.7.gz %{_bindir}/abrt-action-rhtsupport %files plugin-reportuploader %defattr(-,root,root,-) -%config(noreplace) %{_sysconfdir}/%{name}/plugins/Upload.conf -%{_mandir}/man7/abrt-Upload.7.gz +%config(noreplace) %{_sysconfdir}/libreport/plugins/Upload.conf +%{_mandir}/man*/abrt-action-upload.* %{_bindir}/abrt-action-upload %files addon-python @@ -592,31 +516,17 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %files cli %defattr(-,root,root,-) %{_bindir}/abrt-cli -%{_mandir}/man1/abrt-cli.1.gz -%{_sysconfdir}/bash_completion.d/abrt-cli.bash %files desktop %defattr(-,root,root,-) -%files retrace-server -%defattr(-,root,root,-) -%config(noreplace) %{_sysconfdir}/%{name}/retrace.conf -%config(noreplace) %{_sysconfdir}/httpd/conf.d/retrace_httpd.conf -%config(noreplace) %{_sysconfdir}/yum.repos.d/retrace.repo -%dir %attr(0775, apache, abrt) %{_localstatedir}/spool/abrt-retrace -%dir %attr(0755, abrt, abrt) %{_localstatedir}/cache/abrt-retrace -%dir %attr(0755, abrt, abrt) %{_localstatedir}/log/abrt-retrace -%caps(cap_setuid=ep) %{_bindir}/abrt-retrace-worker -%{_bindir}/abrt-retrace-cleanup -%{_bindir}/abrt-retrace-reposync -%{_bindir}/coredump2packages -%{python_site}/retrace.py* -%{_datadir}/abrt-retrace/*.py* -%{_datadir}/abrt-retrace/plugins/*.py* -%{_datadir}/abrt-retrace/*.wsgi -%{_infodir}/abrt-retrace-server* - %changelog +* Mon Jun 20 2011 Jiri Moskovcak - 2.0.3-1 +- new upstream release + +* Fri May 20 2011 Jiri Moskovcak - 2.0.2-6 +- make abrt-ccpp and abrt-oops start on boot + * Fri May 13 2011 Karel Klíč - 2.0.2-5 - Do not force service startup in %%posttrans, as it breaks live media creation (rhbz#704415) @@ -692,6 +602,24 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : - fixed gpg/pgp check - revert to the old icon +* Fri Apr 15 2011 Jiri Moskovcak 2.0.0-5 +- fixed problem with abrt-action-debuginfo-install rhbz#692064 + +* Thu Mar 31 2011 Jiri Moskovcak 2.0.0-4 +- fixed prgname in wizard rhbz#692442 + +* Wed Mar 30 2011 Jiri Moskovcak 2.0.0-3 +- fixed notification persistence in gnome3 (again) +- fixed wrong group:user on /var/cache/abrt-di afte rupdate from abrt 1.x #692064 +- added mono-core to blacklist + +* Tue Mar 29 2011 Jiri Moskovcak 2.0.0-2 +- use %ghost on files in /var/run and /var/lock rhbz#656542 +- fixed notification persistence in gnome3 +- added analyze selector to CLI +- refuse reporting to bz without backtrace or hash +- use g_set_prgname to set the prgname of abrt-gui trac#180 + * Wed Mar 16 2011 Jiri Moskovcak 2.0.0-1 - update to the latest upstream version - many improvements diff --git a/sources b/sources index 2b87354..7440165 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1fb7c2a297dccf206043f764676ead2c abrt-2.0.2.tar.gz +8adb9d85d11dc1fcef43fbebfa129bbd abrt-2.0.3.tar.gz