From 59241bf4c83a619a745ba1a50005eb5bfb1e4ab1c64617e2edc2f7c7a9a00774 Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Fri, 22 Aug 2008 22:48:34 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/kdump?expand=0&rev=23

---
 ...p-f4cf2ef3cc3e6414d7d9386de0ebf7d633cbfed5 | 41 +++++++++++++++++++
 kdump.changes                                 | 12 ++++++
 kdump.spec                                    | 20 ++++++++-
 3 files changed, 72 insertions(+), 1 deletion(-)
 create mode 100644 kdump-f4cf2ef3cc3e6414d7d9386de0ebf7d633cbfed5

diff --git a/kdump-f4cf2ef3cc3e6414d7d9386de0ebf7d633cbfed5 b/kdump-f4cf2ef3cc3e6414d7d9386de0ebf7d633cbfed5
new file mode 100644
index 0000000..6614834
--- /dev/null
+++ b/kdump-f4cf2ef3cc3e6414d7d9386de0ebf7d633cbfed5
@@ -0,0 +1,41 @@
+changeset:   314:f4cf2ef3cc3e
+tag:         tip
+user:        Bernhard Walle <bwalle@suse.de>
+date:        Mon Aug 18 16:39:12 2008 +0200
+summary:     Change default location of KDUMP_SAVEDIR to "/var/crash"
+
+diff -r f2128430a054 -r f4cf2ef3cc3e ChangeLog
+--- a/ChangeLog	Fri Aug 15 14:34:55 2008 +0200
++++ b/ChangeLog	Mon Aug 18 16:39:12 2008 +0200
+@@ -1,3 +1,7 @@
++2008-08-18  Bernhard Walle <bwalle@suse.de>
++
++	* change default location to "/var/crash"
++
+ 2008-08-15  Bernhard Walle <bwalle@suse.de>
+ 
+ 	* make the kdump init script a boot script ("boot.kdump")
+diff -r f2128430a054 -r f4cf2ef3cc3e NEWS
+--- a/NEWS	Fri Aug 15 14:34:55 2008 +0200
++++ b/NEWS	Mon Aug 18 16:39:12 2008 +0200
+@@ -1,3 +1,7 @@
++0.6.4
++-----
++  * change default location for KDUMP_SAVEDIR to "/var/crash"
++
+ 0.6.3
+ -----
+   * make the kdump init script a boot script ("boot.kdump")
+diff -r f2128430a054 -r f4cf2ef3cc3e sysconfig.kdump
+--- a/sysconfig.kdump	Fri Aug 15 14:34:55 2008 +0200
++++ b/sysconfig.kdump	Mon Aug 18 16:39:12 2008 +0200
+@@ -91,7 +91,7 @@
+ # See also: kdump(5) which contains an exact specification for the URL format.
+ # Consider using the "yast2 kdump" module if you are unsure.
+ #
+-KDUMP_SAVEDIR="file:///var/log/dump"
++KDUMP_SAVEDIR="file:///var/crash"
+ 
+ ## Type:	integer
+ ## Default:	5
+
diff --git a/kdump.changes b/kdump.changes
index 6e44a84..5ac1b1a 100644
--- a/kdump.changes
+++ b/kdump.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Mon Aug 18 18:10:16 CEST 2008 - bwalle@suse.de
+
+- also create /var/log/dump link when the /var/log/dump directory
+  did not exist
+- delete /var/log/dump link in %postun
+
+-------------------------------------------------------------------
+Mon Aug 18 16:40:53 CEST 2008 - bwalle@suse.de
+
+- change default for KDUMP_SAVEDIR to "/var/crash"
+
 -------------------------------------------------------------------
 Fri Aug 15 14:41:25 CEST 2008 - bwalle@suse.de
 
diff --git a/kdump.spec b/kdump.spec
index f9e5f9c..c831e23 100644
--- a/kdump.spec
+++ b/kdump.spec
@@ -22,7 +22,7 @@ Url:            http://freehg.org/u/bwalle/kdump/
 Name:           kdump
 License:        GPL v2 or later
 Version:        0.6.3
-Release:        1
+Release:        10
 Requires:       curl openssh makedumpfile
 Summary:        Script for kdump
 Group:          System/Kernel
@@ -34,6 +34,7 @@ BuildRequires:  libssh2-devel
 %endif
 PreReq:         %insserv_prereq %fillup_prereq mkinitrd
 Source:         %{name}-%{version}.tar.bz2
+Patch0:         %{name}-f4cf2ef3cc3e6414d7d9386de0ebf7d633cbfed5
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 # rename "kdump-helpers" (10.3) -> "kdump" (11.0/SP2)
 Provides:       kdump-helpers = 0.2.4
@@ -55,6 +56,7 @@ Authors:
 
 %prep
 %setup
+%patch0 -p1
 
 %build
 mkdir build
@@ -70,10 +72,17 @@ cd -
 # symlink for init script
 mkdir -p $RPM_BUILD_ROOT/sbin
 ln -s /etc/init.d/boot.kdump $RPM_BUILD_ROOT/sbin/rckdump
+# empty directory
+mkdir $RPM_BUILD_ROOT/var/crash
 
 %post
 %{fillup_and_insserv -n kdump boot.kdump}
 /sbin/mkinitrd_setup
+# if /var/log/dump is empty, make it a symlink to /var/crash
+if test -d /var/log/dump && rmdir /var/log/dump &>/dev/null ||
+        ! test -d /var/log/dump ; then
+    ln -s /var/crash /var/log/dump
+fi
 
 %preun
 echo "Stopping kexec ..."
@@ -83,6 +92,8 @@ echo "Stopping kexec ..."
 %restart_on_update boot.kdump
 %insserv_cleanup
 /sbin/mkinitrd_setup
+# delete symbolic link
+rm /var/log/dump &>/dev/null || true
 
 %clean
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
@@ -101,8 +112,15 @@ echo "Stopping kexec ..."
 /var/adm/fillup-templates/sysconfig.kdump
 /lib/mkinitrd/scripts/*-kdump.sh
 %config %{_sysconfdir}/udev/rules.d/70-kdump.rules
+%dir /var/crash 
 
 %changelog
+* Mon Aug 18 2008 bwalle@suse.de
+- also create /var/log/dump link when the /var/log/dump directory
+  did not exist
+- delete /var/log/dump link in %%postun
+* Mon Aug 18 2008 bwalle@suse.de
+- change default for KDUMP_SAVEDIR to "/var/crash"
 * Fri Aug 15 2008 bwalle@suse.de
 - update to 0.6.3
   o make the kdump init script a boot script ("boot.kdump")