renamed abrt to abrtd, few minor spec file fixes

abrtd is less confusing for users as it stands for abrt daemon
added some obsoletes to make the installation smooth and remove bbuddy

3 files changed, 22 insertions, 17 deletions

diff --git a/abrt.init b/abrt.init
index 47b2f563..f1dc410b 100644
--- a/abrt.init
+++ b/abrt.init
@@ -3,7 +3,7 @@
 #
 # chkconfig: 35 82 16
 # description: Daemon to detect crashing apps
-# processname: abrt
+# processname: abrtd
 ### BEGIN INIT INFO
 # Provides: abrt
 # Required-Start: $syslog $local_fs
@@ -28,7 +28,7 @@ check() {
 	[ `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() {
@@ -38,7 +38,7 @@ start() {
 	# Check if it is already running
 	if [ ! -f /var/lock/subsys/abrt ]; then
 		echo -n $"Starting abrt daemon: "
-		daemon /usr/sbin/abrt
+		daemon /usr/sbin/abrtd
 		RETVAL=$?
 		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/abrt
 		echo
@@ -51,7 +51,7 @@ 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
diff --git a/abrt.spec b/abrt.spec
index a11eee43..824ab5b0 100644
--- a/abrt.spec
+++ b/abrt.spec
@@ -4,7 +4,7 @@
 Summary: Automatic bug detection and reporting tool
 Name: abrt
 Version: 0.0.8
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: https://fedorahosted.org/abrt/
@@ -57,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.
@@ -76,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
@@ -200,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 \
@@ -215,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
@@ -230,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
@@ -336,6 +337,10 @@ fi
 %defattr(-,root,root,-)
 
 %changelog
+* Wed Sep 02 2009  Colin Walters <watlers@verbum.org> 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 <jmoskovc@redhat.com> 0.0.8-1
 - new version
 - resolved: Bug 518420 -  ordinary user's abrt-applet shows up for root owned crashes (npajkovs)
diff --git a/src/Daemon/Makefile.am b/src/Daemon/Makefile.am
index 6961960f..934016a9 100644
--- a/src/Daemon/Makefile.am
+++ b/src/Daemon/Makefile.am
@@ -1,9 +1,9 @@
-sbin_PROGRAMS = abrt
+sbin_PROGRAMS = abrtd
 
 # FIXME: we still link against dbus-c++ (not just dbus)
 # because lib/CommLayer links it in
 
-abrt_SOURCES = \
+abrtd_SOURCES = \
     ABRTPlugin.cpp ABRTPlugin.h \
     PluginManager.cpp PluginManager.h \
     RPM.cpp RPM.h \
@@ -14,7 +14,7 @@ abrt_SOURCES = \
     CommLayerServerDBus.h CommLayerServerDBus.cpp \
     Daemon.cpp Daemon.h \
     Settings.h Settings.cpp
-abrt_CPPFLAGS = \
+abrtd_CPPFLAGS = \
     -I$(srcdir)/../../inc \
     -I$(srcdir)/../../lib/MiddleWare \
     -I$(srcdir)/../../lib/CommLayer \
@@ -26,7 +26,7 @@ abrt_CPPFLAGS = \
     -DVAR_RUN=\"$(VAR_RUN)\" \
     $(GLIB_CFLAGS) $(DBUS_CFLAGS) \
     $(ENABLE_SOCKET_OR_DBUS)
-abrt_LDADD = \
+abrtd_LDADD = \
     ../../lib/MiddleWare/libABRTMiddleWare.la \
     ../../lib/CommLayer/libABRTCommLayer.la \
     $(DL_LIBS) $(DBUS_LIBS) $(RPM_LIBS)