commit d3f5b5cc7b5d86f4a4912d980a99d4c90024440d Author: Jakub Bogusz <qbo...@pld-linux.org> Date: Fri Apr 5 17:49:53 2013 +0200
- up to 2.1.3 - updated format_security patch - removed obsolete automake patch - pl - added rpm45 patch (used in place of rpm5 patch if using PLD rpm 4.5) abrt-rpm45.patch | 110 ++++++++++ abrt.spec | 563 +++++++++++++++++++++++++++++--------------------- automake.patch | 24 --- format_security.patch | 8 +- 4 files changed, 436 insertions(+), 269 deletions(-) --- diff --git a/abrt.spec b/abrt.spec index 7a66967..f4ee1ab 100644 --- a/abrt.spec +++ b/abrt.spec @@ -1,35 +1,40 @@ +# TODO: +# - handle obsolete packages: abrt-plugin-{catcut,rhfastcheck,rhticket,ticketuploader} +# - SysV init scripts for -addon-ccpp, -addon-kerneloops, -addon-vmcore, -addon-xorg Summary: Automatic bug detection and reporting tool +Summary(pl.UTF-8): Narzędzie do automatycznego wykrywania i zgłaszania błędów Name: abrt -Version: 2.0.15 +Version: 2.1.3 Release: 0.1 License: GPL v2+ Group: Applications/System -URL: https://fedorahosted.org/abrt/ Source0: https://fedorahosted.org/released/abrt/%{name}-%{version}.tar.gz -# Source0-md5: 0ac147b6e43ca873e6b1927601ec22a4 +# Source0-md5: ba54ade40bd9688d0260b6e2355d1faa Source1: %{name}.init Patch0: %{name}-rpm5.patch -Patch1: automake.patch +Patch1: %{name}-rpm45.patch Patch2: rpmkey-pld.patch Patch3: format_security.patch -BuildRequires: autoconf +URL: https://fedorahosted.org/abrt/ +BuildRequires: asciidoc +BuildRequires: autoconf >= 2.50 BuildRequires: automake -BuildRequires: bison BuildRequires: btparser-devel -BuildRequires: bzip2-devel -BuildRequires: curl-devel BuildRequires: dbus-devel -BuildRequires: gettext-devel -BuildRequires: gtk+2-devel -BuildRequires: intltool +BuildRequires: gettext-devel >= 0.17 +BuildRequires: glib2-devel >= 1:2.21 +BuildRequires: gtk+3-devel >= 3.0 +BuildRequires: intltool >= 0.35.0 +BuildRequires: json-c-devel BuildRequires: libmagic-devel BuildRequires: libnotify-devel BuildRequires: libreport-devel BuildRequires: libreport-gtk-devel BuildRequires: libreport-web-devel -BuildRequires: libtar-devel BuildRequires: libtool -BuildRequires: libzip-devel +BuildRequires: libxml2-devel >= 2 +BuildRequires: rpm-devel >= 4.5 +BuildRequires: nss-devel BuildRequires: pkgconfig BuildRequires: polkit-devel BuildRequires: python-devel @@ -37,11 +42,7 @@ BuildRequires: python-modules BuildRequires: rpm-devel >= 4.5-28 BuildRequires: rpm-pythonprov BuildRequires: rpmbuild(macros) >= 1.219 -BuildRequires: sqlite3-devel -BuildRequires: xmlrpc-c-client -BuildRequires: xmlrpc-c-devel >= 1.20.3-1 BuildRequires: xmlto -BuildRequires: zlib-devel Requires(postun): /usr/sbin/groupdel Requires(postun): /usr/sbin/userdel Requires(pre): /bin/id @@ -51,200 +52,255 @@ Requires(pre): /usr/sbin/useradd Requires: %{name}-libs = %{version}-%{release} Provides: group(abrt) Provides: user(abrt) +Obsoletes: abrt-plugin-filetransfer +Obsoletes: abrt-plugin-runapp +Obsoletes: abrt-plugin-sosreport Obsoletes: abrt-plugin-sqlite3 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description -abrt is a tool to help users to detect defects in applications and to +ABRT is a tool to help users to detect defects in applications and to create a bug report with all informations needed by maintainer to fix it. It uses plugin system to extend its functionality. +%description -l pl.UTF-8 +ABRT to narzędzie pomagające użytkownikom w wykrywaniu defektów w +aplikacjach oraz tworzeniu raportów błędów ze wszystkimi informacjami +potrzebnymi utrzymującemu pakiet do poprawienia go. Wykorzystuje +system wtyczek do rozszerzania funkcjonalności. + %package libs -Summary: Libraries for abrt +Summary: ABRT shared library +Summary(pl.UTF-8): Biblioteka współdzielona ABRT Group: Libraries %description libs -Libraries for %{name}. +ABRT shared library. + +%description libs -l pl.UTF-8 +Biblioteka współdzielona ABRT. %package devel -Summary: Development libraries for abrt +Summary: Header files for ABRT livrary +Summary(pl.UTF-8): Pliki nagłówkowe bibliotekia ABRT Group: Development/Libraries Requires: %{name}-libs = %{version}-%{release} %description devel -Development libraries and headers for %{name}. - -%package gui -Summary: abrt's gui -Group: X11/Applications -Requires(post,postun): gtk-update-icon-cache -Requires(post,postun): hicolor-icon-theme -Requires: %{name} = %{version}-%{release} -Requires: python-dbus -Requires: python-gnome-desktop-keyring -Requires: python-gnome-vfs -Requires: python-pygtk-glade -Requires: python-pygtk-gtk -# only if gtk2 version < 2.17 -#Requires: python-sexy -Provides: abrt-applet = %{version}-%{release} -Obsoletes: abrt-applet < 0.0.5 -Conflicts: abrt-applet < 0.0.5 +Header files for ABRT livrary. -%description gui -GTK+ wizard for convenient bug reporting. +%description devel -l pl.UTF-8 +Pliki nagłówkowe bibliotekia ABRT. %package addon-ccpp -Summary: abrt's C/C++ addon +Summary: ABRT's C/C++ addon +Summary(pl.UTF-8): Dodatek C/C++ do ABRT Group: Libraries Requires: %{name} = %{version}-%{release} +Requires: %{name}-retrace-client = %{version}-%{release} +Requires: btparser +Requires: cpio Requires: elfutils +Requires: gdb >= 7.0-3 Requires: yum-utils %description addon-ccpp This package contains hook for C/C++ crashed programs and abrt's C/C++ analyzer plugin. +%description addon-ccpp -l pl.UTF-8 +Ten pakiet zawiera punkt zaczepienia dla programów w C/C++, które +uległy awarii oraz wtyczkę analizatora C/C++ ABRT. + %package addon-kerneloops -Summary: abrt's kerneloops addon +Summary: ABRT's kerneloops addon +Summary(pl.UTF-8): Dodatek kerneloops do ABRT Group: Libraries Requires: %{name} = %{version}-%{release} Requires: curl +Requires: libreport-plugin-kerneloops Obsoletes: abrt-plugin-kerneloops Obsoletes: abrt-plugin-kerneloopsreporter Obsoletes: kerneloops %description addon-kerneloops This package contains plugin for collecting kernel crash information -and reporter plugin which sends this information to specified server, -usually to kerneloops.org. - -%package plugin-rhfastcheck -Summary: %{name}'s rhfastcheck plugin -Group: Libraries -Requires: %{name} = %{version}-%{release} +from system log. -%description plugin-rhfastcheck -Plugin to quickly check RH support DB for known solution. +%description addon-kerneloops -l pl.UTF-8 +Ten pakiet zawiera wtyczkę do zbierania informacji o awarii jądra z +logu systemowego. -%package plugin-rhticket -Summary: %{name}'s rhticket plugin +%package addon-python +Summary: ABRT's addon for catching and analyzing Python exceptions +Summary(pl.UTF-8): Dodatek ABRT do przechwytywania i analizy wyjątków Pythona Group: Libraries Requires: %{name} = %{version}-%{release} +Obsoletes: gnome-python2-bugbuddy -%description plugin-rhticket -Plugin to report bugs into RH support system. - -%package plugin-logger -Summary: abrt's logger reporter plugin -Group: Libraries -Requires: %{name} = %{version}-%{release} +%description addon-python +This package contains Python hook and Python analyzer plugin for +handling uncaught exception in Python programs. -%description plugin-logger -The simple reporter plugin which writes a report to a specified file. +%description addon-python -l pl.UTF-8 +Ten pakiet zawiera pythonowy punkt zaczepienia oraz wtyczkę +analizatora Pythona do obsługi nie obsłużonych wyjątków w programach w +Pythonie. -%package plugin-mailx -Summary: abrt's mailx reporter plugin +%package addon-vmcore +Summary: ABRT's vmcore addon +Summary(pl.UTF-8): Dodatek vmcore do ABRT Group: Libraries Requires: %{name} = %{version}-%{release} -Requires: mailx - -%description plugin-mailx -The simple reporter plugin which sends a report via mailx to a -specified email. +Requires: %{name}-addon-kerneloops = %{version}-%{release} +# not available in PLD +#Requires: crash -%package plugin-runapp -Summary: abrt's runapp plugin -Group: Libraries -Requires: %{name} = %{version}-%{release} +%description addon-vmcore +This package contains plugin for collecting kernel crash information +from vmcore files. -%description plugin-runapp -Plugin to run external programs. +%description addon-vmcore -l pl.UTF-8 +Ten pakiet zawiera wtyczkę do zbierania informacji o awarii jądra z +plików vmcore. -%package plugin-sosreport -Summary: abrt's sosreport plugin +%package addon-xorg +Summary: ABRT's Xorg addon +Summary(pl.UTF-8): Dodatek Xorg do ABRT Group: Libraries Requires: %{name} = %{version}-%{release} -Requires: sosreport - -%description plugin-sosreport -Plugin to include an sosreport in an abrt report. +Requires: curl -%package plugin-bugzilla -Summary: abrt's bugzilla plugin -Group: Libraries -Requires: %{name} = %{version}-%{release} +%description addon-xorg +This package contains plugin for collecting Xorg crash information +from Xorg log. -%description plugin-bugzilla -Plugin to report bugs into the bugzilla. +%description addon-xorg -l pl.UTF-8 +Ten pakiet zawiera wtyczkę do zbierania informacji o awarii jądra z +logu Xorg. -%package plugin-catcut -Summary: abrt's catcut plugin +%package plugin-bodhi +Summary: ABRT's bodhi plugin +Summary(pl.UTF-8): Wtyczka bodhi do ABRT Group: Libraries Requires: %{name} = %{version}-%{release} +Requires: libreport-web-devel >= 2.0.10 +Obsoletes: libreport-plugin-bodhi + +%description plugin-bodhi +Plugin to search for a new updates in bodhi server. -%description plugin-catcut -Plugin to report bugs into the catcut. +%description plugin-bodhi -l pl.UTF-8 +Wtyczka do wyszukiwania nowych uaktualnień na serwerze bodhi. -%package plugin-ticketuploader -Summary: abrt's ticketuploader plugin +%package retrace-client +Summary: ABRT's retrace client +Summary(pl.UTF-8): Klient Retrace dla ABRT Group: Libraries Requires: %{name} = %{version}-%{release} +Requires: xz -%description plugin-ticketuploader -Plugin to report bugs into anonymous FTP site associated with -ticketing system. +%description retrace-client +This package contains the client application for Retrace server which +is able to analyze C/C++ crashes remotely. -%package plugin-filetransfer -Summary: abrt's File Transfer plugin -Group: Libraries +%description retrace-client -l pl.UTF-8 +Ten pakiet zawiera aplikację kliencką dla serwera Retrace, który +potrafi zdalnie przeanalizować awarię programu w C/C++. + +%package dbus +Summary: ABRT DBus service +Summary(pl.UTF-8): Usługa DBus ABRT +Group: Applications/System Requires: %{name} = %{version}-%{release} +Requires: libreport -%description plugin-filetransfer -Plugin to uploading files to a server. +%description dbus +ABRT DBus service which provides org.freedesktop.problems API on DBus +and uses PolicyKit to authorize to access the problem data. -%package addon-python -Summary: abrt's addon for catching and analyzing Python exceptions -Group: Libraries +%description dbus -l pl.UTF-8 +Usługa DBus ABRT, udostępniająca poprzez DBus API +org.freedesktop.problems, używająca PolicyKit do autoryzacji dostępu +do danych o problemach. + +%package python +Summary: ABRT Python API +Summary(pl.UTF-8): API Pythona do ABRT +Group: Libraries/Python Requires: %{name} = %{version}-%{release} +%if "%{_rpmversion}" >= "5.0" +BuildArch: noarch +%endif -%description addon-python -This package contains python hook and python analyzer plugin for -handling uncaught exception in python programs. +%description python +High-level API for querying, creating and manipulating problems +handled by ABRT in Python. + +%description python -l pl.UTF-8 +Wysokopoziomowe API do odpytywania, tworzenia i obróbki z poziomu +Pythona problemów obsługiwanych przez ABRT. %package cli -Summary: abrt's command line interface -Group: X11/Applications +Summary: ABRT's command line interface +Summary(pl.UTF-8): Interfejs linii poleceń ABRT +Group: Applications/System Requires: %{name} = %{version}-%{release} # analyzers -Requires: %{name}-addon-ccpp -Requires: %{name}-addon-kerneloops -Requires: %{name}-addon-python +Requires: %{name}-addon-ccpp = %{version}-%{release} +Requires: %{name}-addon-kerneloops = %{version}-%{release} +Requires: %{name}-addon-python = %{version}-%{release} # reporters -Requires: %{name}-plugin-logger -Requires: %{name}-plugin-runapp +Requires: libreport-plugin-bugzilla +Requires: libreport-plugin-logger %description cli -This package contains simple command line client for controling abrt +This package contains simple command line client for controling ABRT daemon over the sockets. +%description cli -l pl.UTF-8 +Ten pakiet zawiera prostego klienta obsługiwanego z linii poleceń, +pozwalającego na sterowanie demonem poprzez gniazda. + +%package gui +Summary: ABRT's GUI +Summary(pl.UTF-8): Graficzny interfejs użytkownika do ABRT +Group: X11/Applications +Requires(post,postun): gtk-update-icon-cache +Requires(post,postun): hicolor-icon-theme +Requires: %{name} = %{version}-%{release} +Requires: %{name}-dbus = %{version}-%{release} +# not available in PLD +#Requires: gnome-abrt +Provides: abrt-applet = %{version}-%{release} +Obsoletes: abrt-applet < 0.0.5 +Conflicts: abrt-applet < 0.0.5 + +%description gui +GTK+ wizard for convenient bug reporting. + +%description gui -l pl.UTF-8 +Oparty na GTK+ kreator do wygodnego zgłaszania błędów. + %package desktop Summary: Virtual package to install all necessary packages for usage from desktop environment +Summary(pl.UTF-8): Writualny pakiet do instalacji pakietów potrzebnych do użycia w środowisku graficznym Group: X11/Applications -# This package gets installed when anything requests bug-buddy - -# happens when users upgrade Fn to Fn+1; -# or if user just wants "typical desktop installation". -# Installing abrt-desktop should result in the abrt which works without +# This package should be installed when anything requests bug-buddy; +# installing abrt-desktop should result in the abrt which works without # any tweaking in abrt.conf (IOW: all plugins mentioned there must be installed) Requires: %{name} = %{version}-%{release} Requires: %{name}-addon-ccpp = %{version}-%{release} Requires: %{name}-addon-kerneloops = %{version}-%{release} Requires: %{name}-addon-python = %{version}-%{release} -# Default config of addon-ccpp requires gdb -Requires: %{name}-gui -Requires: %{name}-plugin-logger -Requires: %{name}-plugin-runapp -Requires: gdb >= 7.0-3 +Requires: %{name}-addon-vmcore = %{version}-%{release} +Requires: %{name}-addon-xorg = %{version}-%{release} +Requires: %{name}-gui = %{version}-%{release} +Requires: %{name}-plugin-bodhi = %{version}-%{release} +Requires: %{name}-retrace-client = %{version}-%{release} +Requires: libreport-plugin-bugzilla +Requires: libreport-plugin-logger +Requires: libreport-plugin-ureport Provides: bug-buddy Obsoletes: bug-buddy @@ -252,10 +308,17 @@ Obsoletes: bug-buddy Virtual package to make easy default installation on desktop environments. +%description desktop -l pl.UTF-8 +Wirtualny pakiet ułatwiający domyślną instalację w środowiskach +graficznych. + %prep %setup -q +%if "%{_rpmversion}" >= "5.0" %patch0 -p1 +%else %patch1 -p1 +%endif %patch2 -p1 %patch3 -p1 @@ -266,6 +329,7 @@ environments. %{__autoheader} %{__automake} %configure \ + --disable-silent-rules \ --with-systemdsystemunitdir=%{systemdunitdir} %{__make} @@ -275,19 +339,23 @@ rm -rf $RPM_BUILD_ROOT %{__make} install \ DESTDIR=$RPM_BUILD_ROOT -%find_lang %{name} - %py_postclean -# remove all .la files -rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/lib*.la $RPM_BUILD_ROOT%{_libdir}/lib*.la +# obsoleted by pkg-config +%{__rm} $RPM_BUILD_ROOT%{_libdir}/lib*.la -install -d $RPM_BUILD_ROOT/etc/rc.d/init.d -install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/abrtd +install -D %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/abrtd install -d $RPM_BUILD_ROOT/var/cache/%{name} install -d $RPM_BUILD_ROOT/var/cache/%{name}-di install -d $RPM_BUILD_ROOT/var/run/%{name} +install -d $RPM_BUILD_ROOT/usr/lib/tmpfiles.d +cat >$RPM_BUILD_ROOT/usr/lib/tmpfiles.d/abrt.conf <<EOF +/var/run/%{name} 0755 root root - +EOF + +%find_lang %{name} + %clean rm -rf $RPM_BUILD_ROOT @@ -323,150 +391,163 @@ fi %files -f %{name}.lang %defattr(644,root,root,755) %doc README +%attr(755,root,root) %{_bindir}/abrt-action-save-package-data +%attr(755,root,root) %{_bindir}/abrt-handle-upload +%attr(755,root,root) %{_bindir}/abrt-watch-log +%attr(755,root,root) %{_sbindir}/abrt-server %attr(755,root,root) %{_sbindir}/abrtd -%attr(755,root,root) %{_bindir}/%{name}-debuginfo-install -%attr(755,root,root) %{_bindir}/%{name}-backtrace -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/%{name}.conf +%attr(755,root,root) %{_libexecdir}/abrt-action-ureport +%attr(755,root,root) %{_libexecdir}/abrt-handle-event +%dir %{_sysconfdir}/%{name} +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/abrt.conf +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/abrt-action-save-package-data.conf %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/gpg_keys -/etc/dbus-1/system.d/dbus-%{name}.conf +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/xorg.conf +%dir %{_sysconfdir}/%{name}/plugins +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libreport/events.d/abrt_event.conf +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libreport/events.d/smart_event.conf %attr(754,root,root) /etc/rc.d/init.d/abrtd -%dir %attr(775,root,abrt) /var/cache/%{name} +%{systemdunitdir}/abrtd.service +%attr(775,root,abrt) %dir /var/cache/%{name} %dir /var/run/%{name} -%dir %{_sysconfdir}/%{name} -%dir %{_sysconfdir}/%{name}/plugins -%dir %{_libdir}/%{name} -%{_mandir}/man1/%{name}-backtrace.1* +/usr/lib/tmpfiles.d/abrt.conf +%{_mandir}/man1/abrt-action-save-package-data.1* +%{_mandir}/man1/abrt-handle-upload.1* +%{_mandir}/man1/abrt-server.1* +%{_mandir}/man5/abrt.conf.5* +%{_mandir}/man5/abrt-action-save-package-data.conf.5* %{_mandir}/man8/abrtd.8* -%{_mandir}/man5/%{name}.conf.5* -%{_mandir}/man7/%{name}-plugins.7* -%{_datadir}/polkit-1/actions/org.fedoraproject.abrt.policy -%{_datadir}/dbus-1/system-services/com.redhat.abrt.service - -# plugin-sqlite3 -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/plugins/SQLite3.conf -%attr(755,root,root) %{_libdir}/%{name}/libSQLite3.so -%{_mandir}/man7/%{name}-SQLite3.7* %files libs %defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/libABRTUtils.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libABRTUtils.so.0 -%attr(755,root,root) %{_libdir}/libABRTdUtils.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libABRTdUtils.so.0 +%attr(755,root,root) %{_libdir}/libabrt.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libabrt.so.0 %files devel %defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/libABRTUtils.so -%attr(755,root,root) %{_libdir}/libABRTdUtils.so - -%files gui -%defattr(644,root,root,755) -%attr(755,root,root) %{_bindir}/%{name}-gui -%dir %{_datadir}/%{name} -# all glade, gtkbuilder and py files for gui -%{_datadir}/%{name}/*.py* -%{_datadir}/%{name}/*.glade -%{_desktopdir}/%{name}.desktop -%{_iconsdir}/hicolor/*/apps/* -# XXX ... should be in hicolor dir? -%dir %{_datadir}/%{name}/icons -%dir %{_datadir}/%{name}/icons/hicolor -%dir %{_datadir}/%{name}/icons/hicolor/* -%dir %{_datadir}/%{name}/icons/hicolor/*/status -%{_datadir}/%{name}/icons/hicolor/*/status/*.png -%attr(755,root,root) %{_bindir}/%{name}-applet -%{_sysconfdir}/xdg/autostart/%{name}-applet.desktop +%attr(755,root,root) %{_libdir}/libabrt.so +%{_includedir}/abrt +%{_pkgconfigdir}/abrt.pc %files addon-ccpp %defattr(644,root,root,755) -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/plugins/CCpp.conf -%attr(755,root,root) %{_libdir}/%{name}/libCCpp.so +%attr(755,root,root) %{_bindir}/abrt-action-analyze-backtrace +%attr(755,root,root) %{_bindir}/abrt-action-analyze-c +%attr(755,root,root) %{_bindir}/abrt-action-analyze-ccpp-local +%attr(755,root,root) %{_bindir}/abrt-action-analyze-core +%attr(755,root,root) %{_bindir}/abrt-action-generate-backtrace +%attr(755,root,root) %{_bindir}/abrt-action-generate-core-backtrace +%attr(755,root,root) %{_bindir}/abrt-action-install-debuginfo +%attr(755,root,root) %{_bindir}/abrt-action-list-dsos +%attr(755,root,root) %{_bindir}/abrt-action-perform-ccpp-analysis +%attr(755,root,root) %{_bindir}/abrt-action-trim-files +%attr(755,root,root) %{_bindir}/abrt-dedup-client +%attr(755,root,root) %{_sbindir}/abrt-install-ccpp-hook +%attr(6755,abrt,abrt) %{_libexecdir}/abrt-action-install-debuginfo-to-abrt-cache %attr(755,root,root) %{_libexecdir}/abrt-hook-ccpp -%dir %{_localstatedir}/cache/%{name}-di +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/plugins/CCpp.conf +%{_sysconfdir}/libreport/events/analyze_CCpp.xml +%{_sysconfdir}/libreport/events/analyze_LocalGDB.xml +%{_sysconfdir}/libreport/events/collect_GConf.xml +%{_sysconfdir}/libreport/events/collect_vimrc_system.xml +%{_sysconfdir}/libreport/events/collect_vimrc_user.xml +%{_sysconfdir}/libreport/events/collect_xsession_errors.xml +%{_sysconfdir}/libreport/events/post_report.xml +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libreport/events.d/ccpp_event.conf +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libreport/events.d/gconf_event.conf +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libreport/events.d/vimrc_event.conf +%attr(775,abrt,abrt) %dir %{_localstatedir}/cache/abrt-di +#%attr(754,root,root) /etc/rc.d/init.d/abrt-ccpp +%{systemdunitdir}/abrt-ccpp.service +%{_mandir}/man1/abrt-action-analyze-backtrace.1* +%{_mandir}/man1/abrt-action-analyze-c.1* +%{_mandir}/man1/abrt-action-analyze-ccpp-local.1* +%{_mandir}/man1/abrt-action-generate-backtrace.1* +%{_mandir}/man1/abrt-action-generate-core-backtrace.1* +%{_mandir}/man1/abrt-action-list-dsos.1* +%{_mandir}/man1/abrt-action-trim-files.1* +%{_mandir}/man1/abrt-install-ccpp-hook.1* %files addon-kerneloops %defattr(644,root,root,755) -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/plugins/Kerneloops.conf -%attr(755,root,root) %{_bindir}/dumpoops -%attr(755,root,root) %{_libdir}/%{name}/libKerneloops.so -%attr(755,root,root) %{_libdir}/%{name}/libKerneloopsScanner.so -%attr(755,root,root) %{_libdir}/%{name}/libKerneloopsReporter.so -%{_libdir}/%{name}/KerneloopsReporter.GTKBuilder -%{_mandir}/man7/%{name}-KerneloopsScanner.7* -%{_mandir}/man7/%{name}-KerneloopsReporter.7* - -%files plugin-logger -%defattr(644,root,root,755) -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/plugins/Logger.conf -%attr(755,root,root) %{_libdir}/%{name}/libLogger.so -%{_libdir}/%{name}/Logger.GTKBuilder -%{_mandir}/man7/%{name}-Logger.7* - -%files plugin-mailx -%defattr(644,root,root,755) -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/plugins/Mailx.conf -%attr(755,root,root) %{_libdir}/%{name}/libMailx.so -%{_libdir}/%{name}/Mailx.GTKBuilder -%{_mandir}/man7/%{name}-Mailx.7* - -%files plugin-runapp -%defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/%{name}/libRunApp.so -%{_mandir}/man7/%{name}-RunApp.7* - -%files plugin-sosreport -%defattr(644,root,root,755) -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/plugins/SOSreport.conf -%attr(755,root,root) %{_libdir}/%{name}/libSOSreport.so +%attr(755,root,root) %{_bindir}/abrt-action-analyze-oops +%attr(755,root,root) %{_bindir}/abrt-action-save-kernel-data +%attr(755,root,root) %{_bindir}/abrt-dump-oops +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libreport/events.d/koops_event.conf +#%attr(754,root,root) /etc/rc.d/init.d/abrt-oops +%{systemdunitdir}/abrt-oops.service +%{_mandir}/man1/abrt-action-analyze-oops.1* -%files plugin-bugzilla +%files addon-python %defattr(644,root,root,755) -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/plugins/Bugzilla.conf -%attr(755,root,root) %{_libdir}/%{name}/libBugzilla.so -%{_libdir}/%{name}/Bugzilla.GTKBuilder -%{_mandir}/man7/%{name}-Bugzilla.7* - -%files plugin-rhfastcheck +%attr(755,root,root) %{_bindir}/abrt-action-analyze-python +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/plugins/python.conf +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libreport/events.d/python_event.conf +%{py_sitedir}/abrt_exception_handler.py[co] +%{py_sitedir}/abrt.pth +%{_mandir}/man1/abrt-action-analyze-python.1* + +%files addon-vmcore %defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/%{name}/librhfastcheck.so - -%files plugin-rhticket +%attr(755,root,root) %{_bindir}/abrt-action-analyze-vmcore +%attr(755,root,root) %{_sbindir}/abrt-harvest-vmcore +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/abrt-harvest-vmcore.conf +%{_sysconfdir}/libreport/events/analyze_VMcore.xml +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libreport/events.d/vmcore_event.conf +#%attr(754,root,root) /etc/rc.d/init.d/abrt-vmcore +%{systemdunitdir}/abrt-vmcore.service +%{_mandir}/man1/abrt-action-analyze-vmcore.1* + +%files addon-xorg %defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/%{name}/librhticket.so +%attr(755,root,root) %{_bindir}/abrt-action-analyze-xorg +%attr(755,root,root) %{_bindir}/abrt-dump-xorg +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libreport/events.d/xorg_event.conf +#%attr(754,root,root) /etc/rc.d/init.d/abrt-xorg +%{systemdunitdir}/abrt-xorg.service -%files plugin-catcut +%files plugin-bodhi %defattr(644,root,root,755) -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/plugins/Catcut.conf -%attr(755,root,root) %{_libdir}/%{name}/libCatcut.so -%{_libdir}/%{name}/Catcut.GTKBuilder -#%{_mandir}/man7/%{name}-Catcut.7* +%attr(755,root,root) %{_bindir}/abrt-bodhi +%{_mandir}/man1/abrt-bodhi.1* -%files plugin-ticketuploader +%files retrace-client %defattr(644,root,root,755) -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/plugins/TicketUploader.conf -%attr(755,root,root) %{_libdir}/%{name}/libTicketUploader.so -%{_libdir}/%{name}/TicketUploader.GTKBuilder -%{_mandir}/man7/%{name}-TicketUploader.7* +%{_sysconfdir}/libreport/events/analyze_RetraceServer.xml +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libreport/events.d/ccpp_retrace_event.conf +%attr(755,root,root) %{_bindir}/abrt-retrace-client +%{_mandir}/man1/abrt-retrace-client.1* -%files plugin-filetransfer +%files dbus %defattr(644,root,root,755) -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/plugins/FileTransfer.conf -%attr(755,root,root) %{_libdir}/%{name}/libFileTransfer.so -%{_mandir}/man7/%{name}-FileTransfer.7* - -%files addon-python +%attr(755,root,root) %{_sbindir}/abrt-dbus +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libreport/events.d/dbus_event.conf +/etc/dbus-1/system.d/dbus-abrt.conf +%{_datadir}/dbus-1/interfaces/org.freedesktop.Problems.xml +%{_datadir}/dbus-1/system-services/org.freedesktop.problems.service +%{_datadir}/polkit-1/actions/abrt_polkit.policy +%{_mandir}/man8/abrt-dbus.8* +%{_docdir}/abrt-dbus-%{version} + +%files python %defattr(644,root,root,755) -%attr(4755,abrt,abrt) %{_libexecdir}/abrt-hook-python -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/plugins/Python.conf -%attr(755,root,root) %{_libdir}/%{name}/libPython.so -%{py_sitescriptdir}/*.py[co] -%{py_sitescriptdir}/abrt.pth +%{py_sitescriptdir}/problem +%{_mandir}/man5/abrt-python.5* +%{_docdir}/abrt-python-%{version} %files cli %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/abrt-cli %{_mandir}/man1/abrt-cli.1* -/etc/bash_completion.d/abrt-cli.bash + +%files gui +%defattr(644,root,root,755) +%attr(755,root,root) %{_bindir}/abrt-applet +%dir %{_datadir}/%{name} +%{_datadir}/%{name}/icons +%{_iconsdir}/hicolor/*/apps/abrt.png +%{_iconsdir}/hicolor/*/status/abrt.png +%{_sysconfdir}/xdg/autostart/abrt-applet.desktop %files desktop %defattr(644,root,root,755) diff --git a/abrt-rpm45.patch b/abrt-rpm45.patch new file mode 100644 index 0000000..aa675fb --- /dev/null +++ b/abrt-rpm45.patch @@ -0,0 +1,110 @@ +--- abrt-2.0.8/src/daemon/Makefile.am.0011~ 2011-12-15 13:39:13.000000000 +0100 ++++ abrt-2.0.8/src/daemon/Makefile.am 2012-03-11 21:28:24.900043460 +0100 +@@ -84,6 +84,7 @@ abrt_action_save_package_data_CPPFLAGS = + -I$(srcdir)/../include \ + -I$(srcdir)/../lib \ + -DCONF_DIR=\"$(CONF_DIR)\" \ ++ $(RPM_CFLAGS) \ + $(GLIB_CFLAGS) \ + $(LIBREPORT_CFLAGS) \ + -D_GNU_SOURCE \ +--- abrt-2.1.3/src/daemon/rpm.h.orig 2013-03-13 10:00:17.000000000 +0100 ++++ abrt-2.1.3/src/daemon/rpm.h 2013-04-02 18:02:06.019396313 +0200 +@@ -22,6 +22,7 @@ + #ifndef RPM_H_ + #define RPM_H_ + ++#include "rpmlib.h" + #include <rpm/rpmts.h> + #include <rpm/rpmcli.h> + #include <rpm/rpmdb.h> +--- abrt-2.1.3/src/daemon/rpm.c.orig 2013-03-13 10:00:17.000000000 +0100 ++++ abrt-2.1.3/src/daemon/rpm.c 2013-04-02 18:09:54.892719865 +0200 +@@ -62,7 +62,6 @@ void rpm_init() + void rpm_destroy() + { + rpmFreeRpmrc(); +- rpmFreeCrypto(); + rpmFreeMacros(NULL); + + list_free_with_free(list_fingerprints); +@@ -103,7 +102,14 @@ int rpm_chk_fingerprint(const char* pkg) + if (!header) + goto error; + +- pgpsig = headerFormat(header, "%|SIGGPG?{%{SIGGPG:pgpsig}}:{%{SIGPGP:pgpsig}}|", &errmsg); ++ pgpsig = headerSprintf( ++ header, ++ "%|DSAHEADER?{%{DSAHEADER:pgpsig}}:{%|RSAHEADER?{%{RSAHEADER:pgpsig}}:" ++ "{%|SIGGPG?{%{SIGGPG:pgpsig}}:{%|SIGPGP?{%{SIGPGP:pgpsig}}:{(none)}|}|}|}|", ++ NULL, ++ NULL, ++ &errmsg); ++ + if (!pgpsig && errmsg) + { + VERB1 log("cannot get siggpg:pgpsig. reason: %s", errmsg); +@@ -195,14 +201,13 @@ char* rpm_get_component(const char *file + rpmdbFreeIterator(iter); + rpmtsFree(ts); + ts = rpmtsCreate(); +- if (rpmtsSetRootDir(ts, rootdir_or_NULL) != 0) +- goto error1; ++ rpmtsSetRootDir(ts, rootdir_or_NULL); + filename += len; + rootdir_or_NULL = NULL; + } + + const char *errmsg = NULL; +- srpm = headerFormat(header, "%{SOURCERPM}", &errmsg); ++ srpm = headerSprintf(header, "%{SOURCERPM}", NULL, NULL, &errmsg); + if (!srpm && errmsg) + { + error_msg("cannot get srpm. reason: %s", errmsg); +@@ -223,7 +228,7 @@ char* rpm_get_component(const char *file + static inline int pkg_add_##name(Header header, struct pkg_envra *p) \ + { \ + const char *errmsg = NULL; \ +- p->p_##name = headerFormat(header, "%{"#name"}", &errmsg); \ ++ p->p_##name = headerSprintf(header, "%{"#name"}", NULL, NULL, &errmsg); \ + if (p->p_##name || !errmsg) \ + return 0; \ + \ +@@ -268,8 +273,7 @@ struct pkg_envra *rpm_get_package_nvr(co + rpmdbFreeIterator(iter); + rpmtsFree(ts); + ts = rpmtsCreate(); +- if (rpmtsSetRootDir(ts, rootdir_or_NULL) != 0) +- goto error1; ++ rpmtsSetRootDir(ts, rootdir_or_NULL); + filename += len; + rootdir_or_NULL = NULL; + } +--- abrt-2.1.3/src/plugins/bodhi.c.orig 2013-03-13 10:00:17.000000000 +0100 ++++ abrt-2.1.3/src/plugins/bodhi.c 2013-04-02 18:15:58.076045639 +0200 +@@ -18,6 +18,8 @@ + */ + + #include <json/json.h> ++#include <stdint.h> ++#include <rpmlib.h> + #include <rpm/rpmts.h> + #include <rpm/rpmcli.h> + #include <rpm/rpmdb.h> +@@ -338,7 +340,7 @@ static char *rpm_get_nvr_by_pkg_name(con + goto error; + + const char *errmsg = NULL; +- nvr = headerFormat(header, "%{name}-%{version}-%{release}", &errmsg); ++ nvr = headerSprintf(header, "%{name}-%{version}-%{release}", NULL, NULL, &errmsg); + + if (!nvr && errmsg) + error_msg("cannot get nvr. reason: %s", errmsg); +@@ -348,7 +350,6 @@ error: + rpmtsFree(ts); + + rpmFreeRpmrc(); +- rpmFreeCrypto(); + rpmFreeMacros(NULL); + + return nvr; diff --git a/automake.patch b/automake.patch deleted file mode 100644 index 2651713..0000000 --- a/automake.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- abrt-2.0.15/configure.ac.orig 2012-09-24 09:43:03.000000000 +0200 -+++ abrt-2.0.15/configure.ac 2012-10-14 23:06:30.028035439 +0200 -@@ -3,7 +3,7 @@ - [crash-catc...@fedorahosted.org]) - - AC_CONFIG_MACRO_DIR([m4]) --AM_INIT_AUTOMAKE([-Wall -Werror foreign]) -+AM_INIT_AUTOMAKE([-Wall foreign]) - # Support silent build rules. Disable by either passing --disable-silent-rules - # to ./configure or passing V=1 to make - m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES]) -@@ -11,10 +11,12 @@ - AM_SILENT_RULES([yes]) - - -+AM_PROG_AR - AC_DISABLE_STATIC - AC_PROG_LIBTOOL - AC_PROG_CC - AC_PROG_LN_S -+AM_PROG_CC_C_O - - AC_SYS_LARGEFILE - CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE \ diff --git a/format_security.patch b/format_security.patch index 5d3d889..53e94c4 100644 --- a/format_security.patch +++ b/format_security.patch @@ -1,9 +1,9 @@ ---- abrt-2.0.8/src/plugins/abrt-retrace-client.c.str_fmt~ 2012-03-11 21:23:29.615896279 +0100 -+++ abrt-2.0.8/src/plugins/abrt-retrace-client.c 2012-03-11 21:23:52.795907834 +0100 -@@ -613,7 +613,7 @@ static int create(bool delete_temp_archi +--- abrt-2.1.3/src/plugins/abrt-retrace-client.c.orig 2013-04-02 17:15:14.012788254 +0200 ++++ abrt-2.1.3/src/plugins/abrt-retrace-client.c 2013-04-02 17:42:57.132753624 +0200 +@@ -741,7 +741,7 @@ if (response_code == 500 || response_code == 507) { - alert_server_error(); + alert_server_error(cfg.url); - error_msg_and_die(http_body); + error_msg_and_die("%s", http_body); } ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/abrt.git/commitdiff/d3f5b5cc7b5d86f4a4912d980a99d4c90024440d _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit