Merge branch 'master' of ssh://git.fedorahosted.org/git/abrt

3 files changed, 5 insertions, 4 deletions

diff --git a/abrt.spec b/abrt.spec
index bbccd376..8f8f5bd3 100644
--- a/abrt.spec
+++ b/abrt.spec
@@ -318,6 +318,7 @@ fi
 %config(noreplace) %{_sysconfdir}/%{name}/gpg_keys
 %config(noreplace) %{_sysconfdir}/dbus-1/system.d/dbus-%{name}.conf
 %{_initrddir}/%{name}d
+# /var/cache/%{name} is to be removed in 1.3.x timeframe
 %dir %attr(0755, abrt, abrt) %{_localstatedir}/cache/%{name}
 %dir %attr(0755, abrt, abrt) %{_localstatedir}/spool/%{name}
 %dir /var/run/%{name}
diff --git a/doc/DESIGN b/doc/DESIGN
index df006f96..6074457b 100644
--- a/doc/DESIGN
+++ b/doc/DESIGN
@@ -59,14 +59,14 @@ After this, abrt-hook-ccpp spawns "abrt-process -d /var/spool/abrt/DIR"
 and terminates.
 
 When python program crashes, it invokes internel python subroutine
-which dumps crash info into ~/abrt/cache/DIR.
+which dumps crash info into ~/abrt/spool/DIR.
 [this is a tentative plan, currently we dump in /var/spool/abrt/DIR]
-After this, it spawns "abrt-process -d ~/abrt/cache/DIR"
+After this, it spawns "abrt-process -d ~/abrt/spool/DIR"
 and terminates.
 
 [Problem: dumping to /var/spool/abrt/DIR needs world-writable
 /var/spool/abrt and allows user to go way over his
-disk quota. Dumping to ~/abrt/cache/DIR makes it difficult
+disk quota. Dumping to ~/abrt/spool/DIR makes it difficult
 to present a list of all crashes which happened on the machine -
 for example, root-owned processes cannot even access user data
 in ~user/* if /home is on NFS4...
diff --git a/lib/Plugins/SQLite3.cpp b/lib/Plugins/SQLite3.cpp
index 6ccadae4..74d2dcdb 100644
--- a/lib/Plugins/SQLite3.cpp
+++ b/lib/Plugins/SQLite3.cpp
@@ -328,7 +328,7 @@ static bool check_table(sqlite3 *db)
 
 
 CSQLite3::CSQLite3() :
-    m_sDBPath(LOCALSTATEDIR "/cache/abrt/abrt-db"),
+    m_sDBPath(LOCALSTATEDIR "/spool/abrt/abrt-db"),
     m_pDB(NULL)
 {}