--- /dev/null
+--- abrt-2.2.0/po/hu.po.orig 2014-03-05 10:37:27.000000000 +0100
++++ abrt-2.2.0/po/hu.po 2014-03-08 08:35:47.026524324 +0100
+@@ -553,7 +553,10 @@
+ "& [-v] [-r] -d DIR\n"
+ "\n"
+ "Creates coredump-level backtrace from core dump and corresponding binary"
+-msgstr "& [-v] [-r] -d DIR \\n\n\\n\nEgy coredump-szintű nyomkövetési adatot készít a hibaadatokból és a kapcsolódó binárisból"
++msgstr ""
++"& [-v] [-r] -d DIR \n"
++"\n"
++"Egy coredump-szintű nyomkövetési adatot készít a hibaadatokból és a kapcsolódó binárisból"
+
+ #: ../src/plugins/abrt-action-generate-core-backtrace.c:53
+ msgid "Do not hash fingerprints"
+@@ -597,7 +600,21 @@
+ " -e,--exact Download only specified files\n"
+ " --repo Pattern to use when searching for repos.\n"
+ " Default: *debug*\n"
+-msgstr "Használat: %s [-vy] [--ids=BUILD_IDS_FILE] \\n [--tmpdir=TMPDIR] [--cache=CACHEDIR[:DEBUGINFODIR1:DEBUGINFODIR2...]] [--size_mb=SIZE] \\n [-e, --exact=PATH] \\n A felsorolt azonosítók alapján felépíti és telepíti a debuginfot BUILD_IDS_FILE alapján \\n a CACHEDIR segítségével a TMPDIR ideiglenes átmeneti területére . \\n A régi fájlok tőrlődnek a CACHEDIRból amíg a z kisebb , mint a SIZE . \\n \\n -v Legyen részletesebb \\n -Y Legyen interaktív és válaszoljunk 'igen'el mindegyik kérdésre \\n --ids Alapértelmezett: build_ids \\n --tmpdir Alapértelmezett: @LARGE_DATA_TMP_DIR@/abrt-tmp-debuginfo-RANDOM_SUFFIX \\n --cache Alapértelmezett: /var/cache/abrt-di \\n --size_mb Alapértelmezettt: 4096 \\n -e,--exact Csak a megadott fájlok letöltése \\n"
++msgstr ""
++"Használat: %s [-vy] [--ids=BUILD_IDS_FILE] \n"
++" [--tmpdir=TMPDIR] [--cache=CACHEDIR[:DEBUGINFODIR1:DEBUGINFODIR2...]] [--size_mb=SIZE] \n"
++" [-e, --exact=PATH] \n"
++" A felsorolt azonosítók alapján felépíti és telepíti a debuginfot BUILD_IDS_FILE alapján \n"
++" a CACHEDIR segítségével a TMPDIR ideiglenes átmeneti területére . \n"
++" A régi fájlok tőrlődnek a CACHEDIRból amíg a z kisebb , mint a SIZE . \n"
++" \n"
++" -v Legyen részletesebb \n"
++" -Y Legyen interaktív és válaszoljunk 'igen'el mindegyik kérdésre \n"
++" --ids Alapértelmezett: build_ids \n"
++" --tmpdir Alapértelmezett: @LARGE_DATA_TMP_DIR@/abrt-tmp-debuginfo-RANDOM_SUFFIX \n"
++" --cache Alapértelmezett: /var/cache/abrt-di \n"
++" --size_mb Alapértelmezettt: 4096 \n"
++" -e,--exact Csak a megadott fájlok letöltése \n"
+
+ #: ../src/plugins/abrt-action-install-debuginfo.in:169
+ msgid "Can't open {0}: {1}"
+@@ -756,7 +773,7 @@
+
+ #: ../src/plugins/abrt-gdb-exploitable:693
+ msgid "Can't get signal no and do exploitability analysis\n"
+-msgstr "Nincsen jel és így nem lehet kihasználhatósági elemzést készíteni \\n"
++msgstr "Nincsen jel és így nem lehet kihasználhatósági elemzést készíteni \n"
+
+ #: ../src/plugins/abrt-gdb-exploitable:706
+ msgid "Likely crash reason: "
+@@ -772,7 +789,7 @@
+
+ #: ../src/plugins/abrt-gdb-exploitable:711
+ msgid "Exploitability analysis came up empty\n"
+-msgstr "A kihasználhatósági elemzés üresen jött \\n"
++msgstr "A kihasználhatósági elemzés üresen jött \n"
+
+ #: ../src/plugins/abrt-watch-log.c:142
+ msgid ""
+@@ -814,7 +831,10 @@
+ "& [-vusoxm] [-d DIR]/[-D] [FILE]\n"
+ "\n"
+ "Extract oops from FILE (or standard input)"
+-msgstr "& [-vusoxm] [-d DIR]/[-D] [FILE] \\n\n\\n\nBontsa ki az oppsot okozó fájlt a (standard bemenetre)"
++msgstr ""
++"& [-vusoxm] [-d DIR]/[-D] [FILE] \n"
++"\n"
++"Bontsa ki az oppsot okozó fájlt a (standard bemenetre)"
+
+ #: ../src/plugins/abrt-dump-oops.c:274
+ msgid "Print found oopses on standard output"
+@@ -1400,7 +1420,10 @@
+ "& [-v] [-od] FILE...\n"
+ "\n"
+ "Scans files for split oops message. Can print and/or delete them."
+-msgstr "& [-v] [-od] FILE... \\n\n\\n\nAz osztott oops üzeneteket kinyomtathatja/törölheti az átviszgált fájlban ."
++msgstr ""
++"& [-v] [-od] FILE... \n"
++"\n"
++"Az osztott oops üzeneteket kinyomtathatja/törölheti az átviszgált fájlban ."
+
+ #: ../src/hooks/abrt-merge-pstoreoops.c:97
+ msgid "Print found oopses"
+@@ -1499,7 +1522,7 @@
+ #: ../src/cli/status.c:104
+ #, c-format
+ msgid "ABRT has detected %u problem(s). For more info run: abrt-cli list%s\n"
+-msgstr "Az ABRT több hibát is talált %u (s) . További információhoz futtasa az abrt-cli list %s parancsot \\n"
++msgstr "Az ABRT több hibát is talált %u (s) . További információhoz futtasa az abrt-cli list %s parancsot \n"
+
+ #: ../src/plugins/analyze_CCpp.xml.in.h:1
+ msgid ""
+--- abrt-2.2.0/po/tr.po.orig 2014-03-05 10:37:21.000000000 +0100
++++ abrt-2.2.0/po/tr.po 2014-03-08 09:42:51.143022113 +0100
+@@ -902,7 +902,9 @@
+ msgid ""
+ "Unexpected HTTP response from server: %d\n"
+ "%s"
+-msgstr "Sunucudan beklenmeyen HTTP cevabı: %d\\n\n%s"
++msgstr ""
++"Sunucudan beklenmeyen HTTP cevabı: %d\n"
++"%s"
+
+ #: ../src/plugins/abrt-retrace-client.c:232
+ #: ../src/plugins/abrt-retrace-client.c:745
+@@ -985,17 +987,17 @@
+ #: ../src/plugins/abrt-retrace-client.c:673
+ #, c-format
+ msgid "Uploading %d megabytes\n"
+-msgstr "%d megabytes yükleniyor\\n"
++msgstr "%d megabytes yükleniyor\n"
+
+ #: ../src/plugins/abrt-retrace-client.c:675
+ #, c-format
+ msgid "Uploading %lld bytes\n"
+-msgstr "Yüklenen %lld byte \\n"
++msgstr "Yüklenen %lld byte \n"
+
+ #: ../src/plugins/abrt-retrace-client.c:699
+ #, c-format
+ msgid "Uploading %d%%\n"
+-msgstr "Yükleniyor '%d%%\\n"
++msgstr "Yükleniyor '%d%%\n"
+
+ #: ../src/plugins/abrt-retrace-client.c:711
+ msgid "Failed to read from a pipe"
+@@ -1039,7 +1041,9 @@
+ msgid ""
+ "Task Id: %s\n"
+ "Task Password: %s\n"
+-msgstr "Görev Id: %d\\n\nGörev Şifresi: %s\\n"
++msgstr ""
++"Görev Id: %s\n"
++"Görev Şifresi: %s\n"
+
+ #: ../src/plugins/abrt-retrace-client.c:856
+ msgid "Invalid response from server: missing X-Task-Status."
+@@ -1050,7 +1054,9 @@
+ msgid ""
+ "Task Status: %s\n"
+ "%s\n"
+-msgstr "Görev Durumu: %s\\n\n%s\\n"
++msgstr ""
++"Görev Durumu: %s\n"
++"%s\n"
+
+ #: ../src/plugins/abrt-retrace-client.c:899
+ #: ../src/plugins/abrt-retrace-client.c:973
# TODO:
# - handle obsolete packages: abrt-plugin-{catcut,rhfastcheck,rhticket,ticketuploader}
# - SysV init scripts for -addon-ccpp, -addon-kerneloops, -addon-pstoreoops, -addon-upload-watch, -addon-vmcore, -addon-xorg
-%define libreport_ver 2.1.12
+# - teach build system to use python3.2+ __pycache__
+%define libreport_ver 2.2.0
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.1.12
+Version: 2.2.0
Release: 1
License: GPL v2+
Group: Applications/System
Source0: https://fedorahosted.org/released/abrt/%{name}-%{version}.tar.gz
-# Source0-md5: 2e659a4acf115065aa0cf52398e2a9d5
+# Source0-md5: 7d5325ece7728a6058c94999ce2ceccb
Source1: %{name}.init
Patch0: %{name}-rpm5.patch
Patch1: %{name}-rpm45.patch
Patch2: format_security.patch
Patch3: %{name}-link.patch
-Patch4: %{name}-pythondir.patch
+Patch4: %{name}-po.patch
URL: https://fedorahosted.org/abrt/
BuildRequires: asciidoc
BuildRequires: autoconf >= 2.50
BuildRequires: nss-devel
BuildRequires: pkgconfig
BuildRequires: polkit-devel
-BuildRequires: python-devel
-BuildRequires: python-modules
+BuildRequires: python-devel >= 2
+BuildRequires: python-modules >= 2
+BuildRequires: python3-devel >= 3
+BuildRequires: python3-modules >= 3
BuildRequires: rpm-devel >= 4.5-28
BuildRequires: rpm-pythonprov
BuildRequires: rpmbuild(macros) >= 1.219
Ten pakiet zawiera wtyczkę do zbierania oopsów jądra z danych pstore.
%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
+Summary: ABRT's addon for catching and analyzing Python 2 exceptions
+Summary(pl.UTF-8): Dodatek ABRT do przechwytywania i analizy wyjątków Pythona 2
Group: Libraries
Requires: %{name} = %{version}-%{release}
+Requires: %{name}-python = %{version}-%{release}
+# for detecting package name containing offending file
+Suggests: python-rpm
+# for logging to journal
+Suggests: python-systemd
Obsoletes: gnome-python2-bugbuddy
%description addon-python
This package contains Python hook and Python analyzer plugin for
-handling uncaught exception in Python programs.
+handling uncaught exception in Python 2 programs.
%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.
+Pythonie 2.
+
+%package addon-python3
+Summary: ABRT's addon for catching and analyzing Python 3 exceptions
+Summary(pl.UTF-8): Dodatek ABRT do przechwytywania i analizy wyjątków Pythona 3
+Group: Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: %{name}-python3 = %{version}-%{release}
+# for detecting package name containing offending file (TODO: python3-rpm package)
+#Suggests: python3-rpm
+# for logging to journal (TODO: python3-systemd package)
+#Suggests: python3-systemd
+
+%description addon-python3
+This package contains Python hook and Python analyzer plugin for
+handling uncaught exception in Python 3 programs.
+
+%description addon-python3 -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 3.
%package addon-upload-watch
Summary: ABRT's upload addon
Group: Libraries
Requires: %{name} = %{version}-%{release}
Requires: %{name}-addon-kerneloops = %{version}-%{release}
-# not available in PLD
-#Requires: crash
+Requires: crash
%description addon-vmcore
This package contains plugin for collecting kernel crash information
do danych o problemach.
%package python
-Summary: ABRT Python API
-Summary(pl.UTF-8): API Pythona do ABRT
+Summary: ABRT Python 2 API
+Summary(pl.UTF-8): API Pythona 2 do ABRT
Group: Libraries/Python
Requires: %{name} = %{version}-%{release}
+Requires: python-libreport >= %{libreport_ver}
%description python
High-level API for querying, creating and manipulating problems
-handled by ABRT in Python.
+handled by ABRT in Python 2.
%description python -l pl.UTF-8
Wysokopoziomowe API do odpytywania, tworzenia i obróbki z poziomu
-Pythona problemów obsługiwanych przez ABRT.
+Pythona 2 problemów obsługiwanych przez ABRT.
+
+%package python3
+Summary: ABRT Python 3 API
+Summary(pl.UTF-8): API Pythona 3 do ABRT
+Group: Libraries/Python
+Requires: %{name} = %{version}-%{release}
+Requires: python3-libreport >= %{libreport_ver}
+
+%description python3
+High-level API for querying, creating and manipulating problems
+handled by ABRT in Python.
+
+%description python3 -l pl.UTF-8
+Wysokopoziomowe API do odpytywania, tworzenia i obróbki z poziomu
+Pythona 3 problemów obsługiwanych przez ABRT.
%package cli
Summary: ABRT's command line interface
EOF
%{__rm} $RPM_BUILD_ROOT%{py_sitedir}/problem/*.la
+%{__rm} $RPM_BUILD_ROOT%{py3_sitedir}/problem/*.la
# examples
%{__rm} -r $RPM_BUILD_ROOT%{py_sitescriptdir}/problem_examples
+%{__rm} -r $RPM_BUILD_ROOT%{py3_sitescriptdir}/problem_examples
# outdated copy of lt
%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/lt_LT
%files -f %{name}.lang
%defattr(644,root,root,755)
%doc README
+%attr(755,root,root) %{_bindir}/abrt-action-analyze-python
%attr(755,root,root) %{_bindir}/abrt-action-notify
%attr(755,root,root) %{_bindir}/abrt-action-save-package-data
%attr(755,root,root) %{_bindir}/abrt-handle-upload
%attr(775,root,abrt) %dir /var/cache/%{name}
%dir /var/run/%{name}
%{systemdtmpfilesdir}/abrt.conf
+%{_mandir}/man1/abrt-action-analyze-python.1*
%{_mandir}/man1/abrt-action-notify.1*
%{_mandir}/man1/abrt-action-save-package-data.1*
%{_mandir}/man1/abrt-auto-reporting.1*
%files addon-python
%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/abrt-action-analyze-python
-%dir %{_datadir}/%{name}/conf.d/plugins/python.conf
+%{_datadir}/%{name}/conf.d/plugins/python.conf
%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*
%{_mandir}/man5/abrt-python.conf.5*
%{_mandir}/man5/python_event.conf.5*
+%files addon-python3
+%defattr(644,root,root,755)
+%{_datadir}/%{name}/conf.d/plugins/python3.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/plugins/python3.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libreport/events.d/python3_event.conf
+%{py3_sitedir}/abrt_exception_handler3.py*
+%{py3_sitedir}/abrt3.pth
+%{_mandir}/man5/abrt-python3.conf.5*
+%{_mandir}/man5/python3_event.conf.5*
+
%files addon-upload-watch
%defattr(644,root,root,755)
%attr(755,root,root) %{_sbindir}/abrt-upload-watch
%{py_sitedir}/problem/*.py[co]
%{_mandir}/man5/abrt-python.5*
+%files python3
+%defattr(644,root,root,755)
+%dir %{py3_sitedir}/problem
+%attr(755,root,root) %{py3_sitedir}/problem/_py3abrt.so
+%{py3_sitedir}/problem/*.py*
+%{_mandir}/man5/abrt-python3.5*
+
%files cli
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/abrt-cli
projects / packages / abrt.git / commitdiff