- updated to 2.0.15

diff --git a/abrt-pld.patch b/abrt-pld.patch
deleted file mode 100644 (file)
index 27532f5..0000000
--- a/abrt-pld.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- abrt-1.0.9/lib/Utils/DebugDump.cpp~        2010-04-02 12:53:59.000000000 +0300
-+++ abrt-1.0.9/lib/Utils/DebugDump.cpp 2010-04-08 23:04:27.265361307 +0300
-@@ -331,6 +331,7 @@
-         SaveText(FILENAME_ARCHITECTURE, buf.machine);
-         std::string release;
-         LoadTextFile("/etc/redhat-release", release);
-+        LoadTextFile("/etc/pld-release", release);
-         const char *release_ptr = release.c_str();
-         unsigned len_1st_str = strchrnul(release_ptr, '\n') - release_ptr;
-         release.erase(len_1st_str); /* usually simply removes trailing '\n' */

diff --git a/abrt.spec b/abrt.spec
index 4552a598451cbfb54bdb4f0ce9db261c3b4a2965..e58a357a477516694703fe2e5b7a425c81edbfc3 100644 (file)
--- a/abrt.spec
+++ b/abrt.spec
@@ -1,18 +1,16 @@
-# TODO
-# - fixes to get working with jbj rpm
 Summary:       Automatic bug detection and reporting tool
 Name:          abrt
-Version:       1.0.9
-Release:       0.3
+Version:       2.0.15
+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: aaa31f787ae7c144c57837928d26fdc9
+# Source0-md5: 0ac147b6e43ca873e6b1927601ec22a4
 Source1:       %{name}.init
-Patch0:                %{name}-rpm.patch
-Patch1:                %{name}-pld.patch
+Patch0:                %{name}-rpm5.patch
 Patch2:                rpmkey-pld.patch
+Patch3:                format_security.patch
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: bison
@@ -251,8 +249,8 @@ environments.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %{__libtoolize}
@@ -260,7 +258,9 @@ environments.
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-%configure
+%configure \
+       --with-systemdsystemunitdir=%{systemdunitdir}
+
 %{__make}
 
 %install

diff --git a/format_security.patch b/format_security.patch
new file mode 100644 (file)
index 0000000..5d3d889
--- /dev/null
+++ b/format_security.patch
@@ -0,0 +1,11 @@
+--- 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
+     if (response_code == 500 || response_code == 507)
+     {
+         alert_server_error();
+-        error_msg_and_die(http_body);
++        error_msg_and_die("%s", http_body);
+     }
+     else if (response_code == 403)
+     {

diff --git a/rpmkey-pld.patch b/rpmkey-pld.patch
index ef7988a01aa1b6ff23ca08af5a1bac30a338acfa..d1017164a0a056343b84b74a28cd514b63571d39 100644 (file)
--- a/rpmkey-pld.patch
+++ b/rpmkey-pld.patch
@@ -1,5 +1,5 @@
---- abrt-1.0.8/src/Daemon/gpg_keys~    2010-02-12 00:52:28.000000000 +0200
-+++ abrt-1.0.8/src/Daemon/gpg_keys     2010-03-24 12:47:24.745636712 +0200
+--- abrt-1.0.8/src/daemon/gpg_keys~    2010-02-12 00:52:28.000000000 +0200
++++ abrt-1.0.8/src/daemon/gpg_keys     2010-03-24 12:47:24.745636712 +0200
 @@ -1 +1,2 @@
 -/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
 +/etc/pki/rpm-gpg/PLD-2.0-Ac-GPG-key.asc