diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | abrt.spec | 52 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | lib/Plugins/Makefile.am | 1 | ||||
| -rw-r--r-- | src/Daemon/CrashWatcher.cpp | 1 | ||||
| -rw-r--r-- | src/Daemon/Makefile.am | 3 | ||||
| -rw-r--r-- | src/Hooks/Makefile.am | 2 | ||||
| -rw-r--r-- | src/Hooks/abrt_exception_handler.py.in | 1 | ||||
| -rw-r--r-- | src/TUI/Makefile.am | 2 |
9 files changed, 57 insertions, 10 deletions
diff --git a/Makefile.am b/Makefile.am index 796bd840..a2e6cc89 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,3 +1,3 @@ -SUBDIRS = lib src +SUBDIRS = lib src inc EXTRA_DIST = doc/CodingStyle abrt.spec
\ No newline at end of file @@ -1,6 +1,9 @@ +%{!?python_site: %define 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)")} Summary: Automatic bug detection and reporting tool Name: abrt -Version: 0.0.3 +Version: 0.0.4 Release: 1%{?dist} License: GPLv2+ Group: Applications/System @@ -17,6 +20,7 @@ BuildRequires: nss-devel BuildRequires: libnotify-devel BuildRequires: xmlrpc-c-devel BuildRequires: file-devel +BuildRequires: python-devel BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -138,6 +142,24 @@ Requires: %{name} = %{version}-%{release} %description plugin-filetransfer Plugin to uploading files to a server. +%package addon-python +Summary: %{name}'s addon for catching and analyzing Python exceptions +Group: System Environment/Libraries +Requires: %{name} = %{version}-%{release} + +%description addon-python +This package contains python hook and python analyzer plugin for hadnling +uncaught exception in python programs. + +%package cli +Summary: %{name}'s command line interface +Group: User Interface/Desktops +Requires: %{name} = %{version}-%{release} + +%description cli +This package contains simple command line client for controling abrt daemon over +the sockets. + %prep %setup -q @@ -149,10 +171,12 @@ make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} -rm -rf $RPM_BUILD_ROOT/%{_libdir}/lib*.la -rm -rf $RPM_BUILD_ROOT/%{_libdir}/%{name}/lib*.la +#rm -rf $RPM_BUILD_ROOT/%{_libdir}/lib*.la +#rm -rf $RPM_BUILD_ROOT/%{_libdir}/%{name}/lib*.la +# 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} mkdir -p $RPM_BUILD_ROOT/var/cache/%{name} @@ -187,6 +211,8 @@ fi %dir %{_sysconfdir}/%{name} %dir %{_sysconfdir}/%{name}/plugins %dir %{_libdir}/%{name} +%{_mandir}/man8/%{name}.8.gz +%{_mandir}/man5/%{name}.conf.5.gz %files libs %defattr(-,root,root,-) @@ -251,8 +277,26 @@ fi %defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/%{name}/plugins/FileTransfer.conf %{_libdir}/%{name}/libFileTransfer.so* +%{_mandir}/man7/%{name}-FileTransfer.7.gz + +%files addon-python +%defattr(-,root,root,-) +%config(noreplace) %{_sysconfdir}/%{name}/pyhook.conf +%{python_sitearch}/ABRTUtils.so +%{_libdir}/%{name}/libPython.so* +%{python_site}/*.py* + +%files cli +%defattr(-,root,root,-) +%{_bindir}/abrt-cmd %changelog +* Mon Jun 15 2009 Jiri Moskovcak <jmoskovc@redhat.com> 0.0.4-1 +- new version +- added cli (only supports sockets) +- added python hook +- many fixes + * Fri Apr 10 2009 Jiri Moskovcak <jmoskovc@redhat.com> 0.0.3-1 - new version - added bz plugin diff --git a/configure.ac b/configure.ac index 0b8351e1..a1036d51 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([abrt], [0.0.3], [jmoskovc@redhat.com, zprikryl@redhat.com]) +AC_INIT([abrt], [0.0.4], [jmoskovc@redhat.com, zprikryl@redhat.com]) AM_INIT_AUTOMAKE([-Wall -Werror foreign]) @@ -74,6 +74,7 @@ AC_CONFIG_FILES([ src/Applet/Makefile src/Gui/Makefile src/TUI/Makefile + inc/Makefile ]) AC_OUTPUT
\ No newline at end of file diff --git a/lib/Plugins/Makefile.am b/lib/Plugins/Makefile.am index fa5d6b3f..437f3db6 100644 --- a/lib/Plugins/Makefile.am +++ b/lib/Plugins/Makefile.am @@ -16,6 +16,7 @@ pluginsconfdir=$(PLUGINS_CONF_DIR) dist_pluginsconf_DATA = CCpp.conf Mailx.conf SQLite3.conf Logger.conf KerneloopsScanner.conf KerneloopsReporter.conf Bugzilla.conf FileTransfer.conf man_MANS = abrt-FileTransfer.7 +EXTRA_DIST = $(man_MANS) # CCpp libCCpp_la_SOURCES = CCpp.cpp CCpp.h PluginSettings.h diff --git a/src/Daemon/CrashWatcher.cpp b/src/Daemon/CrashWatcher.cpp index 97d03b57..fca8fc34 100644 --- a/src/Daemon/CrashWatcher.cpp +++ b/src/Daemon/CrashWatcher.cpp @@ -31,7 +31,6 @@ #include <sstream> #include <dirent.h> #include <cstring> -#include "CommLayerInner.h" #include "ABRTException.h" /* just a helper function diff --git a/src/Daemon/Makefile.am b/src/Daemon/Makefile.am index 844abb43..4d9bed56 100644 --- a/src/Daemon/Makefile.am +++ b/src/Daemon/Makefile.am @@ -15,4 +15,5 @@ dist_dbusabrtconf_DATA = dbus-abrt.conf daemonconfdir = $(CONF_DIR) dist_daemonconf_DATA = abrt.conf -man_MANS = abrt.8 abrt.conf.5
\ No newline at end of file +man_MANS = abrt.8 abrt.conf.5 +EXTRA_DIST = $(man_MANS) diff --git a/src/Hooks/Makefile.am b/src/Hooks/Makefile.am index db2cb957..ba067a50 100644 --- a/src/Hooks/Makefile.am +++ b/src/Hooks/Makefile.am @@ -8,6 +8,8 @@ hookCCpp_CPPFLAGS = -I$(srcdir)/../../inc -I$(srcdir)/../../lib/Utils \ python_PYTHON = sitecustomize.py abrt_exception_handler.py +EXTRA_DIST = abrt_exception_handler.py.in + pyhookconfdir = $(CONF_DIR) dist_pyhookconf_DATA = pyhook.conf diff --git a/src/Hooks/abrt_exception_handler.py.in b/src/Hooks/abrt_exception_handler.py.in index 4283f3b6..689b5e0c 100644 --- a/src/Hooks/abrt_exception_handler.py.in +++ b/src/Hooks/abrt_exception_handler.py.in @@ -110,7 +110,6 @@ def write_dump(pid, tb_uuid, tb): import time ttime = int(time.time()) # localstatedir - #dir_name = "/home/jmoskovc/.local/abrt/var/cache/abrt/pyhook-%s-%s" % (ttime , pid) dir_name = "@DEBUG_DUMP_DIR@/pyhook-%s-%s" % (ttime , pid) dd = ABRTUtils.CDebugDump() try: diff --git a/src/TUI/Makefile.am b/src/TUI/Makefile.am index bd89309c..cfc16dfd 100644 --- a/src/TUI/Makefile.am +++ b/src/TUI/Makefile.am @@ -1,3 +1,3 @@ bin_PROGRAMS = abrt-cmd -abrt_cmd_SOURCES = ABRTSocket.cpp ABRTSocket.h Cmd.cpp CrashTypes.h SocketCrashTypes.h +abrt_cmd_SOURCES = ABRTSocket.cpp ABRTSocket.h Cmd.cpp abrt_cmd_CPPFLAGS = -I$(srcdir)/../../inc
\ No newline at end of file |