diff --git a/.cvsignore b/.cvsignore index a77407e..c12ee8b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -abrt-0.0.8.tar.gz +abrt-0.0.8.5.tar.gz diff --git a/abrt.init b/abrt.init index f1aed30..f1dc410 100644 --- a/abrt.init +++ b/abrt.init @@ -1,15 +1,16 @@ #!/bin/bash # Starts the abrt daemon # -# chkconfig: - 82 16 +# chkconfig: 35 82 16 # description: Daemon to detect crashing apps -# processname: abrt +# processname: abrtd ### BEGIN INIT INFO # Provides: abrt # Required-Start: $syslog $local_fs # Required-Stop: $syslog $local_fs -# Default-Stop: 0 1 2 3 4 5 6 -# Short-Description: start and stop crash-carcher daemon +# Default-Stop: 0 1 2 6 +# Default-Start: 3 5 +# Short-Description: start and stop abrt daemon # Description: Listen and dispatch crash events ### END INIT INFO @@ -25,22 +26,22 @@ RETVAL=0 check() { # Check that we're a privileged user [ `id -u` = 0 ] || exit 4 - + # Check if abrt is executable - test -x /usr/sbin/abrt || exit 5 + test -x /usr/sbin/abrtd || exit 5 } start() { check - + # Check if it is already running if [ ! -f /var/lock/subsys/abrt ]; then - echo -n $"Starting abrt daemon: " - daemon /usr/sbin/abrt - RETVAL=$? - [ $RETVAL -eq 0 ] && touch /var/lock/subsys/abrt - echo + echo -n $"Starting abrt daemon: " + daemon /usr/sbin/abrtd + RETVAL=$? + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/abrt + echo fi return $RETVAL } @@ -48,24 +49,24 @@ start() { stop() { check - + echo -n $"Stopping abrt daemon: " - killproc /usr/sbin/abrt + killproc /usr/sbin/abrtd RETVAL=$? [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/abrt echo - return $RETVAL + return $RETVAL } restart() { stop start -} +} reload() { restart -} +} case "$1" in start) diff --git a/abrt.spec b/abrt.spec index cd1d6e1..a5427a0 100644 --- a/abrt.spec +++ b/abrt.spec @@ -3,13 +3,14 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Summary: Automatic bug detection and reporting tool Name: abrt -Version: 0.0.8 +Version: 0.0.8.5 Release: 1%{?dist} License: GPLv2+ Group: Applications/System URL: https://fedorahosted.org/abrt/ Source: http://jmoskovc.fedorapeople.org/%{name}-%{version}.tar.gz Source1: abrt.init +BuildRequires: dbus-devel BuildRequires: dbus-c++-devel BuildRequires: gtk2-devel BuildRequires: curl-devel @@ -56,6 +57,7 @@ Requires: dbus-python, pygtk2, pygtk2-libglade,gnome-python2-gnomevfs Provides: abrt-applet = %{version}-%{release} Obsoletes: abrt-applet < 0.0.5 Conflicts: abrt-applet < 0.0.5 +Obsoletes: bug-buddy %description gui GTK+ wizard for convenient bug reporting. @@ -75,7 +77,7 @@ Summary: %{name}'s kerneloops addon Group: System Environment/Libraries Requires: %{name}-plugin-kerneloopsreporter = %{version}-%{release} Requires: %{name} = %{version}-%{release} -Conflicts: kerneloops +Obsoletes: kerneloops Obsoletes: abrt-plugin-kerneloops %description addon-kerneloops @@ -199,7 +201,7 @@ 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} -install -m 755 %SOURCE1 ${RPM_BUILD_ROOT}/%{_initrddir}/%{name} +install -m 755 %SOURCE1 ${RPM_BUILD_ROOT}/%{_initrddir}/abrtd mkdir -p $RPM_BUILD_ROOT/var/cache/%{name} desktop-file-install \ @@ -214,14 +216,14 @@ desktop-file-install \ rm -rf $RPM_BUILD_ROOT %post -/sbin/chkconfig --add %{name} +/sbin/chkconfig --add %{name}d %post libs -p /sbin/ldconfig %preun -if [ "$1" = 0 ] ; then - service %{name} stop >/dev/null 2>&1 - /sbin/chkconfig --del %{name} +if [ "$1" -eq "0" ] ; then + service %{name}d stop >/dev/null 2>&1 + /sbin/chkconfig --del %{name}d fi %postun libs -p /sbin/ldconfig @@ -229,10 +231,10 @@ fi %files -f %{name}.lang %defattr(-,root,root,-) %doc README COPYING -%{_sbindir}/%{name} +%{_sbindir}/%{name}d %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf %config(noreplace) %{_sysconfdir}/dbus-1/system.d/dbus-%{name}.conf -%{_initrddir}/%{name} +%{_initrddir}/%{name}d %dir /var/cache/%{name} %dir %{_sysconfdir}/%{name} %dir %{_sysconfdir}/%{name}/plugins @@ -335,6 +337,22 @@ fi %defattr(-,root,root,-) %changelog +* Fri Sep 4 2009 Jiri Moskovcak 0.0.8.5-1 +- new version +- APPLET: added about dialog, removed popup, if icon is not visible, fixed (trac#43) (jmoskovc@redhat.com) +- renamed abrt to abrtd, few minor spec file fixes (jmoskovc@redhat.com) +- Made abrt service start by deafult (jmoskovc@redhat.com) +- add gettext support for all plugins (npajkovs@redhat.com) +- APPLET: removed the warning bubble about not running abrt service (walters) +- APPLET: changed tooltip rhbz#520293 (jmoskovc@redhat.com) +- CommLayerServerDBus: rewrote to use dbus, not dbus-c++ (vda.linux@googlemail.com) +- fixed timeout on boot causing [ FAILED ] message (vda.linux@googlemail.com) +- and many other fixes + +* Wed Sep 02 2009 Colin Walters 0.0.8-2 +- Change Conflicts: kerneloops to be an Obsoletes so we do the right thing + on upgrades. Also add an Obsoletes: bug-buddy. + * Wed Aug 26 2009 Jiri Moskovcak 0.0.8-1 - new version - resolved: Bug 518420 - ordinary user's abrt-applet shows up for root owned crashes (npajkovs) diff --git a/sources b/sources index 0bfd2b4..9a230d1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0945b2fd88a2d8acd31a171e4a65ed16 abrt-0.0.8.tar.gz +a66bdfb2d95a2a7c71ac6aa56be98d5e abrt-0.0.8.5.tar.gz